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