Move from store to flat

src/Dodge/Data/Damage.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -10,6 +12,7 @@ module Dodge.Data.Damage (
     module Dodge.Data.Damage.Type,
 ) where
 
+import Flat
 import LinearHelp
 import Control.Lens
 import TH.Derive
@@ -28,7 +31,7 @@ data DamageEffect
     | TorqueDamage {_deTorque :: Float}
     | PushBackDamage {_dePushBack :: Float}
     | NoDamageEffect
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data Damage = Damage
     { _dmType :: DamageType
@@ -38,7 +41,7 @@ data Damage = Damage
     , _dmTo :: Point2
     , _dmEffect :: DamageEffect
     }
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 isElectrical :: Damage -> Bool
 isElectrical dm = case _dmType dm of
@@ -55,5 +58,3 @@ makeLenses ''Damage
 makeLenses ''DamageEffect
 deriveJSON defaultOptions ''DamageEffect
 deriveJSON defaultOptions ''Damage
-$($(derive [d| instance Deriving (Store DamageEffect) |]))
-$($(derive [d| instance Deriving (Store Damage) |]))