Distinguish between selected item and root-selected item

2024-09-21 21:59:53 +01:00
parent 2154abfb1d
commit 31b5db6e9e
33 changed files with 313 additions and 281 deletions
@@ -38,6 +38,6 @@ strFromHeldItem :: Creature -> Int
 strFromHeldItem cr
 --x---    | _posture (_crStance cr) == Aiming || crIsReloading cr = negate $ fromMaybe 0 $ do
    | _posture (_crStance cr) == Aiming = negate $ fromMaybe 0 $ do
-        i <- cr ^? crManipulation . manObject . inInventory . ispItem
+        i <- cr ^? crManipulation . manObject . inInventory . imRootItem
        cr ^? crInv . ix i . itUse . heldAim . aimWeight
    | otherwise = 0