Modularise shockwaves, stop landing self damage when blinking

src/Dodge/Item/Weapon.hs

@@ -920,9 +920,6 @@ flamerAngle = 0.3
 aSelf :: Int -> World -> World
 aSelf = blinkAction
 
-
-
-
 reflect :: Float -> Float -> Float
 reflect a b = a + 2*(a-b)
 

src/Dodge/Item/Weapon/Bullet.hs

@@ -5,6 +5,7 @@ import Dodge.Base
 import Dodge.WorldEvent
 import Dodge.SoundLogic
 import Dodge.RandomHelp
+import Dodge.WorldEvent.Shockwave
 
 import Dodge.Creature.Property
 
@@ -129,7 +130,7 @@ bulConCr' bt p cr w
     where   cid = _crID cr
             sp = head $ _btTrail' bt
             ep = sp +.+ _btVel' bt
-            mkwave = over worldEvents $ (.) (makeShockwaveAt p 15 4 1 white)
+            mkwave = over worldEvents $ (.) (makeShockwaveAt [] p 15 4 1 white)
 
 bulHitWall' :: Particle' -> Point2 -> Wall -> World -> World
 bulHitWall' bt p x w =  damageBlocks x
@@ -195,7 +196,7 @@ bulConWall' bt p wl w =  damageBlocks wl
                   Just hp -> foldr (\j -> over (walls . ix j . blHP) (\y -> y - 5)) w (_blIDs wall)
                   _ -> w
             wallV = (_wlLine wl !! 1 -.- _wlLine wl !! 0)
-            mkwave = over worldEvents $ (.) (makeShockwaveAt p 15 4 1 white)
+            mkwave = over worldEvents $ (.) (makeShockwaveAt [] p 15 4 1 white)
 
 hvBulHitWall' :: Particle' -> Point2 -> Wall -> World -> World
 hvBulHitWall' bt p x w =  damageBlocks x