Make equipment indices point to item indices

2025-08-26 23:57:02 +01:00
parent 49efe62910
commit 06d50ac752
18 changed files with 108 additions and 522 deletions
@@ -116,8 +116,7 @@ twists m cr = crInAimStance TwoHandUnder m cr || crInAimStance TwoHandOver m cr
 -- Not sure if it is a good idea
 crIsArmouredFrom :: IM.IntMap Item -> Point2 -> Creature -> Bool
 crIsArmouredFrom m p cr = fromMaybe False $ do
-    invid <- cr ^? crEquipment . ix OnChest
-    itid <- cr ^? crInv . ix invid
+    NInt itid <- cr ^? crEquipment . ix OnChest
    ittype <- m ^? ix itid . itType
    return $
        EQUIP FRONTARMOUR == ittype