Move SSSExtra out of SelectionSections
This commit is contained in:
@@ -61,7 +61,7 @@ updateCombineSections w cfig =
|
||||
IM.singleton
|
||||
0
|
||||
(SelectionInfo ["COMBINATIONS FILTER: " ++ str, numfiltitems] 2 True white 0)
|
||||
mstr = w ^? hud . hudElement . subInventory . ciSections . sssExtra . sssFilters . ix (-1) . _Just
|
||||
mstr = w ^? hud . hudElement . subInventory . ciFilters . ix (-1) . _Just
|
||||
numfiltitems = " " ++ show (length allcombs - length filtcombs) ++ " FILTERED"
|
||||
|
||||
regexCombs :: IM.IntMap (SelectionItem ()) -> SelectionItem CombinableItem -> String -> Bool
|
||||
@@ -127,7 +127,7 @@ updateDisplaySections w cfig sss =
|
||||
, (i + 1, itms')
|
||||
)
|
||||
where
|
||||
mstr = w ^? hud . hudElement . diSections . sssExtra . sssFilters . ix i . _Just
|
||||
mstr = w ^? hud . hudElement . diFilters . ix i . _Just
|
||||
filtsis = fromMaybe mempty $ do
|
||||
str <- mstr
|
||||
return $
|
||||
@@ -247,6 +247,7 @@ listSelectionColorPicture = foldMap f
|
||||
|
||||
enterCombineInv :: Configuration -> World -> World
|
||||
enterCombineInv cfig w = w & hud . hudElement . subInventory .~ CombineInventory sss selpos
|
||||
(IM.singleton (-1) Nothing)
|
||||
where
|
||||
cm' = IM.fromDistinctAscList . zip [0 ..] $ combineList w
|
||||
cm
|
||||
@@ -255,10 +256,6 @@ enterCombineInv cfig w = w & hud . hudElement . subInventory .~ CombineInventory
|
||||
sss =
|
||||
SelectionSections
|
||||
{ _sssSections = IM.fromDistinctAscList [(-1, filtsection), (0, combsection)]
|
||||
, _sssExtra =
|
||||
SSSExtra
|
||||
{ _sssFilters = IM.singleton (-1) Nothing
|
||||
}
|
||||
}
|
||||
selpos
|
||||
| null cm' = Nothing
|
||||
|
||||
Reference in New Issue
Block a user