Cleanup

src/Dodge/Combine/Combinations.hs

@@ -12,7 +12,7 @@ import Dodge.Data.Item
 import Dodge.Item
 import LensHelp
 
-watchCombinations :: [([(ItAmount, ItemBaseType)], Item)]
+watchCombinations :: [([(ItAmount, ItemType)], Item)]
 watchCombinations =
     [ po [LEFT STOPWATCH, LEFT REWINDWATCH] scrollWatch
     , po [CRAFT TIMEMODULE, CRAFT MICROCHIP, CRAFT HARDDRIVE] scrollWatch
@@ -22,7 +22,7 @@ watchCombinations =
     po xs it = (map o xs, it)
     o = (1,)
 
-backpackCombinations :: [([(ItAmount,ItemBaseType)],Item)]
+backpackCombinations :: [([(ItAmount,ItemType)],Item)]
 backpackCombinations = 
     [ po [CRAFT HOSE, CRAFT STEELDRUM] fuelPack
     ]
@@ -38,7 +38,7 @@ backpackCombinations =
 --    po xs it = (map o xs, it)
 --    o = (1,)
 
-magazineCombinations :: [([(ItAmount,ItemBaseType)],Item)]
+magazineCombinations :: [([(ItAmount,ItemType)],Item)]
 magazineCombinations = 
     [ po [CRAFT TIN, CRAFT SPRING] tinMag 
     ]
@@ -46,12 +46,12 @@ magazineCombinations =
     po xs it = (map o xs, it)
     o = (1,)
 
-flatItemCombinations :: [([ItemBaseType], Item)]
+flatItemCombinations :: [([ItemType], Item)]
 flatItemCombinations = map (over _1 (concatMap f)) itemCombinations
   where
     f (x,it) = replicate (_getItAmount x) it
 
-itemCombinations :: [([(ItAmount, ItemBaseType)], Item)]
+itemCombinations :: [([(ItAmount, ItemType)], Item)]
 itemCombinations =
     watchCombinations ++
     backpackCombinations ++