Fix distributer not to take ammo from overfilled magazines

This commit is contained in:
2025-12-24 21:01:49 +00:00
parent 225ee310ad
commit 8e484e37a9
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -51,7 +51,7 @@ tutAnoTree = do
, corDoor , corDoor
, return $ tToBTree "cor" $ return $ cleatOnward corridor , return $ tToBTree "cor" $ return $ cleatOnward corridor
, tToBTree "sdr" . return . cleatOnward <$> , tToBTree "sdr" . return . cleatOnward <$>
(shuffleLinks =<< distributerRoom BulletAmmo 10000000) (shuffleLinks =<< distributerRoom BulletAmmo 100)
, return $ tToBTree "cor" $ return $ cleatOnward corridor , return $ tToBTree "cor" $ return $ cleatOnward corridor
--, tToBTree "sdr" . return . cleatOnward <$> slowDoorRoom --, tToBTree "sdr" . return . cleatOnward <$> slowDoorRoom
-- , tToBTree "sr" . return . cleatOnward <$> tanksRoom [] [] -- , tToBTree "sr" . return . cleatOnward <$> tanksRoom [] []
+1 -1
View File
@@ -150,7 +150,7 @@ distributeAmmoToItem x itm = fromMaybe (x,0) $ do
m <- magMax itm m <- magMax itm
cur <- itm ^. itConsumables cur <- itm ^. itConsumables
let d = m - cur let d = m - cur
t = min x d t = max 0 $ min x d
return (x-t,t) return (x-t,t)
resetTerminal :: TerminalStatus -> Terminal -> World -> World resetTerminal :: TerminalStatus -> Terminal -> World -> World