Work on inventory management

2023-02-16 16:12:03 +00:00
parent ff5fa6321a
commit 934dd64704
30 changed files with 129 additions and 111 deletions
@@ -36,8 +36,7 @@ crCurrentEquipment cr =

 strFromHeldItem :: Creature -> Int
 strFromHeldItem cr
-    | _posture (_crStance cr) == Aiming || crIsReloading cr =
-        negate $ fromMaybe 0 $ cr ^? crInv . ix itRef . itUse . heldAim . aimWeight
+    | _posture (_crStance cr) == Aiming || crIsReloading cr = negate $ fromMaybe 0 $ do
+        i <- cr ^? crManipulation . isel . ispItem
+        cr ^? crInv . ix i . itUse . heldAim . aimWeight
    | otherwise = 0
-  where
-    itRef = cr ^?! crInvSel . isel . ispItem -- unsafe!! TODO change