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

Fix AttackMove getting unarmed units stuck

Browse Source
This commit is contained in:
abcdefg30
2020-09-12 15:19:01 +02:00
committed by reaperrr
parent 53c02eb2b9
commit ce4d263b52
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Activities/Move/AttackMoveActivity.cs
View File

@@ -39,8 +39,11 @@ namespace OpenRA.Mods.Common.Activities
protected override void OnFirstRun(Actor self) protected override void OnFirstRun(Actor self)
{ {
if (attackMove == null) if (attackMove == null || autoTarget == null)
{
QueueChild(getMove());
return; return;
}
if (isAssaultMove) if (isAssaultMove)
token = self.GrantCondition(attackMove.Info.AssaultMoveCondition); token = self.GrantCondition(attackMove.Info.AssaultMoveCondition);
@@ -50,11 +53,11 @@ namespace OpenRA.Mods.Common.Activities
public override bool Tick(Actor self) public override bool Tick(Actor self)
{ {
if (IsCanceling) if (IsCanceling || attackMove == null || autoTarget == null)
return TickChild(self); return TickChild(self);
// We are currently not attacking, so scan for new targets. // We are currently not attacking, so scan for new targets.
if (autoTarget != null && (ChildActivity == null || runningMoveActivity)) if (ChildActivity == null || runningMoveActivity)
{ {
// Use the standard ScanForTarget rate limit while we are running the move activity to save performance. // Use the standard ScanForTarget rate limit while we are running the move activity to save performance.
// Override the rate limit if our attack activity has completed so we can immediately acquire a new target instead of moving. // Override the rate limit if our attack activity has completed so we can immediately acquire a new target instead of moving.