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
             ]

src/Dodge/Combine/Data.hs

@@ -61,6 +61,7 @@ data CraftType
     | FRAGMODULE
     | FLASHMODULE
     | BOUNCEMODULE
+    | PENMODULE
     --
     | TELEPORTMODULE
     | TIMEMODULE
@@ -184,6 +185,7 @@ data ItemModuleType
     | MAGNETMAG
     | INCENDBUL
     | BOUNCEBUL
+    | PENBUL
     | STATICBUL
     | CONCUSBUL
     | TARGCR 
@@ -209,6 +211,7 @@ data Detector
 
 data ModuleSlot
     = ModBullet
+    | ModBulletSpawn
     | ModRifleMag
     | ModAutoMag
     | ModTarget

src/Dodge/Combine/Module.hs

@@ -19,6 +19,7 @@ moduleModification imt = case imt of
     MAGNETMAG   -> itUse . useDelay . rateMax .~ 4
     INCENDBUL   -> itConsumption . laAmmoType . amBullet . buSpawn .~ BulBall IncBall
     BOUNCEBUL   -> itConsumption . laAmmoType . amBullet . buEffect .~ BounceBullet 
+    PENBUL    -> itConsumption . laAmmoType . amBullet . buEffect .~ PenetrateBullet 
     STATICBUL   -> itConsumption . laAmmoType . amBullet . buSpawn .~ BulBall TeslaBall
     CONCUSBUL   -> itConsumption . laAmmoType . amBullet . buSpawn .~ BulBall ConcBall
     TARGCR      -> itTargeting .~ targetRBCreature