Further cleanup

src/Dodge/Particle/Spark.hs

@@ -3,12 +3,13 @@ module Dodge.Particle.Spark
     , colSparkRandDir
     , createBarrelSpark
     , randColDirTimeSpark
-    )
-    where
+    ) where
 import Dodge.Data
+import Dodge.Particle.HitEffect.ExpireAndDamage
 import Dodge.Particle.Bullet.Draw
+import Dodge.Particle.Damage
+--import Dodge.Particle.Bullet.HitEffect
 import Dodge.Particle.Bullet.Update
-import Dodge.Particle.Bullet.DestroyDamage
 --import Dodge.WorldEvent.HitEffect
 import Color
 import Geometry
@@ -29,7 +30,7 @@ createBarrelSpark pos dir maycid time colid = instantParticles .:~ BulletPt
     , _ptCrIgnore = maycid
     , _ptWidth = 1
     , _ptTimer = time
-    , _ptHitEff = bulletDestroyDamage SparkDam 1
+    , _ptHitEff = expireAndDamage basicSparkDams
     }
 colSpark :: Int -> Color -> Point2 -> Float -> World -> World
 colSpark = colSparkRandDir 0.7
@@ -60,7 +61,7 @@ randColDirTimeSpark randcol randdir randtime pos w = w
         , _ptCrIgnore = Nothing
         , _ptWidth = 1
         , _ptTimer = time
-        , _ptHitEff = bulletDestroyDamage SparkDam 1
+        , _ptHitEff = expireAndDamage basicSparkDams
         }
 
 colSparkRandDir :: Float -> Int -> Color -> Point2 -> Float -> World -> World
@@ -80,5 +81,5 @@ colSparkRandDir randDir time col pos baseDir w = w
         , _ptCrIgnore = Nothing
         , _ptWidth = 1
         , _ptTimer = time
-        , _ptHitEff = bulletDestroyDamage SparkDam 1
+        , _ptHitEff = expireAndDamage basicSparkDams
         }