Remove old ammo code, add magazines to some test loadouts

2024-06-21 23:24:26 +01:00
parent ecefba21d6
commit 944b40cb56
12 changed files with 182 additions and 165 deletions
@@ -42,7 +42,7 @@ crIsReloading cr = case cr ^? crManipulation . manObject . inInventory . iselAct
 crWeaponReady :: Creature -> Bool
 crWeaponReady cr = fromMaybe False $ do
    i <- cr ^? crManipulation . manObject . inInventory . ispItem
-    x <- cr ^? crInv . ix (i + 1) . itUse . attachParams . ammoAttachParams . iaLoaded
+    x <- cr ^? crInv . ix (i + 1) . itUse . attachParams . ammoLoadStatus . iaLoaded
    return (x > 0)

 crCanSeeCr :: Creature -> (World, Creature) -> Bool