Major item refactor, still broken

src/Dodge/Creature/Statistics.hs

@@ -6,6 +6,7 @@ module Dodge.Creature.Statistics (
     crIntelligence,
 ) where
 
+import Dodge.Data.LWorld
 import Data.Maybe
 import Dodge.Data.Creature
 import qualified IntMapHelp as IM
@@ -42,11 +43,11 @@ crIntelligence  cr = case cr ^. crType of
     LampCrit {} -> 0
     
 
-getCrMoveSpeed :: Creature -> Int
-getCrMoveSpeed cr = strFromHeldItem cr + strFromEquipment cr + crStrength cr
+getCrMoveSpeed :: LWorld -> Creature -> Int
+getCrMoveSpeed lw cr = strFromHeldItem lw cr + strFromEquipment lw cr + crStrength cr
 
-strFromEquipment :: Creature -> Int
-strFromEquipment = sum . fmap equipmentStrValue . crCurrentEquipment
+strFromEquipment :: LWorld -> Creature -> Int
+strFromEquipment lw = sum . fmap equipmentStrValue . crCurrentEquipment lw
 
 equipmentStrValue :: Item -> Int
 equipmentStrValue itm = case _itType itm of
@@ -54,14 +55,16 @@ equipmentStrValue itm = case _itType itm of
     EQUIP POWERLEGS -> 3
     _ -> 0
 
-crCurrentEquipment :: Creature -> IM.IntMap Item
-crCurrentEquipment = IM.filter (isJust . (^? itLocation . ilEquipSite . _Just)) . _crInv
+crCurrentEquipment :: LWorld -> Creature -> IM.IntMap Item
+crCurrentEquipment lw = IM.filter (isJust . (^? itLocation . ilEquipSite . _Just)) . fmap f . _crInv
+  where
+    f i = lw ^?! items . ix i
 
-strFromHeldItem :: Creature -> Int
-strFromHeldItem cr = fromMaybe 0 $ do
+strFromHeldItem :: LWorld -> Creature -> Int
+strFromHeldItem lw cr = fromMaybe 0 $ do
     Aiming <- cr ^? crStance . posture
     i <- cr ^? crManipulation . manObject . imRootSelectedItem
-    fmap (negate . itemWeight) $ cr ^? crInv . ix i
+    fmap (negate . itemWeight) $ lw ^? items . ix i
 
 itemWeight :: Item -> Int
 itemWeight it = case it ^. itType of