Bump stackage version, uses later version of GHC
This commit is contained in:
@@ -21,12 +21,8 @@ data ActionPlan
|
||||
, _apStrategy :: Strategy
|
||||
, _apGoal :: [Goal]
|
||||
}
|
||||
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)
|
||||
deriving (Eq, Ord, Show) --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
|
||||
|
||||
Reference in New Issue
Block a user