This commit is contained in:
2024-09-30 12:03:23 +01:00
parent 9ad1b8cc5b
commit 65564c993b
11 changed files with 147 additions and 290 deletions
+12 -9
View File
@@ -3,14 +3,14 @@ module Dodge.Combine (
combineList,
) where
import Control.Lens
import Control.Monad
--import Control.Lens
--import Control.Monad
import Data.Bifunctor
import qualified Data.IntSet as IS
--import qualified Data.IntSet as IS
import Data.List (sortOn)
import Data.Map.Merge.Strict
--import Data.Map.Merge.Strict
import qualified Data.Map.Strict as M
import Data.Maybe
--import Data.Maybe
import Dodge.Base.You
import Dodge.Combine.Trie
import Dodge.Data.Combine
@@ -18,7 +18,7 @@ import Dodge.Data.Universe
import Dodge.Item.Display
import Dodge.Item.InventoryColor
import Dodge.Item.SlotsTaken
import Dodge.Module
--import Dodge.Module
import qualified IntMapHelp as IM
import SimpleTrie
@@ -55,13 +55,16 @@ combineList = map f . combineListInfo
}
combineListInfo :: World -> [([Int], ([String], Item))]
combineListInfo w = filter f . map (cmm inv) $ combineItemListYouX w
combineListInfo w = map (cmm inv) $ combineItemListYouX w
where
inv = yourInv w
f (is, (_, itm)) = _itType itm `notElem` fmap _itType (IM.restrictKeys inv (IS.fromList is))
--combineListInfo w = filter f . map (cmm inv) $ combineItemListYouX w
-- where
-- inv = yourInv w
-- f (is, (_, itm)) = _itType itm `notElem` fmap _itType (IM.restrictKeys inv (IS.fromList is))
cmm :: IM.IntMap Item -> ([Int], Item) -> ([Int], ([String], Item))
cmm inv (is, itm) = (is, ([], itm))
cmm _ (is, itm) = (is, ([], itm))
--cmm :: IM.IntMap Item -> ([Int], Item) -> ([Int], ([String], Item))
--cmm inv (is, itm) = (is, itm & itType . iyModules %%~ flip combineModuleMaps mms)