Refactor bullet particles

src/Dodge/WorldEvent/Bullet.hs

@@ -1,34 +0,0 @@
-{-
-Bullet update.
- -}
-module Dodge.WorldEvent.Bullet
-    where
-import Dodge.Data
---import Dodge.Base
-import Dodge.WorldEvent.ThingsHit
---import Picture
-import Geometry
-
-import Control.Lens
---import Data.Maybe
---import Data.List
---import Data.Bifunctor
---import qualified Data.IntMap.Strict as IM
-
-{-
-Update for a generic bullet.
--}
-mvGenBullet' :: World -> Particle -> (World, Maybe Particle)
-mvGenBullet' w bt 
-    | t <= 0 = (w, Nothing)
-    | t < 4  = (w, Just $ set btPassThrough' Nothing
-                        $ set btTrail' (p:p:ps)
-                        $ set btTimer' (t-1) bt                      
-               )
-    | otherwise = hiteff bt (thingsHitExceptCr mcr p (p +.+ vel) w) w
-  where 
-    mcr     = _btPassThrough' bt
-    (p:ps)  = _btTrail' bt
-    vel     = _btVel' bt
-    hiteff  = _btHitEffect' bt
-    t       = _btTimer' bt

src/Dodge/WorldEvent/SpawnParticle.hs

@@ -12,7 +12,8 @@ import Dodge.WorldEvent.HitEffect
 import Dodge.WorldEvent.ThingsHit
 import Dodge.WorldEvent.Cloud
 import Dodge.WorldEvent.Flash
-import Dodge.WorldEvent.Bullet
+import Dodge.Particle.Bullet.Draw
+import Dodge.Particle.Bullet.Update
 import Dodge.SoundLogic
 import Dodge.RandomHelp
 import Dodge.Debug
@@ -418,8 +419,25 @@ createSpark time colid pos dir maycid w
       where 
         sp = head (_btTrail' bt)
         ep = sp +.+ _btVel' bt
+createSparkCol :: Int -> Color -> Point2 -> Float -> Maybe Int -> World -> World
+createSparkCol time col pos dir maycid w 
+    = w & worldEvents %~ ( (over particles (spark :) . sparkFlashAt pos') . )
+  where 
+    spark = Bul'
+        { _ptDraw = drawBul
+        , _ptUpdate' = mvGenBullet'
+        , _btVel' = rotateV dir (5,0)
+        , _btColor' = col
+        , _btTrail' = [pos]
+        , _btPassThrough' = maycid
+        , _btWidth' = 1
+        , _btTimer' = time
+        , _btHitEffect' = destroyOnImpact sparkEff noEff noEff
+        }
+    pos' = pos +.+ rotateV dir (5,0)
+    sparkEff bt p cr
+        = creatures . ix (_crID cr) . crState . crDamage %~ ( SparkDam 1 sp p ep : )
+      where 
+        sp = head (_btTrail' bt)
+        ep = sp +.+ _btVel' bt
 
-drawBul :: Particle -> Picture
-drawBul pt = setLayer 1 . color thecolor $ thickLine (take 2 $ _btTrail' pt) (_btWidth' pt)
-  where
-    thecolor = _btColor' pt