Remove one use of ssItems

src/Dodge/DisplayInventory.hs

@@ -10,6 +10,7 @@ module Dodge.DisplayInventory (
 ) where
 
 --import StrictHelp
+import Dodge.Item.Display
 import qualified Data.Strict.Tuple as STup
 import Control.Applicative
 import Control.Lens
@@ -65,9 +66,11 @@ updateCombineSections w cfig =
             (IM.fromDistinctAscList . zip [0 ..] $ combineList w)
             "COMBINATIONS"
             $ 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
     '<' : str -> f str
     str -> (regexList str . _siPictures) ci
@@ -75,7 +78,8 @@ regexCombs inv ci = \case
     f str = any (g str) (_ciInvIDs $ _siPayload ci)
     g str i = fromMaybe False $ do
         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 f x = all (orRegex f x) . List.wordsBy '&'