Remove generic and flat instances

src/Dodge/Data/Bullet.hs

@@ -8,7 +8,6 @@ module Dodge.Data.Bullet
     , module Dodge.Data.Damage
     )where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -30,30 +29,30 @@ data Bullet = Bullet
     , _buTimer :: Int
     , _buDamages :: [Damage]
     }
-    deriving (Show, Read, Eq, Ord, Generic, Flat)
+    deriving (Show, Eq, Ord, Read) --Generic, Flat)
 
 data EnergyBallType = IncBall | TeslaBall | ConcBall
-    deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic, Flat)
+    deriving (Show, Eq, Ord, Enum, Bounded, Read) --Generic, Flat)
 
 data BulletUpdateMod = NoBulletUpdateMod
     | ABulletUpdateMod -- hack for template splicing
-    deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic, Flat)
+    deriving (Show, Eq, Ord, Enum, Bounded, Read) --Generic, Flat)
 
 data BulletEffect
     = DestroyBullet
     | BounceBullet
     | PenetrateBullet
-    deriving (Eq, Ord, Show, Read, Enum, Bounded, Generic, Flat)
+    deriving (Eq, Ord, Show, Enum, Bounded, Read) --Generic, Flat)
 
 data BulletSpawn = BulBall EnergyBallType | BulSpark
-    deriving (Show, Read, Eq, Ord, Generic, Flat)
+    deriving (Show, Eq, Ord, Read) --Generic, Flat)
 
 data BulletTrajectory
     = BasicBulletTrajectory
     | BezierTrajectory Point2 Point2 Point2
     | FlechetteTrajectory Point2
     | MagnetTrajectory Point2
-    deriving (Show, Read, Eq, Ord, Generic, Flat)
+    deriving (Show, Eq, Ord, Read) --Generic, Flat)
 
 makeLenses ''Bullet
 deriveJSON defaultOptions ''Bullet