Further cleanup

src/Dodge/Combine/Combinations.hs

@@ -3,7 +3,8 @@ module Dodge.Combine.Combinations where
 import Geometry
 import Dodge.Data
 import Dodge.WorldEvent.SpawnParticle
-import Dodge.Particle.Bullet.HitEffect
+import Dodge.Particle.HitEffect.ExpireAndDamage
+import Dodge.Particle.Damage
 import Dodge.Item.Equipment
 import Dodge.Item.Craftable
 import Dodge.Item.Weapon.BulletGuns
@@ -114,11 +115,10 @@ moduleCombinations =
         )
     ,   ( ModBullet
         ,   bulletWeapons
---        ,   [amod [INCENDIARYMODULE] "+INCENDIARY" (f $ bulletDestroySpawn incBall)
-        ,   [amod [INCENDIARYMODULE] "+INCENDIARY" (f $ bulletDestroyDamage $ spawnBulDams incBall')
-            ,amod [BOUNCEMODULE]     "+BOUNCE"     (f $ bulletDestroyDamage bounceBulDams)
-            ,amod [STATICMODULE]     "+STATIC"     (f $ bulletDestroySpawn aStaticBall)
-            ,amod [CONCUSSMODULE]    "+CONCUSS"    (f $ bulletDestroySpawn concBall)
+        ,   [amod [INCENDIARYMODULE] "+INCENDIARY" (f $ expireAndDamage $ spawnAtBulDams incBall)
+            ,amod [BOUNCEMODULE]     "+BOUNCE"     (f $ expireAndDamage bounceBulDams)
+            ,amod [STATICMODULE]     "+STATIC"     (f $ expireAndDamage $ spawnAtBulDams aStaticBall)
+            ,amod [CONCUSSMODULE]    "+CONCUSS"    (f $ expireAndDamage $ spawnAtBulDams concBall)
             ]
         )
     ,   ( ModTarget