Remove generic and flat instances

This commit is contained in:
2022-08-21 22:38:40 +01:00
parent 36c8befa9f
commit 7181046aa3
94 changed files with 312 additions and 423 deletions
+13 -14
View File
@@ -5,29 +5,28 @@
module Dodge.Data.CreatureEffect where
import Flat
import Data.Aeson
import Data.Aeson.TH
data WdCrCr = NoCreatureEffect
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data CrWdImp = NoCrWdImp
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data CrWdWd = CrWdWdId
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data IntImp = NoIntImp
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data CrImp
= NoCrImp
| TurnTowardCr Float -- turn amount
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data P2Imp = P2ImpNo
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data WdCrBl
= WdCrTrue
@@ -35,34 +34,34 @@ data WdCrBl
| WdCrNegate WdCrBl
| WdCrLOSTarget
| WdCrSafeDistFromTarget Float
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data CrBl
= CrCanShoot
| CrIsReloading
| CrIsAiming
| CrIsAnimate
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data MCrAc = MCrNoAction
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data CrAc
= CrTurnAround
| CrFleeFromTarget
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data P2Ac = P2NoAction
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data MP2Ac = MP2NoAction
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
data CrWdAc
= CrWdBFSThenReturn Int
| ChooseMovementSpreadGun
| ChooseMovementLtAuto
deriving (Eq, Ord, Show, Read, Generic, Flat)
deriving (Eq, Ord, Show, Read) --Generic, Flat)
deriveJSON defaultOptions ''WdCrCr
deriveJSON defaultOptions ''CrWdImp