Remove generic and flat instances

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 anyclass (Flat)
+--    deriving stock (Generic)
+--    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