Remove ssaTri, bullet movement is broken

src/Dodge/Particle/Spark.hs

@@ -16,30 +16,28 @@ import System.Random
 --import Control.Lens
 
 createBarrelSpark :: Point2 -> Float -> Maybe Int -> Int -> Int -> World -> World
-createBarrelSpark pos dir maycid time colid w = w 
-    & instantParticles .:~ spark
+createBarrelSpark pos dir maycid time colid = instantParticles .:~ BulletPt  
+    { _ptDraw = drawBul
+    , _ptUpdate = mvBullet
+    , _ptVel = rotateV dir (V2 5 0)
+    , _btDrag = 0.9
+    , _btColor' = numColor colid
+    , _btTrail' = [pos]
+    , _btPassThrough' = maycid
+    , _btWidth' = 1
+    , _btTimer' = time
+    , _btHitEffect' = destroyOnImpact sparkEff noEff
+    }
   where 
-    spark = BulletPt  
-        { _ptDraw = drawBul
-        , _ptUpdate = mvBullet
-        , _btVel' = rotateV dir (V2 5 0)
-        , _btDrag = 0.9
-        , _btColor' = numColor colid
-        , _btTrail' = [pos]
-        , _btPassThrough' = maycid
-        , _btWidth' = 1
-        , _btTimer' = time
-        , _btHitEffect' = destroyOnImpact sparkEff noEff
-        }
     sparkEff bt p cr = creatures . ix (_crID cr) . crState . crDamage .:~ SparkDam 1 sp p ep
-      where 
+      where
         sp = head (_btTrail' bt)
-        ep = sp +.+ _btVel' bt
+        ep = sp +.+ _ptVel bt
 colSpark :: Int -> Color -> Point2 -> Float -> World -> World
 colSpark = colSpark' 0.7
 colSpark' :: Float -> Int -> Color -> Point2 -> Float -> World -> World
 colSpark' randDir time col pos baseDir w = w 
-    & worldEvents %~ ( over particles (spark :) . )
+    & instantParticles .:~ spark
     & randGen .~ g
   where 
     (a,g)  = randomR (-randDir,randDir) $ _randGen w
@@ -48,7 +46,7 @@ colSpark' randDir time col pos baseDir w = w
         { _ptDraw = drawBul
         , _ptUpdate = mvBullet
         , _btDrag   = 0.9
-        , _btVel' = rotateV dir (V2 5 0)
+        , _ptVel = rotateV dir (V2 5 0)
         , _btColor' = col
         , _btTrail' = [pos]
         , _btPassThrough' = Nothing
@@ -59,4 +57,4 @@ colSpark' randDir time col pos baseDir w = w
     sparkEff bt p cr = creatures . ix (_crID cr) . crState . crDamage %~ ( SparkDam 1 sp p ep : )
       where 
         sp = head (_btTrail' bt)
-        ep = sp +.+ _btVel' bt
+        ep = sp +.+ _ptVel bt