Cleanup

2022-07-27 12:49:23 +01:00
parent 6554d219dc
commit 8d17ce66e9
106 changed files with 2911 additions and 2678 deletions
@@ -1,61 +1,73 @@
 {-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
-module Dodge.Data.Machine
-    where
-import GHC.Generics
-import Data.Aeson
-import Dodge.Data.GenParams
-import Dodge.Data.Item
-import Sound.Data
-import Dodge.Data.Object
-import Dodge.Data.Damage
-import Dodge.Data.Sensor
-import Geometry.Data
+{-# LANGUAGE TemplateHaskell #-}
+
+module Dodge.Data.Machine where
+
 import Color
-import Dodge.Data.Material
+import Control.Lens
+import Data.Aeson
 import qualified Data.IntSet as IS
 import qualified Data.Map.Strict as M
-import Control.Lens
-data MachineDraw = MachineDrawMempty
+import Dodge.Data.Damage
+import Dodge.Data.GenParams
+import Dodge.Data.Item
+import Dodge.Data.Material
+import Dodge.Data.Object
+import Dodge.Data.Sensor
+import GHC.Generics
+import Geometry.Data
+import Sound.Data
+
+data MachineDraw
+    = MachineDrawMempty
    | MachineDrawTerminal
    | MachineDrawTurret
-    | MachineDrawDamageSensor Float (PaletteColor,DecorationShape)
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON MachineDraw  where
+    | MachineDrawDamageSensor Float (PaletteColor, DecorationShape)
+    deriving (Eq, Ord, Show, Read, Generic)
+
+instance ToJSON MachineDraw where
    toEncoding = genericToEncoding defaultOptions
-instance FromJSON MachineDraw 
+
+instance FromJSON MachineDraw
+
 data Machine = Machine
-    { _mcID     :: Int
-    , _mcWallIDs    :: IS.IntSet
-    , _mcDraw   :: MachineDraw --Machine -> SPic
+    { _mcID :: Int
+    , _mcWallIDs :: IS.IntSet
+    , _mcDraw :: MachineDraw --Machine -> SPic
    , _mcMaterial :: Material
-    , _mcPos    :: Point2
-    , _mcDir    :: Float
-    , _mcColor  :: Color
-    , _mcHP     :: Int
+    , _mcPos :: Point2
+    , _mcDir :: Float
+    , _mcColor :: Color
+    , _mcHP :: Int
    , _mcSensor :: Sensor
    , _mcDamage :: [Damage]
-    , _mcType   :: MachineType
+    , _mcType :: MachineType
    , _mcMounts :: M.Map ObjectType Int
-    , _mcName   :: String
-    , _mcCloseSound  :: Maybe SoundID
+    , _mcName :: String
+    , _mcCloseSound :: Maybe SoundID
    }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Machine  where
+    deriving (Eq, Show, Read, Generic)
+
+instance ToJSON Machine where
    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Machine 
-data MachineType 
+
+instance FromJSON Machine
+
+data MachineType
    = StaticMachine
    | Turret
-        { _tuWeapon     :: Item
-        , _tuTurnSpeed  :: Float
-        , _tuFireTime   :: Int
-        , _tuMCrID      :: Maybe Int
+        { _tuWeapon :: Item
+        , _tuTurnSpeed :: Float
+        , _tuFireTime :: Int
+        , _tuMCrID :: Maybe Int
        }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON MachineType  where
+    deriving (Eq, Show, Read, Generic)
+
+instance ToJSON MachineType where
    toEncoding = genericToEncoding defaultOptions
-instance FromJSON MachineType 
+
+instance FromJSON MachineType
+
 makeLenses ''Machine
 makeLenses ''MachineType