Move from store to flat

src/Dodge/Data/CrGroupParams.hs

@@ -1,13 +1,16 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Dodge.Data.CrGroupParams where
 
-import LinearHelp
+import Flat
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import qualified Data.IntSet as IS
+import qualified IntSetHelp as IS
 import Geometry.Data
 import TH.Derive
 import Data.Store
@@ -18,14 +21,11 @@ data CrGroupParams = CrGroupParams
     , _crGroupCenter :: Point2
     , _crGroupUpdate :: CrGroupUpdate --World -> CrGroupParams -> Maybe CrGroupParams
     }
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data CrGroupUpdate = DefaultCrGroupUpdate
-    | HackCrGroupUpdate
-    deriving (Eq, Ord, Show, Read)
+    deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 makeLenses ''CrGroupParams
 deriveJSON defaultOptions ''CrGroupParams
 deriveJSON defaultOptions ''CrGroupUpdate
-$($(derive [d| instance Deriving (Store CrGroupParams) |]))
-$($(derive [d| instance Deriving (Store CrGroupUpdate) |]))