Move further towards removing _crInvEquipped

src/Dodge/Creature/ArmourChase.hs

@@ -48,4 +48,3 @@ armourChaseCrit =
         , _crMvType = defaultChaseMvType{_mvTurnRad = FloatConst 0.05}
         }
         & crEquipment . at OnChest ?~ 0
---        & crInvEquipped . at 0 ?~ OnChest

src/Dodge/Creature/ChaseCrit.hs

@@ -28,7 +28,6 @@ invisibleChaseCrit =
 --        & crCamouflage .~ Invisible
         & crInv . at 0 ?~ wristInvisibility
         & crEquipment . at OnLeftWrist ?~ 0
---        & crInvEquipped . at 0 ?~ OnLeftWrist
 
 chaseCrit :: Creature
 chaseCrit =

src/Dodge/Creature/Statistics.hs

@@ -25,12 +25,6 @@ equipmentStrValue itm = case _itType itm of
 
 crCurrentEquipment :: Creature -> IM.IntMap Item
 crCurrentEquipment = IM.filter (isJust . (^? itLocation . ilEquipPosition . _Just)) . _crInv
---    merge
---        dropMissing
---        dropMissing
---        (zipWithMatched (\_ _ itm -> itm))
---        (_crInvEquipped cr)
---        (_crInv cr)
 
 strFromHeldItem :: Creature -> Int
 strFromHeldItem cr

src/Dodge/Data/Creature.hs

@@ -75,8 +75,6 @@ data Creature = Creature
     , _crHammerPosition :: HammerPosition
     , _crName :: String
     , _crStatistics :: CreatureStatistics
---    , _crCamouflage :: CamouflageStatus
---    , _crTargeting :: CreatureTargeting
     }
 
 --deriving (Eq, Show, Read) --Generic, Flat)

src/Dodge/Euse.hs

@@ -34,8 +34,6 @@ useE loc cr = case eo of
     Just EMagShield -> useMagShield itm cr
     Just EWristShield -> setWristShieldPos itm cr
     Just EHeadLamp -> createHeadLamp itm cr
---    Just EBatterySource{} -> tryChargeBattery itm cr
---    Just EAmmoSource{} -> tryAttachBulletBelt itm cr
   where
     itm = loc ^. locLDT . ldtValue . _1
     eo = itm ^? itUse . uequipEffect . eeUse
@@ -106,7 +104,7 @@ setWristShieldPos itm cr w = w & moveWallIDUnsafe i wlline
     i = _eparamID $ _eeParams $ _uequipEffect $ _itUse itm
     wlline = (f (V3 (-10) 7 0), f (V3 10 7 0))
     invid = _ilInvID (_itLocation itm)
-    handtrans = case cr ^? crInvEquipped . ix invid of
+    handtrans = case cr ^? crInv . ix invid . itLocation . ilEquipPosition . _Just of
         Just OnLeftWrist -> \cr' -> translatePointToLeftHand cr' . g
         _ -> translatePointToRightHand
     g

src/Dodge/Hotkey.hs

@@ -25,7 +25,8 @@ newHotkey cr = fromMaybe maxBound $ find (not . (`M.member` usedhks)) [minBound
 -- requires there actually is equipment in the slot, too
 assignHotkey :: Int -> Hotkey -> Creature -> Creature
 assignHotkey invid hk cr = fromMaybe cr $ do
-    guard (invid `IM.member` (cr ^. crInvEquipped))
+    --guard (invid `IM.member` (cr ^. crInvEquipped))
+    guard $ isJust $ cr ^? crInv . ix invid . itLocation . ilEquipPosition . _Just
     _ <- cr ^? crInv . ix invid . itUse . leftUse
     return $ (setHotkey invid hk . moveOldHotkey invid hk) cr
 

src/Dodge/Inventory/RBList.hs

@@ -36,7 +36,6 @@ 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 ^? crInv . ix i . itLocation . ilEquipPosition . _Just
     elemIndex ep eps
 
@@ -52,7 +51,6 @@ 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 ^? crInv . ix curpos . itLocation . ilEquipPosition . _Just of
         Just epos
             | es == epos -> RemoveEquipment{_allocOldPos = epos}

src/Dodge/Inventory/SelectionList.hs

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

src/Dodge/Item/Draw.hs

@@ -22,7 +22,7 @@ itemEquipPict cr itmtree = case itm ^. itUse of
     ituse -> fold $ do
         attachpos <- ituse ^? uequipEffect . eeAttachPos
         i <- itm ^? itLocation . ilInvID
-        epos <- cr ^? crInvEquipped . ix i
+        epos <- cr ^? crInv . ix i . itLocation . ilEquipPosition . _Just
         return $ equipPosition epos cr attachpos (itemSPic itm)
   where
     itm = itmtree ^. ldtValue . _1