Cleanup

src/Dodge/Equipment.hs

@@ -13,6 +13,7 @@ import Dodge.Wall.ForceField
 import Dodge.Wall.Move
 import Geometry
 import qualified IntMapHelp as IM
+import NewInt
 
 effectOnRemove :: Item -> Creature -> World -> World
 effectOnRemove itm = case itm ^. itType of
@@ -49,11 +50,14 @@ setWristShieldPos itm cr w = w & moveWallIDUnsafe i wlline
   where
     i = _itParamID $ _itParams itm
     wlline = (f (V3 (-10) 7 0), f (V3 10 7 0))
-    invid = _ilInvID (_itLocation itm)
-    handtrans = case cr ^? crInv . ix invid >>= \k -> w ^? cWorld . lWorld . items . ix k . itLocation . ilEquipSite . _Just of
-            Just x -> translateToES cr x -- . g
-            _ -> undefined
---    g
---        | twists cr = (+.+.+ V3 (-5) 10 0)
---        | otherwise = id
+    handtrans = case w ^? cWorld . lWorld . items
+            . ix (itm ^. itID . unNInt)
+            . itLocation
+            . ilEquipSite
+            . _Just of
+        Just x -> translateToES cr x -- . g
+        _ -> undefined
+    --    g
+    --        | twists cr = (+.+.+ V3 (-5) 10 0)
+    --        | otherwise = id
     f = (+.+ _crPos cr) . stripZ . rotate3 (_crDir cr) . handtrans