Refactor machines

src/Dodge/Data.hs

@@ -84,7 +84,11 @@ module Dodge.Data
     , module Dodge.Data.LinearShockwave
     , module Dodge.Data.TractorBeam
     , module Dodge.Data.MountedObject
+    , module Dodge.Data.Machine
+    , module Dodge.Data.GenParams
     ) where
+import Dodge.Data.GenParams
+import Dodge.Data.Machine
 import Dodge.Data.MountedObject
 import Dodge.Data.TractorBeam
 import Dodge.Data.LinearShockwave
@@ -161,7 +165,6 @@ import Dodge.Item.Attachment.Data
 import Dodge.Item.Data
 import Data.Preload
 import Picture.Data
-import ShapePicture
 import Geometry.Data
 import Geometry.ConvexPoly
 import Sound.Data
@@ -294,18 +297,12 @@ data World = World
     , _lSelect          :: Point2
     , _rSelect          :: Point2
     }
-  --deriving (Eq,Ord,Show,Read)
+  --deriving (Eq,Show,Read)
 data WorldHammer
     = SubInvHam
     | DoubleMouseHam
   deriving (Eq,Ord,Show,Read,Enum,Bounded)
 
-newtype GenParams = GenParams
-    { _sensorCoding :: M.Map DamageType (PaletteColor,DecorationShape)
-    }
-  deriving (Eq,Ord,Show,Read)
-data DecorationShape = PLUS | SQUARE | CIRCLE | THREELINES
-  deriving (Eq,Ord,Enum,Show,Read)
 
 data TimeFlowStatus
     = RewindingNow
@@ -434,30 +431,6 @@ data TerminalToggle = TerminalToggle
     { _ttTriggerID :: Int
     , _ttDeathEffect :: Bool -> Bool
     }
-data Machine = Machine
-    { _mcID     :: Int
-    , _mcWallIDs    :: IS.IntSet
-    , _mcDraw   :: Machine -> SPic
-    , _mcMaterial :: Material
-    , _mcPos    :: Point2
-    , _mcDir    :: Float
-    , _mcColor  :: Color
-    , _mcHP     :: Int
-    , _mcSensor :: Sensor
-    , _mcDamage :: [Damage]
-    , _mcType   :: MachineType
-    , _mcMounts :: M.Map Object Int
-    , _mcName   :: String
-    , _mcCloseSound  :: Maybe SoundID
-    }
-data MachineType 
-    = StaticMachine
-    | Turret
-        { _tuWeapon     :: Item
-        , _tuTurnSpeed  :: Float
-        , _tuFireTime   :: Int
-        , _tuMCrID      :: Maybe Int
-        }
 
 data EffectArguments
     = NoArguments {_cmdEffect :: [TerminalLine]}
@@ -575,8 +548,6 @@ makeLenses ''World
 makeLenses ''FloorItem
 --makeLenses ''Particle
 makeLenses ''Terminal
-makeLenses ''Machine
-makeLenses ''MachineType
 makeLenses ''Universe
 makeLenses ''GunBarrels
 makeLenses ''Nozzle
@@ -586,7 +557,6 @@ makeLenses ''ScreenLayer
 makeLenses ''WorldBeams
 makeLenses ''TerminalCommand
 makeLenses ''TerminalInput
-makeLenses ''GenParams
 ----- ROOM LENSES
 
 makeLenses ''Room