Reify shockwaves

2022-07-24 00:20:28 +01:00
parent 97174535d8
commit 5b9e9968f3
17 changed files with 197 additions and 166 deletions
@@ -79,7 +79,9 @@ module Dodge.Data
    , module Dodge.Data.PressPlate
    , module Dodge.Data.Laser
    , module Dodge.Data.TeslaArc
+    , module Dodge.Data.Shockwave
    ) where
+import Dodge.Data.Shockwave
 import Dodge.Data.TeslaArc
 import Dodge.Data.Laser
 import Dodge.Data.PressPlate
@@ -225,6 +227,7 @@ data World = World
    , _newBeams         :: WorldBeams
    , _beams            :: WorldBeams
    , _teslaArcs        :: [TeslaArc]
+    , _shockwaves       :: [Shockwave]
    , _lasers           :: [LaserStart]
    , _lasersToDraw     :: [Laser]
    , _walls            :: IM.IntMap Wall
@@ -377,22 +380,7 @@ data WorldBeams = WorldBeams
 {- Objects without ids.
 Update themselves, perhaps with side effects.  -}
 data Particle
-    = PtTargetLaser
-        { _ptUpdate :: World -> Particle -> (World, Maybe Particle)
-        , _ptPoints :: [Point2]
-        , _ptColor  :: Color
-        }
-    | Shockwave
-        { _ptUpdate     :: World -> Particle -> (World, Maybe Particle)
-        , _ptColor      :: Color
-        , _ptPos        :: Point2
-        , _ptRad        :: Float
-        , _ptDam        :: Int
-        , _ptPush       :: Float
-        , _ptMaxTime    :: Int
-        , _ptTimer      :: Int
-        }
-    | PtInvShockwave
+    = PtInvShockwave
        { _ptUpdate     :: World -> Particle -> (World, Maybe Particle)
        , _ptColor      :: Color
        , _ptPos        :: Point2