Go back to JSON encoding

src/Dodge/Data/WorldEffect.hs

@@ -5,9 +5,6 @@
 
 module Dodge.Data.WorldEffect where
 
-import TH.Derive
-import Data.Store
-import Data.Binary
 import Flat
 import Data.Aeson
 import Data.Aeson.TH
@@ -21,7 +18,6 @@ data ItCrWdWd
     = ItCrWdId
     | ItCrWdItemEffect
     deriving (Eq, Ord, Show, Read, Generic, Flat)
-$($(derive [d| instance Deriving (Store ItCrWdWd) |]))
 
 data WdWd
     = NoWorldEffect
@@ -38,13 +34,11 @@ data WdWd
     | WdWdFromItCrixWdWd Item Int ItCrWdWd
     deriving (Eq, Show, Read, Generic)
     --hderiving (Eq, Show, Read, Generic, Flat)
-$($(derive [d| instance Deriving (Store WdWd) |]))
 
 data WdP2
     = WdP2Const Point2
     | WdYouPos
     deriving (Eq, Ord, Show, Read, Generic, Flat)
-$($(derive [d| instance Deriving (Store WdP2) |]))
 
 data MdWdWd
     = MdWdId
@@ -52,7 +46,6 @@ data MdWdWd
     | MdSetLSCol Point3
     | MdFlickerUpdate
     deriving (Eq, Ord, Show, Read, Generic, Flat)
-$($(derive [d| instance Deriving (Store MdWdWd) |]))
 
 data WdBl
     = WdTrig Int
@@ -63,13 +56,11 @@ data WdBl
     | WdBlBtOn Int
     | WdBlBtNotOff Int
     deriving (Eq, Ord, Show, Read, Generic, Flat)
-$($(derive [d| instance Deriving (Store WdBl) |]))
 
 data WdP2f
     = WdP2f0
     | WdP2fDoorPosition Int
     deriving (Eq, Ord, Show, Read, Generic, Flat)
-$($(derive [d| instance Deriving (Store WdP2f) |]))
 
 data DrWdWd
     = DrWdId
@@ -77,7 +68,6 @@ data DrWdWd
     | DrWdMechanismStepwise Int [Int] [(Point2, Point2)]
     | DoorMechanism
     deriving (Eq, Ord, Show, Read, Generic, Flat)
-$($(derive [d| instance Deriving (Store DrWdWd) |]))
 
 data TmWdWd
     = TmWdId
@@ -87,7 +77,6 @@ data TmWdWd
     | TmWdWdDoDeathTriggers
     deriving (Eq, Show, Read, Generic)
     --hderiving (Eq, Show, Read, Generic, Flat)
-$($(derive [d| instance Deriving (Store TmWdWd) |]))
 
 deriveJSON defaultOptions ''ItCrWdWd
 deriveJSON defaultOptions ''WdWd