Further cleanup

src/Dodge/Item/Weapon/Bullet.hs

@@ -3,15 +3,17 @@ module Dodge.Item.Weapon.Bullet
     , hvBullet
     ) where
 import Dodge.Data
-import Dodge.WorldEvent.HitEffect
+import Dodge.Particle.HitEffect
 import Dodge.Particle.Bullet.HitEffect
+import Dodge.Particle.Damage
+import Dodge.Particle.HitEffect.ExpireAndDamage
 
 import Geometry.Data
 basicBullet :: AmmoType
 basicBullet = BulletAmmo
     { _amString = "BASIC"
     --, _amBulEff = destroyOnImpact bulHitCr bulHitWall
-    , _amBulEff = bulletDestroyDamage basicBulDams
+    , _amBulEff = expireAndDamage basicBulDams
     , _amBulWth = 2
     , _amBulVel = V2 50 0
     , _amBulTraj = BasicBulletTrajectory