Remove parameters from machine damage sensors

src/Dodge/Data/Machine.hs

@@ -38,11 +38,8 @@ data Machine = Machine
     , _mcDamage :: [Damage]
     , _mcType :: MachineType
     , _mcMounts :: M.Map ObjectType Int
---    , _mcCloseSound :: Maybe SoundID
     , _mcWidth :: Float
     }
-    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data MachineType
     = McStatic
@@ -50,8 +47,6 @@ data MachineType
     | McDamSensor DamageSensor
     | McProxSensor ProximitySensor
     | McTurret {_mctTurret :: Turret}
-    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data Turret = Turret
     { _tuWeapon :: Int
@@ -59,8 +54,6 @@ data Turret = Turret
     , _tuFireTime :: Int
     , _tuDir :: Float
     }
-    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''MachineType
 makeLenses ''Machine

src/Dodge/Data/Machine/Sensor.hs

@@ -8,29 +8,23 @@ module Dodge.Data.Machine.Sensor (
     module Dodge.Data.Machine.Sensor.Type,
 ) where
 
-import Geometry.Data
-import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import Dodge.Data.GenParams
 import Dodge.Data.Item.Combine
 import Dodge.Data.Machine.Sensor.Type
+import Geometry.Data
 
 data DamageSensor = DamSensor
-        { _sensToggle :: Bool
-        , _sensAmount :: Int
-        , _sensType :: SensorType
-        , _sensDraw :: (PaletteColor, DecorationShape)
-        , _sensThreshold :: Int
-        }
+    { _sensAmount :: Int
+    , _sensType :: SensorType
+    , _sensThreshold :: Int
+    }
 
 data ProximitySensor = ProxSensor
-        { _proxRequirement :: ProximityRequirement
-        , _proxToggle :: Bool
-        }
-
---deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    { _proxRequirement :: ProximityRequirement
+    , _proxToggle :: Bool
+    }
 
 data ProximityRequirement
     = RequireHealth {_proxReqMinHealth :: Int}