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

Define plumbing to pass initial target positions to inner move activities.

Browse Source
This commit is contained in:
Paul Chote
2019-01-16 11:06:58 +00:00
parent b2d960ec19
commit 2080c72ab9
10 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,8 @@ namespace OpenRA.Mods.Common.Activities
readonly IMove move;
readonly Color? targetLineColor;
public Follow(Actor self, Target target, WDist minRange, WDist maxRange, Color? targetLineColor = null)
public Follow(Actor self, Target target, WDist minRange, WDist maxRange,
WPos? initialTargetPosition, Color? targetLineColor = null)
{
this.target = target;
this.minRange = minRange;

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

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Activities
Activity inner;
bool repath;
public MoveAdjacentTo(Actor self, Target target, Color? targetLineColor = null)
public MoveAdjacentTo(Actor self, Target target, WPos? initialTargetPosition = null, Color? targetLineColor = null)
{
Target = target;
@@ -56,7 +56,9 @@ namespace OpenRA.Mods.Common.Activities
pathFinder = self.World.WorldActor.Trait<IPathFinder>();
domainIndex = self.World.WorldActor.Trait<DomainIndex>();
if (target.IsValidFor(self))
if (initialTargetPosition.HasValue)
targetPosition = self.World.Map.CellContaining(initialTargetPosition.Value);
else if (target.IsValidFor(self) && target.Actor.CanBeViewedByPlayer(self.Owner))
targetPosition = self.World.Map.CellContaining(target.CenterPosition);
repath = true;

5
OpenRA.Mods.Common/Activities/Move/MoveWithinRange.cs
View File

@@ -21,8 +21,9 @@ namespace OpenRA.Mods.Common.Activities
readonly WDist maxRange;
readonly WDist minRange;
public MoveWithinRange(Actor self, Target target, WDist minRange, WDist maxRange, Color? targetLineColor = null)
: base(self, target, targetLineColor)
public MoveWithinRange(Actor self, Target target, WDist minRange, WDist maxRange,
WPos? initialTargetPosition = null, Color? targetLineColor = null)
: base(self, target, initialTargetPosition, targetLineColor)
{
this.minRange = minRange;
this.maxRange = maxRange;