Simplify analyser machines somewhat

src/Dodge/Data/Machine/Sensor.hs

@@ -17,19 +17,17 @@ import Dodge.Data.GenParams
 import Dodge.Data.Item.Combine
 import Dodge.Data.Machine.Sensor.Type
 
-data Sensor
-    = DamageSensor
+data DamageSensor = DamSensor
         { _sensToggle :: Bool
         , _sensAmount :: Int
         , _sensType :: SensorType
         , _sensDraw :: (PaletteColor, DecorationShape)
         , _sensThreshold :: Int
         }
-    | ProximitySensor
-        { _proxStatus :: CloseToggle
-        , _proxDist :: Float
-        , _proxRequirement :: ProximityRequirement
-        , _sensToggle :: Bool
+
+data ProximitySensor = ProxSensor
+        { _proxRequirement :: ProximityRequirement
+        , _proxToggle :: Bool
         }
 
 --deriving (Eq, Ord, Show, Read) --Generic, Flat)
@@ -40,15 +38,9 @@ data ProximityRequirement
     | RequireNoItems {_proxNoItems :: [Point2]}
     deriving (Show)
 
---deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data CloseToggle = NotClose | IsClose
-    deriving (Show)
-
---deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-makeLenses ''Sensor
+makeLenses ''DamageSensor
+makeLenses ''ProximitySensor
 makeLenses ''ProximityRequirement
 deriveJSON defaultOptions ''ProximityRequirement
-deriveJSON defaultOptions ''CloseToggle
-deriveJSON defaultOptions ''Sensor
+deriveJSON defaultOptions ''ProximitySensor
+deriveJSON defaultOptions ''DamageSensor