Remove generic and flat instances

src/Dodge/Data/Creature/Memory.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Creature.Memory where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -16,7 +15,7 @@ data Memory = Memory
     { _soundsToInvestigate :: [Point2]
     , _nodesSearched :: [Int]
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Memory
 deriveJSON defaultOptions ''Memory

src/Dodge/Data/Creature/Misc.hs

@@ -8,7 +8,6 @@ module Dodge.Data.Creature.Misc (
     module Dodge.Data.CamouflageStatus,
 ) where
 
-import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -23,7 +22,7 @@ data CreatureStatistics = CreatureStatistics
     , _dexterity :: Int
     , _intelligence :: Int
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Vocalization
     = Mute
@@ -33,7 +32,7 @@ data Vocalization
         , _vcMaxCoolDown :: Int
         , _vcCoolDown :: Int
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrMvType
     = NoMvType
@@ -44,7 +43,7 @@ data CrMvType
         , _mvTurnJit :: Float
         , _mvAimSpeed :: FloatFloat
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data HumanoidAI
     = YourAI
@@ -60,7 +59,7 @@ data HumanoidAI
     | MiniGunAI
     | LongAI
     | MultGunAI
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CreatureType
     = Humanoid
@@ -72,10 +71,10 @@ data CreatureType
     | Barreloid {_barrelType :: BarrelType}
     | Lampoid {_lampHeight :: Float, _lampColor :: Point3, _lampLSID :: Maybe Int}
     | NonDrawnCreature
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data BarrelType = PlainBarrel | ExplosiveBarrel
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''CreatureStatistics
 makeLenses ''Vocalization

src/Dodge/Data/Creature/Perception.hs

@@ -23,7 +23,6 @@ module Dodge.Data.Creature.Perception (
     auDist,
 ) where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -37,18 +36,18 @@ data Perception = Perception
     , _cpVision :: Vision
     , _cpAudition :: Audition
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Vision = Eyes
     { _viFOV :: FloatFloat
     , _viDist :: FloatFloat
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 newtype Audition = Ears
     { _auDist :: FloatFloat
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Vigilance
     = Comatose
@@ -56,17 +55,17 @@ data Vigilance
     | Lethargic
     | Vigilant
     | Overstrung
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Attention
     = AttentiveTo {_getAttentiveTo :: IM.IntMap Awareness}
     | Fixated {_getFixated :: Int}
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Awareness
     = Suspicious Float
     | Cognizant Float
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Perception
 makeLenses ''Vision

src/Dodge/Data/Creature/Stance.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Creature.Stance where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -17,7 +16,7 @@ data Stance = Stance
     , _posture :: Posture
     , _strideLength :: Int
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Carriage
     = Walking
@@ -28,19 +27,19 @@ data Carriage
     | Floating
     | Flying
     | Boosting Point2
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data FootForward
     = LeftForward
     | RightForward
     | WasLeftForward
     | WasRightForward
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Posture
     = Aiming
     | AtEase
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Stance
 makeLenses ''Carriage

src/Dodge/Data/Creature/State.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Creature.State where
 
-import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -19,18 +18,18 @@ data CreatureState = CrSt
     , _csSpState :: CrSpState
     , _csDropsOnDeath :: CreatureDropType
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CreatureDropType
     = DropAll
     | DropAmount Int
     | DropSpecific [Int]
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrSpState
     = Barrel {_piercedPoints :: [Point2]}
     | GenCr
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Faction
     = GenericFaction Int
@@ -41,7 +40,7 @@ data Faction
     | NoFaction
     | ColorFaction Color
     | PlayerFaction
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrGroup
     = LoneWolf
@@ -51,7 +50,7 @@ data CrGroup
         }
     | CrGroupID {_crGroupID :: Int}
     | ShieldGroup
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''CreatureState
 makeLenses ''CrSpState