Move towards removing crInvEquipped

src/Dodge/Inventory/RBList.hs

@@ -36,7 +36,8 @@ updateRBList w
 chooseEquipmentPosition :: Creature -> [EquipPosition] -> Int
 chooseEquipmentPosition cr eps = fromMaybe (chooseFreeSite cr eps) $ do
     i <- cr ^? crManipulation . manObject . imSelectedItem
-    ep <- cr ^? crInvEquipped . ix i
+    --ep <- cr ^? crInvEquipped . ix i
+    ep <- cr ^? crInv . ix i . itLocation . ilEquipPosition . _Just
     elemIndex ep eps
 
 chooseFreeSite :: Creature -> [EquipPosition] -> Int
@@ -51,7 +52,8 @@ getEquipmentAllocation w = fromMaybe DoNotMoveEquipment $ do
     i <- w ^? rbOptions . opSel
         <|> Just (chooseEquipmentPosition (you w) (equipSiteToPositions esite))
     es <- equipSiteToPositions esite ^? ix i
-    return $ case you w ^? crInvEquipped . ix curpos of
+    --return $ case you w ^? crInvEquipped . ix curpos of
+    return $ case you w ^? crInv . ix curpos . itLocation . ilEquipPosition . _Just of
         Just epos
             | es == epos -> RemoveEquipment{_allocOldPos = epos}
         Just epos

src/Dodge/Inventory/SelectionList.hs

@@ -32,7 +32,9 @@ invSelectionItem indent cr i ci =
         }
   where
     anyhotkey = maybe [] ((' ' :) . hotkeyToString) (cr ^? crInvHotkeys . ix i)
-    anyequippos = maybe [] (rightPad 8 ' ' . (' ' :) . eqPosText) (cr ^? crInvEquipped . ix i)
+    anyequippos = maybe [] (rightPad 8 ' ' . (' ' :) . eqPosText) 
+        (ci ^? _1 . itLocation . ilEquipPosition . _Just)
+--        (cr ^? crInvEquipped . ix i)
     col = itemInvColor ci
     pics = itemDisplay cr ci