Split bullet spawning and bouncing/penetration

src/Dodge/Combine/Combinations.hs

@@ -118,6 +118,9 @@ itemCombinations =
     hd = HELD
     eq = EQUIP
 
+-- so there are two requirements for a module combination: the module slot must
+-- exist on the item, and the item must be in the given list below
+-- these two requirements should probably be combined
 moduleCombinations :: [( ModuleSlot, [Item], [([ItemBaseType],ItemModuleType)] )]
 moduleCombinations =
     [   ( ModRifleMag
@@ -147,9 +150,14 @@ moduleCombinations =
             ]
         )
     ,   ( ModBullet
+        ,   bulletWeapons
+        ,   [amod [cr BOUNCEMODULE]     BOUNCEBUL
+            ,amod [cr PENMODULE]        PENBUL
+            ]
+        )
+    ,   ( ModBulletSpawn
         ,   bulletWeapons
         ,   [amod [cr INCENDIARYMODULE] INCENDBUL
-            ,amod [cr BOUNCEMODULE]     BOUNCEBUL
             ,amod [cr STATICMODULE]     STATICBUL
             ,amod [cr CONCUSSMODULE]    CONCUSBUL
             ]