Move from store to flat

src/Dodge/Data/Machine.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -11,12 +13,13 @@ module Dodge.Data.Machine (
     module Dodge.Data.GenParams,
 ) where
 
+import Flat
 import LinearHelp
 import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import qualified Data.IntSet as IS
+import qualified IntSetHelp as IS
 import qualified Data.Map.Strict as M
 import Dodge.Data.Damage
 import Dodge.Data.GenParams
@@ -44,14 +47,14 @@ data Machine = Machine
     , _mcCloseSound :: Maybe SoundID
     , _mcWidth :: Float
     }
-    deriving (Eq, Show, Read)
+    deriving (Eq, Show, Read, Generic, Flat)
 
 data MachineType
     = McStatic
     | McTerminal
     | McSensor Sensor
     | McTurret Turret
-    deriving (Eq, Show, Read)
+    deriving (Eq, Show, Read, Generic, Flat)
 
 data Turret = Turret
     { _tuWeapon :: Item
@@ -59,7 +62,7 @@ data Turret = Turret
     , _tuFireTime :: Int
     , _tuDir :: Float
     }
-    deriving (Eq, Show, Read)
+    deriving (Eq, Show, Read, Generic, Flat)
 
 makeLenses ''Machine
 makeLenses ''Turret
@@ -67,6 +70,3 @@ makePrisms ''MachineType
 deriveJSON defaultOptions ''Machine
 deriveJSON defaultOptions ''MachineType
 deriveJSON defaultOptions ''Turret
-$($(derive [d| instance Deriving (Store Machine) |]))
-$($(derive [d| instance Deriving (Store MachineType) |]))
-$($(derive [d| instance Deriving (Store Turret) |]))