Major item refactor, still broken

src/Dodge/Item/Draw.hs

@@ -4,6 +4,7 @@ module Dodge.Item.Draw (
     itemEquipPict,
 ) where
 
+import qualified Data.IntMap.Strict as IM
 import qualified Quaternion as Q
 import Dodge.Data.Equipment.Misc
 import Dodge.Data.ComposedItem
@@ -16,12 +17,12 @@ import Dodge.Item.Draw.SPic
 import Dodge.Item.HeldOffset
 import ShapePicture
 
-itemEquipPict :: Creature -> DTree CItem -> SPic
-itemEquipPict cr itmtree
+itemEquipPict :: IM.IntMap Item -> Creature -> DTree CItem -> SPic
+itemEquipPict m cr itmtree
     | Just i <- itm ^? itLocation . ilInvID
-    , Just esite <- cr ^? crInv . ix i . itLocation . ilEquipSite . _Just
+    , Just esite <- itm ^? itLocation . ilEquipSite . _Just
     , Just attachpos <- equipAttachPos <$> itm ^? itType . ibtEquip
-        = equipPosition esite cr attachpos (itemSPic itm)
+        = equipPosition esite m cr attachpos (itemSPic itm)
     | itm ^? itLocation . ilInvID == cr ^? crManipulation . manObject . imRootSelectedItem
         = overPosSP (Q.prePos $ handHandleOrient loc cr) (itemTreeSPic itmtree)
     | otherwise = mempty
@@ -37,15 +38,15 @@ equipAttachPos = \case
     BULLETBELTBRACER -> V3 (-9) 0 10
     _ -> 0
 
-equipPosition :: EquipSite -> Creature -> Point3 -> SPic -> SPic
-equipPosition epos cr p sh = case epos of
-    OnLeftWrist -> translateToLeftWrist cr sh
-    OnRightWrist -> translateToRightWrist cr sh
+equipPosition :: EquipSite -> IM.IntMap Item -> Creature -> Point3 -> SPic -> SPic
+equipPosition epos m cr p sh = case epos of
+    OnLeftWrist -> translateToLeftWrist m cr sh
+    OnRightWrist -> translateToRightWrist m cr sh
     OnLegs ->
         translateToLeftLeg cr sh
             <> translateToRightLeg cr sh-- (mirrorSPxz sh)
-    OnHead -> translateToHead cr sh
-    OnChest -> translateToChest cr sh
+    OnHead -> translateToHead m cr sh
+    OnChest -> translateToChest m cr sh
     --OnBack -> translateToBack cr p sh
-    OnBack -> overPosSP (\x -> fst $ backPQ cr `Q.comp` (p + x,Q.qID)) sh
-    OnSpecial -> sh
+    OnBack -> overPosSP (\x -> fst $ backPQ m cr `Q.comp` (p + x,Q.qID)) sh
+--    OnSpecial -> sh