epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace pseudo-childactivities in AttackMoveActivity.

Browse Source
This commit is contained in:
tovl
2019-04-03 23:08:00 +02:00
committed by reaperrr
parent 1c13520ffd
commit 0e1374f0eb
2 changed files with 42 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenRA.Mods.Common/Traits/AttackMove.cs
View File

@@ -38,46 +38,17 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new AttackMove(init.Self, this); }
}
class AttackMove : INotifyCreated, ITick, IResolveOrder, IOrderVoice
class AttackMove : IResolveOrder, IOrderVoice
{
public readonly AttackMoveInfo Info;
readonly IMove move;
ConditionManager conditionManager;
int attackMoveToken = ConditionManager.InvalidConditionToken;
int assaultMoveToken = ConditionManager.InvalidConditionToken;
public AttackMove(Actor self, AttackMoveInfo info)
{
move = self.Trait<IMove>();
Info = info;
}
void INotifyCreated.Created(Actor self)
{
conditionManager = self.TraitOrDefault<ConditionManager>();
}
void ITick.Tick(Actor self)
{
if (conditionManager == null)
return;
var activity = self.CurrentActivity as AttackMoveActivity;
var attackActive = activity != null && !activity.IsAssaultMove;
var assaultActive = activity != null && activity.IsAssaultMove;
if (attackActive && attackMoveToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.AttackMoveScanCondition))
attackMoveToken = conditionManager.GrantCondition(self, Info.AttackMoveScanCondition);
else if (!attackActive && attackMoveToken != ConditionManager.InvalidConditionToken)
attackMoveToken = conditionManager.RevokeCondition(self, attackMoveToken);
if (assaultActive && assaultMoveToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(Info.AssaultMoveScanCondition))
assaultMoveToken = conditionManager.GrantCondition(self, Info.AssaultMoveScanCondition);
else if (!assaultActive && assaultMoveToken != ConditionManager.InvalidConditionToken)
assaultMoveToken = conditionManager.RevokeCondition(self, assaultMoveToken);
}
string IOrderVoice.VoicePhraseForOrder(Actor self, Order order)
{
if (!Info.MoveIntoShroud && order.Target.Type != TargetType.Invalid)