Move bullet bouncing into separate datatype field

src/Dodge/Item/Weapon/Bullet.hs

@@ -4,22 +4,25 @@ module Dodge.Item.Weapon.Bullet
     ) where
 import Dodge.Data
 import Dodge.Particle.Damage
-import Dodge.Particle.HitEffect.ExpireAndDamage
 
 import Geometry.Data
 basicBullet :: AmmoType
 basicBullet = BulletAmmo
     { _amString = "BASIC"
-    , _amBulEff = expireAndDamage' basicBulDams
+    , _amBulDams = basicBulDams
     , _amBulWth = 2
     , _amBulVel = V2 50 0
     , _amBulTraj = BasicBulletTrajectory
+    , _amBulEffect = DestroyBullet
+    , _amBulSpawn = BulSpark
     }
 hvBullet :: AmmoType
 hvBullet = BulletAmmo
     { _amString = "HVBULLET"
-    , _amBulEff = expireAndDamage' hvBulDams
+    , _amBulDams = hvBulDams
     , _amBulWth = 6
     , _amBulVel = V2 80 0
     , _amBulTraj = BasicBulletTrajectory
+    , _amBulEffect = DestroyBullet
+    , _amBulSpawn = BulSpark
     }

src/Dodge/Item/Weapon/BulletGun/Rod.hs

@@ -8,16 +8,10 @@ module Dodge.Item.Weapon.BulletGun.Rod
     ) where
 import Dodge.Data
 import Dodge.Reloading.Action
-import Dodge.Particle.HitEffect
 import Dodge.Particle.Damage
---import Dodge.ChainEffect
---import Dodge.TweakBullet
 import Dodge.Default.Weapon
---import Dodge.Item.Weapon.InventoryDisplay
 import Dodge.Default
 import Dodge.Item.Weapon.ZoomScope
---import Dodge.Particle.HitEffect.ExpireAndDamage
---import Dodge.Particle.Damage
 import Dodge.Item.Weapon.ExtraEffect
 import Dodge.Item.Weapon.TriggerType
 import Dodge.SoundLogic.LoadSound
@@ -63,7 +57,7 @@ bangRod = defaultBulletWeapon
     & itUse . useAim . aimZoom .~ defaultItZoom {_itZoomFac = 1.5}
     & itUse . useAim . aimHandlePos .~ 5
     & itUse . useAim . aimMuzPos .~ 30
-    & itConsumption . laAmmoType . amBulEff .~ expireAndDamage' heavyBulDams
+    & itConsumption . laAmmoType . amBulDams .~ heavyBulDams
 elephantGun :: Item
 elephantGun = bangRod
     & itType . iyBase .~ HELD ELEPHANTGUN