Flatten values in creature manipulation data types

src/Dodge/Inventory/RBList.hs

@@ -20,7 +20,7 @@ updateRBList w
     | otherwise = case w ^. rbOptions of
         EquipOptions{} -> w
         _ -> fromMaybe (w & rbOptions .~ NoRightButtonOptions) $ do
-            i <- cr ^? crManipulation . manObject . inInventory . imSelectedItem
+            i <- cr ^? crManipulation . manObject . imSelectedItem
             esite <- cr ^? crInv . ix i . itUse . equipEffect . eeSite
             return $
                 w
@@ -35,7 +35,7 @@ updateRBList w
 -- find a free equipment slot
 chooseEquipmentPosition :: Creature -> [EquipPosition] -> Int
 chooseEquipmentPosition cr eps = fromMaybe (chooseFreeSite cr eps) $ do
-    i <- cr ^? crManipulation . manObject . inInventory . imSelectedItem
+    i <- cr ^? crManipulation . manObject . imSelectedItem
     ep <- cr ^? crInvEquipped . ix i
     elemIndex ep eps
 
@@ -46,7 +46,7 @@ chooseFreeSite cr = fromMaybe 0 . findIndex hasnoequipment
 
 getEquipmentAllocation :: World -> EquipmentAllocation
 getEquipmentAllocation w = fromMaybe DoNotMoveEquipment $ do
-    curpos <- you w ^? crManipulation . manObject . inInventory . imSelectedItem
+    curpos <- you w ^? crManipulation . manObject . imSelectedItem
     esite <- you w ^? crInv . ix curpos . itUse . equipEffect . eeSite
     i <- w ^? rbOptions . opSel
         <|> Just (chooseEquipmentPosition (you w) (equipSiteToPositions esite))