Refactor, try to limit dependencies

src/Dodge/Data/WorldEffect.hs

@@ -1,27 +1,20 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
 
 module Dodge.Data.WorldEffect where
 
 import Data.Aeson
+import Data.Aeson.TH
 import Dodge.Data.CreatureEffect
 import Dodge.Data.Item
 import Dodge.Data.SoundOrigin
-import GHC.Generics
 import Geometry.Data
 import Sound.Data
 
 data ItCrWdWd
     = ItCrWdId
     | ItCrWdItemEffect
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON ItCrWdWd where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON ItCrWdWd
+    deriving (Eq, Ord, Show, Read)
 
 data WdWd
     = NoWorldEffect
@@ -36,34 +29,19 @@ data WdWd
     | WdWdNegateTrig Int
     | WdWdFromItixCrixWdWd Int Int ItCrWdWd
     | WdWdFromItCrixWdWd Item Int ItCrWdWd
-    deriving (Eq, Show, Read, Generic)
-
-instance ToJSON WdWd where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON WdWd
+    deriving (Eq, Show, Read)
 
 data WdP2
     = WdP2Const Point2
     | WdYouPos
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON WdP2 where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON WdP2
+    deriving (Eq, Ord, Show, Read)
 
 data MdWdWd
     = MdWdId
     | MdTrigIf MdWdWd MdWdWd
     | MdSetLSCol Point3
     | MdFlickerUpdate
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON MdWdWd where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON MdWdWd
+    deriving (Eq, Ord, Show, Read)
 
 data WdBl
     = WdTrig Int
@@ -73,34 +51,19 @@ data WdBl
     | WdBlCrFilterNearPoint Float Point2 CrBl
     | WdBlBtOn Int
     | WdBlBtNotOff Int
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON WdBl where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON WdBl
+    deriving (Eq, Ord, Show, Read)
 
 data WdP2f
     = WdP2f0
     | WdP2fDoorPosition Int
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON WdP2f where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON WdP2f
+    deriving (Eq, Ord, Show, Read)
 
 data DrWdWd
     = DrWdId
     | DrWdMakeDoorDebris
     | DrWdMechanismStepwise Int [Int] [(Point2, Point2)]
     | DoorMechanism
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON DrWdWd where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON DrWdWd
+    deriving (Eq, Ord, Show, Read)
 
 data TmWdWd
     = TmWdId
@@ -108,9 +71,13 @@ data TmWdWd
     | TmWdWdfromWdWd WdWd
     | TmWdWdTermSound SoundID
     | TmWdWdDoDeathTriggers
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read)
 
-instance ToJSON TmWdWd where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON TmWdWd
+deriveJSON defaultOptions ''ItCrWdWd
+deriveJSON defaultOptions ''WdWd
+deriveJSON defaultOptions ''WdP2
+deriveJSON defaultOptions ''MdWdWd
+deriveJSON defaultOptions ''WdBl
+deriveJSON defaultOptions ''WdP2f
+deriveJSON defaultOptions ''DrWdWd
+deriveJSON defaultOptions ''TmWdWd