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

Fix actors with AttackFollow moving away from their targets on amove

Browse Source
This commit is contained in:
abcdefg30
2022-03-27 19:04:32 +02:00
committed by Matthias Mailänder
parent b88ebd8499
commit 0134f63f4d
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Traits
public override object Create(ActorInitializer init) { return new AttackFollow(init.Self, this); }
}
public class AttackFollow : AttackBase, INotifyOwnerChanged, IDisableAutoTarget, INotifyStanceChanged
public class AttackFollow : AttackBase, INotifyOwnerChanged, IOverrideAutoTarget, INotifyStanceChanged
{
public new readonly AttackFollowInfo Info;
public Target RequestedTarget { get; private set; }
@@ -184,10 +184,22 @@ namespace OpenRA.Mods.Common.Traits
opportunityTargetIsPersistentTarget = false;
}
bool IDisableAutoTarget.DisableAutoTarget(Actor self)
bool IOverrideAutoTarget.TryGetAutoTargetOverride(Actor self, out Target target)
{
return RequestedTarget.Type != TargetType.Invalid ||
(opportunityTargetIsPersistentTarget && OpportunityTarget.Type != TargetType.Invalid);
if (RequestedTarget.Type != TargetType.Invalid)
{
target = RequestedTarget;
return true;
}
if (opportunityTargetIsPersistentTarget && OpportunityTarget.Type != TargetType.Invalid)
{
target = OpportunityTarget;
return true;
}
target = Target.Invalid;
return false;
}
void INotifyStanceChanged.StanceChanged(Actor self, AutoTarget autoTarget, UnitStance oldStance, UnitStance newStance)