Tweak module display and logic

src/Dodge/Combine/Combinations.hs

@@ -94,8 +94,8 @@ itemCombinations =
            , po [cr MICROCHIP, cr TRANSMITTER, cr HEATSENSOR] (autoDetector CREATUREDETECTOR)
            , po [cr BATTERY, cr LED] torch
            , po [hd TORCH, eq HAT] headLamp
-           , po [cr LIGHTER, cr THERMOMETER, cr MICROCHIP] (makeTypeCraft INCENDIARYMODULE)
-           , po [cr TRANSFORMER, cr BATTERY, cr MICROCHIP] (makeTypeCraft STATICMODULE)
+           , po [cr LIGHTER, cr THERMOMETER, cr MICROCHIP] (bulletPayloadCraft IncBall)
+           , po [cr TRANSFORMER, cr BATTERY, cr MICROCHIP] (bulletPayloadCraft TeslaBall)
            ]
         ++ map (\i -> po [HELD (LASWIDE i), cr TRANSFORMER] $ lasWide (i + 1)) [2 .. 9]
         ++ map (\i -> po [cr PIPE, HELD (BANGSTICK i)] $ bangStick (i + 1)) [1 .. 8]
@@ -159,17 +159,14 @@ moduleCombinations =
         ( ModBulletCollision
         , bulletWeapons
         ,
-            [ amod [cr BOUNCEMODULE] BOUNCEBUL
-            , amod [cr PENMODULE] PENBUL
+            [ amod [cr (BULBODYMODULE be)] (BULBODY be) | be <- [minBound..]
             ]
         )
     ,
         ( ModBulletPayload
         , bulletWeapons
         ,
-            [ amod [cr INCENDIARYMODULE] INCENDBUL
-            , amod [cr STATICMODULE] STATICBUL
-            , amod [cr CONCUSSMODULE] CONCUSBUL
+            [ amod [cr (BULPAYLOADMODULE x)] (BULPAY x) | x <- [minBound ..]
             ]
         )
     ,
@@ -194,9 +191,9 @@ moduleCombinations =
         ( ModDualBeam
         , [dualBeam]
         ,
-            [ amod [cr INCENDIARYMODULE] INCENDLAS
+            [ amod [cr (BULPAYLOADMODULE IncBall)] INCENDLAS
             , amod [cr TRANSFORMER] SPLITLAS
-            , amod [cr STATICMODULE] STATICLAS
+            , amod [cr (BULPAYLOADMODULE TeslaBall)] STATICLAS
             ]
         )
     ,