Cleanup

2022-07-27 12:49:23 +01:00
parent 6554d219dc
commit 8d17ce66e9
106 changed files with 2911 additions and 2678 deletions
@@ -41,7 +41,7 @@ crIsReloading cr = case cr ^? crInvSel . iselAction of

 crWeaponReady :: Creature -> Bool
 crWeaponReady cr = fromMaybe False $ do
-    ic <- cr ^? crInv . ix (crSel cr) . itConsumption
+    ic <- cr ^? crInv . ix (crSel cr) . itUse . heldConsumption
    return (_laLoaded ic > 0 && _laPrimed ic)

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