Work towards adding external ammo sources

2023-05-17 11:01:52 +01:00
parent 63c71c852d
commit 7df81559d9
30 changed files with 246 additions and 196 deletions
@@ -118,7 +118,7 @@ useMod hm = case hm of
        , ammoHammerCheck
        ]
    AmmoCheckMod -> [ammoCheckI]
-    AmmoUseCheckMod -> [ammoUseCheck]
+    AmmoUseCheckMod -> [useAmmoAmount 1,useTimeCheck, ammoCheckI]
    AmmoHammerTimeUseOneMod ->
        [ useAmmoAmount 1
        , useTimeCheck
@@ -465,13 +465,11 @@ fireRemoteShell it cr w =

 caneStickSoundChoice :: Item -> SoundID
 caneStickSoundChoice it
-    | _laLoaded (_heldConsumption (_itUse it)) < 2 = tap3S
+    | (it ^?! itUse . heldConsumption . laSource . _InternalSource . iaLoaded) < 2 = tap3S
    | otherwise = shotgunS

 bangStickSoundChoice :: Item -> SoundID
-bangStickSoundChoice it
-    | _laLoaded (_heldConsumption (_itUse it)) < 2 = tap3S
-    | otherwise = shotgunS
+bangStickSoundChoice = caneStickSoundChoice

 coneRandItemUpdate :: State StdGen (Item -> Item)
 coneRandItemUpdate = do