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
@@ -174,7 +174,7 @@ reloadOverride :: Creature -> Creature
 reloadOverride cr = fromMaybe cr $ do
    guard $ cr ^. crStance . posture == Aiming
    itRef <- cr ^? crManipulation . manObject . inInventory . ispItem
-    guard $ cr ^? crInv . ix (itRef + 1) . itUse . attachParams . ammoAttachParams . iaLoaded == Just 0
+    guard $ cr ^? crInv . ix (itRef + 1) . itUse . attachParams . ammoLoadStatus . iaLoaded == Just 0
    return $ cr & crActionPlan . apStrategy .~ StrategyActions Reload reloadActions
  where
    reloadActions =