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

Allow attack orders to preempt move completion for turreted units.

Browse Source
This commit is contained in:
Paul Chote
2019-01-27 13:55:58 +00:00
committed by reaperrr
parent 518a54a494
commit dc40a973e3
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -358,8 +358,11 @@ namespace OpenRA.Mods.Common.Traits
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(GetAttackActivity(self, target, allowMove, forceAttack)); self.QueueActivity(GetAttackActivity(self, target, allowMove, forceAttack));
OnQueueAttackActivity(self, target, queued, allowMove, forceAttack);
} }
public virtual void OnQueueAttackActivity(Actor self, Target target, bool queued, bool allowMove, bool forceAttack) { }
public bool IsReachableTarget(Target target, bool allowMove) public bool IsReachableTarget(Target target, bool allowMove)
{ {
return HasAnyValidWeapons(target) return HasAnyValidWeapons(target)

23
OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
View File

@@ -27,6 +27,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
protected Target requestedTarget; protected Target requestedTarget;
protected bool requestedForceAttack; protected bool requestedForceAttack;
protected int requestedTargetLastTick;
Mobile mobile; Mobile mobile;
public AttackFollow(Actor self, AttackFollowInfo info) public AttackFollow(Actor self, AttackFollowInfo info)
@@ -60,6 +61,14 @@ namespace OpenRA.Mods.Common.Traits
if (IsTraitDisabled) if (IsTraitDisabled)
requestedTarget = Target.Invalid; requestedTarget = Target.Invalid;
if (requestedTargetLastTick != self.World.WorldTick)
{
// Activities tick before traits, so if we are here it means the activity didn't run
// (either queued next or already cancelled) and we need to recalculate the target ourself
bool targetIsHiddenActor;
requestedTarget = requestedTarget.Recalculate(self.Owner, out targetIsHiddenActor);
}
// Can't fire on anything // Can't fire on anything
if (mobile != null && !mobile.CanInteractWithGroundLayer(self)) if (mobile != null && !mobile.CanInteractWithGroundLayer(self))
return; return;
@@ -81,6 +90,19 @@ namespace OpenRA.Mods.Common.Traits
return new AttackActivity(self, newTarget, allowMove, forceAttack); return new AttackActivity(self, newTarget, allowMove, forceAttack);
} }
public override void OnQueueAttackActivity(Actor self, Target target, bool queued, bool allowMove, bool forceAttack)
{
// If not queued we know that the attack activity will run next
// We can improve responsiveness for turreted actors by preempting
// the last order (usually a move) and set the target immediately
if (!queued)
{
requestedTarget = target;
requestedForceAttack = forceAttack;
requestedTargetLastTick = self.World.WorldTick;
}
}
public override void OnStopOrder(Actor self) public override void OnStopOrder(Actor self)
{ {
requestedTarget = Target.Invalid; requestedTarget = Target.Invalid;
@@ -148,6 +170,7 @@ namespace OpenRA.Mods.Common.Traits
bool targetIsHiddenActor; bool targetIsHiddenActor;
attack.requestedForceAttack = forceAttack; attack.requestedForceAttack = forceAttack;
attack.requestedTarget = target = target.Recalculate(self.Owner, out targetIsHiddenActor); attack.requestedTarget = target = target.Recalculate(self.Owner, out targetIsHiddenActor);
attack.requestedTargetLastTick = self.World.WorldTick;
hasTicked = true; hasTicked = true;
if (!targetIsHiddenActor && target.Type == TargetType.Actor) if (!targetIsHiddenActor && target.Type == TargetType.Actor)