Refactor, try to limit dependencies

src/Dodge/Data/Creature/Misc.hs

@@ -1,80 +1,87 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
-module Dodge.Data.Creature.Misc
-    ( module Dodge.Data.Creature.Misc
-    , module Dodge.Data.CamouflageStatus
-    ) where
-import GHC.Generics
-import Data.Aeson
-import Dodge.Data.FloatFunction
-import Dodge.Data.CamouflageStatus
-import Sound.Data
-import Geometry.Data
+{-# LANGUAGE TemplateHaskell #-}
+
+module Dodge.Data.Creature.Misc (
+    module Dodge.Data.Creature.Misc,
+    module Dodge.Data.CamouflageStatus,
+) where
+
 import Color
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Dodge.Data.CamouflageStatus
+import Dodge.Data.FloatFunction
+import Geometry.Data
+import Sound.Data
+
 data CreatureStatistics = CreatureStatistics
-    { _strength       :: Int
-    , _dexterity      :: Int
-    , _intelligence   :: Int
+    { _strength :: Int
+    , _dexterity :: Int
+    , _intelligence :: Int
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON CreatureStatistics  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON CreatureStatistics 
-data Vocalization 
+    deriving (Eq, Ord, Show, Read)
+
+data Vocalization
     = Mute
     | Vocalization
-        {_vcSound :: SoundID
-        ,_vcWarnings :: [SoundID]
-        ,_vcMaxCoolDown :: Int
-        ,_vcCoolDown    :: Int
+        { _vcSound :: SoundID
+        , _vcWarnings :: [SoundID]
+        , _vcMaxCoolDown :: Int
+        , _vcCoolDown :: Int
         }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Vocalization  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Vocalization 
-data CrMvType 
+    deriving (Eq, Ord, Show, Read)
+
+data CrMvType
     = NoMvType
-    | MvWalking { _mvSpeed :: Float }
+    | MvWalking {_mvSpeed :: Float}
     | CrMvType
-        { _mvSpeed      :: Float
-        , _mvTurnRad    :: FloatFloat
-        , _mvTurnJit    :: Float
-        , _mvAimSpeed   :: FloatFloat
+        { _mvSpeed :: Float
+        , _mvTurnRad :: FloatFloat
+        , _mvTurnJit :: Float
+        , _mvAimSpeed :: FloatFloat
         }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON CrMvType  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON CrMvType 
-data HumanoidAI = YourAI | ChaseAI | InanimateAI | SpreadGunAI | PistolAI
-    | LtAutoAI | LauncherAI | SwarmAI | AutoAI | FlockArmourChaseAI | MiniGunAI
-    | LongAI | MultGunAI
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON HumanoidAI  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON HumanoidAI 
+    deriving (Eq, Ord, Show, Read)
+
+data HumanoidAI
+    = YourAI
+    | ChaseAI
+    | InanimateAI
+    | SpreadGunAI
+    | PistolAI
+    | LtAutoAI
+    | LauncherAI
+    | SwarmAI
+    | AutoAI
+    | FlockArmourChaseAI
+    | MiniGunAI
+    | LongAI
+    | MultGunAI
+    deriving (Eq, Ord, Show, Read)
+
 data CreatureType
     = Humanoid
-        { _skinHead     :: Color
-        , _skinUpper    :: Color
-        , _skinLower    :: Color
-        , _humanoidAI   :: HumanoidAI
+        { _skinHead :: Color
+        , _skinUpper :: Color
+        , _skinLower :: Color
+        , _humanoidAI :: HumanoidAI
         }
     | Barreloid {_barrelType :: BarrelType}
     | Lampoid {_lampHeight :: Float, _lampColor :: Point3, _lampLSID :: Maybe Int}
     | Turretoid
     | NonDrawnCreature
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON CreatureType where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON CreatureType
+    deriving (Eq, Ord, Show, Read)
+
 data BarrelType = PlainBarrel | ExplosiveBarrel
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON BarrelType  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON BarrelType 
+    deriving (Eq, Ord, Show, Read)
+
 makeLenses ''CreatureStatistics
 makeLenses ''Vocalization
-makeLenses ''CrMvType 
+makeLenses ''CrMvType
 makeLenses ''CreatureType
+deriveJSON defaultOptions ''CreatureStatistics
+deriveJSON defaultOptions ''Vocalization
+deriveJSON defaultOptions ''CrMvType
+deriveJSON defaultOptions ''HumanoidAI
+deriveJSON defaultOptions ''CreatureType
+deriveJSON defaultOptions ''BarrelType