Move towards a non-stacking inventory

src/Dodge/Combine/Combinations.hs

@@ -2,9 +2,11 @@
 
 module Dodge.Combine.Combinations 
     ( itemCombinations
+    , flatItemCombinations
     , bulletWeapons
     ) where
 
+import Data.Bifunctor
 import Dodge.Item.Ammo
 import Dodge.Data.Item
 import Dodge.Item
@@ -44,6 +46,11 @@ magazineCombinations =
     po xs it = (map o xs, it)
     o = (1,)
 
+flatItemCombinations :: [([ItemBaseType], Item)]
+flatItemCombinations = map (over _1 (concatMap f)) itemCombinations
+  where
+    f (x,it) = replicate (_getItAmount x) it
+
 itemCombinations :: [([(ItAmount, ItemBaseType)], Item)]
 itemCombinations =
     watchCombinations ++

src/Dodge/Combine/Trie.hs

@@ -7,6 +7,13 @@ import Dodge.Data.Item
 import SimpleTrie
 import Data.Foldable
 
+flatCombinationsTrie :: Trie ItemBaseType Item
+{-# INLINE flatCombinationsTrie #-}
+flatCombinationsTrie = foldl'
+    (flip $ uncurry insertInTrie . first sort)
+    emptyTrie
+    flatItemCombinations
+
 combinationsTrie :: Trie (ItAmount, ItemBaseType) Item
 {-# INLINE combinationsTrie #-}
 combinationsTrie =