Move from store to flat

src/Dodge/Data/Creature/Misc.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -6,6 +8,7 @@ module Dodge.Data.Creature.Misc (
     module Dodge.Data.CamouflageStatus,
 ) where
 
+import Flat
 import TH.Derive
 import Data.Store
 import Color
@@ -22,7 +25,7 @@ data CreatureStatistics = CreatureStatistics
     , _dexterity :: Int
     , _intelligence :: Int
     }
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data Vocalization
     = Mute
@@ -32,7 +35,7 @@ data Vocalization
         , _vcMaxCoolDown :: Int
         , _vcCoolDown :: Int
         }
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data CrMvType
     = NoMvType
@@ -43,7 +46,7 @@ data CrMvType
         , _mvTurnJit :: Float
         , _mvAimSpeed :: FloatFloat
         }
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data HumanoidAI
     = YourAI
@@ -59,7 +62,7 @@ data HumanoidAI
     | MiniGunAI
     | LongAI
     | MultGunAI
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data CreatureType
     = Humanoid
@@ -71,10 +74,10 @@ data CreatureType
     | Barreloid {_barrelType :: BarrelType}
     | Lampoid {_lampHeight :: Float, _lampColor :: Point3, _lampLSID :: Maybe Int}
     | NonDrawnCreature
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data BarrelType = PlainBarrel | ExplosiveBarrel
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 makeLenses ''CreatureStatistics
 makeLenses ''Vocalization
@@ -86,12 +89,3 @@ deriveJSON defaultOptions ''CrMvType
 deriveJSON defaultOptions ''HumanoidAI
 deriveJSON defaultOptions ''CreatureType
 deriveJSON defaultOptions ''BarrelType
-
-{- FOURMOLU_DISABLE -}
-$($(derive [d| instance Deriving (Store CreatureStatistics) |]))
-$($(derive [d| instance Deriving (Store Vocalization) |]))
-$($(derive [d| instance Deriving (Store CrMvType) |]))
-$($(derive [d| instance Deriving (Store HumanoidAI) |]))
-$($(derive [d| instance Deriving (Store CreatureType) |]))
-$($(derive [d| instance Deriving (Store BarrelType) |]))
-{- FOURMOLU_ENABLE -}