Refactor, try to limit dependencies

src/Dodge/Data/Damage.hs

@@ -1,49 +1,54 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
-{- 
+{-# LANGUAGE TemplateHaskell #-}
+
+{-
 Datatypes describing the type of damage effects that are to be applied to
 creatures.
 -}
-module Dodge.Data.Damage 
-    ( module Dodge.Data.Damage
-    , module Dodge.Data.Damage.Type
-    ) where
-import GHC.Generics
+module Dodge.Data.Damage (
+    module Dodge.Data.Damage,
+    module Dodge.Data.Damage.Type,
+) where
+
+import Control.Lens
 import Data.Aeson
+import Data.Aeson.TH
 import Dodge.Data.Damage.Type
 import Geometry.Data
-import Control.Lens
+
 data DamageEffect
-    = PushDamage 
-        { _dePush :: Float 
+    = PushDamage
+        { _dePush :: Float
         , _dePushExp :: Float
         , _dePushRadius :: Float
         }
-    | TorqueDamage { _deTorque :: Float }
-    | PushBackDamage {_dePushBack :: Float }
+    | TorqueDamage {_deTorque :: Float}
+    | PushBackDamage {_dePushBack :: Float}
     | NoDamageEffect
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON DamageEffect where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON DamageEffect
-data Damage = Damage 
+    deriving (Eq, Ord, Show, Read)
+
+data Damage = Damage
     { _dmType :: DamageType
-    , _dmAmount :: Int , _dmFrom :: Point2 , _dmAt :: Point2 , _dmTo :: Point2 
+    , _dmAmount :: Int
+    , _dmFrom :: Point2
+    , _dmAt :: Point2
+    , _dmTo :: Point2
     , _dmEffect :: DamageEffect
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Damage  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Damage 
+    deriving (Eq, Ord, Show, Read)
+
 isElectrical :: Damage -> Bool
 isElectrical dm = case _dmType dm of
     ELECTRICAL -> True
     _ -> False
+
 isMovementDam :: Damage -> Bool
 isMovementDam dm = case _dmType dm of
     TORQUEDAM -> True
     PUSHDAM -> True
     _ -> False
+
 makeLenses ''Damage
 makeLenses ''DamageEffect
+deriveJSON defaultOptions ''DamageEffect
+deriveJSON defaultOptions ''Damage