Remove generic and flat instances

src/Color.hs

@@ -1,12 +1,13 @@
 --{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 
 module Color where
 
-import Flat
 import Data.Aeson
+import Data.Aeson.TH
 import Geometry
 import LinearHelp ()
 
@@ -25,12 +26,7 @@ data PaletteColor
     | ORANGE
     | WHITE
     | BLACK
-    deriving (Eq, Ord, Enum, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Enum, Show, Read) --Generic, Flat)
-
-instance ToJSON PaletteColor where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON PaletteColor
 
 type RGBA = Point4
 
@@ -169,3 +165,5 @@ numColor _ = toV4 (1, 1, 1, 1)
 
 light4 :: Color -> Color
 light4 = light . light . light . light
+
+deriveJSON defaultOptions ''PaletteColor

src/Dodge/Data/ActionPlan.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.ActionPlan where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -22,12 +21,12 @@ data ActionPlan
         , _apStrategy :: Strategy
         , _apGoal :: [Goal]
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data RandImpulse
     = RandImpulseList [Impulse]
     | RandImpulseCircMove Float
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Impulse
     = Move Point2
@@ -61,7 +60,7 @@ data Impulse
         { _impulseUseAheadPos :: P2Imp
         }
     | ImpulseNothing
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 infixr 9 `WaitThen`
 
@@ -168,7 +167,7 @@ data Action
         { _sideImpulses :: [Impulse]
         , _mainAction :: Action
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Strategy
     = Flank Int
@@ -186,13 +185,13 @@ data Strategy
     | Reload
     | Flee
     | MeleeStrike
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Goal
     = LiveLongAndProsper
     | Kill Int
     | SentinelAt Point2 Float
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''ActionPlan
 deriveJSON defaultOptions ''RandImpulse

src/Dodge/Data/ArcStep.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.ArcStep where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -18,12 +17,12 @@ data ArcStep = ArcStep
     , _asDir :: Float
     , _asObject :: CrWlID --Maybe (Either Creature Wall)
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data NextArcStep
     = EndArc
     | DefaultArcStep
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''ArcStep
 deriveJSON defaultOptions ''ArcStep

src/Dodge/Data/Beam.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Beam where
 
-import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -29,12 +28,12 @@ data Beam = Beam
     , _bmOrigin :: Maybe Int
     , _bmType :: BeamType
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data BeamDraw
     = BasicBeamDraw
     | BeamDrawColor Color
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data BeamCombineType
     = FlameBeamCombine
@@ -42,14 +41,14 @@ data BeamCombineType
     | TeslaBeamCombine
     | SplitBeamCombine
     | NoBeamCombine
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data BeamType
     = BeamCombine
         { _beamCombine :: BeamCombineType -- (Point2 , (Point2,Point2,Beam) , (Point2,Point2,Beam)) -> World -> World
         }
     | BeamSimple
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''BeamType
 makeLenses ''Beam

src/Dodge/Data/Block.hs

@@ -9,7 +9,6 @@ module Dodge.Data.Block (
     module Dodge.Data.PathGraph,
 ) where
 
-import Flat
 import LinearHelp ()
 import Color
 import Control.Lens
@@ -34,19 +33,19 @@ data Block = Block
     , _blDraw :: BlockDraw --Block -> SPic
     , _blObstructs :: [(Int, Int, PathEdge)]
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data BlockDraw
     = BlockDrawMempty
     | BlockDrawBlSh BlSh
     | BlockDraws [BlockDraw]
     | BlockDrawColHeightPoss Color Float [Point2]
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data BlSh
     = BlShMempty
     | BlShConst Shape
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Block
 deriveJSON defaultOptions ''Block

src/Dodge/Data/Bounds.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Bounds where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -16,7 +15,7 @@ data Bounds = Bounds
     , _bdMinY :: Float
     , _bdMaxY :: Float
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 defaultBounds :: Bounds
 defaultBounds = Bounds 0 0 0 0

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

src/Dodge/Data/Button.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Button where
 
-import Flat
 import LinearHelp ()
 import Color
 import Control.Lens
@@ -19,7 +18,7 @@ data ButtonDraw
     = DefaultDrawButton Color
     | DefaultDrawSwitch Color Color
     | DrawNoButton
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ButtonEvent
     = ButtonDoNothing
@@ -44,8 +43,8 @@ data ButtonEvent
         , _boffEff :: WdWd
         }
     | ButtonAccessTerminal
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data Button = Button
     { _btPict :: ButtonDraw --Button -> SPic
@@ -59,11 +58,11 @@ data Button = Button
     , _btName :: String
     , _btColor :: Color
     }
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data ButtonState = BtOn | BtOff | BtNoLabel
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Button
 makeLenses ''ButtonEvent

src/Dodge/Data/CWorld.hs

@@ -48,7 +48,6 @@ module Dodge.Data.CWorld (
     module Dodge.Data.WorldEffect,
 ) where
 
-import Flat
 --import LinearHelp
 import Control.Lens
 import Data.Aeson
@@ -114,7 +113,7 @@ data CWCam = CWCam
     , _cwcBoundBox :: [Point2]
     , _cwcBoundDist :: (Float, Float, Float, Float) -- NSEW, S and W negative
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CWorld = CWorld
     --{ _cameraCenter :: Point2
@@ -188,8 +187,8 @@ data CWorld = CWorld
     , _cwTime :: CWTime
     , _cwGen :: CWGen
     }
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data CWTime = CWTime
     { _maybeWorld :: Maybe' CWorld
@@ -197,8 +196,8 @@ data CWTime = CWTime
     , _worldClock :: Int
     , _deathDelay :: Maybe Int
     }
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
     
 
 data CWGen = CWGen
@@ -208,7 +207,7 @@ data CWGen = CWGen
     , _cwgRoomClipping :: [ConvexPoly]
     , _cwgSeed :: Int
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WorldBeams = WorldBeams
     { _blockingBeams :: [Beam]
@@ -216,7 +215,7 @@ data WorldBeams = WorldBeams
     , _positronBeams :: [Beam]
     , _electronBeams :: [Beam]
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''CWorld
 deriveJSON defaultOptions ''WorldBeams

src/Dodge/Data/CamouflageStatus.hs

@@ -5,13 +5,12 @@
 
 module Dodge.Data.CamouflageStatus where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 
 data CamouflageStatus
     = FullyVisible
     | Invisible
-    deriving (Eq, Ord, Enum, Read, Show, Bounded, Generic, Flat)
+    deriving (Eq, Ord, Enum, Show, Bounded, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''CamouflageStatus

src/Dodge/Data/Cloud.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Cloud where
 
-import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -15,7 +14,7 @@ import Geometry
 data CloudDraw
     = CloudColor Float Float Color -- radius-multiply fade-time color
     | DrawGasCloud Color
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Cloud = Cloud
     { _clPos :: Point3
@@ -26,12 +25,12 @@ data Cloud = Cloud
     , _clTimer :: Int
     , _clType :: CloudType
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CloudType
     = SmokeCloud
     | GasCloud
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Cloud
 deriveJSON defaultOptions ''CloudDraw

src/Dodge/Data/Corpse.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Corpse where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -14,7 +13,7 @@ import Geometry.Data
 import ShapePicture.Data
 
 data CorpseResurrection = NoResurrection
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Corpse = Corpse
     { _cpID :: Int
@@ -23,7 +22,7 @@ data Corpse = Corpse
     , _cpSPic :: SPic
     , _cpRes :: CorpseResurrection
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Corpse
 deriveJSON defaultOptions ''CorpseResurrection

src/Dodge/Data/CrGroupParams.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.CrGroupParams where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -19,10 +18,10 @@ data CrGroupParams = CrGroupParams
     , _crGroupCenter :: Point2
     , _crGroupUpdate :: CrGroupUpdate --World -> CrGroupParams -> Maybe CrGroupParams
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrGroupUpdate = DefaultCrGroupUpdate
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''CrGroupParams
 deriveJSON defaultOptions ''CrGroupParams

src/Dodge/Data/CrWlID.hs

@@ -5,13 +5,12 @@
 
 module Dodge.Data.CrWlID where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 
 data CrWlID = CrID Int | WlID Int | NothingID -- TODO rewrite/remove this
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''CrWlID
 deriveJSON defaultOptions ''CrWlID

src/Dodge/Data/Creature.hs

@@ -17,7 +17,6 @@ module Dodge.Data.Creature (
     module Dodge.Data.Hammer,
 ) where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -75,17 +74,17 @@ data Creature = Creature
     , _crStatistics :: CreatureStatistics
     , _crCamouflage :: CamouflageStatus
     }
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 data CreatureCorpse = MakeDefaultCorpse
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Intention = Intention
     { _targetCr :: Maybe Creature
     , _mvToPoint :: Maybe Point2
     , _viewPoint :: Maybe Point2
     }
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 crSel :: Creature -> Int
 crSel = _iselPos . _crInvSel

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

src/Dodge/Data/CreatureEffect.hs

@@ -5,29 +5,28 @@
 
 module Dodge.Data.CreatureEffect where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 
 data WdCrCr = NoCreatureEffect
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrWdImp = NoCrWdImp
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrWdWd = CrWdWdId
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data IntImp = NoIntImp
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrImp
     = NoCrImp
     | TurnTowardCr Float -- turn amount
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data P2Imp = P2ImpNo
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WdCrBl
     = WdCrTrue
@@ -35,34 +34,34 @@ data WdCrBl
     | WdCrNegate WdCrBl
     | WdCrLOSTarget
     | WdCrSafeDistFromTarget Float
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrBl
     = CrCanShoot
     | CrIsReloading
     | CrIsAiming
     | CrIsAnimate
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data MCrAc = MCrNoAction
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrAc
     = CrTurnAround
     | CrFleeFromTarget
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data P2Ac = P2NoAction
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data MP2Ac = MP2NoAction
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrWdAc
     = CrWdBFSThenReturn Int
     | ChooseMovementSpreadGun
     | ChooseMovementLtAuto
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''WdCrCr
 deriveJSON defaultOptions ''CrWdImp

src/Dodge/Data/Damage.hs

@@ -12,7 +12,6 @@ module Dodge.Data.Damage (
     module Dodge.Data.Damage.Type,
 ) where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -29,7 +28,7 @@ data DamageEffect
     | TorqueDamage {_deTorque :: Float}
     | PushBackDamage {_dePushBack :: Float}
     | NoDamageEffect
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Damage = Damage
     { _dmType :: DamageType
@@ -39,7 +38,7 @@ data Damage = Damage
     , _dmTo :: Point2
     , _dmEffect :: DamageEffect
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 isElectrical :: Damage -> Bool
 isElectrical dm = case _dmType dm of

src/Dodge/Data/Damage/Type.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Damage.Type where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 
@@ -25,7 +24,7 @@ data DamageType
     | PUSHDAM
     | POISONDAM
     | ENTERREMENT
-    deriving (Eq, Ord, Show, Read, Enum, Bounded, Generic, Flat)
+    deriving (Eq, Ord, Show, Enum, Bounded, Read) --Generic, Flat)
 
 instance ToJSONKey DamageType
 

src/Dodge/Data/Distortion.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Distortion where
 
-import Flat
 import Geometry
 import LinearHelp ()
 import Data.Aeson
@@ -13,6 +12,6 @@ import Data.Aeson.TH
 
 data Distortion
     = RadialDistortion Point2 Point2 Point2 Float
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''Distortion

src/Dodge/Data/Door.hs

@@ -10,7 +10,6 @@ module Dodge.Data.Door (
     module Dodge.Data.WorldEffect,
 ) where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -22,13 +21,13 @@ import Dodge.Data.WorldEffect
 import Geometry.Data
 
 data DoorStatus = DoorOpen | DoorClosed | DoorHalfway | DoorInt Int
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PushSource
     = PushesItself
     | PushedBy Int
     | NotPushed
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Door = Door
     { _drID :: Int
@@ -48,7 +47,7 @@ data Door = Door
     , _drObstructs :: [(Int, Int, PathEdge)]
     , _drObstacleType :: EdgeObstacle
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Door
 deriveJSON defaultOptions ''DoorStatus

src/Dodge/Data/EnergyBall.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.EnergyBall where
 
-import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -23,7 +22,7 @@ data EnergyBall = EnergyBall
     , _ebZ :: Float
     , _ebRot :: Float
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''EnergyBall
 deriveJSON defaultOptions ''EnergyBall

src/Dodge/Data/Equipment/Misc.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Equipment.Misc where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 
@@ -16,7 +15,7 @@ data EquipSite
     | GoesOnWrist
     | GoesOnLegs
     | GoesOnSpecial
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data EquipPosition
     = OnHead
@@ -26,7 +25,7 @@ data EquipPosition
     | OnRightWrist
     | OnLegs
     | OnSpecial
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 instance ToJSONKey EquipPosition
 

src/Dodge/Data/Flame.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Flame where
 
-import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -21,7 +20,7 @@ data Flame = Flame
     , _flZ :: Float
     , _flOriginalVel :: Point2
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Flame
 deriveJSON defaultOptions ''Flame

src/Dodge/Data/Flare.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Flare where
 
-import Flat
 import LinearHelp ()
 import Color
 import Control.Lens
@@ -26,7 +25,7 @@ data Flare
         , _flareTran3 :: Point3
         , _flareTime :: Int
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Flare
 deriveJSON defaultOptions ''Flare

src/Dodge/Data/FloatFunction.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.FloatFunction where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 
@@ -15,6 +14,6 @@ data FloatFloat
     | FloatLessCheck Float
     | FloatAbsCheckGreaterLess Float Float Float
     | FloatConst Float
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''FloatFloat

src/Dodge/Data/FloorItem.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.FloorItem where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -14,7 +13,7 @@ import Dodge.Data.Item
 import Geometry.Data
 
 data FloorItem = FlIt {_flIt :: Item, _flItPos :: Point2, _flItRot :: Float, _flItID :: Int}
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''FloorItem
 deriveJSON defaultOptions ''FloorItem

src/Dodge/Data/ForegroundShape.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.ForegroundShape where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -20,7 +19,7 @@ data ForegroundShape = ForegroundShape
     , _fsRad :: Float -- This should probably be a bounding box
     , _fsSPic :: SPic
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''ForegroundShape
 deriveJSON defaultOptions ''ForegroundShape

src/Dodge/Data/GenParams.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.GenParams where
 
-import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -16,10 +15,10 @@ import Dodge.Data.Damage.Type
 newtype GenParams = GenParams
     { _sensorCoding :: M.Map DamageType (PaletteColor, DecorationShape)
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data DecorationShape = PLUS | SQUARE | CIRCLE | THREELINES
-    deriving (Eq, Ord, Enum, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Enum, Show, Read) --Generic, Flat)
 
 makeLenses ''GenParams
 deriveJSON defaultOptions ''GenParams

src/Dodge/Data/Gust.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Gust where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -18,7 +17,7 @@ data Gust = Gust
     , _guVel :: Point2
     , _guTime :: Int
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Gust
 deriveJSON defaultOptions ''Gust

src/Dodge/Data/HUD.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.HUD where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -15,7 +14,7 @@ import Geometry.Data
 data HUDElement
     = DisplayInventory {_subInventory :: SubInventory}
     | DisplayCarte
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data SubInventory
     = NoSubInventory
@@ -24,7 +23,7 @@ data SubInventory
     | InspectInventory
     | LockedInventory
     | DisplayTerminal {_termID :: Int}
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data HUD = HUD
     { _hudElement :: HUDElement
@@ -32,7 +31,7 @@ data HUD = HUD
     , _carteZoom :: Float
     , _carteRot :: Float
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''HUD
 makeLenses ''HUDElement

src/Dodge/Data/Hammer.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Hammer where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -13,13 +12,13 @@ import Data.Aeson.TH
 data HammerType
     = NoHammer
     | HasHammer {_hammerPosition :: HammerPosition}
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data HammerPosition
     = HammerDown
     | HammerReleased
     | HammerUp
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''HammerType
 deriveJSON defaultOptions ''HammerType

src/Dodge/Data/Item.hs

@@ -17,7 +17,6 @@ module Dodge.Data.Item (
     module Dodge.Data.Item.Location,
 ) where
 
-import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -50,7 +49,7 @@ data Item = Item
     --, _itValue :: ItemValue
     , _itParams :: ItemParams
     }
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 _itUseAimStance :: Item -> AimStance
 _itUseAimStance = _aimStance . _heldAim . _itUse

src/Dodge/Data/Item/Combine.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Item.Combine where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -18,10 +17,10 @@ data ItemType = ItemType
     , _iyModules :: M.Map ModuleSlot ItemModuleType
     , _iyStack :: Stack
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Stack = NoStack | Stack ItAmount
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CraftType
     = PIPE
@@ -70,7 +69,7 @@ data CraftType
     | TIMEMODULE
     | SIZEMODULE
     | GRAVITYMODULE
-    deriving (Eq, Ord, Show, Enum, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Enum, Read) --Generic, Flat)
 
 data ItemBaseType
     = NoItemType
@@ -79,12 +78,12 @@ data ItemBaseType
     | EQUIP {_ibtEquip :: EquipItemType}
     | Consumable {_ibtConsumable :: ConsumableItemType}
     | CRAFT CraftType
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ConsumableItemType
     = MEDKIT Int
     | EXPLOSIVES
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data EquipItemType
     = MAGSHIELD
@@ -100,7 +99,7 @@ data EquipItemType
     | JUMPLEGS
     | JETPACK
     | AUTODETECTOR Detector
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data LeftItemType
     = BOOSTER
@@ -109,7 +108,7 @@ data LeftItemType
     | BLINKERUNSAFE
     | SHRINKER
     | SPAWNER
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data HeldItemType
     = BANGSTICK {_xNum :: Int}
@@ -157,7 +156,7 @@ data HeldItemType
     | TORCH
     | FLATSHIELD
     | KEYCARD Int
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ItemModuleType
     = EMPTYMODULE
@@ -182,13 +181,13 @@ data ItemModuleType
     | LAUNCHHOME
     | EXTRABATTERY
     | ATTACHTORCH
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Detector
     = ITEMDETECTOR
     | CREATUREDETECTOR
     | WALLDETECTOR
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ModuleSlot
     = ModBullet
@@ -202,7 +201,7 @@ data ModuleSlot
     | ModTeleport
     | ModDualBeam
     | ModHeldAttach
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 instance ToJSONKey ModuleSlot
 

src/Dodge/Data/Item/CurseStatus.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Item.CurseStatus where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 
@@ -13,6 +12,6 @@ data CurseStatus
     = Uncursed
     | UndroppableIdentified
     | UndroppableUnidentified
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''CurseStatus

src/Dodge/Data/Item/Effect.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Item.Effect where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -17,7 +16,7 @@ data ItEffect = ItEffect
     , _ieOnHeld :: ItInvEffect
     , _ieOnStash :: ItInvEffect
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ItInvEffect
     = NoInvEffect
@@ -27,13 +26,13 @@ data ItInvEffect
     | CreateShieldWall
     | RemoveShieldWall
     | EffectWhileHeld ItInvEffect
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ItFloorEffect = NoFloorEffect
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ItDropEffect = NoDropEffect
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''ItEffect
 deriveJSON defaultOptions ''ItEffect

src/Dodge/Data/Item/HeldDelay.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Item.HeldDelay where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -26,7 +25,7 @@ data UseDelay -- should just be Delay
         { _warmTime :: Int
         , _warmMax :: Int
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''UseDelay
 deriveJSON defaultOptions ''UseDelay

src/Dodge/Data/Item/HeldScroll.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Item.HeldScroll where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -20,7 +19,7 @@ data HeldScroll
         { _hsInt :: Int
         , _hsMaxInt :: Int
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''HeldScroll
 deriveJSON defaultOptions ''HeldScroll

src/Dodge/Data/Item/HeldUse.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Item.HeldUse where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.CamouflageStatus
@@ -27,12 +26,12 @@ data HeldUse
     | HeldTractor
     | HeldForceField
     | HeldShatter
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Cuse
     = CDoNothing
     | CHeal Int
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Euse
     = EDoNothing
@@ -43,7 +42,7 @@ data Euse
     | ECamouflage CamouflageStatus
     | EonWristShield
     | EoffWristShield
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Luse
     = LDoNothing
@@ -52,7 +51,7 @@ data Luse
     | LBlink
     | LUnsafeBlink
     | LBoost
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data HeldMod
     = HeldModNothing
@@ -90,7 +89,7 @@ data HeldMod
     | RevolverXMod
     | RevolverXRepeatMod
     | BangConeMod
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''Cuse
 deriveJSON defaultOptions ''HeldMod

src/Dodge/Data/Item/Location.hs

@@ -4,7 +4,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 module Dodge.Data.Item.Location where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -14,7 +13,7 @@ data ItemLocation
     | OnTurret {_ipTuID :: Int}
     | OnFloor {_ipFlID :: Int}
     | InVoid
-    deriving (Eq, Show, Read, Ord, Generic, Flat)
+    deriving (Eq, Show, Ord, Read) --Generic, Flat)
 
 makeLenses ''ItemLocation
 deriveJSON defaultOptions ''ItemLocation

src/Dodge/Data/Item/Misc.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Item.Misc where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -17,7 +16,7 @@ data ItemDimension = ItemDimension
     , _dimCenter :: Point3
     , _dimAttachPos :: Point3
     }
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 data ItemPortage
     = HeldItem
@@ -26,16 +25,16 @@ data ItemPortage
         }
     | WornItem
     | NoPortage
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 --data ItemValue = ItemValue
 --    { _ivInt :: Int
 --    , _ivType :: ItemValueType
 --    }
---    deriving (Eq, Show, Read, Generic, Flat)
+--    deriving (Eq, Show, Read) --Generic, Flat)
 --
 --data ItemValueType = MundaneItem | ArtefactItem
---    deriving (Eq, Show, Read, Generic, Flat)
+--    deriving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''ItemDimension
 makeLenses ''ItemPortage

src/Dodge/Data/Item/Params.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Item.Params where
 
-import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -69,13 +68,13 @@ data ItemParams
         }
     | ParamMID {_paramMID :: Maybe Int}
     | BoostPropIX {_boostPropIX :: Maybe Int}
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ShrinkGunStatus = FullSize | Shrunk
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PreviousArcEffect = NoPreviousArcEffect | PerturbTillBreakPreviousArc
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data GunBarrels
     = MultiBarrel
@@ -88,7 +87,7 @@ data GunBarrels
         , _brlInaccuracy :: Float
         }
     | SingleBarrel {_brlInaccuracy :: Float}
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Nozzle = Nozzle
     { _nzPressure :: Float
@@ -98,13 +97,13 @@ data Nozzle = Nozzle
     , _nzWalkSpeed :: Float
     , _nzLength :: Float
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data BarrelSpread
     = AlignedBarrels
     | SpreadBarrels {_spreadAngle :: Float}
     | RotatingBarrels {_rotatingBarrelInaccuracy :: Float}
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''BarrelSpread
 makeLenses ''ItemParams

src/Dodge/Data/Item/Scope.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Item.Scope where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -30,7 +29,7 @@ data Scope
         , -- | if the camera offset is also the center of vision
           _scopeIsCamera :: Bool
         }
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''Scope
 deriveJSON defaultOptions ''Scope

src/Dodge/Data/Item/Targeting.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Item.Targeting where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -21,7 +20,7 @@ data Targeting
         , _tgID :: Maybe Int
         , _tgActive :: Bool
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TargetUpdate
     = NoTargetUpdate
@@ -29,14 +28,14 @@ data TargetUpdate
     | TargetRBPressUpdate
     | TargetRBCreatureUpdate
     | TargetCursorUpdate
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TargetDraw
     = NoTargetDraw
     | TargetDistanceDraw
     | SimpleDrawTarget
     | TargetRBCreatureDraw
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Targeting
 deriveJSON defaultOptions ''Targeting

src/Dodge/Data/Item/Tweak.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Item.Tweak where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -16,7 +15,7 @@ data ItemTweaks
     | Tweakable
         { _tweakParams :: IM.IntMap TweakParam
         }
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 data TweakType
     = TweakPhaseV
@@ -24,14 +23,14 @@ data TweakType
     | TweakSpinDrag
     | TweakSpinAmount
     | TweakThrustDelay
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 data TweakParam = TweakParam
     { _tweakType :: TweakType -- Int -> Item -> Item
     , _tweakVal :: Int
     , _tweakMax :: Int
     }
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''TweakParam
 makeLenses ''ItemTweaks

src/Dodge/Data/Item/Use.hs

@@ -13,7 +13,6 @@ module Dodge.Data.Item.Use (
     module Dodge.Data.Hammer,
 ) where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -50,7 +49,7 @@ data ItemUse
         }
     | CraftUse
         {_useAmount :: ItAmount}
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 data AimParams = AimParams
     { _aimWeight :: Int
@@ -60,21 +59,21 @@ data AimParams = AimParams
     , _aimHandlePos :: Float
     , _aimMuzPos :: Float
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data AimStance
     = TwoHandTwist
     | TwoHandFlat
     | OneHand
     | LeaveHolstered
-    deriving (Eq, Show, Ord, Enum, Read, Generic, Flat)
+    deriving (Eq, Show, Ord, Enum, Read) --Generic, Flat)
 
 data ItZoom = ItZoom
     { _itZoomMax :: Float
     , _itZoomMin :: Float
     , _itZoomFac :: Float
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''ItemUse
 makeLenses ''AimParams

src/Dodge/Data/Item/Use/Consumption.hs

@@ -11,7 +11,6 @@ module Dodge.Data.Item.Use.Consumption (
     module Dodge.Data.Item.Use.Consumption.LoadAction,
 ) where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -28,7 +27,7 @@ data HeldConsumption
         , _laProgress :: Maybe [LoadAction]
         }
     | NoConsumption
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 data LeftConsumption
     = AutoRecharging
@@ -41,13 +40,13 @@ data LeftConsumption
         { _wpMaxCharge :: Int
         , _wpCharge :: Int
         }
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read) --Generic, Flat)
 
 newtype ItAmount = ItAmount {_getItAmount :: Int}
---    deriving (Eq, Ord, Read, Show, Num, Real, Generic, Flat)
+--    deriving (Eq, Ord, Read Show, Num, Real,) --Generic, Flat)
     deriving newtype (Eq, Ord, Read, Show, Num, Real, Enum, Integral)
-    deriving stock (Generic)
+--    deriving stock (Generic)
-    deriving anyclass (Flat)
+--    deriving anyclass (Flat)
 
 makeLenses ''HeldConsumption
 makeLenses ''LeftConsumption

src/Dodge/Data/Item/Use/Consumption/Ammo.hs

@@ -9,7 +9,6 @@ module Dodge.Data.Item.Use.Consumption.Ammo (
     module Dodge.Data.Payload,
 ) where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -17,10 +16,10 @@ import Dodge.Data.Bullet
 import Dodge.Data.Payload
 
 data ProjectileDraw = DrawShell | DrawRemoteShell | DrawDrone | DrawBlankProjectile
-    deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic, Flat)
+    deriving (Show, Eq, Ord, Enum, Bounded, Read) --Generic, Flat)
 
 data ProjectileCreate = CreateShell | CreateTrackingShell
-    deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic, Flat)
+    deriving (Show, Eq, Ord, Enum, Bounded, Read) --Generic, Flat)
 
 data ProjectileUpdate
     = PJThrust {_pjuStart :: Int, _pjuEnd :: Int}
@@ -33,7 +32,7 @@ data ProjectileUpdate
     | PJDecTimMvVel
     | PJShellCollisionCheck
     | PJRemoteShellCollisionCheck
-    deriving (Show, Read, Eq, Ord, Generic, Flat)
+    deriving (Show, Eq, Ord, Read) --Generic, Flat)
 
 data AmmoType
     = ProjectileAmmo
@@ -56,13 +55,13 @@ data AmmoType
         { _amForceFieldType :: ForceFieldType
         }
     | GenericAmmo
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ForceFieldType = DefaultForceField
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data GasCreate = CreatePoisonGas | CreateFlame
-    deriving (Eq, Ord, Show, Enum, Bounded, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Enum, Bounded, Read) --Generic, Flat)
 
 makeLenses ''ProjectileUpdate
 makeLenses ''AmmoType

src/Dodge/Data/Item/Use/Consumption/LoadAction.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Item.Use.Consumption.LoadAction where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -17,15 +16,15 @@ data LoadAction
     | LoadInsert {_actionTime :: Int, _actionSound :: SoundID}
     | LoadAdd {_actionTime :: Int, _actionSound :: SoundID, _insertMax :: Int}
     | LoadPrime {_actionTime :: Int, _actionSound :: SoundID}
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data InvSel = InvSel {_iselPos :: Int, _iselAction :: InvSelAction}
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data InvSelAction
     = NoInvSelAction
     | ReloadAction {_actionProgress :: Int, _reloadAction :: LoadAction, _actionHammer :: HammerType}
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''LoadAction
 makeLenses ''InvSel

src/Dodge/Data/Item/Use/Equipment.hs

@@ -8,7 +8,6 @@ module Dodge.Data.Item.Use.Equipment (
     module Dodge.Data.Item.Use.Equipment,
 ) where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -23,13 +22,13 @@ data EquipEffect = EquipEffect
     , _eeParams :: EquipParams
     , _eeViewDist :: Maybe Float
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data EquipParams
     = NoEquipParams
     | EquipID {_eparamID :: Int}
     | EquipCounter {_eparamInt :: Int}
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''EquipEffect
 makeLenses ''EquipParams

src/Dodge/Data/Laser.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Laser where
 
-import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -15,7 +14,7 @@ import Geometry.Data
 data LaserType
     = DamageLaser {_laserTypeDamage :: Int}
     | TargetLaser
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data LaserStart = LaserStart
     { _lpPhaseV :: Float
@@ -24,14 +23,14 @@ data LaserStart = LaserStart
     , _lpColor :: Color
     , _lpType :: LaserType
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Laser = Laser
     { _laColor :: Color
     , _laPoints :: [Point2]
     , _laType :: LaserType
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Laser
 makeLenses ''LaserStart

src/Dodge/Data/LightSource.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.LightSource where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -13,25 +12,25 @@ import Data.Aeson.TH
 import Geometry
 
 data LightSourceDraw = DefaultLightSourceDraw
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TLSIntensity
     = ConstantIntensity
     | TLSFade Point3 Int
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TLSUpdate
     = DestroyTLS
     | TimerTLS
     | IntensityTLS TLSIntensity
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data LSParam = LSParam
     { _lsPos :: !Point3
     , _lsRad :: !Float
     , _lsCol :: !Point3
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data LightSource = LS
     { _lsID :: Int
@@ -39,14 +38,14 @@ data LightSource = LS
     , _lsDir :: Float
     , _lsPict :: LightSourceDraw --LightSource -> Picture
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TempLightSource = TLS
     { _tlsParam :: LSParam
     , _tlsUpdate :: TLSUpdate --TempLightSource -> Maybe TempLightSource
     , _tlsTime :: Int
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''LSParam
 makeLenses ''LightSource

src/Dodge/Data/LinearShockwave.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.LinearShockwave where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -18,7 +17,7 @@ data LinearShockwave = LinearShockwave
     , _lwPoints :: [(Point2, Point2)]
     , _lwTimer :: Int
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''LinearShockwave
 deriveJSON defaultOptions ''LinearShockwave

src/Dodge/Data/Machine.hs

@@ -13,7 +13,6 @@ module Dodge.Data.Machine (
     module Dodge.Data.GenParams,
 ) where
 
-import Flat
 import LinearHelp ()
 import Color
 import Control.Lens
@@ -45,16 +44,16 @@ data Machine = Machine
     , _mcCloseSound :: Maybe SoundID
     , _mcWidth :: Float
     }
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data MachineType
     = McStatic
     | McTerminal
     | McSensor Sensor
     | McTurret Turret
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data Turret = Turret
     { _tuWeapon :: Item
@@ -62,8 +61,8 @@ data Turret = Turret
     , _tuFireTime :: Int
     , _tuDir :: Float
     }
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''Machine
 makeLenses ''Turret

src/Dodge/Data/Machine/Sensor.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Machine.Sensor where
 
-import Flat
 import LinearHelp ()
 import Dodge.Data.GenParams
 import Color
@@ -29,16 +28,16 @@ data Sensor
         , _proxRequirement :: ProximityRequirement
         , _sensToggle :: Bool
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ProximityRequirement
     = RequireHealth {_proxReqMinHealth :: Int}
     | RequireEquipment {_proxReqEquipment :: ItemBaseType}
     | RequireImpossible
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CloseToggle = NotClose | IsClose
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Sensor
 makeLenses ''ProximityRequirement

src/Dodge/Data/Magnet.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Magnet where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -13,12 +12,12 @@ import Data.Aeson.TH
 import Geometry.Data
 
 newtype MagnetUpdate = MagnetUpdateTimer Int
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data MagnetBuBu
     = MagnetBuId
     | MagnetBuBuCurveAroundField Float Float
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Magnet = Magnet
     { _mgID :: Int
@@ -26,7 +25,7 @@ data Magnet = Magnet
     , _mgPos :: Point2
     , _mgField :: MagnetBuBu
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Magnet
 deriveJSON defaultOptions ''MagnetUpdate

src/Dodge/Data/Material.hs

@@ -5,11 +5,10 @@
 
 module Dodge.Data.Material where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 
 data Material = Wood | Dirt | Stone | Glass | Metal | Crystal | Flesh | Electronics
-    deriving (Eq, Ord, Show, Bounded, Enum, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Bounded, Enum, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''Material

src/Dodge/Data/Modification.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Modification where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -28,7 +27,7 @@ data Modification
         , _mdExternalID2 :: Int
         , _mdUpdate :: MdWdWd
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Modification
 deriveJSON defaultOptions ''Modification

src/Dodge/Data/MountedObject.hs

@@ -5,13 +5,12 @@
 
 module Dodge.Data.MountedObject where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 
 data MountedObject
     = MountedLS Int
     | MountedProp Int
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''MountedObject

src/Dodge/Data/ObjectType.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.ObjectType where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 
@@ -21,7 +20,7 @@ data ObjectType
     | ObProp
     | ObTrigger
     | ObItem
-    deriving (Eq, Show, Ord, Read, Enum, Bounded, Generic, Flat)
+    deriving (Eq, Show, Ord, Enum, Bounded, Read) --Generic, Flat)
 
 instance ToJSONKey ObjectType
 

src/Dodge/Data/PathGraph.hs

@@ -14,10 +14,10 @@ The warnings have been disabled.
 -}
 module Dodge.Data.PathGraph where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
+import Data.Aeson.TH
 import Data.Graph.Inductive
 import Data.Map.Strict (Map)
 import qualified Data.Set as Set
@@ -29,12 +29,7 @@ data PathGraph = PathGraph
     , _pgNodeCount :: Int
     , _pgEdgeMap :: Map (V2 Point2) (Int, Int, PathEdge)
     }
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-
-instance ToJSON PathGraph where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON PathGraph
 
 data PathEdge = PathEdge
     { _peStart :: Point2
@@ -42,31 +37,24 @@ data PathEdge = PathEdge
     , _peDist :: Float
     , _peObstacles :: Set.Set EdgeObstacle
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-instance ToJSON PathEdge where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON PathEdge
 
 data EdgeObstacle
     = BlockObstacle
     | DoorObstacle
     | AutoDoorObstacle
     | WallObstacle
-    deriving (Eq, Ord, Show, Read, Bounded, Enum, Generic, Flat)
+    deriving (Eq, Ord, Show, Bounded, Enum, Read) --Generic, Flat)
-
-instance ToJSON EdgeObstacle where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON EdgeObstacle
 
 instance (ToJSON a, ToJSON b) => ToJSON (Gr a b) where
     toEncoding = genericToEncoding defaultOptions
 
 instance (FromJSON a, FromJSON b) => FromJSON (Gr a b)
 
-deriving instance (Flat (Gr Point2 PathEdge))
+--deriving instance (Flat (Gr Point2 PathEdge))
 
 makeLenses ''PathGraph
 makeLenses ''PathEdge
+deriveJSON defaultOptions ''PathGraph
+deriveJSON defaultOptions ''PathEdge
+deriveJSON defaultOptions ''EdgeObstacle

src/Dodge/Data/Payload.hs

@@ -5,11 +5,10 @@
 
 module Dodge.Data.Payload where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 
 data Payload = ExplosionPayload | DudPayload
-    deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic, Flat)
+    deriving (Show, Eq, Ord, Enum, Bounded, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''Payload

src/Dodge/Data/PosEvent.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.PosEvent where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -13,14 +12,14 @@ import Data.Aeson.TH
 import Geometry.Data
 
 data PosEventType = SparkSpawner
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PosEvent = PosEvent
     { _pvType :: PosEventType
     , _pvTimer :: Int
     , _pvPos :: Point2
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''PosEvent
 deriveJSON defaultOptions ''PosEventType

src/Dodge/Data/PressPlate.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.PressPlate where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -16,7 +15,7 @@ import Picture
 data PressPlateEvent
     = PressPlateId
     | PPLevelReset
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PressPlate = PressPlate
     { _ppPict :: Picture
@@ -26,7 +25,7 @@ data PressPlate = PressPlate
     , _ppID :: Int
     , _ppText :: String
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''PressPlate
 deriveJSON defaultOptions ''PressPlateEvent

src/Dodge/Data/Projectile.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Projectile where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -28,7 +27,7 @@ data Proj
         , _prjUpdates :: [ProjectileUpdate]
         , _prjMITID :: Maybe Int
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Proj
 deriveJSON defaultOptions ''Proj

src/Dodge/Data/Prop.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Prop where
 
-import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -39,7 +38,7 @@ data Prop
         , _prRot :: Float
         , _prToggle :: Bool
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PropDraw
     = PropDrawSPic SPic
@@ -51,7 +50,7 @@ data PropDraw
     | PropLampCover Float
     | PropDrawToggle PropDraw
     | PropDrawGib Float
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PropUpdate
     = PropUpdateAnd PropUpdate PropUpdate
@@ -65,13 +64,13 @@ data PropUpdate
     | PropUpdatePosition WdP2f
     | PropUpdateWhen WdBl PropUpdate
     | PropUpdateIf WdBl PropUpdate PropUpdate
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PrWdLsLs
     = PrWdLsId
     | PrWdLsSetPosition WdP2f Point3
     | PrWdLsSetColor Point3
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Prop
 deriveJSON defaultOptions ''PropDraw

src/Dodge/Data/RadarBlip.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.RadarBlip where
 
-import Flat
 import LinearHelp ()
 import Color
 import Control.Lens
@@ -20,7 +19,7 @@ data RadarBlip = RadarBlip
     , _rbRad :: Float
     , _rbPos :: Point2
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''RadarBlip
 deriveJSON defaultOptions ''RadarBlip

src/Dodge/Data/RadarSweep.hs

@@ -8,7 +8,6 @@ module Dodge.Data.RadarSweep (
     module Dodge.Data.ObjectType,
 ) where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -22,7 +21,7 @@ data RadarSweep = RadarSweep
     , _rsObject :: ObjectType
     , _rsTimer :: Int
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''RadarSweep
 deriveJSON defaultOptions ''RadarSweep

src/Dodge/Data/RightButtonOptions.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.RightButtonOptions where
 
-import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -20,14 +19,14 @@ data RightButtonOptions
         , _opAllocateEquipment :: AllocateEquipment
         , _opActivateEquipment :: ActivateEquipment
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ActivateEquipment
     = ActivateEquipment {_activateEquipment :: Int}
     | DeactivateEquipment {_deactivateEquipment :: Int}
     | ActivateDeactivateEquipment {_activateEquipment :: Int, _deactivateEquipment :: Int}
     | NoChangeActivateEquipment
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data AllocateEquipment
     = DoNotMoveEquipment
@@ -50,7 +49,7 @@ data AllocateEquipment
     | RemoveEquipment
         { _allocOldPos :: EquipPosition
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''RightButtonOptions
 makeLenses ''AllocateEquipment

src/Dodge/Data/SaveSlot.hs

@@ -4,13 +4,12 @@
 {-# LANGUAGE TemplateHaskell #-}
 
 module Dodge.Data.SaveSlot where
-import Flat
 import Control.Lens
 
 data SaveSlot
     = QuicksaveSlot
     | LevelStartSlot Int
     | SaveSlotNum Int
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''SaveSlot

src/Dodge/Data/Shockwave.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Shockwave where
 
-import Flat
 import Color
 import Control.Lens
 import Data.Aeson
@@ -13,7 +12,7 @@ import Data.Aeson.TH
 import Geometry.Data
 
 data ShockwaveDirection = OutwardShockwave | InwardShockwave
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Shockwave = Shockwave
     { _swColor :: Color
@@ -26,7 +25,7 @@ data Shockwave = Shockwave
     , _swMaxTime :: Int
     , _swTimer :: Int
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Shockwave
 deriveJSON defaultOptions ''ShockwaveDirection

src/Dodge/Data/SoundOrigin.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.SoundOrigin where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Material
@@ -36,7 +35,7 @@ data SoundOrigin
     | LeverSound Int
     | Explosion Int
     | Tap Int
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 instance ToJSONKey SoundOrigin
 

src/Dodge/Data/Spark.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Spark where
 
-import Flat
 import LinearHelp ()
 import Color
 import Control.Lens
@@ -22,7 +21,7 @@ data Spark = Spark
     , _skWidth :: Float
     , _skDamageType :: DamageType
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Spark
 deriveJSON defaultOptions ''Spark

src/Dodge/Data/Terminal.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.Terminal where
 
-import Flat
 import LinearHelp ()
 import Color
 import Control.Lens
@@ -16,20 +15,20 @@ import qualified Data.Text as T
 import Dodge.Data.WorldEffect
 
 data TerminalStatus = TerminalOff | TerminalBusy | TerminalReady
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TerminalInput = TerminalInput
     { _tiText :: T.Text
     , _tiFocus :: Bool
     , _tiSel :: (Int, Int)
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TerminalBootProgram
     = TerminalBootMempty
     | TerminalBootLines [TerminalLine]
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data Terminal = Terminal
     { _tmID :: Int
@@ -49,17 +48,17 @@ data Terminal = Terminal
     , _tmCommandHistory :: [String]
     , _tmToggles :: M.Map String TerminalToggle
     }
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data TerminalLineString = TerminalLineConst String Color
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TmTm
     = TmId
     | TmTmClearDisplayedLines
     | TmTmSetStatus TerminalStatus
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TerminalLine
     = TerminalLineDisplay
@@ -74,20 +73,20 @@ data TerminalLine
         { _tlPause :: Int
         , _tlEffect :: TmWdWd --Terminal -> World -> World
         }
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data TerminalToggle = TerminalToggle
     { _ttTriggerID :: Int
     , _ttDeathEffect :: BlBl
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data BlBl
     = BlNegate
     | BlConst Bool
     | BlId
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data EffectArguments
     = NoArguments {_cmdEffect :: [TerminalLine]}
@@ -95,8 +94,8 @@ data EffectArguments
         { _argType :: String
         , _argList :: M.Map String [TerminalLine]
         }
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data TerminalCommandEffect
     = TerminalCommandArguments EffectArguments
@@ -108,8 +107,8 @@ data TerminalCommandEffect
     | TerminalCommandEffectCommands
     | TerminalCommandEffectSingleCommand WdWd [String]
     | TerminalCommandEffectNone
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data TerminalCommand = TerminalCommand
     { _tcString :: String
@@ -117,8 +116,8 @@ data TerminalCommand = TerminalCommand
     , _tcHelp :: String
     , _tcEffect :: TerminalCommandEffect -- Terminal -> World -> EffectArguments
     }
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''TerminalInput
 makeLenses ''Terminal

src/Dodge/Data/TeslaArc.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.TeslaArc where
 
-import Flat
 import LinearHelp ()
 import Color
 import Control.Lens
@@ -20,7 +19,7 @@ data TeslaArc = TeslaArc
     , _taArcSteps :: [ArcStep]
     , _taColor :: Color
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''TeslaArc
 deriveJSON defaultOptions ''TeslaArc

src/Dodge/Data/TractorBeam.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.TractorBeam where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -18,7 +17,7 @@ data TractorBeam = TractorBeam
     , _tbVel :: Point2
     , _tbTime :: Int
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''TractorBeam
 deriveJSON defaultOptions ''TractorBeam

src/Dodge/Data/Universe.hs

@@ -11,7 +11,6 @@ module Dodge.Data.Universe (
     module Picture.Data,
 ) where
 
-import Flat
 import Control.Lens
 --import qualified Data.Map.Strict as M
 import Data.Preload
@@ -41,7 +40,7 @@ data ConcEffect = NoConcEffect
     | BackgroundConcEffect {_ceString :: String}
 
 data OptionScreenFlag = NormalOptions | GameOverOptions | SplashOptions
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ScreenLayer
     = OptionScreen

src/Dodge/Data/Wall.hs

@@ -8,7 +8,6 @@ module Dodge.Data.Wall (
     module Dodge.Data.Material,
 ) where
 
-import Flat
 import LinearHelp ()
 import Color
 import Control.Lens
@@ -36,17 +35,17 @@ data Wall = Wall
     , _wlHeight :: Float
     , _wlMaterial :: Material
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Opacity
     = SeeThrough
     | SeeAbove
     | DrawnWall {_opDraw :: WallDraw} -- Wall -> SPic
     | Opaque
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WallDraw = DrawForceField
-    deriving (Eq, Ord, Show, Read, Enum, Bounded, Generic, Flat)
+    deriving (Eq, Ord, Show, Enum, Bounded, Read) --Generic, Flat)
 
 data WallStructure
     = StandaloneWall
@@ -56,7 +55,7 @@ data WallStructure
     | CreaturePart
         { _wlStCreature :: Int
         }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Wall
 makeLenses ''Opacity

src/Dodge/Data/World.hs

@@ -12,7 +12,6 @@ module Dodge.Data.World (
     module Dodge.Data.Hammer,
 ) where
 
-import Flat
 import Dodge.Data.SaveSlot
 import Control.Lens
 import qualified Data.Map.Strict as M
@@ -51,7 +50,7 @@ data TimeFlowStatus
     = RewindingNow
     | RewindingLastFrame
     | NormalTimeFlow
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WorldHammer
     = SubInvHam

src/Dodge/Data/WorldEffect.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.WorldEffect where
 
-import Flat
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.CreatureEffect
@@ -17,7 +16,7 @@ import Sound.Data
 data ItCrWdWd
     = ItCrWdId
     | ItCrWdItemEffect
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WdWd
     = NoWorldEffect
@@ -32,20 +31,20 @@ data WdWd
     | WdWdNegateTrig Int
     | WdWdFromItixCrixWdWd Int Int ItCrWdWd
     | WdWdFromItCrixWdWd Item Int ItCrWdWd
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data WdP2
     = WdP2Const Point2
     | WdYouPos
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data MdWdWd
     = MdWdId
     | MdTrigIf MdWdWd MdWdWd
     | MdSetLSCol Point3
     | MdFlickerUpdate
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WdBl
     = WdTrig Int
@@ -55,19 +54,19 @@ data WdBl
     | WdBlCrFilterNearPoint Float Point2 CrBl
     | WdBlBtOn Int
     | WdBlBtNotOff Int
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WdP2f
     = WdP2f0
     | WdP2fDoorPosition Int
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data DrWdWd
     = DrWdId
     | DrWdMakeDoorDebris
     | DrWdMechanismStepwise Int [Int] [(Point2, Point2)]
     | DoorMechanism
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TmWdWd
     = TmWdId
@@ -75,8 +74,8 @@ data TmWdWd
     | TmWdWdfromWdWd WdWd
     | TmWdWdTermSound SoundID
     | TmWdWdDoDeathTriggers
-    deriving (Eq, Show, Read, Generic)
+    deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read, Generic, Flat)
+    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''ItCrWdWd
 deriveJSON defaultOptions ''WdWd

src/Dodge/GameRoom.hs

@@ -7,9 +7,9 @@
 -- | GameRooms contain information about given positions in the world
 module Dodge.GameRoom where
 
-import Flat
 import Control.Lens
 import Data.Aeson
+import Data.Aeson.TH
 import Geometry
 import LinearHelp ()
 
@@ -22,11 +22,12 @@ data GameRoom = GameRoom
     , _grLinkDirs :: [Float]
     , _grName :: String
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --, Generic) --Generic, Flat)
 
-instance ToJSON GameRoom where
+--instance ToJSON GameRoom where
-    toEncoding = genericToEncoding defaultOptions
+--    toEncoding = genericToEncoding defaultOptions
-
+--
-instance FromJSON GameRoom
+--instance FromJSON GameRoom
 
 makeLenses ''GameRoom
+deriveJSON defaultOptions ''GameRoom

src/Dodge/Save.hs

@@ -8,7 +8,6 @@ module Dodge.Save (
     reloadLevelStart,
 ) where
 
---import Flat
 import Dodge.Concurrent
 import Control.Lens
 import Dodge.Data.SaveSlot

src/Geometry/ConvexPoly.hs

@@ -16,7 +16,7 @@ module Geometry.ConvexPoly (
 
 import Control.Lens
 import Data.Aeson
-import Flat
+import Data.Aeson.TH
 import Geometry.Data
 import Geometry.Intersect
 import Geometry.LHS
@@ -30,12 +30,12 @@ data ConvexPoly = ConvexPoly
     , _cpCen :: Point2
     , _cpRad :: Float
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read)--, Generic) --Generic, Flat)
 
-instance ToJSON ConvexPoly where
+--instance ToJSON ConvexPoly where
-    toEncoding = genericToEncoding defaultOptions
+--    toEncoding = genericToEncoding defaultOptions
-
+--
-instance FromJSON ConvexPoly
+--instance FromJSON ConvexPoly
 
 pointsToPoly :: [Point2] -> ConvexPoly
 pointsToPoly xs =
@@ -89,3 +89,4 @@ pairPolyPointsIntersect a' b' (c' : d' : xs') = go c' a' b' (c' : d' : xs')
 pairPolyPointsIntersect _ _ _ = False
 
 makeLenses ''ConvexPoly
+deriveJSON defaultOptions ''ConvexPoly

src/IntSetHelp.hs

@@ -10,8 +10,7 @@ module IntSetHelp (
 
 import Data.IntSet.Internal
 import Data.IntSet
-import Flat
 
 -- IntSet is not an instance of Generic?!
-deriving instance Generic IntSet
+--deriving instance Generic IntSet
-deriving instance Flat IntSet
+--deriving instance Flat IntSet

src/LinearHelp.hs

@@ -1,16 +1,15 @@
---{-# LANGUAGE DeriveGeneric #-}
+----{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE TemplateHaskell #-}
+----{-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+--{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE DeriveAnyClass #-}
+--{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE StandaloneDeriving #-}
+--{-# LANGUAGE StandaloneDeriving #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+--{-# OPTIONS_GHC -fno-warn-orphans #-}
 module LinearHelp where
 
-import Flat
+--import Linear.V2
-import Linear.V2
+--import Linear.V3
-import Linear.V3
+--import Linear.V4
-import Linear.V4
 
-deriving instance (Flat a => Flat (V2 a))
+--deriving instance (Flat a => Flat (V2 a))
-deriving instance (Flat a => Flat (V3 a))
+--deriving instance (Flat a => Flat (V3 a))
-deriving instance (Flat a => Flat (V4 a))
+--deriving instance (Flat a => Flat (V4 a))

src/MaybeHelp.hs

@@ -8,15 +8,16 @@ module MaybeHelp where
 
 import Control.Lens
 import Data.Aeson
-import Flat
+import Data.Aeson.TH
 
 data Maybe' a = Just' {__Just' :: a} | Nothing'
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    --deriving (Eq, Ord, Show, Read, Generic) --Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-instance ToJSON a => ToJSON (Maybe' a) where
+--instance ToJSON a => ToJSON (Maybe' a) where
-    toEncoding = genericToEncoding defaultOptions
+--    toEncoding = genericToEncoding defaultOptions
-
+--
-instance FromJSON a => FromJSON (Maybe' a)
+--instance FromJSON a => FromJSON (Maybe' a)
 
 fromJust' :: Maybe' a -> a
 fromJust' mx = case mx of
@@ -40,3 +41,4 @@ toggleJust Nothing = Just ()
 toggleJust _ = Nothing
 
 makeLenses ''Maybe'
+deriveJSON defaultOptions ''Maybe'

src/Picture/Data.hs

@@ -5,7 +5,6 @@
 
 module Picture.Data where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -20,7 +19,7 @@ data Verx = Verx
     , _vxLayer :: !Layer
     , _vxShadNum :: !ShadNum
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Layer
     = BottomLayer
@@ -29,7 +28,7 @@ data Layer
     | BloomNoZWrite
     | DebugLayer
     | FixedCoordLayer
-    deriving (Eq, Ord, Enum, Bounded, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Enum, Bounded, Show, Read) --Generic, Flat)
 
 layerNum :: Layer -> Int
 layerNum = fromEnum
@@ -38,7 +37,7 @@ numLayers :: Int
 numLayers = length [minBound :: Layer .. maxBound]
 
 newtype ShadNum = ShadNum {_unShadNum :: Int}
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 polyNum, polyzNum, bezNum, textNum, arcNum, ellNum :: ShadNum
 {-# INLINE polyNum #-}

src/Quaternion.hs

@@ -16,7 +16,6 @@ module Quaternion (
 ) where
 
 import Data.Aeson
-import Flat
 import Geometry.Data
 import Geometry.Vector3D
 import Linear.Quaternion
@@ -44,4 +43,4 @@ vToQuat a b
   where
     cprod = crossProd a b
 
-deriving instance (Flat a => Flat (Quaternion a))
+--deriving instance (Flat a => Flat (Quaternion a))

src/Shape/Data.hs

@@ -10,7 +10,7 @@ module Shape.Data where
 
 import Control.Lens
 import Data.Aeson
-import Flat
+import Data.Aeson.TH
 import Geometry.Data
 import LinearHelp ()
 import Streaming
@@ -23,38 +23,22 @@ shVfromList = id
 shEfromList = id
 newtype ShapeType = TopPrism Int
     deriving newtype (Eq, Ord, Show, Read)
-    deriving stock Generic
+    --deriving stock Generic
-    deriving anyclass Flat
+    --deriving anyclass Flat
 
 
 data ShapeObj = ShapeObj
     { _shType :: ShapeType
     , _shVs :: [ShapeV]
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-instance ToJSON ShapeObj where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON ShapeObj
-
-
-instance ToJSON ShapeType where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON ShapeType
 
 -- edges are given by four consecutive points
 data ShapeV = ShapeV
     { _svPos :: Point3
     , _svCol :: Point4
     }
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-instance ToJSON ShapeV where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON ShapeV
 
 pairToSV :: (Point3, Point4) -> ShapeV
 {-# INLINE pairToSV #-}
@@ -66,3 +50,6 @@ type Shape' = Stream (Of ShapeObj) IO ()
 
 type Shape = [ShapeObj]
 
+deriveJSON defaultOptions ''ShapeObj
+deriveJSON defaultOptions ''ShapeType
+deriveJSON defaultOptions ''ShapeV

src/Sound/Data.hs

@@ -5,7 +5,6 @@
 
 module Sound.Data where
 
-import Flat
 import LinearHelp ()
 import Control.Lens
 import Data.Aeson
@@ -29,10 +28,10 @@ data PlayStatus
     | ToStart
     | ToContinueStart
     | ToStop
-    deriving (Eq, Ord, Show, Read, Generic)
+    deriving (Eq, Ord, Show, Read) --, Generic)
 
 newtype SoundID = SoundID {_getSoundID :: Int}
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 newtype SoundData = SoundData
     { _loadedChunks :: IM.IntMap Mix.Chunk