Tweak energyballs

src/Dodge/Data/LWorld.hs

@@ -31,7 +31,6 @@ module Dodge.Data.LWorld (
     module Dodge.Data.Magnet,
     module Dodge.Data.Modification,
     --    module Dodge.Data.PathGraph,
-    module Dodge.Data.PosEvent,
     module Dodge.Data.PressPlate,
     module Dodge.Data.Projectile,
     module Dodge.Data.Prop,
@@ -78,7 +77,6 @@ import Dodge.Data.LinearShockwave
 import Dodge.Data.Machine
 import Dodge.Data.Magnet
 import Dodge.Data.Modification
-import Dodge.Data.PosEvent
 import Dodge.Data.PressPlate
 import Dodge.Data.Projectile
 import Dodge.Data.Prop
@@ -107,7 +105,6 @@ data LWorld = LWorld
     , _bullets :: [Bullet]
     , _radarSweeps :: [RadarSweep]
     , _energyBalls :: [EnergyBall]
-    , _posEvents :: [PosEvent]
     , _flames :: [Flame]
     , _sparks :: [Spark]
     , _radarBlips :: [RadarBlip]

src/Dodge/Data/PosEvent.hs

@@ -1,25 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE StrictData #-}
-{-# LANGUAGE TemplateHaskell #-}
-
-module Dodge.Data.PosEvent where
-
-import Control.Lens
-import Data.Aeson
-import Data.Aeson.TH
-import Geometry.Data
-
-data PosEventType = SparkSpawner
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data PosEvent = PosEvent
-    { _pvType :: PosEventType
-    , _pvTimer :: Int
-    , _pvPos :: Point2
-    }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-makeLenses ''PosEvent
-deriveJSON defaultOptions ''PosEventType
-deriveJSON defaultOptions ''PosEvent

src/Dodge/Data/SoundOrigin.hs

@@ -36,6 +36,7 @@ data SoundOrigin
     | LeverSound Int
     | Explosion Int
     | Tap Int
+    | EBSound Int
     deriving (Eq, Ord, Show, Read) --Generic, Flat)