Commit before changing module system to Map

src/Dodge/Combine/Combinations.hs

@@ -70,17 +70,49 @@ itemCombinations =
     ++ [ po [itype,mtype] $ it & itModules . modHitEffect .~ m
             | (itype,it) <- firearmTypes , (mtype,m) <- bulletModules
         ]
+    ++ [ po (itype : ctypes) $ it & itModules . modRifleMag .~ m
+            | (itype,it) <- rifleMagTypes , (ctypes,m) <- rifleMagModules
+        ]
   where
     p = (,)
     po xs it = (map o xs,it)
     o = (1,)
 
+rifleMagTypes :: [(CombineType,Item)]
+rifleMagTypes
+    =   [(REPEATER,repeater)
+        ,(AUTORIFLE,autoRifle)
+        ,(BURSTRIFLE,burstRifle)
+        ,(FASTBURSTRIFLE,fastBurstRifle)
+        ]
+rifleMagModules :: [([CombineType],ItemModule RifleMag)]
+rifleMagModules = 
+    [([DRUM,HARDWARE],  ItemModule DrumMag   ["+DRUM MAGAZINE"]   1 id)
+    ,([MOTOR,HARDWARE], ItemModule BeltMag   ["+BELT MAGAZINE"]   1 id)
+    ,([MAGNET,HARDWARE],ItemModule MagnetMag ["+MAGNET MAGAZINE"] 1 id)
+    ]
+
 firearmTypes :: [(CombineType,Item)]
 firearmTypes 
     =  [(BANGSTICK i,bangStick i) | i <- [1..9] ]
     ++ [(BANGCANEX i,bangCaneX i) | i <- [1..6] ]
+    ++ [(REVOLVERX i,revolverX i) | i <- [1..5] ]
+    ++ [(MINIGUNX i,miniGunX i)   | i <- [3..16] ]
+    ++ [(BANGCANE,bangCane)
+       ,(PISTOL,pistol)
+       ,(AUTOPISTOL,autoPistol)
+        ,(SMG,smg)
+        ,(MACHINEPISTOL,machinePistol)
+        ,(REVOLVER,revolver)
+        ,(RIFLE,rifle)
+        ,(REPEATER,repeater)
+        ,(AUTORIFLE,autoRifle)
+        ,(BURSTRIFLE,burstRifle)
+        ,(FASTBURSTRIFLE,fastBurstRifle)
+        ,(COMPLETEBURSTRIFLE,completeBurstRifle)
+        ]
 bulletModules :: [(CombineType,ItemModule HitEffect)]
 bulletModules =
-    [(INCENDIARYMODULE, ItemModule (destroyOnImpact bulIncCr bulIncWall) ["+INCENDIARY"] 1 )
-    ,(BOUNCEMODULE, ItemModule (destroyOnImpact bulBounceArmCr' bulBounceWall) ["+BOUNCE"] 1 )
+    [(INCENDIARYMODULE, ItemModule (destroyOnImpact bulIncCr bulIncWall) ["+INCENDIARY"] 1 id)
+    ,(BOUNCEMODULE, ItemModule (destroyOnImpact bulBounceArmCr' bulBounceWall) ["+BOUNCE"] 1 id)
     ]