Bump stackage version, uses later version of GHC

src/Dodge/Data/ActionPlan.hs

@@ -21,12 +21,8 @@ data ActionPlan
         , _apStrategy :: Strategy
         , _apGoal :: [Goal]
         }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
+    deriving (Eq, Ord, Show) --Generic, Flat)
-data RandImpulse
-    = RandImpulseList [Impulse]
-    | RandImpulseCircMove Float
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Impulse
     = Move Point2
@@ -60,7 +56,14 @@ data Impulse
         { _impulseUseAheadPos :: P2Imp
         }
     | ImpulseNothing
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq, Ord, Show) --Generic, Flat)
+
+data RandImpulse
+    = RandImpulseList [Impulse]
+    | RandImpulseCircMove Float
+    deriving (Eq, Ord, Show) --Generic, Flat)
+
 
 infixr 9 `WaitThen`
 
@@ -167,7 +170,8 @@ data Action
         { _sideImpulses :: [Impulse]
         , _mainAction :: Action
         }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq, Ord, Show) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Strategy
     = Flank Int
@@ -185,20 +189,32 @@ data Strategy
     | Reload
     | Flee
     | MeleeStrike
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq, Ord, Show) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Goal
     = LiveLongAndProsper
     | Kill Int
     | SentinelAt Point2 Float
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq, Ord, Show) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+concat <$> mapM (deriveJSON defaultOptions)
+    [ ''Impulse
+    , ''RandImpulse
+    , ''Action
+    , ''Strategy
+    , ''ActionPlan
+    , ''Goal
+    ]
+
+--deriveJSON defaultOptions ''Impulse
+--deriveJSON defaultOptions ''RandImpulse
+--deriveJSON defaultOptions ''Action
+--deriveJSON defaultOptions ''Strategy
+--deriveJSON defaultOptions ''ActionPlan
+--deriveJSON defaultOptions ''Goal
 
-deriveJSON defaultOptions ''ActionPlan
-deriveJSON defaultOptions ''RandImpulse
-deriveJSON defaultOptions ''Impulse
-deriveJSON defaultOptions ''Action
-deriveJSON defaultOptions ''Strategy
-deriveJSON defaultOptions ''Goal
 makeLenses ''ActionPlan
 makeLenses ''Impulse
 makeLenses ''Action

src/Dodge/Data/Beam.hs

@@ -52,7 +52,7 @@ data BeamType
 
 makeLenses ''BeamType
 makeLenses ''Beam
-deriveJSON defaultOptions ''BeamType
-deriveJSON defaultOptions ''Beam
 deriveJSON defaultOptions ''BeamDraw
 deriveJSON defaultOptions ''BeamCombineType
+deriveJSON defaultOptions ''BeamType
+deriveJSON defaultOptions ''Beam

src/Dodge/Data/Block.hs

@@ -13,7 +13,7 @@ import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import qualified IntSetHelp as IS
+import qualified Data.IntSet as IS
 import Dodge.Data.Material
 import Dodge.Data.PathGraph
 import Geometry
@@ -47,6 +47,6 @@ data BlSh
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Block
-deriveJSON defaultOptions ''Block
-deriveJSON defaultOptions ''BlockDraw
 deriveJSON defaultOptions ''BlSh
+deriveJSON defaultOptions ''BlockDraw
+deriveJSON defaultOptions ''Block

src/Dodge/Data/Bullet.hs

@@ -54,9 +54,9 @@ data BulletTrajectory
     deriving (Show, Eq, Ord, Read) --Generic, Flat)
 
 makeLenses ''Bullet
-deriveJSON defaultOptions ''Bullet
 deriveJSON defaultOptions ''EnergyBallType
 deriveJSON defaultOptions ''BulletUpdateMod
 deriveJSON defaultOptions ''BulletEffect
 deriveJSON defaultOptions ''BulletSpawn
 deriveJSON defaultOptions ''BulletTrajectory
+deriveJSON defaultOptions ''Bullet

src/Dodge/Data/Button.hs

@@ -66,6 +66,6 @@ data ButtonState = BtOn | BtOff | BtNoLabel
 makeLenses ''Button
 makeLenses ''ButtonEvent
 deriveJSON defaultOptions ''ButtonDraw
+deriveJSON defaultOptions ''ButtonState
 deriveJSON defaultOptions ''ButtonEvent
 deriveJSON defaultOptions ''Button
-deriveJSON defaultOptions ''ButtonState

src/Dodge/Data/CWorld.hs

@@ -1,7 +1,7 @@
+{-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
 
 module Dodge.Data.CWorld (
     module Dodge.Data.CWorld,
@@ -112,7 +112,8 @@ data CWCam = CWCam
     , _cwcBoundBox :: [Point2]
     , _cwcBoundDist :: (Float, Float, Float, Float) -- NSEW, S and W negative
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CWorld = CWorld
     --{ _cameraCenter :: Point2
@@ -186,8 +187,9 @@ data CWorld = CWorld
     , _cwTime :: CWTime
     , _cwGen :: CWGen
     }
-    --deriving (Eq, Show, Read) --, Generic)
+
-    --h--deriving (Eq, Show, Read) --Generic, Flat)
+--deriving (Eq, Show, Read) --, Generic)
+--h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data CWTime = CWTime
     { _maybeWorld :: Maybe' CWorld
@@ -195,9 +197,9 @@ data CWTime = CWTime
     , _worldClock :: Int
     , _deathDelay :: Maybe Int
     }
-    --deriving (Eq, Show, Read) --, Generic)
+
-    --h--deriving (Eq, Show, Read) --Generic, Flat)
+--deriving (Eq, Show, Read) --, Generic)
-    
+--h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data CWGen = CWGen
     { _cwgParams :: GenParams
@@ -206,7 +208,8 @@ data CWGen = CWGen
     , _cwgRoomClipping :: [ConvexPoly]
     , _cwgSeed :: Int
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WorldBeams = WorldBeams
     { _blockingBeams :: [Beam]
@@ -214,15 +217,20 @@ data WorldBeams = WorldBeams
     , _positronBeams :: [Beam]
     , _electronBeams :: [Beam]
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-deriveJSON defaultOptions ''CWorld
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
-deriveJSON defaultOptions ''WorldBeams
+
-deriveJSON defaultOptions ''CWCam
-deriveJSON defaultOptions ''CWGen
-deriveJSON defaultOptions ''CWTime
 makeLenses ''CWorld
 makeLenses ''WorldBeams
 makeLenses ''CWCam
 makeLenses ''CWGen
 makeLenses ''CWTime
+concat
+    <$> mapM
+        (deriveJSON defaultOptions)
+        [ ''WorldBeams
+        , ''CWCam
+        , ''CWGen
+        , ''CWTime
+        , ''CWorld
+        ]

src/Dodge/Data/Cloud.hs

@@ -34,5 +34,5 @@ data CloudType
 
 makeLenses ''Cloud
 deriveJSON defaultOptions ''CloudDraw
-deriveJSON defaultOptions ''Cloud
 deriveJSON defaultOptions ''CloudType
+deriveJSON defaultOptions ''Cloud

src/Dodge/Data/CrGroupParams.hs

@@ -8,7 +8,7 @@ module Dodge.Data.CrGroupParams where
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import qualified IntSetHelp as IS
+import qualified Data.IntSet as IS
 import Geometry.Data
 
 data CrGroupParams = CrGroupParams
@@ -23,5 +23,5 @@ data CrGroupUpdate = DefaultCrGroupUpdate
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''CrGroupParams
-deriveJSON defaultOptions ''CrGroupParams
 deriveJSON defaultOptions ''CrGroupUpdate
+deriveJSON defaultOptions ''CrGroupParams

src/Dodge/Data/Creature.hs

@@ -1,8 +1,8 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 
 module Dodge.Data.Creature (
     module Dodge.Data.Creature,
@@ -73,23 +73,31 @@ data Creature = Creature
     , _crStatistics :: CreatureStatistics
     , _crCamouflage :: CamouflageStatus
     }
-    --deriving (Eq, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Show, Read) --Generic, Flat)
 
 data CreatureCorpse = MakeDefaultCorpse
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Intention = Intention
     { _targetCr :: Maybe Creature
     , _mvToPoint :: Maybe Point2
     , _viewPoint :: Maybe Point2
     }
-    --deriving (Eq, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Show, Read) --Generic, Flat)
 
 crSel :: Creature -> Int
 crSel = _iselPos . _crInvSel
 
 makeLenses ''Creature
 makeLenses ''Intention
-deriveJSON defaultOptions ''Creature
+
-deriveJSON defaultOptions ''CreatureCorpse
+concat
-deriveJSON defaultOptions ''Intention
+    <$> mapM
+        (deriveJSON defaultOptions)
+        [ ''CreatureCorpse
+        , ''Creature
+        , ''Intention
+        ]

src/Dodge/Data/Creature/Misc.hs

@@ -84,5 +84,5 @@ deriveJSON defaultOptions ''CreatureStatistics
 deriveJSON defaultOptions ''Vocalization
 deriveJSON defaultOptions ''CrMvType
 deriveJSON defaultOptions ''HumanoidAI
-deriveJSON defaultOptions ''CreatureType
 deriveJSON defaultOptions ''BarrelType
+deriveJSON defaultOptions ''CreatureType

src/Dodge/Data/Creature/Perception.hs

@@ -71,9 +71,9 @@ makeLenses ''Perception
 makeLenses ''Vision
 makeLenses ''Audition
 makeLenses ''Attention
-deriveJSON defaultOptions ''Perception
 deriveJSON defaultOptions ''Vision
 deriveJSON defaultOptions ''Audition
 deriveJSON defaultOptions ''Vigilance
-deriveJSON defaultOptions ''Attention
 deriveJSON defaultOptions ''Awareness
+deriveJSON defaultOptions ''Attention
+deriveJSON defaultOptions ''Perception

src/Dodge/Data/Creature/Stance.hs

@@ -43,7 +43,7 @@ data Posture
 makeLenses ''Stance
 makeLenses ''Carriage
 makeLenses ''Posture
-deriveJSON defaultOptions ''Stance
-deriveJSON defaultOptions ''Carriage
 deriveJSON defaultOptions ''FootForward
 deriveJSON defaultOptions ''Posture
+deriveJSON defaultOptions ''Carriage
+deriveJSON defaultOptions ''Stance

src/Dodge/Data/Creature/State.hs

@@ -9,7 +9,7 @@ import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import qualified IntSetHelp as IS
+import qualified Data.IntSet as IS
 import Dodge.Data.Damage
 import Geometry.Data
 
@@ -55,8 +55,8 @@ data CrGroup
 makeLenses ''CreatureState
 makeLenses ''CrSpState
 makeLenses ''CrGroup
-deriveJSON defaultOptions ''CreatureState
 deriveJSON defaultOptions ''CreatureDropType
 deriveJSON defaultOptions ''CrSpState
 deriveJSON defaultOptions ''Faction
 deriveJSON defaultOptions ''CrGroup
+deriveJSON defaultOptions ''CreatureState

src/Dodge/Data/CreatureEffect.hs

@@ -69,8 +69,8 @@ deriveJSON defaultOptions ''CrWdWd
 deriveJSON defaultOptions ''IntImp
 deriveJSON defaultOptions ''CrImp
 deriveJSON defaultOptions ''P2Imp
-deriveJSON defaultOptions ''WdCrBl
 deriveJSON defaultOptions ''CrBl
+deriveJSON defaultOptions ''WdCrBl
 deriveJSON defaultOptions ''MCrAc
 deriveJSON defaultOptions ''CrAc
 deriveJSON defaultOptions ''P2Ac

src/Dodge/Data/Damage/Type.hs

@@ -26,8 +26,8 @@ data DamageType
     | ENTERREMENT
     deriving (Eq, Ord, Show, Enum, Bounded, Read) --Generic, Flat)
 
+deriveJSON defaultOptions ''DamageType
 instance ToJSONKey DamageType
 
 instance FromJSONKey DamageType
 
-deriveJSON defaultOptions ''DamageType

src/Dodge/Data/Door.hs

@@ -13,7 +13,7 @@ module Dodge.Data.Door (
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import qualified IntSetHelp as IS
+import qualified Data.IntSet as IS
 import Dodge.Data.MountedObject
 import Dodge.Data.PathGraph
 import Dodge.Data.WorldEffect

src/Dodge/Data/Equipment/Misc.hs

@@ -29,9 +29,9 @@ data EquipPosition
     deriving (Eq, Ord)
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-instance ToJSONKey EquipPosition
-
-instance FromJSONKey EquipPosition
 
 deriveJSON defaultOptions ''EquipSite
 deriveJSON defaultOptions ''EquipPosition
+instance ToJSONKey EquipPosition
+
+instance FromJSONKey EquipPosition

src/Dodge/Data/GenParams.hs

@@ -21,5 +21,5 @@ data DecorationShape = PLUS | SQUARE | CIRCLE | THREELINES
     deriving (Eq, Ord, Enum, Show, Read) --Generic, Flat)
 
 makeLenses ''GenParams
-deriveJSON defaultOptions ''GenParams
 deriveJSON defaultOptions ''DecorationShape
+deriveJSON defaultOptions ''GenParams

src/Dodge/Data/HUD.hs

@@ -35,6 +35,6 @@ data HUD = HUD
 makeLenses ''HUD
 makeLenses ''HUDElement
 makeLenses ''SubInventory
-deriveJSON defaultOptions ''HUDElement
 deriveJSON defaultOptions ''SubInventory
+deriveJSON defaultOptions ''HUDElement
 deriveJSON defaultOptions ''HUD

src/Dodge/Data/Hammer.hs

@@ -21,5 +21,5 @@ data HammerPosition
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''HammerType
-deriveJSON defaultOptions ''HammerType
 deriveJSON defaultOptions ''HammerPosition
+deriveJSON defaultOptions ''HammerType

src/Dodge/Data/Item/Combine.hs

@@ -209,21 +209,21 @@ data ModuleSlot
     | ModHeldAttach
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-instance ToJSONKey ModuleSlot
+makeLenses ''ItemType
-
+makeLenses ''ItemBaseType
-instance FromJSONKey ModuleSlot
+makeLenses ''HeldItemType
-
-deriveJSON defaultOptions ''ItemType
 deriveJSON defaultOptions ''Stack
 deriveJSON defaultOptions ''CraftType
-deriveJSON defaultOptions ''ItemBaseType
 deriveJSON defaultOptions ''ConsumableItemType
+deriveJSON defaultOptions ''Detector
 deriveJSON defaultOptions ''EquipItemType
 deriveJSON defaultOptions ''LeftItemType
 deriveJSON defaultOptions ''HeldItemType
 deriveJSON defaultOptions ''ItemModuleType
-deriveJSON defaultOptions ''Detector
 deriveJSON defaultOptions ''ModuleSlot
-makeLenses ''ItemType
+deriveJSON defaultOptions ''ItemBaseType
-makeLenses ''ItemBaseType
+deriveJSON defaultOptions ''ItemType
-makeLenses ''HeldItemType
+instance ToJSONKey ModuleSlot
+
+instance FromJSONKey ModuleSlot
+

src/Dodge/Data/Item/Effect.hs

@@ -35,7 +35,7 @@ data ItDropEffect = NoDropEffect
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''ItEffect
-deriveJSON defaultOptions ''ItEffect
 deriveJSON defaultOptions ''ItInvEffect
 deriveJSON defaultOptions ''ItFloorEffect
 deriveJSON defaultOptions ''ItDropEffect
+deriveJSON defaultOptions ''ItEffect

src/Dodge/Data/Item/Params.hs

@@ -109,9 +109,9 @@ makeLenses ''BarrelSpread
 makeLenses ''ItemParams
 makeLenses ''Nozzle
 makeLenses ''GunBarrels
-deriveJSON defaultOptions ''ItemParams
 deriveJSON defaultOptions ''ShrinkGunStatus
 deriveJSON defaultOptions ''PreviousArcEffect
-deriveJSON defaultOptions ''GunBarrels
 deriveJSON defaultOptions ''Nozzle
 deriveJSON defaultOptions ''BarrelSpread
+deriveJSON defaultOptions ''GunBarrels
+deriveJSON defaultOptions ''ItemParams

src/Dodge/Data/Item/Targeting.hs

@@ -37,6 +37,6 @@ data TargetDraw
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Targeting
-deriveJSON defaultOptions ''Targeting
 deriveJSON defaultOptions ''TargetUpdate
 deriveJSON defaultOptions ''TargetDraw
+deriveJSON defaultOptions ''Targeting

src/Dodge/Data/Item/Tweak.hs

@@ -34,6 +34,6 @@ data TweakParam = TweakParam
 
 makeLenses ''TweakParam
 makeLenses ''ItemTweaks
-deriveJSON defaultOptions ''ItemTweaks
 deriveJSON defaultOptions ''TweakType
 deriveJSON defaultOptions ''TweakParam
+deriveJSON defaultOptions ''ItemTweaks

src/Dodge/Data/Item/Use.hs

@@ -79,7 +79,7 @@ data ItZoom = ItZoom
 makeLenses ''ItemUse
 makeLenses ''AimParams
 makeLenses ''ItZoom
-deriveJSON defaultOptions ''ItemUse
-deriveJSON defaultOptions ''AimParams
 deriveJSON defaultOptions ''AimStance
 deriveJSON defaultOptions ''ItZoom
+deriveJSON defaultOptions ''AimParams
+deriveJSON defaultOptions ''ItemUse

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

@@ -68,6 +68,6 @@ makeLenses ''AmmoType
 deriveJSON defaultOptions ''ProjectileDraw
 deriveJSON defaultOptions ''ProjectileCreate
 deriveJSON defaultOptions ''ProjectileUpdate
-deriveJSON defaultOptions ''AmmoType
 deriveJSON defaultOptions ''GasCreate
 deriveJSON defaultOptions ''ForceFieldType
+deriveJSON defaultOptions ''AmmoType

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

@@ -30,5 +30,5 @@ makeLenses ''LoadAction
 makeLenses ''InvSel
 makeLenses ''InvSelAction
 deriveJSON defaultOptions ''LoadAction
-deriveJSON defaultOptions ''InvSel
 deriveJSON defaultOptions ''InvSelAction
+deriveJSON defaultOptions ''InvSel

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

@@ -32,5 +32,5 @@ data EquipParams
 
 makeLenses ''EquipEffect
 makeLenses ''EquipParams
-deriveJSON defaultOptions ''EquipEffect
 deriveJSON defaultOptions ''EquipParams
+deriveJSON defaultOptions ''EquipEffect

src/Dodge/Data/Machine.hs

@@ -17,7 +17,7 @@ import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import qualified IntSetHelp as IS
+import qualified Data.IntSet as IS
 import qualified Data.Map.Strict as M
 import Dodge.Data.Damage
 import Dodge.Data.GenParams
@@ -66,6 +66,6 @@ data Turret = Turret
 makeLenses ''Machine
 makeLenses ''Turret
 makePrisms ''MachineType
-deriveJSON defaultOptions ''Machine
-deriveJSON defaultOptions ''MachineType
 deriveJSON defaultOptions ''Turret
+deriveJSON defaultOptions ''MachineType
+deriveJSON defaultOptions ''Machine

src/Dodge/Data/Machine/Sensor.hs

@@ -42,6 +42,6 @@ data CloseToggle = NotClose | IsClose
 
 makeLenses ''Sensor
 makeLenses ''ProximityRequirement
-deriveJSON defaultOptions ''Sensor
 deriveJSON defaultOptions ''ProximityRequirement
 deriveJSON defaultOptions ''CloseToggle
+deriveJSON defaultOptions ''Sensor

src/Dodge/Data/ObjectType.hs

@@ -22,8 +22,8 @@ data ObjectType
     | ObItem
     deriving (Eq, Show, Ord, Enum, Bounded, Read) --Generic, Flat)
 
+deriveJSON defaultOptions ''ObjectType
 instance ToJSONKey ObjectType
 
 instance FromJSONKey ObjectType
 
-deriveJSON defaultOptions ''ObjectType

src/Dodge/Data/PathGraph.hs

@@ -54,7 +54,7 @@ data EdgeObstacle
 
 makeLenses ''PathGraph
 makeLenses ''PathEdge
-deriveJSON defaultOptions ''PathGraph
-deriveJSON defaultOptions ''PathEdge
 deriveJSON defaultOptions ''EdgeObstacle
+deriveJSON defaultOptions ''PathEdge
 deriveJSON defaultOptions ''Gr
+deriveJSON defaultOptions ''PathGraph

src/Dodge/Data/Prop.hs

@@ -74,6 +74,6 @@ data PrWdLsLs
 
 makeLenses ''Prop
 deriveJSON defaultOptions ''PropDraw
-deriveJSON defaultOptions ''PropUpdate
 deriveJSON defaultOptions ''PrWdLsLs
+deriveJSON defaultOptions ''PropUpdate
 deriveJSON defaultOptions ''Prop

src/Dodge/Data/RightButtonOptions.hs

@@ -54,6 +54,6 @@ data AllocateEquipment
 makeLenses ''RightButtonOptions
 makeLenses ''AllocateEquipment
 makeLenses ''ActivateEquipment
-deriveJSON defaultOptions ''RightButtonOptions
 deriveJSON defaultOptions ''ActivateEquipment
 deriveJSON defaultOptions ''AllocateEquipment
+deriveJSON defaultOptions ''RightButtonOptions

src/Dodge/Data/SoundOrigin.hs

@@ -37,8 +37,8 @@ data SoundOrigin
     | Tap Int
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
+
+deriveJSON defaultOptions ''SoundOrigin
 instance ToJSONKey SoundOrigin
 
 instance FromJSONKey SoundOrigin
-
-deriveJSON defaultOptions ''SoundOrigin

src/Dodge/Data/Terminal.hs

@@ -127,13 +127,13 @@ makeLenses ''EffectArguments
 makeLenses ''TerminalCommand
 deriveJSON defaultOptions ''TerminalStatus
 deriveJSON defaultOptions ''TerminalInput
-deriveJSON defaultOptions ''TerminalBootProgram
-deriveJSON defaultOptions ''Terminal
 deriveJSON defaultOptions ''TerminalLineString
 deriveJSON defaultOptions ''TmTm
 deriveJSON defaultOptions ''TerminalLine
-deriveJSON defaultOptions ''TerminalToggle
+deriveJSON defaultOptions ''TerminalBootProgram
 deriveJSON defaultOptions ''BlBl
+deriveJSON defaultOptions ''TerminalToggle
 deriveJSON defaultOptions ''EffectArguments
 deriveJSON defaultOptions ''TerminalCommandEffect
 deriveJSON defaultOptions ''TerminalCommand
+deriveJSON defaultOptions ''Terminal

src/Dodge/Data/Wall.hs

@@ -59,7 +59,7 @@ data WallStructure
 makeLenses ''Wall
 makeLenses ''Opacity
 makeLenses ''WallStructure
-deriveJSON defaultOptions ''Wall
-deriveJSON defaultOptions ''Opacity
 deriveJSON defaultOptions ''WallDraw
+deriveJSON defaultOptions ''Opacity
 deriveJSON defaultOptions ''WallStructure
+deriveJSON defaultOptions ''Wall

src/IntSetHelp.hs

@@ -1,16 +0,0 @@
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE StandaloneDeriving #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
-
-module IntSetHelp (
-    --module IntSetHelp,
-    module Data.IntSet,
-) where
-
-import Data.IntSet.Internal
-import Data.IntSet
-
--- IntSet is not an instance of Generic?!
---deriving instance Generic IntSet
---deriving instance Flat IntSet

src/Picture/Data.hs

@@ -84,6 +84,6 @@ tflat4 (x, y, z, w) = [x, y, z, w]
 {-# INLINE tflat4 #-}
 
 makeLenses ''Verx
-deriveJSON defaultOptions ''Verx
 deriveJSON defaultOptions ''Layer
 deriveJSON defaultOptions ''ShadNum
+deriveJSON defaultOptions ''Verx

src/Shape/Data.hs

@@ -47,6 +47,6 @@ makeLenses ''ShapeObj
 
 type Shape = [ShapeObj]
 
-deriveJSON defaultOptions ''ShapeObj
 deriveJSON defaultOptions ''ShapeType
 deriveJSON defaultOptions ''ShapeV
+deriveJSON defaultOptions ''ShapeObj

src/Sound/Data.hs

@@ -62,7 +62,7 @@ makeLenses ''SoundData
 makeLenses ''Sound
 makeLenses ''SoundID
 makeLenses ''SoundStatus
-deriveJSON defaultOptions ''SoundStatus
 deriveJSON defaultOptions ''PlayStatus
 deriveJSON defaultOptions ''SoundID
+deriveJSON defaultOptions ''SoundStatus
 deriveJSON defaultOptions ''ToPlaySound

stack.yaml

@@ -18,7 +18,8 @@
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
 #resolver: lts-17.1
-resolver: lts-18.28
+#resolver: lts-18.28
+resolver: lts-19.20
 #resolver: lts-19.3
 
 # User packages to be built.
@@ -39,9 +40,9 @@ packages:
 extra-deps:
     #- SDL-0.6.7.0@sha256:9d6ba75c0cab575ec38468c8277803983e985f9622437aeca6a53e6a7337a7d5,2045
 - sdl2-mixer-1.2.0.0@sha256:6a6b5a46c035c9e77eaf9c244e45de9e4a9b9a110890cfeeb9fa72faa2419cef,4497   
-- repa-3.4.1.5@sha256:4d94845e66d668345130f75f5de8f7c69139b91495c8c4b5a825014e8985e2fd,3562
+  #- repa-3.4.1.5@sha256:4d94845e66d668345130f75f5de8f7c69139b91495c8c4b5a825014e8985e2fd,3562
-- strict-containers-0.1@sha256:d751696a8a74e368cf778cf98410b43fcd192d68febd4c691faaac1d6c3ab63f,10591
+  #- strict-containers-0.1@sha256:d751696a8a74e368cf778cf98410b43fcd192d68febd4c691faaac1d6c3ab63f,10591
-- strict-containers-lens-0.1@sha256:97c0e68e2e23578074d41fa45690a9ff7b1d47057ea6635d863af99f0daa2f9d,1103
+  #- strict-containers-lens-0.1@sha256:97c0e68e2e23578074d41fa45690a9ff7b1d47057ea6635d863af99f0daa2f9d,1103
    #- repa-3.4.1.4@sha256:5a99bde69fe96a18d70aae23f47c8f719b1134558dca3ee5a7c15423b68a132e,3323
    #- sdl2-mixer-1.1.0@sha256:c809aecd91ebf9c759af66eebaa4f45f766f2603c13a73412abfd0bd1e02071a,3067
   #  # for threadscope