justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Move towards removing crInvEquipped

Browse Source
This commit is contained in:
justin
2024-12-19 01:49:13 +00:00
parent 8c04a3f968
commit 19e5927934
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Inventory/RBList.hs
+4 -2
View File
@@ -36,7 +36,8 @@ updateRBList w
chooseEquipmentPosition :: Creature -> [EquipPosition] -> Int chooseEquipmentPosition :: Creature -> [EquipPosition] -> Int
chooseEquipmentPosition cr eps = fromMaybe (chooseFreeSite cr eps) $ do chooseEquipmentPosition cr eps = fromMaybe (chooseFreeSite cr eps) $ do
i <- cr ^? crManipulation . manObject . imSelectedItem i <- cr ^? crManipulation . manObject . imSelectedItem
ep <- cr ^? crInvEquipped . ix i --ep <- cr ^? crInvEquipped . ix i
ep <- cr ^? crInv . ix i . itLocation . ilEquipPosition . _Just
elemIndex ep eps elemIndex ep eps
chooseFreeSite :: Creature -> [EquipPosition] -> Int chooseFreeSite :: Creature -> [EquipPosition] -> Int
@@ -51,7 +52,8 @@ getEquipmentAllocation w = fromMaybe DoNotMoveEquipment $ do
i <- w ^? rbOptions . opSel i <- w ^? rbOptions . opSel
<|> Just (chooseEquipmentPosition (you w) (equipSiteToPositions esite)) <|> Just (chooseEquipmentPosition (you w) (equipSiteToPositions esite))
es <- equipSiteToPositions esite ^? ix i es <- equipSiteToPositions esite ^? ix i
return $ case you w ^? crInvEquipped . ix curpos of --return $ case you w ^? crInvEquipped . ix curpos of
return $ case you w ^? crInv . ix curpos . itLocation . ilEquipPosition . _Just of
Just epos Just epos
| es == epos -> RemoveEquipment{_allocOldPos = epos} | es == epos -> RemoveEquipment{_allocOldPos = epos}
Just epos Just epos
src/Dodge/Inventory/SelectionList.hs
+3 -1
View File
@@ -32,7 +32,9 @@ invSelectionItem indent cr i ci =
} }
where where
anyhotkey = maybe [] ((' ' :) . hotkeyToString) (cr ^? crInvHotkeys . ix i) anyhotkey = maybe [] ((' ' :) . hotkeyToString) (cr ^? crInvHotkeys . ix i)
anyequippos = maybe [] (rightPad 8 ' ' . (' ' :) . eqPosText) (cr ^? crInvEquipped . ix i) anyequippos = maybe [] (rightPad 8 ' ' . (' ' :) . eqPosText)
(ci ^? _1 . itLocation . ilEquipPosition . _Just)
-- (cr ^? crInvEquipped . ix i)
col = itemInvColor ci col = itemInvColor ci
pics = itemDisplay cr ci pics = itemDisplay cr ci