Cleanup

src/Dodge/Combine.hs

@@ -1,9 +1,5 @@
 --{-# LANGUAGE TupleSections #-}
 module Dodge.Combine (
-    combinePoss,
-    combineSizes,
-    combineItemListYou,
-    combineListInfo,
     toggleCombineInv,
     enterCombineInv,
     combineListSelection,
@@ -18,14 +14,13 @@ import qualified Data.IntSet as IS
 import Control.Lens
 import Control.Monad
 import Data.Bifunctor
-import Data.List (scanl', sortOn)
+import Data.List (sortOn)
 import Data.Map.Merge.Strict
 import qualified Data.Map.Strict as M
 import Data.Maybe
 import Dodge.Base.You
 import Dodge.Combine.Trie
 import Dodge.Data.World
-import Dodge.Inventory.ItemSpace
 import Dodge.Item.Amount
 import Dodge.Module
 import qualified IntMapHelp as IM
@@ -51,7 +46,12 @@ combineItemListYouX = map (first $ concatMap g) . lookupItems . yourInv
     g (amount, i) = replicate (_getItAmount amount) i
 
 combineList :: World -> [SelectionItem CombinableItem]
-combineList = map f . combineListInfo
+combineList w = case combineList' w of
+    [] -> [SelectionInfo ["No possible combinations"] 1 False 0 white 0]
+    xs -> xs
+
+combineList' :: World -> [SelectionItem CombinableItem]
+combineList' = map f . combineListInfo
   where
     f (is,(strs,itm)) = SelectionItem
         { _siPictures = itemDisplay itm 
@@ -69,9 +69,6 @@ combineListInfo w = filter f . map (cmm inv) $ combineItemListYouX w
     inv = yourInv w
     f (is,(_,itm)) = _itType itm `notElem` fmap _itType (IM.restrictKeys inv (IS.fromList is))
 
-combineItemListYou :: World -> [([Int], Item)]
-combineItemListYou = map (second snd) . combineListInfo
-
 cmm :: IM.IntMap Item -> ([Int], Item) -> ([Int], ([String], Item))
 cmm inv (is, itm) = (is, itm & itType . iyModules %%~ flip combineModuleMaps mms)
   where
@@ -114,13 +111,7 @@ enterCombineInv :: World -> World
 enterCombineInv w = w & hud . hudElement . subInventory .~ CombineInventory 
     (combineListSelection w mi "" False)
   where
-    mi = 0 <$ listToMaybe (combineItemListYou w)
-
-combineSizes :: World -> [Int]
-combineSizes = map (itSlotsTaken . snd) . combineItemListYou
-
-combinePoss :: World -> [Int]
-combinePoss = scanl' (+) 0 . combineSizes
+    mi = 0 <$ listToMaybe (combineList w)
 
 combineListSelection :: World -> Maybe Int -> String -> Bool -> SelectionIntMap CombinableItem
 combineListSelection w mi regex x = SelectionIntMap
@@ -132,28 +123,6 @@ combineListSelection w mi regex x = SelectionIntMap
     , _smShownItems = IM.fromAscList $ zip [0..] (combineList w)
     }
 
-combineListSelectionItems :: World -> [SelectionItem ()]
-combineListSelectionItems w = case combineListSelectionItems' w of
-    [] -> [SelectionItem [thetext] 1 False (length thetext) white 0 ()]
-    xs -> xs
-  where
-    thetext = "NO POSSIBLE COMBINATIONS"
-
-combineListSelectionItems' :: World -> [SelectionItem ()]
-combineListSelectionItems' = map (picsToSelectable 15 . itemText . snd) . combineItemListYou
-
-combineToSelectionItem :: Int -> [String] -> SelectionItem ()
-combineToSelectionItem wdth pics =
-    SelectionItem
-        { _siPictures = pics
-        , _siHeight = length pics
-        , _siIsSelectable = True
-        , _siWidth = wdth
-        , _siColor = white
-        , _siOffX = 0
-        , _siPayload = ()
-        }
-
 picsToSelectable :: Int -> [String] -> SelectionItem ()
 picsToSelectable wdth pics =
     SelectionItem
@@ -165,11 +134,3 @@ picsToSelectable wdth pics =
         , _siOffX = 0
         , _siPayload = ()
         }
-
-itemText :: Item -> [String]
-{-# INLINE itemText #-}
-itemText it = f $ case _itCurseStatus it of
-    UndroppableIdentified -> itemDisplay it
-    _ -> itemDisplay it
-  where
-    f = take (itSlotsTaken it) . (++ replicate 10 "*")