Start work on clouds, damage, sensors

src/Dodge/Data/Machine/Sensor.hs

@@ -1,23 +1,27 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module Dodge.Data.Machine.Sensor where
+module Dodge.Data.Machine.Sensor (
+    module Dodge.Data.Machine.Sensor,
+    module Dodge.Data.Machine.Sensor.Type,
+) where
 
-import Dodge.Data.GenParams
 import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
+import Dodge.Data.GenParams
 import Dodge.Data.Item.Combine
-import Dodge.Data.Damage.Type
+import Dodge.Data.Machine.Sensor.Type
 
 data Sensor
     = DamageSensor
         { _sensToggle :: Bool
         , _sensAmount :: Int
-        , _sensType :: DamageType
+        , --        , _sensType :: DamageType
+          _sensType :: SensorType
         , _sensDraw :: (PaletteColor, DecorationShape)
         , _sensThreshold :: Int
         }
@@ -27,18 +31,21 @@ data Sensor
         , _proxRequirement :: ProximityRequirement
         , _sensToggle :: Bool
         }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ProximityRequirement
     = RequireHealth {_proxReqMinHealth :: Int}
     | RequireEquipment {_proxReqEquipment :: ItemType}
     | RequireImpossible
     deriving (Show)
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CloseToggle = NotClose | IsClose
     deriving (Show)
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Sensor
 makeLenses ''ProximityRequirement