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

Remove one use of ssItems

Browse Source
This commit is contained in:
justin
2025-01-05 16:05:49 +00:00
parent 12e5cba62b
commit 27ffeb3a5a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/DisplayInventory.hs
+7 -3
View File
@@ -10,6 +10,7 @@ module Dodge.DisplayInventory (
) where ) where
--import StrictHelp --import StrictHelp
import Dodge.Item.Display
import qualified Data.Strict.Tuple as STup import qualified Data.Strict.Tuple as STup
import Control.Applicative import Control.Applicative
import Control.Lens import Control.Lens
@@ -65,9 +66,11 @@ updateCombineSections w cfig =
(IM.fromDistinctAscList . zip [0 ..] $ combineList w) (IM.fromDistinctAscList . zip [0 ..] $ combineList w)
"COMBINATIONS" "COMBINATIONS"
$ w ^? hud . hudElement . subInventory . ciFilter . _Just $ w ^? hud . hudElement . subInventory . ciFilter . _Just
invitms = fold $ w ^? hud . hudElement . diSections . ix 0 . ssItems --invitms = fold $ w ^? hud . hudElement . diSections . ix 0 . ssItems
invitms = fold $ w ^? cWorld . lWorld . creatures . ix 0 . crInv
regexCombs :: IM.IntMap (SelectionItem ()) -> SelectionItem CombinableItem -> String -> Bool --regexCombs :: IM.IntMap (SelectionItem ()) -> SelectionItem CombinableItem -> String -> Bool
regexCombs :: IM.IntMap Item -> SelectionItem CombinableItem -> String -> Bool
regexCombs inv ci = \case regexCombs inv ci = \case
'<' : str -> f str '<' : str -> f str
str -> (regexList str . _siPictures) ci str -> (regexList str . _siPictures) ci
@@ -75,7 +78,8 @@ regexCombs inv ci = \case
f str = any (g str) (_ciInvIDs $ _siPayload ci) f str = any (g str) (_ciInvIDs $ _siPayload ci)
g str i = fromMaybe False $ do g str i = fromMaybe False $ do
si <- inv ^? ix i si <- inv ^? ix i
return $ regexList str $ _siPictures si return $ regexList str $ basicItemDisplay si
--return $ regexList str $ _siPictures si
andOrRegex :: (a -> String -> Bool) -> a -> String -> Bool andOrRegex :: (a -> String -> Bool) -> a -> String -> Bool
andOrRegex f x = all (orRegex f x) . List.wordsBy '&' andOrRegex f x = all (orRegex f x) . List.wordsBy '&'