Assorted changes, cleanup menu selection text

src/Dodge/Item/Equipment.hs

@@ -14,6 +14,7 @@ import Shape
 import qualified IntMapHelp as IM
 import LensHelp
 
+import Data.Maybe
 magShield :: Item
 magShield = defaultEquipment
     { _itType = MAGSHIELD
@@ -98,9 +99,11 @@ effectOnEquip f = ItInvEffectID
     , _itEffectID = Nothing
     }
   where
-    g f' _ cr invid w 
+    g f' itm cr w 
         | _crInvSel cr == invid = f' cr (_crInv (_creatures w IM.! _crID cr) IM.! invid) w
         | otherwise = w
+      where
+        invid = fromJust $ _itInvPos itm
 
 shieldWall :: Int -> Wall
 shieldWall crid = defaultWall
@@ -156,9 +159,11 @@ effectOnOffEquip f f' = ItInvEffectID
     , _itEffectID = Nothing
     }
   where
-    g _ cr invid w 
+    g itm cr w 
         | _crInvSel cr == invid = f  cr invid w
         | otherwise             = f' cr invid w
+      where
+        invid = fromJust $ _itInvPos itm
 
 {- | Increases speed, reduces friction, cannot only move forwards. -}
 jetPack :: Item