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

Refactor MoveAdjacentTo.

Browse Source
This commit is contained in:
tovl
2019-06-30 19:56:36 +02:00
committed by teinarss
parent 3ac5ac25f6
commit 37379daf3c
1 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenRA.Mods.Common/Activities/Move/MoveAdjacentTo.cs
View File

@@ -40,7 +40,6 @@ namespace OpenRA.Mods.Common.Activities
Target lastVisibleTarget; Target lastVisibleTarget;
protected CPos lastVisibleTargetLocation; protected CPos lastVisibleTargetLocation;
bool useLastVisibleTarget; bool useLastVisibleTarget;
bool repath;
public MoveAdjacentTo(Actor self, Target target, WPos? initialTargetPosition = null, Color? targetLineColor = null) public MoveAdjacentTo(Actor self, Target target, WPos? initialTargetPosition = null, Color? targetLineColor = null)
{ {
@@ -63,8 +62,6 @@ namespace OpenRA.Mods.Common.Activities
lastVisibleTarget = Target.FromPos(initialTargetPosition.Value); lastVisibleTarget = Target.FromPos(initialTargetPosition.Value);
lastVisibleTargetLocation = self.World.Map.CellContaining(initialTargetPosition.Value); lastVisibleTargetLocation = self.World.Map.CellContaining(initialTargetPosition.Value);
} }
repath = true;
} }
protected virtual bool ShouldStop(Actor self) protected virtual bool ShouldStop(Actor self)
@@ -82,6 +79,11 @@ namespace OpenRA.Mods.Common.Activities
return Util.AdjacentCells(self.World, Target); return Util.AdjacentCells(self.World, Target);
} }
protected override void OnFirstRun(Actor self)
{
QueueChild(self, Mobile.MoveTo(() => CalculatePathToTarget(self)));
}
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
bool targetIsHiddenActor; bool targetIsHiddenActor;
@@ -106,35 +108,21 @@ namespace OpenRA.Mods.Common.Activities
// Target is hidden or dead, and we don't have a fallback position to move towards // Target is hidden or dead, and we don't have a fallback position to move towards
var noTarget = useLastVisibleTarget && !lastVisibleTarget.IsValidFor(self); var noTarget = useLastVisibleTarget && !lastVisibleTarget.IsValidFor(self);
// Inner move order has completed.
if (ChildActivity == null)
{
// We are done here if the order was cancelled for any
// reason except the target moving.
if (IsCanceling || !repath || !targetIsValid)
return NextActivity;
// Target has moved, and MoveAdjacentTo is still valid.
ChildActivity = Mobile.MoveTo(() => CalculatePathToTarget(self));
repath = false;
}
// Cancel the current path if the activity asks to stop, or asks to repath // Cancel the current path if the activity asks to stop, or asks to repath
// The repath happens once the move activity stops in the next cell // The repath happens once the move activity stops in the next cell
var shouldStop = ShouldStop(self); var shouldRepath = targetIsValid && ShouldRepath(self, oldTargetLocation);
var shouldRepath = targetIsValid && !repath && ShouldRepath(self, oldTargetLocation); if (ChildActivity != null && (ShouldStop(self) || shouldRepath || noTarget))
if (shouldStop || shouldRepath || noTarget) ChildActivity.Cancel(self);
{
if (ChildActivity != null)
ChildActivity.Cancel(self);
repath = shouldRepath; // Target has moved, and MoveAdjacentTo is still valid.
} if (!IsCanceling && shouldRepath)
QueueChild(self, Mobile.MoveTo(() => CalculatePathToTarget(self)));
// Ticks the inner move activity to actually move the actor.
ChildActivity = ActivityUtils.RunActivity(self, ChildActivity); ChildActivity = ActivityUtils.RunActivity(self, ChildActivity);
if (ChildActivity != null)
return this;
return this; return NextActivity;
} }
List<CPos> CalculatePathToTarget(Actor self) List<CPos> CalculatePathToTarget(Actor self)