Cleanup, remove bullet tweaks

src/Dodge/WorldEvent/SpawnParticle.hs

@@ -5,6 +5,8 @@ module Dodge.WorldEvent.SpawnParticle
     , makeFlamelet
     , aStaticBall
     , makeStaticBall
+    , incBall
+    , concBall
     ) where
 import Dodge.Data
 import Dodge.Base
@@ -13,6 +15,7 @@ import Dodge.WorldEvent.HitEffect
 import Dodge.WorldEvent.ThingsHit
 import Dodge.WorldEvent.Cloud
 import Dodge.WorldEvent.Flash
+import Dodge.WorldEvent.Shockwave
 import Dodge.SoundLogic
 import Dodge.RandomHelp
 import Dodge.Wall.Damage
@@ -111,8 +114,38 @@ moveFlame rotd w pt
     reflV wall = (0.3 *.* reflectIn (uncurry (-.-) . swap $ _wlLine wall) vel )
         +.+ (0.2 *.* vel)
 
-aStaticBall :: Point2 -> Particle
-aStaticBall vel = PtZ 
+incBall :: RandomGen g => Point2 -> State g Particle
+incBall vel = do
+    rot <- state $ randomR (0,3)
+    return PtZ 
+        { _ptDraw       = drawFlameletZ rot
+        , _ptUpdate     = moveFlamelet
+        , _ptVel        = vel
+        , _ptColor      = red
+        , _ptPos        = V2 0 0
+        , _ptCrIgnore   = Nothing
+        , _ptWidth      = 3
+        , _ptTimer      = 20
+        , _ptHitEff     = damageBothTypeAmount Flaming 20
+        , _ptZ          = 20
+        }
+
+concBall :: Point2 -> State g Particle
+concBall _ = return Shockwave
+    { _ptDraw      = drawShockwave
+    , _ptUpdate    = mvShockwave []
+    , _ptColor     = white
+    , _ptPos       = 0
+    , _ptRad       = 15
+    , _ptDam       = 4
+    , _ptPush      = 1
+    , _ptMaxTime   = 10
+    , _ptTimer     = 10
+    }
+
+
+aStaticBall :: Point2 -> State g Particle
+aStaticBall vel = return PtZ 
     { _ptDraw       = drawStaticBall
     , _ptUpdate     = moveStaticBall
     , _ptVel        = vel