Simplify sparks

src/Dodge/Data/Machine/Sensor.hs

@@ -20,8 +20,7 @@ data Sensor
     = DamageSensor
         { _sensToggle :: Bool
         , _sensAmount :: Int
-        , --        , _sensType :: DamageType
-          _sensType :: SensorType
+        , _sensType :: SensorType
         , _sensDraw :: (PaletteColor, DecorationShape)
         , _sensThreshold :: Int
         }

src/Dodge/Data/Spark.hs

@@ -5,22 +5,23 @@
 
 module Dodge.Data.Spark where
 
-import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import Dodge.Data.Damage.Type
+--import Dodge.Data.Damage.Type
 import Geometry.Data
 
 data Spark = Spark
     { _skVel :: Point2
-    , _skColor :: Color
     , _skPos :: Point2
     , _skOldPos :: Point2
-    , _skWidth :: Float
-    , _skDamageType :: DamageType
+    , _skType :: SparkType
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
+data SparkType = ElectricSpark | FireSpark | NormalSpark
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
 makeLenses ''Spark
+deriveJSON defaultOptions ''SparkType
 deriveJSON defaultOptions ''Spark