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

Fix target invalidation and reacquisition in Follow.

Browse Source
This commit is contained in:
Paul Chote
2019-01-12 19:35:49 +00:00
parent 975821023d
commit 616b6c8499
1 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
OpenRA.Mods.Common/Activities/Move/Follow.cs
View File

@@ -18,11 +18,14 @@ namespace OpenRA.Mods.Common.Activities
{ {
public class Follow : Activity public class Follow : Activity
{ {
readonly Target target;
readonly WDist minRange; readonly WDist minRange;
readonly WDist maxRange; readonly WDist maxRange;
readonly IMove move; readonly IMove move;
readonly Color? targetLineColor; readonly Color? targetLineColor;
Target target;
Target lastVisibleTarget;
bool useLastVisibleTarget;
bool wasMovingWithinRange;
public Follow(Actor self, Target target, WDist minRange, WDist maxRange, public Follow(Actor self, Target target, WDist minRange, WDist maxRange,
WPos? initialTargetPosition, Color? targetLineColor = null) WPos? initialTargetPosition, Color? targetLineColor = null)
@@ -31,26 +34,58 @@ namespace OpenRA.Mods.Common.Activities
this.minRange = minRange; this.minRange = minRange;
this.maxRange = maxRange; this.maxRange = maxRange;
this.targetLineColor = targetLineColor; this.targetLineColor = targetLineColor;
move = self.Trait<IMove>(); move = self.Trait<IMove>();
// The target may become hidden between the initial order request and the first tick (e.g. if queued)
// Moving to any position (even if quite stale) is still better than immediately giving up
if ((target.Type == TargetType.Actor && target.Actor.CanBeViewedByPlayer(self.Owner))
|| target.Type == TargetType.FrozenActor || target.Type == TargetType.Terrain)
lastVisibleTarget = Target.FromPos(target.CenterPosition);
else if (initialTargetPosition.HasValue)
lastVisibleTarget = Target.FromPos(initialTargetPosition.Value);
} }
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
if (IsCanceled || !target.IsValidFor(self)) if (IsCanceled)
return NextActivity; return NextActivity;
var cachedPosition = target.CenterPosition; bool targetIsHiddenActor;
var path = move.MoveWithinRange(target, minRange, maxRange, targetLineColor: targetLineColor); target = target.Recalculate(self.Owner, out targetIsHiddenActor);
if (!targetIsHiddenActor && target.Type == TargetType.Actor)
lastVisibleTarget = Target.FromTargetPositions(target);
// We are already in range, so wait until the target moves before doing anything var oldUseLastVisibleTarget = useLastVisibleTarget;
if (target.IsInRange(self.CenterPosition, maxRange) && !target.IsInRange(self.CenterPosition, minRange)) useLastVisibleTarget = targetIsHiddenActor || !target.IsValidFor(self);
{
var wait = new WaitFor(() => !target.IsValidFor(self) || target.CenterPosition != cachedPosition);
return ActivityUtils.SequenceActivities(wait, path, this);
}
return ActivityUtils.SequenceActivities(path, this); // If we are ticking again after previously sequencing a MoveWithRange then that move must have completed
// Either we are in range and can see the target, or we've lost track of it and should give up
if (wasMovingWithinRange && targetIsHiddenActor)
return NextActivity;
wasMovingWithinRange = false;
// Update target lines if required
if (useLastVisibleTarget != oldUseLastVisibleTarget && targetLineColor.HasValue)
self.SetTargetLine(useLastVisibleTarget ? lastVisibleTarget : target, targetLineColor.Value, false);
// Target is hidden or dead, and we don't have a fallback position to move towards
if (useLastVisibleTarget && !lastVisibleTarget.IsValidFor(self))
return NextActivity;
var pos = self.CenterPosition;
var checkTarget = useLastVisibleTarget ? lastVisibleTarget : target;
// We've reached the required range - if the target is visible and valid then we wait
// otherwise if it is hidden or dead we give up
if (checkTarget.IsInRange(pos, maxRange) && !checkTarget.IsInRange(pos, minRange))
return useLastVisibleTarget ? NextActivity : this;
// Move into range
wasMovingWithinRange = true;
return ActivityUtils.SequenceActivities(
move.MoveWithinRange(target, minRange, maxRange, checkTarget.CenterPosition, targetLineColor),
this);
} }
} }
} }