Move from store to flat

2022-08-20 17:54:35 +01:00
parent 8571ab9254
commit ff9dbdf068
95 changed files with 793 additions and 748 deletions
@@ -1,8 +1,11 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}

 module Dodge.Data.Shockwave where

+import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -12,7 +15,7 @@ import TH.Derive
 import Data.Store

 data ShockwaveDirection = OutwardShockwave | InwardShockwave
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)

 data Shockwave = Shockwave
    { _swColor :: Color
@@ -25,10 +28,8 @@ data Shockwave = Shockwave
    , _swMaxTime :: Int
    , _swTimer :: Int
    }
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)

 makeLenses ''Shockwave
 deriveJSON defaultOptions ''ShockwaveDirection
 deriveJSON defaultOptions ''Shockwave
-$($(derive [d| instance Deriving (Store ShockwaveDirection) |]))
-$($(derive [d| instance Deriving (Store Shockwave) |]))