Continue reload refactor

src/Dodge/Creature/Impulse/UseItem.hs

@@ -13,7 +13,7 @@ import Data.Maybe
 useItem :: Creature -> World -> World
 useItem cr' w = fromMaybe (f w) $ do
     cr <-  w ^? creatures . ix (_crID cr')
-    it <- cr ^? crInv . ix (_crInvSel cr)
+    it <- cr ^? crInv . ix (crSel cr)
     return $ itemEffect cr it w
   where
     f = creatures . ix (_crID cr') . crHammerPosition .~ HammerDown
@@ -25,7 +25,7 @@ itemEffect cr it w = case it ^? itUse of
     Just LeftUse {} -> doequipmentchange
     Just EquipUse{} -> doequipmentchange
     -- ConsumeUse will cause problems if the item is not selected
-    Just (ConsumeUse eff) -> setuhamdown $ hammerTest $ eff it cr . rmInvItem (_crID cr) (_crInvSel cr)
+    Just (ConsumeUse eff) -> setuhamdown $ hammerTest $ eff it cr . rmInvItem (_crID cr) (crSel cr)
     Just NoUse  -> setuhamdown w
     Nothing     -> setuhamdown w
   where
@@ -33,7 +33,7 @@ itemEffect cr it w = case it ^? itUse of
         HammerUp -> f w
         _ -> w & setuhamdown
     setuhamdown = creatures . ix (_crID cr) . crHammerPosition .~ HammerDown
-    doequipmentchange = setuhamdown $ hammerTest (toggleEquipmentAt (_rbOptions w) (_crInvSel cr) cr
+    doequipmentchange = setuhamdown $ hammerTest (toggleEquipmentAt (_rbOptions w) (crSel cr) cr
         . activateEquipmentAt (_rbOptions w) cr)
 
 activateEquipmentAt :: RightButtonOptions -> Creature -> World -> World
@@ -72,7 +72,7 @@ toggleEquipmentAt rbops invid cr w = case rbops ^? opAllocateEquipment of
   where
     crpoint = creatures . ix (_crID cr)
     itmat i = _crInv cr IM.! i
-    itm = itmat (_crInvSel cr)
+    itm = itmat (crSel cr)
     onequip itm' = (_eqOnEquip . _eqEq . _itUse) itm' itm'
     onremove itm' = (_eqOnRemove . _eqEq . _itUse) itm' itm'
 
@@ -87,8 +87,8 @@ useLeftItem cid w
         return $ f itm cr w
   where
     cr = _creatures w IM.! cid
-    itmShouldBeUsed = isJust (cr ^? crInv . ix (_crInvSel cr) . itUse . cUse)
-        || ( isJust (cr ^? crInv . ix (_crInvSel cr) . itUse . eqEq . eqUse)
-            && _crLeftInvSel cr /= Just (_crInvSel cr)
+    itmShouldBeUsed = isJust (cr ^? crInv . ix (crSel cr) . itUse . cUse)
+        || ( isJust (cr ^? crInv . ix (crSel cr) . itUse . eqEq . eqUse)
+            && _crLeftInvSel cr /= Just (crSel cr)
             )
     -- TODO determine itmShouldBeUsed with reference to config options