Move from store to flat

src/Dodge/Data/WorldEffect.hs

@@ -1,8 +1,11 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Dodge.Data.WorldEffect where
 
+import Flat
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.CreatureEffect
@@ -16,7 +19,7 @@ import Data.Store
 data ItCrWdWd
     = ItCrWdId
     | ItCrWdItemEffect
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data WdWd
     = NoWorldEffect
@@ -31,19 +34,19 @@ data WdWd
     | WdWdNegateTrig Int
     | WdWdFromItixCrixWdWd Int Int ItCrWdWd
     | WdWdFromItCrixWdWd Item Int ItCrWdWd
-    deriving (Eq, Show, Read)
+    deriving (Eq, Show, Read, Generic, Flat)
 
 data WdP2
     = WdP2Const Point2
     | WdYouPos
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data MdWdWd
     = MdWdId
     | MdTrigIf MdWdWd MdWdWd
     | MdSetLSCol Point3
     | MdFlickerUpdate
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data WdBl
     = WdTrig Int
@@ -53,19 +56,19 @@ data WdBl
     | WdBlCrFilterNearPoint Float Point2 CrBl
     | WdBlBtOn Int
     | WdBlBtNotOff Int
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data WdP2f
     = WdP2f0
     | WdP2fDoorPosition Int
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data DrWdWd
     = DrWdId
     | DrWdMakeDoorDebris
     | DrWdMechanismStepwise Int [Int] [(Point2, Point2)]
     | DoorMechanism
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data TmWdWd
     = TmWdId
@@ -73,7 +76,7 @@ data TmWdWd
     | TmWdWdfromWdWd WdWd
     | TmWdWdTermSound SoundID
     | TmWdWdDoDeathTriggers
-    deriving (Eq, Show, Read)
+    deriving (Eq, Show, Read, Generic, Flat)
 
 deriveJSON defaultOptions ''ItCrWdWd
 deriveJSON defaultOptions ''WdWd
@@ -83,11 +86,3 @@ deriveJSON defaultOptions ''WdBl
 deriveJSON defaultOptions ''WdP2f
 deriveJSON defaultOptions ''DrWdWd
 deriveJSON defaultOptions ''TmWdWd
-$($(derive [d| instance Deriving (Store ItCrWdWd) |]))
-$($(derive [d| instance Deriving (Store WdWd) |]))
-$($(derive [d| instance Deriving (Store WdP2) |]))
-$($(derive [d| instance Deriving (Store MdWdWd) |]))
-$($(derive [d| instance Deriving (Store WdBl) |]))
-$($(derive [d| instance Deriving (Store WdP2f) |]))
-$($(derive [d| instance Deriving (Store DrWdWd) |]))
-$($(derive [d| instance Deriving (Store TmWdWd) |]))