Commit before changing combining code

src/Dodge/Combine.hs

@@ -25,7 +25,7 @@ import qualified Data.IntMap.Strict as IM
 import qualified Data.Map.Strict as M
 import Data.Map.Merge.Strict
 import Data.Maybe
-import Data.List (scanl',sortOn)
+import Data.List (scanl',sortOn,sort)
 
 combinationsTrie :: Trie (Int,ItemBaseType) Item
 combinationsTrie = foldr 
@@ -79,16 +79,7 @@ addModules (ps,it) = (is , (applyModules newm it, ss))
         (s',m''') = combineModules m' m''
 
 applyModules :: M.Map ModuleSlot ItemModuleType -> Item -> Item
-applyModules ms it = foldr f (it & itType . iyModules .~ ms) ms
-  where
-    f m = moduleModification m
---    (is , ) <$> [ (it & itModules .~ themodules,s) | (themodules,s) <- combinedmodules]
---  where
---    (ms,is) = unzip ps
---    combinedmodules = foldr f [(_itModules it,[])] ms
---    f :: M.Map ModuleSlot ItemModule -> [(M.Map ModuleSlot ItemModule,[String])] -> [(M.Map ModuleSlot ItemModule,[String])]
---    f ims imss = concatMap (g ims) imss
---    g ims (ims',s) = map (second (s++)) $ combineModules ims ims'
+applyModules ms it = foldr moduleModification (it & itType . iyModules .~ ms) ms
 
 combineModules :: M.Map ModuleSlot ItemModuleType 
     -> M.Map ModuleSlot ItemModuleType