From f1ef75f5119b891d22d46100e10381a7d28100f3 Mon Sep 17 00:00:00 2001 From: justin Date: Sun, 21 Aug 2022 21:23:59 +0100 Subject: [PATCH] Go back to JSON encoding --- package.yaml | 4 +- src/Color.hs | 4 -- src/Dodge/Data/ActionPlan.hs | 9 ----- src/Dodge/Data/ArcStep.hs | 5 --- src/Dodge/Data/Beam.hs | 7 ---- src/Dodge/Data/Block.hs | 6 --- src/Dodge/Data/Bounds.hs | 4 -- src/Dodge/Data/Bullet.hs | 9 ----- src/Dodge/Data/Button.hs | 7 ---- src/Dodge/Data/CWorld.hs | 10 +---- src/Dodge/Data/CamouflageStatus.hs | 4 -- src/Dodge/Data/Cloud.hs | 6 --- src/Dodge/Data/Corpse.hs | 6 --- src/Dodge/Data/CrGroupParams.hs | 6 --- src/Dodge/Data/CrWlID.hs | 6 --- src/Dodge/Data/Creature.hs | 7 ---- src/Dodge/Data/Creature/Memory.hs | 4 -- src/Dodge/Data/Creature/Misc.hs | 9 ----- src/Dodge/Data/Creature/Perception.hs | 9 ----- src/Dodge/Data/Creature/Stance.hs | 7 ---- src/Dodge/Data/Creature/State.hs | 8 ---- src/Dodge/Data/CreatureEffect.hs | 24 ------------ src/Dodge/Data/Damage.hs | 5 --- src/Dodge/Data/Damage/Type.hs | 4 -- src/Dodge/Data/Distortion.hs | 4 -- src/Dodge/Data/Door.hs | 6 --- src/Dodge/Data/EnergyBall.hs | 4 -- src/Dodge/Data/Equipment/Misc.hs | 5 --- src/Dodge/Data/Flame.hs | 4 -- src/Dodge/Data/Flare.hs | 4 -- src/Dodge/Data/FloatFunction.hs | 4 -- src/Dodge/Data/FloorItem.hs | 4 -- src/Dodge/Data/ForegroundShape.hs | 4 -- src/Dodge/Data/GenParams.hs | 5 --- src/Dodge/Data/Gust.hs | 4 -- src/Dodge/Data/HUD.hs | 6 --- src/Dodge/Data/Hammer.hs | 5 --- src/Dodge/Data/Item.hs | 6 +-- src/Dodge/Data/Item/Combine.hs | 14 ------- src/Dodge/Data/Item/CurseStatus.hs | 4 -- src/Dodge/Data/Item/Effect.hs | 9 ----- src/Dodge/Data/Item/HeldDelay.hs | 4 -- src/Dodge/Data/Item/HeldScroll.hs | 4 -- src/Dodge/Data/Item/HeldUse.hs | 8 ---- src/Dodge/Data/Item/Location.hs | 4 -- src/Dodge/Data/Item/Misc.hs | 7 ---- src/Dodge/Data/Item/Params.hs | 9 ----- src/Dodge/Data/Item/Scope.hs | 4 -- src/Dodge/Data/Item/Targeting.hs | 6 --- src/Dodge/Data/Item/Tweak.hs | 6 --- src/Dodge/Data/Item/Use.hs | 7 ---- src/Dodge/Data/Item/Use/Consumption.hs | 6 --- src/Dodge/Data/Item/Use/Consumption/Ammo.hs | 10 ----- .../Data/Item/Use/Consumption/LoadAction.hs | 6 --- src/Dodge/Data/Item/Use/Equipment.hs | 5 --- src/Dodge/Data/Laser.hs | 6 --- src/Dodge/Data/LightSource.hs | 10 ----- src/Dodge/Data/LinearShockwave.hs | 4 -- src/Dodge/Data/Machine.hs | 6 --- src/Dodge/Data/Machine/Sensor.hs | 6 --- src/Dodge/Data/Magnet.hs | 6 --- src/Dodge/Data/Material.hs | 4 -- src/Dodge/Data/Modification.hs | 4 -- src/Dodge/Data/MountedObject.hs | 4 -- src/Dodge/Data/ObjectType.hs | 6 --- src/Dodge/Data/PathGraph.hs | 6 --- src/Dodge/Data/Payload.hs | 4 -- src/Dodge/Data/PosEvent.hs | 6 --- src/Dodge/Data/PressPlate.hs | 5 --- src/Dodge/Data/Projectile.hs | 4 -- src/Dodge/Data/Prop.hs | 7 ---- src/Dodge/Data/RadarBlip.hs | 4 -- src/Dodge/Data/RadarSweep.hs | 4 -- src/Dodge/Data/RightButtonOptions.hs | 6 --- src/Dodge/Data/SaveSlot.hs | 4 -- src/Dodge/Data/Shockwave.hs | 5 --- src/Dodge/Data/SoundOrigin.hs | 4 -- src/Dodge/Data/Spark.hs | 4 -- src/Dodge/Data/Terminal.hs | 15 -------- src/Dodge/Data/TeslaArc.hs | 4 -- src/Dodge/Data/TractorBeam.hs | 4 -- src/Dodge/Data/Universe.hs | 4 -- src/Dodge/Data/Wall.hs | 8 ---- src/Dodge/Data/World.hs | 4 -- src/Dodge/Data/WorldEffect.hs | 11 ------ src/Dodge/GameRoom.hs | 4 -- src/Dodge/Save.hs | 37 +++---------------- src/Geometry/ConvexPoly.hs | 4 -- src/IntSetHelp.hs | 1 - src/LinearHelp.hs | 6 --- src/MaybeHelp.hs | 5 --- src/Picture/Data.hs | 6 --- src/Quaternion.hs | 4 -- src/Shape/Data.hs | 7 ---- src/Sound/Data.hs | 4 -- 95 files changed, 9 insertions(+), 586 deletions(-) diff --git a/package.yaml b/package.yaml index a54bdb817..768db8bc3 100644 --- a/package.yaml +++ b/package.yaml @@ -51,8 +51,8 @@ dependencies: - linear - aeson - aeson-pretty -- store -- binary + #- store + #- binary - flat - th-utilities - directory diff --git a/src/Color.hs b/src/Color.hs index 8efb1ae26..ca5c2d659 100644 --- a/src/Color.hs +++ b/src/Color.hs @@ -6,9 +6,6 @@ module Color where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Geometry @@ -30,7 +27,6 @@ data PaletteColor | WHITE | BLACK deriving (Eq, Ord, Enum, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store PaletteColor) |])) instance ToJSON PaletteColor where toEncoding = genericToEncoding defaultOptions diff --git a/src/Dodge/Data/ActionPlan.hs b/src/Dodge/Data/ActionPlan.hs index 0d4c7c23a..483ea8294 100644 --- a/src/Dodge/Data/ActionPlan.hs +++ b/src/Dodge/Data/ActionPlan.hs @@ -5,9 +5,6 @@ module Dodge.Data.ActionPlan where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -206,9 +203,3 @@ deriveJSON defaultOptions ''Goal makeLenses ''ActionPlan makeLenses ''Impulse makeLenses ''Action -$($(derive [d| instance Deriving (Store Goal) |])) -$($(derive [d| instance Deriving (Store ActionPlan) |])) -$($(derive [d| instance Deriving (Store RandImpulse) |])) -$($(derive [d| instance Deriving (Store Impulse) |])) -$($(derive [d| instance Deriving (Store Action) |])) -$($(derive [d| instance Deriving (Store Strategy) |])) diff --git a/src/Dodge/Data/ArcStep.hs b/src/Dodge/Data/ArcStep.hs index 46e749dda..abb9bb8a5 100644 --- a/src/Dodge/Data/ArcStep.hs +++ b/src/Dodge/Data/ArcStep.hs @@ -5,9 +5,6 @@ module Dodge.Data.ArcStep where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -22,13 +19,11 @@ data ArcStep = ArcStep , _asObject :: CrWlID --Maybe (Either Creature Wall) } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store ArcStep ) |])) data NextArcStep = EndArc | DefaultArcStep deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store NextArcStep) |])) makeLenses ''ArcStep deriveJSON defaultOptions ''ArcStep diff --git a/src/Dodge/Data/Beam.hs b/src/Dodge/Data/Beam.hs index ff8ac60f9..2a43b8601 100644 --- a/src/Dodge/Data/Beam.hs +++ b/src/Dodge/Data/Beam.hs @@ -5,9 +5,6 @@ module Dodge.Data.Beam where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Color import Control.Lens @@ -60,7 +57,3 @@ deriveJSON defaultOptions ''BeamType deriveJSON defaultOptions ''Beam deriveJSON defaultOptions ''BeamDraw deriveJSON defaultOptions ''BeamCombineType -$($(derive [d| instance Deriving (Store Beam ) |])) -$($(derive [d| instance Deriving (Store BeamDraw) |])) -$($(derive [d| instance Deriving (Store BeamCombineType) |])) -$($(derive [d| instance Deriving (Store BeamType) |])) diff --git a/src/Dodge/Data/Block.hs b/src/Dodge/Data/Block.hs index 89008f56f..8055382e0 100644 --- a/src/Dodge/Data/Block.hs +++ b/src/Dodge/Data/Block.hs @@ -9,9 +9,6 @@ module Dodge.Data.Block ( module Dodge.Data.PathGraph, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Color @@ -55,6 +52,3 @@ makeLenses ''Block deriveJSON defaultOptions ''Block deriveJSON defaultOptions ''BlockDraw deriveJSON defaultOptions ''BlSh -$($(derive [d| instance Deriving (Store BlSh) |])) -$($(derive [d| instance Deriving (Store Block ) |])) -$($(derive [d| instance Deriving (Store BlockDraw) |])) diff --git a/src/Dodge/Data/Bounds.hs b/src/Dodge/Data/Bounds.hs index dd77f6bf7..ecbd1c3f8 100644 --- a/src/Dodge/Data/Bounds.hs +++ b/src/Dodge/Data/Bounds.hs @@ -5,9 +5,6 @@ module Dodge.Data.Bounds where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -20,7 +17,6 @@ data Bounds = Bounds , _bdMaxY :: Float } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Bounds ) |])) defaultBounds :: Bounds defaultBounds = Bounds 0 0 0 0 diff --git a/src/Dodge/Data/Bullet.hs b/src/Dodge/Data/Bullet.hs index 204ee4704..454c1ab14 100644 --- a/src/Dodge/Data/Bullet.hs +++ b/src/Dodge/Data/Bullet.hs @@ -8,9 +8,6 @@ module Dodge.Data.Bullet , module Dodge.Data.Damage )where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -65,9 +62,3 @@ deriveJSON defaultOptions ''BulletUpdateMod deriveJSON defaultOptions ''BulletEffect deriveJSON defaultOptions ''BulletSpawn deriveJSON defaultOptions ''BulletTrajectory -$($(derive [d| instance Deriving (Store Bullet ) |])) -$($(derive [d| instance Deriving (Store EnergyBallType ) |])) -$($(derive [d| instance Deriving (Store BulletUpdateMod ) |])) -$($(derive [d| instance Deriving (Store BulletEffect) |])) -$($(derive [d| instance Deriving (Store BulletTrajectory) |])) -$($(derive [d| instance Deriving (Store BulletSpawn ) |])) diff --git a/src/Dodge/Data/Button.hs b/src/Dodge/Data/Button.hs index 10af14d4a..cf97076e8 100644 --- a/src/Dodge/Data/Button.hs +++ b/src/Dodge/Data/Button.hs @@ -5,9 +5,6 @@ module Dodge.Data.Button where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Color @@ -74,7 +71,3 @@ deriveJSON defaultOptions ''ButtonDraw deriveJSON defaultOptions ''ButtonEvent deriveJSON defaultOptions ''Button deriveJSON defaultOptions ''ButtonState -$($(derive [d| instance Deriving (Store ButtonDraw) |])) -$($(derive [d| instance Deriving (Store ButtonEvent) |])) -$($(derive [d| instance Deriving (Store Button ) |])) -$($(derive [d| instance Deriving (Store ButtonState ) |])) diff --git a/src/Dodge/Data/CWorld.hs b/src/Dodge/Data/CWorld.hs index c5c1e5e93..c8a99e832 100644 --- a/src/Dodge/Data/CWorld.hs +++ b/src/Dodge/Data/CWorld.hs @@ -48,11 +48,8 @@ module Dodge.Data.CWorld ( module Dodge.Data.WorldEffect, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat -import LinearHelp +--import LinearHelp import Control.Lens import Data.Aeson import Data.Aeson.TH @@ -231,8 +228,3 @@ makeLenses ''WorldBeams makeLenses ''CWCam makeLenses ''CWGen makeLenses ''CWTime -$($(derive [d| instance Deriving (Store CWCam ) |])) -$($(derive [d| instance Deriving (Store CWorld ) |])) -$($(derive [d| instance Deriving (Store CWTime ) |])) -$($(derive [d| instance Deriving (Store CWGen ) |])) -$($(derive [d| instance Deriving (Store WorldBeams ) |])) diff --git a/src/Dodge/Data/CamouflageStatus.hs b/src/Dodge/Data/CamouflageStatus.hs index 60b8b7275..dfa4d93a3 100644 --- a/src/Dodge/Data/CamouflageStatus.hs +++ b/src/Dodge/Data/CamouflageStatus.hs @@ -5,9 +5,6 @@ module Dodge.Data.CamouflageStatus where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Data.Aeson.TH @@ -16,6 +13,5 @@ data CamouflageStatus = FullyVisible | Invisible deriving (Eq, Ord, Enum, Read, Show, Bounded, Generic, Flat) -$($(derive [d| instance Deriving (Store CamouflageStatus) |])) deriveJSON defaultOptions ''CamouflageStatus diff --git a/src/Dodge/Data/Cloud.hs b/src/Dodge/Data/Cloud.hs index dd3f1a5c4..8c308c826 100644 --- a/src/Dodge/Data/Cloud.hs +++ b/src/Dodge/Data/Cloud.hs @@ -5,9 +5,6 @@ module Dodge.Data.Cloud where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Color import Control.Lens @@ -40,6 +37,3 @@ makeLenses ''Cloud deriveJSON defaultOptions ''CloudDraw deriveJSON defaultOptions ''Cloud deriveJSON defaultOptions ''CloudType -$($(derive [d| instance Deriving (Store CloudType) |])) -$($(derive [d| instance Deriving (Store CloudDraw) |])) -$($(derive [d| instance Deriving (Store Cloud ) |])) diff --git a/src/Dodge/Data/Corpse.hs b/src/Dodge/Data/Corpse.hs index 56d136f07..0fb4859be 100644 --- a/src/Dodge/Data/Corpse.hs +++ b/src/Dodge/Data/Corpse.hs @@ -5,9 +5,6 @@ module Dodge.Data.Corpse where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -17,9 +14,7 @@ import Geometry.Data import ShapePicture.Data data CorpseResurrection = NoResurrection - | HackCorpseResurrection deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store CorpseResurrection ) |])) data Corpse = Corpse { _cpID :: Int @@ -29,7 +24,6 @@ data Corpse = Corpse , _cpRes :: CorpseResurrection } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Corpse ) |])) makeLenses ''Corpse deriveJSON defaultOptions ''CorpseResurrection diff --git a/src/Dodge/Data/CrGroupParams.hs b/src/Dodge/Data/CrGroupParams.hs index 6df4440ce..dfb37618f 100644 --- a/src/Dodge/Data/CrGroupParams.hs +++ b/src/Dodge/Data/CrGroupParams.hs @@ -5,9 +5,6 @@ module Dodge.Data.CrGroupParams where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -25,11 +22,8 @@ data CrGroupParams = CrGroupParams deriving (Eq, Ord, Show, Read, Generic, Flat) data CrGroupUpdate = DefaultCrGroupUpdate - | HackCrGroupUpdate deriving (Eq, Ord, Show, Read, Generic, Flat) makeLenses ''CrGroupParams deriveJSON defaultOptions ''CrGroupParams deriveJSON defaultOptions ''CrGroupUpdate -$($(derive [d| instance Deriving (Store CrGroupParams ) |])) -$($(derive [d| instance Deriving (Store CrGroupUpdate ) |])) diff --git a/src/Dodge/Data/CrWlID.hs b/src/Dodge/Data/CrWlID.hs index 356a8f882..69537a96b 100644 --- a/src/Dodge/Data/CrWlID.hs +++ b/src/Dodge/Data/CrWlID.hs @@ -5,19 +5,13 @@ module Dodge.Data.CrWlID where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson import Data.Aeson.TH -import TH.Derive -import Data.Store data CrWlID = CrID Int | WlID Int | NothingID -- TODO rewrite/remove this deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store CrWlID ) |])) makeLenses ''CrWlID deriveJSON defaultOptions ''CrWlID diff --git a/src/Dodge/Data/Creature.hs b/src/Dodge/Data/Creature.hs index affa308ff..68c87016a 100644 --- a/src/Dodge/Data/Creature.hs +++ b/src/Dodge/Data/Creature.hs @@ -17,9 +17,6 @@ module Dodge.Data.Creature ( module Dodge.Data.Hammer, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -81,7 +78,6 @@ data Creature = Creature deriving (Eq, Show, Read, Generic, Flat) data CreatureCorpse = MakeDefaultCorpse - | HackCreatureCorpse deriving (Eq, Ord, Show, Read, Generic, Flat) data Intention = Intention @@ -99,6 +95,3 @@ makeLenses ''Intention deriveJSON defaultOptions ''Creature deriveJSON defaultOptions ''CreatureCorpse deriveJSON defaultOptions ''Intention -$($(derive [d| instance Deriving (Store Intention ) |])) -$($(derive [d| instance Deriving (Store Creature ) |])) -$($(derive [d| instance Deriving (Store CreatureCorpse ) |])) diff --git a/src/Dodge/Data/Creature/Memory.hs b/src/Dodge/Data/Creature/Memory.hs index 8c7405a89..7d247f28c 100644 --- a/src/Dodge/Data/Creature/Memory.hs +++ b/src/Dodge/Data/Creature/Memory.hs @@ -5,9 +5,6 @@ module Dodge.Data.Creature.Memory where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -20,7 +17,6 @@ data Memory = Memory , _nodesSearched :: [Int] } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Memory ) |])) makeLenses ''Memory deriveJSON defaultOptions ''Memory diff --git a/src/Dodge/Data/Creature/Misc.hs b/src/Dodge/Data/Creature/Misc.hs index 187a5fdec..b1fc31bc2 100644 --- a/src/Dodge/Data/Creature/Misc.hs +++ b/src/Dodge/Data/Creature/Misc.hs @@ -8,9 +8,6 @@ module Dodge.Data.Creature.Misc ( module Dodge.Data.CamouflageStatus, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Color import Control.Lens @@ -90,9 +87,3 @@ deriveJSON defaultOptions ''CrMvType deriveJSON defaultOptions ''HumanoidAI deriveJSON defaultOptions ''CreatureType deriveJSON defaultOptions ''BarrelType -$($(derive [d| instance Deriving (Store CrMvType) |])) -$($(derive [d| instance Deriving (Store HumanoidAI) |])) -$($(derive [d| instance Deriving (Store CreatureType) |])) -$($(derive [d| instance Deriving (Store BarrelType ) |])) -$($(derive [d| instance Deriving (Store CreatureStatistics ) |])) -$($(derive [d| instance Deriving (Store Vocalization) |])) diff --git a/src/Dodge/Data/Creature/Perception.hs b/src/Dodge/Data/Creature/Perception.hs index 27920888c..5ac558d64 100644 --- a/src/Dodge/Data/Creature/Perception.hs +++ b/src/Dodge/Data/Creature/Perception.hs @@ -23,9 +23,6 @@ module Dodge.Data.Creature.Perception ( auDist, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -70,7 +67,6 @@ data Awareness = Suspicious Float | Cognizant Float deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Awareness) |])) makeLenses ''Perception makeLenses ''Vision @@ -82,8 +78,3 @@ deriveJSON defaultOptions ''Audition deriveJSON defaultOptions ''Vigilance deriveJSON defaultOptions ''Attention deriveJSON defaultOptions ''Awareness -$($(derive [d| instance Deriving (Store Perception ) |])) -$($(derive [d| instance Deriving (Store Vision ) |])) -$($(derive [d| instance Deriving (Store Audition ) |])) -$($(derive [d| instance Deriving (Store Vigilance) |])) -$($(derive [d| instance Deriving (Store Attention) |])) diff --git a/src/Dodge/Data/Creature/Stance.hs b/src/Dodge/Data/Creature/Stance.hs index 90176e4a7..d152a85af 100644 --- a/src/Dodge/Data/Creature/Stance.hs +++ b/src/Dodge/Data/Creature/Stance.hs @@ -5,9 +5,6 @@ module Dodge.Data.Creature.Stance where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -44,7 +41,6 @@ data Posture = Aiming | AtEase deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Posture) |])) makeLenses ''Stance makeLenses ''Carriage @@ -53,6 +49,3 @@ deriveJSON defaultOptions ''Stance deriveJSON defaultOptions ''Carriage deriveJSON defaultOptions ''FootForward deriveJSON defaultOptions ''Posture -$($(derive [d| instance Deriving (Store Stance ) |])) -$($(derive [d| instance Deriving (Store Carriage) |])) -$($(derive [d| instance Deriving (Store FootForward) |])) diff --git a/src/Dodge/Data/Creature/State.hs b/src/Dodge/Data/Creature/State.hs index 231c92d9a..4f5bc1a77 100644 --- a/src/Dodge/Data/Creature/State.hs +++ b/src/Dodge/Data/Creature/State.hs @@ -5,9 +5,6 @@ module Dodge.Data.Creature.State where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Color import Control.Lens @@ -64,8 +61,3 @@ deriveJSON defaultOptions ''CreatureDropType deriveJSON defaultOptions ''CrSpState deriveJSON defaultOptions ''Faction deriveJSON defaultOptions ''CrGroup -$($(derive [d| instance Deriving (Store CreatureState ) |])) -$($(derive [d| instance Deriving (Store CreatureDropType) |])) -$($(derive [d| instance Deriving (Store CrSpState) |])) -$($(derive [d| instance Deriving (Store Faction) |])) -$($(derive [d| instance Deriving (Store CrGroup) |])) diff --git a/src/Dodge/Data/CreatureEffect.hs b/src/Dodge/Data/CreatureEffect.hs index 660aa8f34..e079216b5 100644 --- a/src/Dodge/Data/CreatureEffect.hs +++ b/src/Dodge/Data/CreatureEffect.hs @@ -5,40 +5,28 @@ module Dodge.Data.CreatureEffect where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Data.Aeson.TH data WdCrCr = NoCreatureEffect - | HackWdCrCr deriving (Eq, Ord, Show, Read, Generic, Flat) data CrWdImp = NoCrWdImp - | HackCrWdImp deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store CrWdImp ) |])) data CrWdWd = CrWdWdId - | HackCrWdWd deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store CrWdWd ) |])) data IntImp = NoIntImp - | HackNoIntImp deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store IntImp ) |])) data CrImp = NoCrImp | TurnTowardCr Float -- turn amount deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store CrImp) |])) data P2Imp = P2ImpNo - | HackP2ImpNo deriving (Eq, Ord, Show, Read, Generic, Flat) data WdCrBl @@ -55,35 +43,26 @@ data CrBl | CrIsAiming | CrIsAnimate deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store CrBl) |])) data MCrAc = MCrNoAction - | HackMCrAc deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store MCrAc ) |])) data CrAc = CrTurnAround | CrFleeFromTarget deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store CrAc) |])) data P2Ac = P2NoAction - | HackP2Ac deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store P2Ac ) |])) data MP2Ac = MP2NoAction - | HackMP2Ac deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store MP2Ac ) |])) data CrWdAc = CrWdBFSThenReturn Int | ChooseMovementSpreadGun | ChooseMovementLtAuto deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store CrWdAc) |])) deriveJSON defaultOptions ''WdCrCr deriveJSON defaultOptions ''CrWdImp @@ -98,6 +77,3 @@ deriveJSON defaultOptions ''CrAc deriveJSON defaultOptions ''P2Ac deriveJSON defaultOptions ''MP2Ac deriveJSON defaultOptions ''CrWdAc -$($(derive [d| instance Deriving (Store P2Imp ) |])) -$($(derive [d| instance Deriving (Store WdCrBl) |])) -$($(derive [d| instance Deriving (Store WdCrCr ) |])) diff --git a/src/Dodge/Data/Damage.hs b/src/Dodge/Data/Damage.hs index b9dfdd866..f37013032 100644 --- a/src/Dodge/Data/Damage.hs +++ b/src/Dodge/Data/Damage.hs @@ -12,9 +12,6 @@ module Dodge.Data.Damage ( module Dodge.Data.Damage.Type, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -33,7 +30,6 @@ data DamageEffect | PushBackDamage {_dePushBack :: Float} | NoDamageEffect deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store DamageEffect) |])) data Damage = Damage { _dmType :: DamageType @@ -44,7 +40,6 @@ data Damage = Damage , _dmEffect :: DamageEffect } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Damage ) |])) isElectrical :: Damage -> Bool isElectrical dm = case _dmType dm of diff --git a/src/Dodge/Data/Damage/Type.hs b/src/Dodge/Data/Damage/Type.hs index deff1d5cb..ec4b0ef71 100644 --- a/src/Dodge/Data/Damage/Type.hs +++ b/src/Dodge/Data/Damage/Type.hs @@ -5,9 +5,6 @@ module Dodge.Data.Damage.Type where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Data.Aeson.TH @@ -29,7 +26,6 @@ data DamageType | POISONDAM | ENTERREMENT deriving (Eq, Ord, Show, Read, Enum, Bounded, Generic, Flat) -$($(derive [d| instance Deriving (Store DamageType) |])) instance ToJSONKey DamageType diff --git a/src/Dodge/Data/Distortion.hs b/src/Dodge/Data/Distortion.hs index 394c2bcbe..791c6a86d 100644 --- a/src/Dodge/Data/Distortion.hs +++ b/src/Dodge/Data/Distortion.hs @@ -5,9 +5,6 @@ module Dodge.Data.Distortion where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Geometry import LinearHelp () @@ -17,6 +14,5 @@ import Data.Aeson.TH data Distortion = RadialDistortion Point2 Point2 Point2 Float deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Distortion) |])) deriveJSON defaultOptions ''Distortion diff --git a/src/Dodge/Data/Door.hs b/src/Dodge/Data/Door.hs index fd84cab2a..f9b74f940 100644 --- a/src/Dodge/Data/Door.hs +++ b/src/Dodge/Data/Door.hs @@ -10,9 +10,6 @@ module Dodge.Data.Door ( module Dodge.Data.WorldEffect, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -26,14 +23,12 @@ import Geometry.Data data DoorStatus = DoorOpen | DoorClosed | DoorHalfway | DoorInt Int deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store DoorStatus ) |])) data PushSource = PushesItself | PushedBy Int | NotPushed deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store PushSource) |])) data Door = Door { _drID :: Int @@ -54,7 +49,6 @@ data Door = Door , _drObstacleType :: EdgeObstacle } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Door ) |])) makeLenses ''Door deriveJSON defaultOptions ''DoorStatus diff --git a/src/Dodge/Data/EnergyBall.hs b/src/Dodge/Data/EnergyBall.hs index 95e8e04ac..e1fc3e94e 100644 --- a/src/Dodge/Data/EnergyBall.hs +++ b/src/Dodge/Data/EnergyBall.hs @@ -5,9 +5,6 @@ module Dodge.Data.EnergyBall where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Color import Control.Lens @@ -27,7 +24,6 @@ data EnergyBall = EnergyBall , _ebRot :: Float } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store EnergyBall ) |])) makeLenses ''EnergyBall deriveJSON defaultOptions ''EnergyBall diff --git a/src/Dodge/Data/Equipment/Misc.hs b/src/Dodge/Data/Equipment/Misc.hs index 8579e744e..b4c826fcb 100644 --- a/src/Dodge/Data/Equipment/Misc.hs +++ b/src/Dodge/Data/Equipment/Misc.hs @@ -5,9 +5,6 @@ module Dodge.Data.Equipment.Misc where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Data.Aeson.TH @@ -20,7 +17,6 @@ data EquipSite | GoesOnLegs | GoesOnSpecial deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store EquipSite) |])) data EquipPosition = OnHead @@ -31,7 +27,6 @@ data EquipPosition | OnLegs | OnSpecial deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store EquipPosition) |])) instance ToJSONKey EquipPosition diff --git a/src/Dodge/Data/Flame.hs b/src/Dodge/Data/Flame.hs index 3d10768e6..b00a2a926 100644 --- a/src/Dodge/Data/Flame.hs +++ b/src/Dodge/Data/Flame.hs @@ -5,9 +5,6 @@ module Dodge.Data.Flame where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Color import Control.Lens @@ -25,7 +22,6 @@ data Flame = Flame , _flOriginalVel :: Point2 } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Flame ) |])) makeLenses ''Flame deriveJSON defaultOptions ''Flame diff --git a/src/Dodge/Data/Flare.hs b/src/Dodge/Data/Flare.hs index 4f59db830..8a90a92d9 100644 --- a/src/Dodge/Data/Flare.hs +++ b/src/Dodge/Data/Flare.hs @@ -5,9 +5,6 @@ module Dodge.Data.Flare where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Color @@ -30,7 +27,6 @@ data Flare , _flareTime :: Int } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Flare) |])) makeLenses ''Flare deriveJSON defaultOptions ''Flare diff --git a/src/Dodge/Data/FloatFunction.hs b/src/Dodge/Data/FloatFunction.hs index 33cb806bf..1b317f1bd 100644 --- a/src/Dodge/Data/FloatFunction.hs +++ b/src/Dodge/Data/FloatFunction.hs @@ -5,9 +5,6 @@ module Dodge.Data.FloatFunction where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Data.Aeson.TH @@ -19,6 +16,5 @@ data FloatFloat | FloatAbsCheckGreaterLess Float Float Float | FloatConst Float deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store FloatFloat) |])) deriveJSON defaultOptions ''FloatFloat diff --git a/src/Dodge/Data/FloorItem.hs b/src/Dodge/Data/FloorItem.hs index 8a7d518ea..58e60e34f 100644 --- a/src/Dodge/Data/FloorItem.hs +++ b/src/Dodge/Data/FloorItem.hs @@ -5,9 +5,6 @@ module Dodge.Data.FloorItem where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -18,7 +15,6 @@ import Geometry.Data data FloorItem = FlIt {_flIt :: Item, _flItPos :: Point2, _flItRot :: Float, _flItID :: Int} deriving (Eq, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store FloorItem ) |])) makeLenses ''FloorItem deriveJSON defaultOptions ''FloorItem diff --git a/src/Dodge/Data/ForegroundShape.hs b/src/Dodge/Data/ForegroundShape.hs index 986cbf0d5..80057e690 100644 --- a/src/Dodge/Data/ForegroundShape.hs +++ b/src/Dodge/Data/ForegroundShape.hs @@ -5,9 +5,6 @@ module Dodge.Data.ForegroundShape where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -24,7 +21,6 @@ data ForegroundShape = ForegroundShape , _fsSPic :: SPic } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store ForegroundShape ) |])) makeLenses ''ForegroundShape deriveJSON defaultOptions ''ForegroundShape diff --git a/src/Dodge/Data/GenParams.hs b/src/Dodge/Data/GenParams.hs index ea46c5f97..8eaefac73 100644 --- a/src/Dodge/Data/GenParams.hs +++ b/src/Dodge/Data/GenParams.hs @@ -5,9 +5,6 @@ module Dodge.Data.GenParams where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Color import Control.Lens @@ -27,5 +24,3 @@ data DecorationShape = PLUS | SQUARE | CIRCLE | THREELINES makeLenses ''GenParams deriveJSON defaultOptions ''GenParams deriveJSON defaultOptions ''DecorationShape -$($(derive [d| instance Deriving (Store GenParams ) |])) -$($(derive [d| instance Deriving (Store DecorationShape ) |])) diff --git a/src/Dodge/Data/Gust.hs b/src/Dodge/Data/Gust.hs index d1fbba0a6..842cbafef 100644 --- a/src/Dodge/Data/Gust.hs +++ b/src/Dodge/Data/Gust.hs @@ -5,9 +5,6 @@ module Dodge.Data.Gust where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -22,7 +19,6 @@ data Gust = Gust , _guTime :: Int } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Gust ) |])) makeLenses ''Gust deriveJSON defaultOptions ''Gust diff --git a/src/Dodge/Data/HUD.hs b/src/Dodge/Data/HUD.hs index 7ec16ae0a..88069736a 100644 --- a/src/Dodge/Data/HUD.hs +++ b/src/Dodge/Data/HUD.hs @@ -5,9 +5,6 @@ module Dodge.Data.HUD where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -28,7 +25,6 @@ data SubInventory | LockedInventory | DisplayTerminal {_termID :: Int} deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store SubInventory) |])) data HUD = HUD { _hudElement :: HUDElement @@ -37,7 +33,6 @@ data HUD = HUD , _carteRot :: Float } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store HUD ) |])) makeLenses ''HUD makeLenses ''HUDElement @@ -45,4 +40,3 @@ makeLenses ''SubInventory deriveJSON defaultOptions ''HUDElement deriveJSON defaultOptions ''SubInventory deriveJSON defaultOptions ''HUD -$($(derive [d| instance Deriving (Store HUDElement) |])) diff --git a/src/Dodge/Data/Hammer.hs b/src/Dodge/Data/Hammer.hs index 16d06c5b4..b00fa4206 100644 --- a/src/Dodge/Data/Hammer.hs +++ b/src/Dodge/Data/Hammer.hs @@ -5,9 +5,6 @@ module Dodge.Data.Hammer where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -23,9 +20,7 @@ data HammerPosition | HammerReleased | HammerUp deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store HammerPosition) |])) makeLenses ''HammerType deriveJSON defaultOptions ''HammerType deriveJSON defaultOptions ''HammerPosition -$($(derive [d| instance Deriving (Store HammerType) |])) diff --git a/src/Dodge/Data/Item.hs b/src/Dodge/Data/Item.hs index a68b25100..864ab8516 100644 --- a/src/Dodge/Data/Item.hs +++ b/src/Dodge/Data/Item.hs @@ -1,6 +1,6 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveAnyClass #-} -{-# LANGUAGE StrictData #-} +--{-# LANGUAGE StrictData #-} {-# LANGUAGE TemplateHaskell #-} module Dodge.Data.Item ( @@ -17,9 +17,6 @@ module Dodge.Data.Item ( module Dodge.Data.Item.Location, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Color import Control.Lens @@ -54,7 +51,6 @@ data Item = Item , _itParams :: ItemParams } deriving (Eq, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Item ) |])) _itUseAimStance :: Item -> AimStance _itUseAimStance = _aimStance . _heldAim . _itUse diff --git a/src/Dodge/Data/Item/Combine.hs b/src/Dodge/Data/Item/Combine.hs index 3c225c099..f291303a4 100644 --- a/src/Dodge/Data/Item/Combine.hs +++ b/src/Dodge/Data/Item/Combine.hs @@ -5,9 +5,6 @@ module Dodge.Data.Item.Combine where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -225,14 +222,3 @@ deriveJSON defaultOptions ''ModuleSlot makeLenses ''ItemType makeLenses ''ItemBaseType makeLenses ''HeldItemType -$($(derive [d| instance Deriving (Store ItemType ) |])) -$($(derive [d| instance Deriving (Store Stack ) |])) -$($(derive [d| instance Deriving (Store CraftType) |])) -$($(derive [d| instance Deriving (Store ItemBaseType) |])) -$($(derive [d| instance Deriving (Store ConsumableItemType) |])) -$($(derive [d| instance Deriving (Store EquipItemType) |])) -$($(derive [d| instance Deriving (Store LeftItemType) |])) -$($(derive [d| instance Deriving (Store HeldItemType) |])) -$($(derive [d| instance Deriving (Store ItemModuleType) |])) -$($(derive [d| instance Deriving (Store Detector) |])) -$($(derive [d| instance Deriving (Store ModuleSlot) |])) diff --git a/src/Dodge/Data/Item/CurseStatus.hs b/src/Dodge/Data/Item/CurseStatus.hs index c37869f55..ff7d73f13 100644 --- a/src/Dodge/Data/Item/CurseStatus.hs +++ b/src/Dodge/Data/Item/CurseStatus.hs @@ -5,9 +5,6 @@ module Dodge.Data.Item.CurseStatus where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Data.Aeson.TH @@ -17,6 +14,5 @@ data CurseStatus | UndroppableIdentified | UndroppableUnidentified deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store CurseStatus) |])) deriveJSON defaultOptions ''CurseStatus diff --git a/src/Dodge/Data/Item/Effect.hs b/src/Dodge/Data/Item/Effect.hs index 8cadb99da..538185db5 100644 --- a/src/Dodge/Data/Item/Effect.hs +++ b/src/Dodge/Data/Item/Effect.hs @@ -5,9 +5,6 @@ module Dodge.Data.Item.Effect where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -31,14 +28,11 @@ data ItInvEffect | RemoveShieldWall | EffectWhileHeld ItInvEffect deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store ItInvEffect) |])) data ItFloorEffect = NoFloorEffect - | HackItFloorEffect deriving (Eq, Ord, Show, Read, Generic, Flat) data ItDropEffect = NoDropEffect - | HackItDropEffect deriving (Eq, Ord, Show, Read, Generic, Flat) makeLenses ''ItEffect @@ -46,6 +40,3 @@ deriveJSON defaultOptions ''ItEffect deriveJSON defaultOptions ''ItInvEffect deriveJSON defaultOptions ''ItFloorEffect deriveJSON defaultOptions ''ItDropEffect -$($(derive [d| instance Deriving (Store ItEffect ) |])) -$($(derive [d| instance Deriving (Store ItDropEffect ) |])) -$($(derive [d| instance Deriving (Store ItFloorEffect ) |])) diff --git a/src/Dodge/Data/Item/HeldDelay.hs b/src/Dodge/Data/Item/HeldDelay.hs index 8b9b30254..64c9a9dec 100644 --- a/src/Dodge/Data/Item/HeldDelay.hs +++ b/src/Dodge/Data/Item/HeldDelay.hs @@ -5,9 +5,6 @@ module Dodge.Data.Item.HeldDelay where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -30,7 +27,6 @@ data UseDelay -- should just be Delay , _warmMax :: Int } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store UseDelay ) |])) makeLenses ''UseDelay deriveJSON defaultOptions ''UseDelay diff --git a/src/Dodge/Data/Item/HeldScroll.hs b/src/Dodge/Data/Item/HeldScroll.hs index 35142a2fc..8e7163e91 100644 --- a/src/Dodge/Data/Item/HeldScroll.hs +++ b/src/Dodge/Data/Item/HeldScroll.hs @@ -5,9 +5,6 @@ module Dodge.Data.Item.HeldScroll where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -24,7 +21,6 @@ data HeldScroll , _hsMaxInt :: Int } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store HeldScroll) |])) makeLenses ''HeldScroll deriveJSON defaultOptions ''HeldScroll diff --git a/src/Dodge/Data/Item/HeldUse.hs b/src/Dodge/Data/Item/HeldUse.hs index 3321e7e90..22159d29d 100644 --- a/src/Dodge/Data/Item/HeldUse.hs +++ b/src/Dodge/Data/Item/HeldUse.hs @@ -5,9 +5,6 @@ module Dodge.Data.Item.HeldUse where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Data.Aeson.TH @@ -31,13 +28,11 @@ data HeldUse | HeldForceField | HeldShatter deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store HeldUse) |])) data Cuse = CDoNothing | CHeal Int deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Cuse) |])) data Euse = EDoNothing @@ -49,7 +44,6 @@ data Euse | EonWristShield | EoffWristShield deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Euse) |])) data Luse = LDoNothing @@ -59,7 +53,6 @@ data Luse | LUnsafeBlink | LBoost deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Luse) |])) data HeldMod = HeldModNothing @@ -98,7 +91,6 @@ data HeldMod | RevolverXRepeatMod | BangConeMod deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store HeldMod) |])) deriveJSON defaultOptions ''Cuse deriveJSON defaultOptions ''HeldMod diff --git a/src/Dodge/Data/Item/Location.hs b/src/Dodge/Data/Item/Location.hs index ca19606a8..8058b0e3e 100644 --- a/src/Dodge/Data/Item/Location.hs +++ b/src/Dodge/Data/Item/Location.hs @@ -4,9 +4,6 @@ {-# LANGUAGE TemplateHaskell #-} module Dodge.Data.Item.Location where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -18,7 +15,6 @@ data ItemLocation | OnFloor {_ipFlID :: Int} | InVoid deriving (Eq, Show, Read, Ord, Generic, Flat) -$($(derive [d| instance Deriving (Store ItemLocation) |])) makeLenses ''ItemLocation deriveJSON defaultOptions ''ItemLocation diff --git a/src/Dodge/Data/Item/Misc.hs b/src/Dodge/Data/Item/Misc.hs index 39afb8d93..3405b5579 100644 --- a/src/Dodge/Data/Item/Misc.hs +++ b/src/Dodge/Data/Item/Misc.hs @@ -5,9 +5,6 @@ module Dodge.Data.Item.Misc where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -21,7 +18,6 @@ data ItemDimension = ItemDimension , _dimAttachPos :: Point3 } deriving (Eq, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store ItemDimension ) |])) data ItemPortage = HeldItem @@ -31,18 +27,15 @@ data ItemPortage | WornItem | NoPortage deriving (Eq, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store ItemPortage) |])) --data ItemValue = ItemValue -- { _ivInt :: Int -- , _ivType :: ItemValueType -- } -- deriving (Eq, Show, Read, Generic, Flat) --- $($(derive [d| instance Deriving (Store ItemValue ) |])) -- --data ItemValueType = MundaneItem | ArtefactItem -- deriving (Eq, Show, Read, Generic, Flat) --- $($(derive [d| instance Deriving (Store ItemValueType ) |])) makeLenses ''ItemDimension makeLenses ''ItemPortage diff --git a/src/Dodge/Data/Item/Params.hs b/src/Dodge/Data/Item/Params.hs index 0034e86fd..9aa446223 100644 --- a/src/Dodge/Data/Item/Params.hs +++ b/src/Dodge/Data/Item/Params.hs @@ -5,9 +5,6 @@ module Dodge.Data.Item.Params where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Color import Control.Lens @@ -119,9 +116,3 @@ deriveJSON defaultOptions ''PreviousArcEffect deriveJSON defaultOptions ''GunBarrels deriveJSON defaultOptions ''Nozzle deriveJSON defaultOptions ''BarrelSpread -$($(derive [d| instance Deriving (Store PreviousArcEffect ) |])) -$($(derive [d| instance Deriving (Store GunBarrels) |])) -$($(derive [d| instance Deriving (Store Nozzle ) |])) -$($(derive [d| instance Deriving (Store BarrelSpread) |])) -$($(derive [d| instance Deriving (Store ItemParams) |])) -$($(derive [d| instance Deriving (Store ShrinkGunStatus ) |])) diff --git a/src/Dodge/Data/Item/Scope.hs b/src/Dodge/Data/Item/Scope.hs index 3e311fbcc..944b61f31 100644 --- a/src/Dodge/Data/Item/Scope.hs +++ b/src/Dodge/Data/Item/Scope.hs @@ -5,9 +5,6 @@ module Dodge.Data.Item.Scope where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -34,7 +31,6 @@ data Scope _scopeIsCamera :: Bool } deriving (Eq, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Scope) |])) makeLenses ''Scope deriveJSON defaultOptions ''Scope diff --git a/src/Dodge/Data/Item/Targeting.hs b/src/Dodge/Data/Item/Targeting.hs index 03e40e38e..d0a8a6ec7 100644 --- a/src/Dodge/Data/Item/Targeting.hs +++ b/src/Dodge/Data/Item/Targeting.hs @@ -5,9 +5,6 @@ module Dodge.Data.Item.Targeting where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -45,6 +42,3 @@ makeLenses ''Targeting deriveJSON defaultOptions ''Targeting deriveJSON defaultOptions ''TargetUpdate deriveJSON defaultOptions ''TargetDraw -$($(derive [d| instance Deriving (Store Targeting) |])) -$($(derive [d| instance Deriving (Store TargetDraw) |])) -$($(derive [d| instance Deriving (Store TargetUpdate) |])) diff --git a/src/Dodge/Data/Item/Tweak.hs b/src/Dodge/Data/Item/Tweak.hs index 26782aad1..1fedca93f 100644 --- a/src/Dodge/Data/Item/Tweak.hs +++ b/src/Dodge/Data/Item/Tweak.hs @@ -5,9 +5,6 @@ module Dodge.Data.Item.Tweak where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -35,12 +32,9 @@ data TweakParam = TweakParam , _tweakMax :: Int } deriving (Eq, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store TweakParam ) |])) makeLenses ''TweakParam makeLenses ''ItemTweaks deriveJSON defaultOptions ''ItemTweaks deriveJSON defaultOptions ''TweakType deriveJSON defaultOptions ''TweakParam -$($(derive [d| instance Deriving (Store ItemTweaks) |])) -$($(derive [d| instance Deriving (Store TweakType) |])) diff --git a/src/Dodge/Data/Item/Use.hs b/src/Dodge/Data/Item/Use.hs index ce27a3ce9..3fa9a6083 100644 --- a/src/Dodge/Data/Item/Use.hs +++ b/src/Dodge/Data/Item/Use.hs @@ -13,9 +13,6 @@ module Dodge.Data.Item.Use ( module Dodge.Data.Hammer, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -86,7 +83,3 @@ deriveJSON defaultOptions ''ItemUse deriveJSON defaultOptions ''AimParams deriveJSON defaultOptions ''AimStance deriveJSON defaultOptions ''ItZoom -$($(derive [d| instance Deriving (Store AimParams ) |])) -$($(derive [d| instance Deriving (Store AimStance) |])) -$($(derive [d| instance Deriving (Store ItZoom ) |])) -$($(derive [d| instance Deriving (Store ItemUse) |])) diff --git a/src/Dodge/Data/Item/Use/Consumption.hs b/src/Dodge/Data/Item/Use/Consumption.hs index 10ae50931..fb5548b7b 100644 --- a/src/Dodge/Data/Item/Use/Consumption.hs +++ b/src/Dodge/Data/Item/Use/Consumption.hs @@ -11,9 +11,6 @@ module Dodge.Data.Item.Use.Consumption ( module Dodge.Data.Item.Use.Consumption.LoadAction, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -32,7 +29,6 @@ data HeldConsumption } | NoConsumption deriving (Eq, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store HeldConsumption) |])) data LeftConsumption = AutoRecharging @@ -46,14 +42,12 @@ data LeftConsumption , _wpCharge :: Int } deriving (Eq, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store LeftConsumption) |])) newtype ItAmount = ItAmount {_getItAmount :: Int} -- 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) -$($(derive [d| instance Deriving (Store ItAmount) |])) makeLenses ''HeldConsumption makeLenses ''LeftConsumption diff --git a/src/Dodge/Data/Item/Use/Consumption/Ammo.hs b/src/Dodge/Data/Item/Use/Consumption/Ammo.hs index 186dbc436..639c1d4db 100644 --- a/src/Dodge/Data/Item/Use/Consumption/Ammo.hs +++ b/src/Dodge/Data/Item/Use/Consumption/Ammo.hs @@ -9,9 +9,6 @@ module Dodge.Data.Item.Use.Consumption.Ammo ( module Dodge.Data.Payload, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -62,7 +59,6 @@ data AmmoType deriving (Eq, Ord, Show, Read, Generic, Flat) data ForceFieldType = DefaultForceField - | HackForceFieldType deriving (Eq, Ord, Show, Read, Generic, Flat) data GasCreate = CreatePoisonGas | CreateFlame @@ -76,9 +72,3 @@ deriveJSON defaultOptions ''ProjectileUpdate deriveJSON defaultOptions ''AmmoType deriveJSON defaultOptions ''GasCreate deriveJSON defaultOptions ''ForceFieldType -$($(derive [d| instance Deriving (Store AmmoType) |])) -$($(derive [d| instance Deriving (Store ProjectileDraw ) |])) -$($(derive [d| instance Deriving (Store ProjectileCreate ) |])) -$($(derive [d| instance Deriving (Store ProjectileUpdate) |])) -$($(derive [d| instance Deriving (Store ForceFieldType ) |])) -$($(derive [d| instance Deriving (Store GasCreate ) |])) diff --git a/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs b/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs index a1295a499..9ea65e509 100644 --- a/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs +++ b/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs @@ -5,9 +5,6 @@ module Dodge.Data.Item.Use.Consumption.LoadAction where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -36,6 +33,3 @@ makeLenses ''InvSelAction deriveJSON defaultOptions ''LoadAction deriveJSON defaultOptions ''InvSel deriveJSON defaultOptions ''InvSelAction -$($(derive [d| instance Deriving (Store LoadAction) |])) -$($(derive [d| instance Deriving (Store InvSelAction) |])) -$($(derive [d| instance Deriving (Store InvSel ) |])) diff --git a/src/Dodge/Data/Item/Use/Equipment.hs b/src/Dodge/Data/Item/Use/Equipment.hs index 8897d2a56..489589008 100644 --- a/src/Dodge/Data/Item/Use/Equipment.hs +++ b/src/Dodge/Data/Item/Use/Equipment.hs @@ -8,9 +8,6 @@ module Dodge.Data.Item.Use.Equipment ( module Dodge.Data.Item.Use.Equipment, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -38,5 +35,3 @@ makeLenses ''EquipEffect makeLenses ''EquipParams deriveJSON defaultOptions ''EquipEffect deriveJSON defaultOptions ''EquipParams -$($(derive [d| instance Deriving (Store EquipEffect ) |])) -$($(derive [d| instance Deriving (Store EquipParams) |])) diff --git a/src/Dodge/Data/Laser.hs b/src/Dodge/Data/Laser.hs index 25ddd1601..04294ef4a 100644 --- a/src/Dodge/Data/Laser.hs +++ b/src/Dodge/Data/Laser.hs @@ -5,9 +5,6 @@ module Dodge.Data.Laser where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Color import Control.Lens @@ -19,7 +16,6 @@ data LaserType = DamageLaser {_laserTypeDamage :: Int} | TargetLaser deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store LaserType) |])) data LaserStart = LaserStart { _lpPhaseV :: Float @@ -29,7 +25,6 @@ data LaserStart = LaserStart , _lpType :: LaserType } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store LaserStart ) |])) data Laser = Laser { _laColor :: Color @@ -37,7 +32,6 @@ data Laser = Laser , _laType :: LaserType } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Laser ) |])) makeLenses ''Laser makeLenses ''LaserStart diff --git a/src/Dodge/Data/LightSource.hs b/src/Dodge/Data/LightSource.hs index 8029f6d3b..220b0e624 100644 --- a/src/Dodge/Data/LightSource.hs +++ b/src/Dodge/Data/LightSource.hs @@ -5,9 +5,6 @@ module Dodge.Data.LightSource where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -16,22 +13,18 @@ import Data.Aeson.TH import Geometry data LightSourceDraw = DefaultLightSourceDraw - | HackLightSourceDraw deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store LightSourceDraw ) |])) data TLSIntensity = ConstantIntensity | TLSFade Point3 Int deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store TLSIntensity) |])) data TLSUpdate = DestroyTLS | TimerTLS | IntensityTLS TLSIntensity deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store TLSUpdate) |])) data LSParam = LSParam { _lsPos :: !Point3 @@ -39,7 +32,6 @@ data LSParam = LSParam , _lsCol :: !Point3 } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store LSParam ) |])) data LightSource = LS { _lsID :: Int @@ -48,7 +40,6 @@ data LightSource = LS , _lsPict :: LightSourceDraw --LightSource -> Picture } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store LightSource ) |])) data TempLightSource = TLS { _tlsParam :: LSParam @@ -56,7 +47,6 @@ data TempLightSource = TLS , _tlsTime :: Int } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store TempLightSource ) |])) makeLenses ''LSParam makeLenses ''LightSource diff --git a/src/Dodge/Data/LinearShockwave.hs b/src/Dodge/Data/LinearShockwave.hs index fbb832da2..7f9420be8 100644 --- a/src/Dodge/Data/LinearShockwave.hs +++ b/src/Dodge/Data/LinearShockwave.hs @@ -5,9 +5,6 @@ module Dodge.Data.LinearShockwave where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -22,7 +19,6 @@ data LinearShockwave = LinearShockwave , _lwTimer :: Int } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store LinearShockwave ) |])) makeLenses ''LinearShockwave deriveJSON defaultOptions ''LinearShockwave diff --git a/src/Dodge/Data/Machine.hs b/src/Dodge/Data/Machine.hs index 2278d6f66..fecfad67d 100644 --- a/src/Dodge/Data/Machine.hs +++ b/src/Dodge/Data/Machine.hs @@ -13,9 +13,6 @@ module Dodge.Data.Machine ( module Dodge.Data.GenParams, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Color @@ -74,6 +71,3 @@ makePrisms ''MachineType deriveJSON defaultOptions ''Machine deriveJSON defaultOptions ''MachineType deriveJSON defaultOptions ''Turret -$($(derive [d| instance Deriving (Store Turret ) |])) -$($(derive [d| instance Deriving (Store Machine ) |])) -$($(derive [d| instance Deriving (Store MachineType) |])) diff --git a/src/Dodge/Data/Machine/Sensor.hs b/src/Dodge/Data/Machine/Sensor.hs index f764956ce..768966a87 100644 --- a/src/Dodge/Data/Machine/Sensor.hs +++ b/src/Dodge/Data/Machine/Sensor.hs @@ -5,9 +5,6 @@ module Dodge.Data.Machine.Sensor where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Dodge.Data.GenParams @@ -48,6 +45,3 @@ makeLenses ''ProximityRequirement deriveJSON defaultOptions ''Sensor deriveJSON defaultOptions ''ProximityRequirement deriveJSON defaultOptions ''CloseToggle -$($(derive [d| instance Deriving (Store Sensor) |])) -$($(derive [d| instance Deriving (Store ProximityRequirement) |])) -$($(derive [d| instance Deriving (Store CloseToggle ) |])) diff --git a/src/Dodge/Data/Magnet.hs b/src/Dodge/Data/Magnet.hs index 43e6e509d..5818c4547 100644 --- a/src/Dodge/Data/Magnet.hs +++ b/src/Dodge/Data/Magnet.hs @@ -5,9 +5,6 @@ module Dodge.Data.Magnet where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -17,13 +14,11 @@ import Geometry.Data newtype MagnetUpdate = MagnetUpdateTimer Int deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store MagnetUpdate) |])) data MagnetBuBu = MagnetBuId | MagnetBuBuCurveAroundField Float Float deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store MagnetBuBu) |])) data Magnet = Magnet { _mgID :: Int @@ -32,7 +27,6 @@ data Magnet = Magnet , _mgField :: MagnetBuBu } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Magnet ) |])) makeLenses ''Magnet deriveJSON defaultOptions ''MagnetUpdate diff --git a/src/Dodge/Data/Material.hs b/src/Dodge/Data/Material.hs index 90bf035d7..3a0664696 100644 --- a/src/Dodge/Data/Material.hs +++ b/src/Dodge/Data/Material.hs @@ -5,15 +5,11 @@ module Dodge.Data.Material where -import TH.Derive -import Data.Store -import Data.Binary 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) -$($(derive [d| instance Deriving (Store Material ) |])) deriveJSON defaultOptions ''Material diff --git a/src/Dodge/Data/Modification.hs b/src/Dodge/Data/Modification.hs index 1f4b098fb..046f863f3 100644 --- a/src/Dodge/Data/Modification.hs +++ b/src/Dodge/Data/Modification.hs @@ -5,9 +5,6 @@ module Dodge.Data.Modification where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -32,7 +29,6 @@ data Modification , _mdUpdate :: MdWdWd } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Modification) |])) makeLenses ''Modification deriveJSON defaultOptions ''Modification diff --git a/src/Dodge/Data/MountedObject.hs b/src/Dodge/Data/MountedObject.hs index 0900147ff..0d19ad8dd 100644 --- a/src/Dodge/Data/MountedObject.hs +++ b/src/Dodge/Data/MountedObject.hs @@ -5,9 +5,6 @@ module Dodge.Data.MountedObject where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Data.Aeson.TH @@ -16,6 +13,5 @@ data MountedObject = MountedLS Int | MountedProp Int deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store MountedObject) |])) deriveJSON defaultOptions ''MountedObject diff --git a/src/Dodge/Data/ObjectType.hs b/src/Dodge/Data/ObjectType.hs index 2e5ed4627..d56cdbd3a 100644 --- a/src/Dodge/Data/ObjectType.hs +++ b/src/Dodge/Data/ObjectType.hs @@ -5,14 +5,9 @@ module Dodge.Data.ObjectType where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Data.Aeson.TH -import TH.Derive -import Data.Store data ObjectType = ObTerminal @@ -33,4 +28,3 @@ instance ToJSONKey ObjectType instance FromJSONKey ObjectType deriveJSON defaultOptions ''ObjectType -$($(derive [d| instance Deriving (Store ObjectType) |])) diff --git a/src/Dodge/Data/PathGraph.hs b/src/Dodge/Data/PathGraph.hs index b92f41044..de5160cfc 100644 --- a/src/Dodge/Data/PathGraph.hs +++ b/src/Dodge/Data/PathGraph.hs @@ -14,9 +14,6 @@ The warnings have been disabled. -} module Dodge.Data.PathGraph where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -58,7 +55,6 @@ data EdgeObstacle | AutoDoorObstacle | WallObstacle deriving (Eq, Ord, Show, Read, Bounded, Enum, Generic, Flat) -$($(derive [d| instance Deriving (Store EdgeObstacle) |])) instance ToJSON EdgeObstacle where toEncoding = genericToEncoding defaultOptions @@ -74,5 +70,3 @@ deriving instance (Flat (Gr Point2 PathEdge)) makeLenses ''PathGraph makeLenses ''PathEdge -$($(derive [d| instance Deriving (Store PathEdge ) |])) -$($(derive [d| instance Deriving (Store (Gr Point2 PathEdge) ) |])) diff --git a/src/Dodge/Data/Payload.hs b/src/Dodge/Data/Payload.hs index 59a8f3237..3fe9b1d3a 100644 --- a/src/Dodge/Data/Payload.hs +++ b/src/Dodge/Data/Payload.hs @@ -5,15 +5,11 @@ module Dodge.Data.Payload where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Data.Aeson.TH data Payload = ExplosionPayload | DudPayload deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic, Flat) -$($(derive [d| instance Deriving (Store Payload ) |])) deriveJSON defaultOptions ''Payload diff --git a/src/Dodge/Data/PosEvent.hs b/src/Dodge/Data/PosEvent.hs index cd3de3e22..236374fbc 100644 --- a/src/Dodge/Data/PosEvent.hs +++ b/src/Dodge/Data/PosEvent.hs @@ -5,9 +5,6 @@ module Dodge.Data.PosEvent where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -16,9 +13,7 @@ import Data.Aeson.TH import Geometry.Data data PosEventType = SparkSpawner - | HackSparkSpawner deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store PosEventType ) |])) data PosEvent = PosEvent { _pvType :: PosEventType @@ -26,7 +21,6 @@ data PosEvent = PosEvent , _pvPos :: Point2 } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store PosEvent ) |])) makeLenses ''PosEvent deriveJSON defaultOptions ''PosEventType diff --git a/src/Dodge/Data/PressPlate.hs b/src/Dodge/Data/PressPlate.hs index 60f61d7c2..48c1ce7c6 100644 --- a/src/Dodge/Data/PressPlate.hs +++ b/src/Dodge/Data/PressPlate.hs @@ -5,9 +5,6 @@ module Dodge.Data.PressPlate where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -20,7 +17,6 @@ data PressPlateEvent = PressPlateId | PPLevelReset deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store PressPlateEvent) |])) data PressPlate = PressPlate { _ppPict :: Picture @@ -31,7 +27,6 @@ data PressPlate = PressPlate , _ppText :: String } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store PressPlate ) |])) makeLenses ''PressPlate deriveJSON defaultOptions ''PressPlateEvent diff --git a/src/Dodge/Data/Projectile.hs b/src/Dodge/Data/Projectile.hs index 74376525d..4ee8beb0d 100644 --- a/src/Dodge/Data/Projectile.hs +++ b/src/Dodge/Data/Projectile.hs @@ -5,9 +5,6 @@ module Dodge.Data.Projectile where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -32,7 +29,6 @@ data Proj , _prjMITID :: Maybe Int } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Proj) |])) makeLenses ''Proj deriveJSON defaultOptions ''Proj diff --git a/src/Dodge/Data/Prop.hs b/src/Dodge/Data/Prop.hs index 7c5eda56e..b0f0378c3 100644 --- a/src/Dodge/Data/Prop.hs +++ b/src/Dodge/Data/Prop.hs @@ -5,9 +5,6 @@ module Dodge.Data.Prop where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Color import Control.Lens @@ -81,7 +78,3 @@ deriveJSON defaultOptions ''PropDraw deriveJSON defaultOptions ''PropUpdate deriveJSON defaultOptions ''PrWdLsLs deriveJSON defaultOptions ''Prop -$($(derive [d| instance Deriving (Store Prop) |])) -$($(derive [d| instance Deriving (Store PropDraw) |])) -$($(derive [d| instance Deriving (Store PropUpdate) |])) -$($(derive [d| instance Deriving (Store PrWdLsLs) |])) diff --git a/src/Dodge/Data/RadarBlip.hs b/src/Dodge/Data/RadarBlip.hs index 1763ede80..e39c03e76 100644 --- a/src/Dodge/Data/RadarBlip.hs +++ b/src/Dodge/Data/RadarBlip.hs @@ -5,9 +5,6 @@ module Dodge.Data.RadarBlip where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Color @@ -24,7 +21,6 @@ data RadarBlip = RadarBlip , _rbPos :: Point2 } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store RadarBlip ) |])) makeLenses ''RadarBlip deriveJSON defaultOptions ''RadarBlip diff --git a/src/Dodge/Data/RadarSweep.hs b/src/Dodge/Data/RadarSweep.hs index bfdb9677c..ae962e290 100644 --- a/src/Dodge/Data/RadarSweep.hs +++ b/src/Dodge/Data/RadarSweep.hs @@ -8,9 +8,6 @@ module Dodge.Data.RadarSweep ( module Dodge.Data.ObjectType, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -26,7 +23,6 @@ data RadarSweep = RadarSweep , _rsTimer :: Int } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store RadarSweep ) |])) makeLenses ''RadarSweep deriveJSON defaultOptions ''RadarSweep diff --git a/src/Dodge/Data/RightButtonOptions.hs b/src/Dodge/Data/RightButtonOptions.hs index fad20ad20..af44e31ad 100644 --- a/src/Dodge/Data/RightButtonOptions.hs +++ b/src/Dodge/Data/RightButtonOptions.hs @@ -5,9 +5,6 @@ module Dodge.Data.RightButtonOptions where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -61,6 +58,3 @@ makeLenses ''ActivateEquipment deriveJSON defaultOptions ''RightButtonOptions deriveJSON defaultOptions ''ActivateEquipment deriveJSON defaultOptions ''AllocateEquipment -$($(derive [d| instance Deriving (Store RightButtonOptions) |])) -$($(derive [d| instance Deriving (Store ActivateEquipment) |])) -$($(derive [d| instance Deriving (Store AllocateEquipment) |])) diff --git a/src/Dodge/Data/SaveSlot.hs b/src/Dodge/Data/SaveSlot.hs index 24b88ab5f..c3acc5248 100644 --- a/src/Dodge/Data/SaveSlot.hs +++ b/src/Dodge/Data/SaveSlot.hs @@ -4,9 +4,6 @@ {-# LANGUAGE TemplateHaskell #-} module Dodge.Data.SaveSlot where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens @@ -15,6 +12,5 @@ data SaveSlot | LevelStartSlot Int | SaveSlotNum Int deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store SaveSlot) |])) makeLenses ''SaveSlot diff --git a/src/Dodge/Data/Shockwave.hs b/src/Dodge/Data/Shockwave.hs index 4d9634a75..e7e46da5a 100644 --- a/src/Dodge/Data/Shockwave.hs +++ b/src/Dodge/Data/Shockwave.hs @@ -5,9 +5,6 @@ module Dodge.Data.Shockwave where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Color import Control.Lens @@ -17,7 +14,6 @@ import Geometry.Data data ShockwaveDirection = OutwardShockwave | InwardShockwave deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store ShockwaveDirection ) |])) data Shockwave = Shockwave { _swColor :: Color @@ -31,7 +27,6 @@ data Shockwave = Shockwave , _swTimer :: Int } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Shockwave ) |])) makeLenses ''Shockwave deriveJSON defaultOptions ''ShockwaveDirection diff --git a/src/Dodge/Data/SoundOrigin.hs b/src/Dodge/Data/SoundOrigin.hs index 74ef61b51..832c6e748 100644 --- a/src/Dodge/Data/SoundOrigin.hs +++ b/src/Dodge/Data/SoundOrigin.hs @@ -5,9 +5,6 @@ module Dodge.Data.SoundOrigin where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Data.Aeson.TH @@ -40,7 +37,6 @@ data SoundOrigin | Explosion Int | Tap Int deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store SoundOrigin) |])) instance ToJSONKey SoundOrigin diff --git a/src/Dodge/Data/Spark.hs b/src/Dodge/Data/Spark.hs index c81cf15fd..9eec8bbcf 100644 --- a/src/Dodge/Data/Spark.hs +++ b/src/Dodge/Data/Spark.hs @@ -5,9 +5,6 @@ module Dodge.Data.Spark where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Color @@ -26,7 +23,6 @@ data Spark = Spark , _skDamageType :: DamageType } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store Spark ) |])) makeLenses ''Spark deriveJSON defaultOptions ''Spark diff --git a/src/Dodge/Data/Terminal.hs b/src/Dodge/Data/Terminal.hs index c88402ade..971a719ce 100644 --- a/src/Dodge/Data/Terminal.hs +++ b/src/Dodge/Data/Terminal.hs @@ -5,9 +5,6 @@ module Dodge.Data.Terminal where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Color @@ -141,15 +138,3 @@ deriveJSON defaultOptions ''BlBl deriveJSON defaultOptions ''EffectArguments deriveJSON defaultOptions ''TerminalCommandEffect deriveJSON defaultOptions ''TerminalCommand -$($(derive [d| instance Deriving (Store BlBl) |])) -$($(derive [d| instance Deriving (Store EffectArguments) |])) -$($(derive [d| instance Deriving (Store TerminalCommandEffect) |])) -$($(derive [d| instance Deriving (Store TerminalCommand ) |])) -$($(derive [d| instance Deriving (Store TerminalStatus ) |])) -$($(derive [d| instance Deriving (Store TerminalInput ) |])) -$($(derive [d| instance Deriving (Store TerminalBootProgram) |])) -$($(derive [d| instance Deriving (Store Terminal ) |])) -$($(derive [d| instance Deriving (Store TerminalLineString ) |])) -$($(derive [d| instance Deriving (Store TmTm) |])) -$($(derive [d| instance Deriving (Store TerminalLine) |])) -$($(derive [d| instance Deriving (Store TerminalToggle ) |])) diff --git a/src/Dodge/Data/TeslaArc.hs b/src/Dodge/Data/TeslaArc.hs index 64e8f40f3..58f3c291c 100644 --- a/src/Dodge/Data/TeslaArc.hs +++ b/src/Dodge/Data/TeslaArc.hs @@ -5,9 +5,6 @@ module Dodge.Data.TeslaArc where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Color @@ -24,7 +21,6 @@ data TeslaArc = TeslaArc , _taColor :: Color } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store TeslaArc ) |])) makeLenses ''TeslaArc deriveJSON defaultOptions ''TeslaArc diff --git a/src/Dodge/Data/TractorBeam.hs b/src/Dodge/Data/TractorBeam.hs index 603e7417e..5df98014c 100644 --- a/src/Dodge/Data/TractorBeam.hs +++ b/src/Dodge/Data/TractorBeam.hs @@ -5,9 +5,6 @@ module Dodge.Data.TractorBeam where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -22,7 +19,6 @@ data TractorBeam = TractorBeam , _tbTime :: Int } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store TractorBeam ) |])) makeLenses ''TractorBeam deriveJSON defaultOptions ''TractorBeam diff --git a/src/Dodge/Data/Universe.hs b/src/Dodge/Data/Universe.hs index 69743a0fe..a2e4c2900 100644 --- a/src/Dodge/Data/Universe.hs +++ b/src/Dodge/Data/Universe.hs @@ -11,9 +11,6 @@ module Dodge.Data.Universe ( module Picture.Data, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens --import qualified Data.Map.Strict as M @@ -98,4 +95,3 @@ makeLenses ''Universe makeLenses ''ScreenLayer makeLenses ''ConcEffect makeLenses ''MenuOptionDisplay -$($(derive [d| instance Deriving (Store OptionScreenFlag ) |])) diff --git a/src/Dodge/Data/Wall.hs b/src/Dodge/Data/Wall.hs index 154b657a4..9b8e2b88c 100644 --- a/src/Dodge/Data/Wall.hs +++ b/src/Dodge/Data/Wall.hs @@ -8,9 +8,6 @@ module Dodge.Data.Wall ( module Dodge.Data.Material, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Color @@ -49,7 +46,6 @@ data Opacity deriving (Eq, Ord, Show, Read, Generic, Flat) data WallDraw = DrawForceField - | HackWallDraw deriving (Eq, Ord, Show, Read, Enum, Bounded, Generic, Flat) data WallStructure @@ -69,7 +65,3 @@ deriveJSON defaultOptions ''Wall deriveJSON defaultOptions ''Opacity deriveJSON defaultOptions ''WallDraw deriveJSON defaultOptions ''WallStructure -$($(derive [d| instance Deriving (Store Wall ) |])) -$($(derive [d| instance Deriving (Store Opacity) |])) -$($(derive [d| instance Deriving (Store WallDraw ) |])) -$($(derive [d| instance Deriving (Store WallStructure) |])) diff --git a/src/Dodge/Data/World.hs b/src/Dodge/Data/World.hs index c71d75db2..d79f43c78 100644 --- a/src/Dodge/Data/World.hs +++ b/src/Dodge/Data/World.hs @@ -12,9 +12,6 @@ module Dodge.Data.World ( module Dodge.Data.Hammer, ) where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Dodge.Data.SaveSlot import Control.Lens @@ -69,4 +66,3 @@ type HitEffect' = (World, Maybe Flame) makeLenses ''World -$($(derive [d| instance Deriving (Store TimeFlowStatus) |])) diff --git a/src/Dodge/Data/WorldEffect.hs b/src/Dodge/Data/WorldEffect.hs index 849f3c8a9..a7bef292e 100644 --- a/src/Dodge/Data/WorldEffect.hs +++ b/src/Dodge/Data/WorldEffect.hs @@ -5,9 +5,6 @@ module Dodge.Data.WorldEffect where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Data.Aeson import Data.Aeson.TH @@ -21,7 +18,6 @@ data ItCrWdWd = ItCrWdId | ItCrWdItemEffect deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store ItCrWdWd) |])) data WdWd = NoWorldEffect @@ -38,13 +34,11 @@ data WdWd | WdWdFromItCrixWdWd Item Int ItCrWdWd deriving (Eq, Show, Read, Generic) --hderiving (Eq, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store WdWd) |])) data WdP2 = WdP2Const Point2 | WdYouPos deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store WdP2) |])) data MdWdWd = MdWdId @@ -52,7 +46,6 @@ data MdWdWd | MdSetLSCol Point3 | MdFlickerUpdate deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store MdWdWd) |])) data WdBl = WdTrig Int @@ -63,13 +56,11 @@ data WdBl | WdBlBtOn Int | WdBlBtNotOff Int deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store WdBl) |])) data WdP2f = WdP2f0 | WdP2fDoorPosition Int deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store WdP2f) |])) data DrWdWd = DrWdId @@ -77,7 +68,6 @@ data DrWdWd | DrWdMechanismStepwise Int [Int] [(Point2, Point2)] | DoorMechanism deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store DrWdWd) |])) data TmWdWd = TmWdId @@ -87,7 +77,6 @@ data TmWdWd | TmWdWdDoDeathTriggers deriving (Eq, Show, Read, Generic) --hderiving (Eq, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store TmWdWd) |])) deriveJSON defaultOptions ''ItCrWdWd deriveJSON defaultOptions ''WdWd diff --git a/src/Dodge/GameRoom.hs b/src/Dodge/GameRoom.hs index fe02c7003..8703949c7 100644 --- a/src/Dodge/GameRoom.hs +++ b/src/Dodge/GameRoom.hs @@ -7,9 +7,6 @@ -- | GameRooms contain information about given positions in the world module Dodge.GameRoom where -import TH.Derive -import Data.Store -import Data.Binary import Flat import Control.Lens import Data.Aeson @@ -26,7 +23,6 @@ data GameRoom = GameRoom , _grName :: String } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store GameRoom ) |])) instance ToJSON GameRoom where toEncoding = genericToEncoding defaultOptions diff --git a/src/Dodge/Save.hs b/src/Dodge/Save.hs index c9901bf4e..4a6e41f6e 100644 --- a/src/Dodge/Save.hs +++ b/src/Dodge/Save.hs @@ -6,52 +6,25 @@ module Dodge.Save ( writeSaveSlot, readSaveSlot, reloadLevelStart, - toJSONSaveSlot, - fromJSONSaveSlot, ) where -import Data.Binary -import Flat +--import Flat import Dodge.Concurrent import Control.Lens import Dodge.Data.SaveSlot import Data.Aeson import qualified Data.Aeson.Encode.Pretty as AEP import qualified Data.ByteString.Lazy as BS -import qualified Data.ByteString as BSS +--import qualified Data.ByteString as BSS import Dodge.Data.Universe --import qualified Data.Set as S import System.Directory + writeSaveSlot :: SaveSlot -> Universe -> IO (Universe -> Maybe Universe) writeSaveSlot ss u = do putStrLn $ "Saving " ++ saveSlotPath ss createDirectoryIfMissing True "saveSlot" --- BSS.writeFile (saveSlotPath ss) $ --- flat --- (u ^. uvWorld . cWorld) - return Just - -readSaveSlot :: SaveSlot -> IO (Universe -> Maybe Universe) -readSaveSlot ss = do - fExists <- doesFileExist $ saveSlotPath ss --- if fExists --- then do --- bsstr <- BSS.readFile $ saveSlotPath ss --- let cwstr = unflat bsstr --- case cwstr of --- Left _ -> putStrLn "loadSaveSlot failed to read saved file" >> return removescreenlayers --- Right cw -> return $ \uv -> Just $ uv & uvWorld . cWorld .~ cw --- & uvScreenLayers .~ [] --- else putStrLn "loadSaveSlot failed to find saved file" >> return removescreenlayers - return Just - where - removescreenlayers = Just . (uvScreenLayers .~ []) - -toJSONSaveSlot :: SaveSlot -> Universe -> IO (Universe -> Maybe Universe) -toJSONSaveSlot ss u = do - putStrLn $ "Saving " ++ saveSlotPath ss - createDirectoryIfMissing True "saveSlot" BS.writeFile (saveSlotPath ss) $ AEP.encodePretty' (AEP.Config (AEP.Spaces 2) compare AEP.Generic False) @@ -59,8 +32,8 @@ toJSONSaveSlot ss u = do return Just -fromJSONSaveSlot :: SaveSlot -> IO (Universe -> Maybe Universe) -fromJSONSaveSlot ss = do +readSaveSlot :: SaveSlot -> IO (Universe -> Maybe Universe) +readSaveSlot ss = do fExists <- doesFileExist $ saveSlotPath ss if fExists then do diff --git a/src/Geometry/ConvexPoly.hs b/src/Geometry/ConvexPoly.hs index 34904e4ea..bcd4e27bd 100644 --- a/src/Geometry/ConvexPoly.hs +++ b/src/Geometry/ConvexPoly.hs @@ -14,11 +14,8 @@ module Geometry.ConvexPoly ( pointInPolyPoints, ) where -import TH.Derive -import Data.Store import Control.Lens import Data.Aeson -import Data.Binary import Flat import Geometry.Data import Geometry.Intersect @@ -34,7 +31,6 @@ data ConvexPoly = ConvexPoly , _cpRad :: Float } deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store ConvexPoly ) |])) instance ToJSON ConvexPoly where toEncoding = genericToEncoding defaultOptions diff --git a/src/IntSetHelp.hs b/src/IntSetHelp.hs index e563f3d4b..d2a5ca218 100644 --- a/src/IntSetHelp.hs +++ b/src/IntSetHelp.hs @@ -10,7 +10,6 @@ module IntSetHelp ( import Data.IntSet.Internal import Data.IntSet -import Data.Binary import Flat -- IntSet is not an instance of Generic?! diff --git a/src/LinearHelp.hs b/src/LinearHelp.hs index 6c02f37c9..989b3d6da 100644 --- a/src/LinearHelp.hs +++ b/src/LinearHelp.hs @@ -6,9 +6,6 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} module LinearHelp where -import Data.Store -import TH.Derive -import Data.Binary import Flat import Linear.V2 import Linear.V3 @@ -17,6 +14,3 @@ import Linear.V4 deriving instance (Flat a => Flat (V2 a)) deriving instance (Flat a => Flat (V3 a)) deriving instance (Flat a => Flat (V4 a)) -$($(derive [d| instance Store a => Deriving (Store (V2 a)) |])) -$($(derive [d| instance Store a => Deriving (Store (V3 a)) |])) -$($(derive [d| instance Store a => Deriving (Store (V4 a)) |])) diff --git a/src/MaybeHelp.hs b/src/MaybeHelp.hs index 77ab2a267..a33d4d25f 100644 --- a/src/MaybeHelp.hs +++ b/src/MaybeHelp.hs @@ -6,16 +6,12 @@ module MaybeHelp where -import TH.Derive -import Data.Store import Control.Lens import Data.Aeson -import Data.Binary import Flat data Maybe' a = Just' {__Just' :: a} | Nothing' deriving (Eq, Ord, Show, Read, Generic, Flat) -instance (Binary a => Binary (Maybe' a)) instance ToJSON a => ToJSON (Maybe' a) where toEncoding = genericToEncoding defaultOptions @@ -44,4 +40,3 @@ toggleJust Nothing = Just () toggleJust _ = Nothing makeLenses ''Maybe' -$($(derive [d| instance Store a => Deriving (Store (Maybe' a)) |])) diff --git a/src/Picture/Data.hs b/src/Picture/Data.hs index 19e7f2818..09d5229b7 100644 --- a/src/Picture/Data.hs +++ b/src/Picture/Data.hs @@ -5,9 +5,6 @@ module Picture.Data where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -42,7 +39,6 @@ numLayers = length [minBound :: Layer .. maxBound] newtype ShadNum = ShadNum {_unShadNum :: Int} deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store ShadNum) |])) polyNum, polyzNum, bezNum, textNum, arcNum, ellNum :: ShadNum {-# INLINE polyNum #-} @@ -96,5 +92,3 @@ makeLenses ''Verx deriveJSON defaultOptions ''Verx deriveJSON defaultOptions ''Layer deriveJSON defaultOptions ''ShadNum -$($(derive [d| instance Deriving (Store Verx ) |])) -$($(derive [d| instance Deriving (Store Layer) |])) diff --git a/src/Quaternion.hs b/src/Quaternion.hs index e42668385..64ba0faaf 100644 --- a/src/Quaternion.hs +++ b/src/Quaternion.hs @@ -15,10 +15,7 @@ module Quaternion ( module Linear.Quaternion, ) where -import TH.Derive -import Data.Store import Data.Aeson -import Data.Binary import Flat import Geometry.Data import Geometry.Vector3D @@ -48,4 +45,3 @@ vToQuat a b cprod = crossProd a b deriving instance (Flat a => Flat (Quaternion a)) -$($(derive [d| instance Store a => Deriving (Store (Quaternion a)) |])) diff --git a/src/Shape/Data.hs b/src/Shape/Data.hs index 26897eaa2..b79d7e396 100644 --- a/src/Shape/Data.hs +++ b/src/Shape/Data.hs @@ -8,12 +8,8 @@ module Shape.Data where -import TH.Derive -import Data.Store -import Data.Binary import Control.Lens import Data.Aeson -import Data.Binary import Flat import Geometry.Data import LinearHelp () @@ -30,7 +26,6 @@ newtype ShapeType = TopPrism Int deriving stock Generic deriving anyclass Flat -$($(derive [d| instance Deriving (Store ShapeType) |])) data ShapeObj = ShapeObj { _shType :: ShapeType @@ -71,5 +66,3 @@ type Shape' = Stream (Of ShapeObj) IO () type Shape = [ShapeObj] -$($(derive [d| instance Deriving (Store ShapeV ) |])) -$($(derive [d| instance Deriving (Store ShapeObj ) |])) diff --git a/src/Sound/Data.hs b/src/Sound/Data.hs index 2cf49e082..e1605a337 100644 --- a/src/Sound/Data.hs +++ b/src/Sound/Data.hs @@ -5,9 +5,6 @@ module Sound.Data where -import TH.Derive -import Data.Store -import Data.Binary import Flat import LinearHelp () import Control.Lens @@ -36,7 +33,6 @@ data PlayStatus newtype SoundID = SoundID {_getSoundID :: Int} deriving (Eq, Ord, Show, Read, Generic, Flat) -$($(derive [d| instance Deriving (Store SoundID) |])) newtype SoundData = SoundData { _loadedChunks :: IM.IntMap Mix.Chunk