Make use hammers and item positions slightly more logical

src/Dodge/Item/Equipment.hs

@@ -34,7 +34,6 @@ import qualified IntMapHelp as IM
 import LensHelp
 --import ShortShow
 
-import Data.Maybe
 magShield :: Item
 magShield = defaultEquipment
     { _itEquipPict = \_ _ -> (,) emptySH blank
@@ -91,7 +90,7 @@ wristArmour = defaultEquipment
 
 onEquipWristShield :: Item -> Creature -> World -> World
 onEquipWristShield itm cr w = w
-    & creatures . ix (_crID cr) . crInv . ix (fromJust (_itInvPos itm)) . itUse . eqEq . eqParams .~ EquipID i
+    & creatures . ix (_crID cr) . crInv . ix (_ipInvID (_itPos itm)) . itUse . eqEq . eqParams .~ EquipID i
     & walls . at i ?~ forceField {_wlID = i}
     & setWristShieldPos (itm & itUse . eqEq . eqParams .~ EquipID i) cr
   where
@@ -99,7 +98,7 @@ onEquipWristShield itm cr w = w
 
 onRemoveWristShield :: Item -> Creature -> World -> World
 onRemoveWristShield itm cr w = w
-    & creatures . ix (_crID cr) . crInv . ix (fromJust (_itInvPos itm)) . itUse . eqEq . eqParams .~ NoEquipParams
+    & creatures . ix (_crID cr) . crInv . ix (_ipInvID (_itPos itm)) . itUse . eqEq . eqParams .~ NoEquipParams
     & deleteWallID i
   where
     i = _eparamID $ _eqParams $ _eqEq $ _itUse itm
@@ -109,7 +108,7 @@ setWristShieldPos itm cr w = w
   where
     i = _eparamID $ _eqParams $ _eqEq $ _itUse itm
     wlline = (f (V3 (-10) 7 0), f (V3 10 7 0))
-    invid = fromJust (_itInvPos itm)
+    invid = _ipInvID (_itPos itm)
     --wlline = (V2 10 0, V2 (-10) 100)
     handtrans = case cr ^? crInvEquipped . ix invid of
         Just OnLeftWrist -> \cr' -> translatePointToLeftHand cr' . g
@@ -205,7 +204,7 @@ effectOnOffHeld f f' = ItInvEffectID
         | crSel cr == invid = f  cr invid w
         | otherwise             = f' cr invid w
       where
-        invid = fromJust $ _itInvPos itm
+        invid = _ipInvID $ _itPos itm
 
 {- | Increases speed, reduces friction, cannot only move forwards. -}
 jetPack :: Item