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.ArcStep where

+import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -17,15 +20,13 @@ data ArcStep = ArcStep
    , _asDir :: Float
    , _asObject :: CrWlID --Maybe (Either Creature Wall)
    }
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)

 data NextArcStep
    = EndArc
    | DefaultArcStep
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)

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