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
@@ -153,7 +153,7 @@ showEquipmentNumber _ itm = case _eeUse ee of

 showReloadProgress :: Creature -> Item -> String
 showReloadProgress _ itm = fromMaybe [] $ do
-    ia <- itm ^? itUse . attachParams . ammoAttachParams
+    ia <- itm ^? itUse . attachParams . ammoLoadStatus
    return $ case ia ^? iaProgress . _Just . ix 0 of
        Nothing -> maybe "" show $ ia ^? iaLoaded
        Just la -> showLoadActionType la ia