Make _targetCr an Int id rather than a full creature
This commit is contained in:
@@ -149,9 +149,6 @@ data Action
|
||||
}
|
||||
| NoAction
|
||||
| StartSentinelPost
|
||||
| UseTarget
|
||||
{ _useTarget :: MCrAc
|
||||
}
|
||||
| UseSelf
|
||||
{ _useSelf :: CrAc
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@ data CrHP
|
||||
| CrIsPitted
|
||||
|
||||
data Intention = Intention
|
||||
{ _targetCr :: Maybe Creature
|
||||
{ _targetCr :: Maybe Int
|
||||
, _mvToPoint :: Maybe Point2
|
||||
, _viewPoint :: Maybe Point2
|
||||
}
|
||||
|
||||
@@ -42,12 +42,9 @@ data CrBl
|
||||
| CrIsAnimate
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data MCrAc = MCrNoAction
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data CrAc
|
||||
= CrTurnAround
|
||||
| CrFleeFromTarget
|
||||
-- | CrFleeFromTarget
|
||||
deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data P2Ac = P2NoAction
|
||||
@@ -70,7 +67,6 @@ deriveJSON defaultOptions ''CrImp
|
||||
deriveJSON defaultOptions ''P2Imp
|
||||
deriveJSON defaultOptions ''CrBl
|
||||
deriveJSON defaultOptions ''WdCrBl
|
||||
deriveJSON defaultOptions ''MCrAc
|
||||
deriveJSON defaultOptions ''CrAc
|
||||
deriveJSON defaultOptions ''P2Ac
|
||||
deriveJSON defaultOptions ''MP2Ac
|
||||
|
||||
Reference in New Issue
Block a user