Make equipment indices point to item indices

src/Dodge/Inventory.hs

@@ -76,7 +76,7 @@ rmInvItem cid invid w =
         & dounequipfunction --the ordering of these is
         & pointcid . crInv %~ f -- important
         & removeAnySlotEquipment
-        & pointcid . crEquipment . each %~ g
+        & cWorld . lWorld . items . ix itid . itLocation . ilEquipSite .~ Nothing
         & updateselection
         & updateselectionextra
         & pointcid %~ updateRootItemID (w ^. cWorld . lWorld . items)
@@ -96,11 +96,12 @@ rmInvItem cid invid w =
     itm = w ^?! cWorld . lWorld . items . ix itid
     dounequipfunction = effectOnRemove itm cr
     removeAnySlotEquipment = fromMaybe id $ do
-        epos <- w ^? cWorld . lWorld . items . ix itid
-                    . itLocation
+        epos <- itm ^?
+                     itLocation
                     . ilEquipSite
                     . _Just
         return $ pointcid . crEquipment . at epos .~ Nothing
+--        return $ pointcid . crEquipment .~ mempty
     maxk = fmap fst $ IM.lookupMax $ _unNIntMap $ cr ^. crInv
     f inv =
         let (xs, ys) = IM.split (_unNInt invid) $ _unNIntMap inv