Cleanup module pathing

src/Dodge/Data/CreatureEffect.hs

@@ -1,81 +1,76 @@
 {-# LANGUAGE StrictData #-}
-{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.CreatureEffect where
-import GHC.Generics
+
 import Data.Aeson
+import Data.Aeson.TH
+
 data WdCrCr = NoCreatureEffect
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON WdCrCr  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON WdCrCr 
+    deriving (Eq, Ord, Show, Read)
+
 data CrWdImp = NoCrWdImp
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON CrWdImp  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON CrWdImp 
+    deriving (Eq, Ord, Show, Read)
+
 data CrWdWd = CrWdWdId
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON CrWdWd  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON CrWdWd 
+    deriving (Eq, Ord, Show, Read)
+
 data IntImp = NoIntImp
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON IntImp  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON IntImp 
-data CrImp = NoCrImp
+    deriving (Eq, Ord, Show, Read)
+
+data CrImp
+    = NoCrImp
     | TurnTowardCr Float -- turn amount
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON CrImp  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON CrImp 
+    deriving (Eq, Ord, Show, Read)
+
 data P2Imp = P2ImpNo
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON P2Imp  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON P2Imp 
-data WdCrBl = WdCrTrue
+    deriving (Eq, Ord, Show, Read)
+
+data WdCrBl
+    = WdCrTrue
     | WdCrBlfromCrBl CrBl
     | WdCrNegate WdCrBl
     | WdCrLOSTarget
     | WdCrSafeDistFromTarget Float
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON WdCrBl  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON WdCrBl 
-data CrBl = CrCanShoot
+    deriving (Eq, Ord, Show, Read)
+
+data CrBl
+    = CrCanShoot
     | CrIsReloading
     | CrIsAiming
     | CrIsAnimate
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON CrBl  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON CrBl 
+    deriving (Eq, Ord, Show, Read)
+
 data MCrAc = MCrNoAction
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON MCrAc  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON MCrAc 
-data CrAc = CrTurnAround
+    deriving (Eq, Ord, Show, Read)
+
+data CrAc
+    = CrTurnAround
     | CrFleeFromTarget
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON CrAc  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON CrAc 
+    deriving (Eq, Ord, Show, Read)
+
 data P2Ac = P2NoAction
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON P2Ac  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON P2Ac 
+    deriving (Eq, Ord, Show, Read)
+
 data MP2Ac = MP2NoAction
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON MP2Ac  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON MP2Ac 
-data CrWdAc = CrWdBFSThenReturn Int
+    deriving (Eq, Ord, Show, Read)
+
+data CrWdAc
+    = CrWdBFSThenReturn Int
     | ChooseMovementSpreadGun
     | ChooseMovementLtAuto
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON CrWdAc  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON CrWdAc 
+    deriving (Eq, Ord, Show, Read)
+
+deriveJSON defaultOptions ''WdCrCr
+deriveJSON defaultOptions ''CrWdImp
+deriveJSON defaultOptions ''CrWdWd
+deriveJSON defaultOptions ''IntImp
+deriveJSON defaultOptions ''CrImp
+deriveJSON defaultOptions ''P2Imp
+deriveJSON defaultOptions ''WdCrBl
+deriveJSON defaultOptions ''CrBl
+deriveJSON defaultOptions ''MCrAc
+deriveJSON defaultOptions ''CrAc
+deriveJSON defaultOptions ''P2Ac
+deriveJSON defaultOptions ''MP2Ac
+deriveJSON defaultOptions ''CrWdAc