Cleanup

2022-06-02 09:45:28 +01:00
parent 98cb8f2264
commit e112006b46
2 changed files with 24 additions and 14 deletions
@@ -196,12 +196,16 @@ updateRBList :: World -> World
 updateRBList w 
    | w ^? rbOptions . opCurInvPos == Just curinvid 
        = w & setEquipAllocation & setEquipActivation
-    | otherwise = case cr ^? crInv . ix (_crInvSel cr) . itUse . eqSite of
+    | otherwise = case cr ^? crInv . ix curinvid . itUse . eqSite of
        Just esite -> w 
-            & rbOptions .~ EquipOptions (equipSiteToPositions esite) (chooseEquipmentPosition cr (equipSiteToPositions esite)) curinvid DoNotMoveEquipment NoChangeActivateEquipment
+            & rbOptions .~ EquipOptions (equipSiteToPositions esite) 
+                (chooseEquipmentPosition cr (equipSiteToPositions esite)) 
+                curinvid 
+                DoNotMoveEquipment 
+                NoChangeActivateEquipment
            & setEquipAllocation & setEquipActivation
        Nothing -> w & rbOptions .~ NoRightButtonOptions
-    | otherwise = w & rbOptions .~ NoRightButtonOptions
+--    | otherwise = w & rbOptions .~ NoRightButtonOptions
  where
    curinvid = _crInvSel cr
    cr = you w