From 8e484e37a9b1e23c41e6437eca03a5affc309590 Mon Sep 17 00:00:00 2001 From: justin Date: Wed, 24 Dec 2025 21:01:49 +0000 Subject: [PATCH] Fix distributer not to take ammo from overfilled magazines --- src/Dodge/Room/Tutorial.hs | 2 +- src/Dodge/WorldEffect.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Dodge/Room/Tutorial.hs b/src/Dodge/Room/Tutorial.hs index fbfa898bd..a4cf15224 100644 --- a/src/Dodge/Room/Tutorial.hs +++ b/src/Dodge/Room/Tutorial.hs @@ -51,7 +51,7 @@ tutAnoTree = do , corDoor , return $ tToBTree "cor" $ return $ cleatOnward corridor , tToBTree "sdr" . return . cleatOnward <$> - (shuffleLinks =<< distributerRoom BulletAmmo 10000000) + (shuffleLinks =<< distributerRoom BulletAmmo 100) , return $ tToBTree "cor" $ return $ cleatOnward corridor --, tToBTree "sdr" . return . cleatOnward <$> slowDoorRoom -- , tToBTree "sr" . return . cleatOnward <$> tanksRoom [] [] diff --git a/src/Dodge/WorldEffect.hs b/src/Dodge/WorldEffect.hs index c0fe40979..2709dda78 100644 --- a/src/Dodge/WorldEffect.hs +++ b/src/Dodge/WorldEffect.hs @@ -150,7 +150,7 @@ distributeAmmoToItem x itm = fromMaybe (x,0) $ do m <- magMax itm cur <- itm ^. itConsumables let d = m - cur - t = min x d + t = max 0 $ min x d return (x-t,t) resetTerminal :: TerminalStatus -> Terminal -> World -> World