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

Rename Enter.targetCenter to repathWhileMoving.

Browse Source
This commit is contained in:
Paul Chote
2017-06-17 12:54:06 +01:00
committed by Oliver Brakmann
parent b0f1059df2
commit 995a3da43a
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Activities/Enter.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Activities
readonly IMove move; readonly IMove move;
readonly int maxTries = 0; readonly int maxTries = 0;
readonly EnterBehaviour enterBehaviour; readonly EnterBehaviour enterBehaviour;
readonly bool targetCenter; readonly bool repathWhileMoving;
public Target Target { get { return target; } } public Target Target { get { return target; } }
Target target; Target target;
@@ -36,13 +36,13 @@ namespace OpenRA.Mods.Common.Activities
Activity inner; Activity inner;
bool firstApproach = true; bool firstApproach = true;
protected Enter(Actor self, Actor target, EnterBehaviour enterBehaviour, int maxTries = 1, bool targetCenter = false) protected Enter(Actor self, Actor target, EnterBehaviour enterBehaviour, int maxTries = 1, bool repathWhileMoving = true)
{ {
move = self.Trait<IMove>(); move = self.Trait<IMove>();
this.target = Target.FromActor(target); this.target = Target.FromActor(target);
this.maxTries = maxTries; this.maxTries = maxTries;
this.enterBehaviour = enterBehaviour; this.enterBehaviour = enterBehaviour;
this.targetCenter = targetCenter; this.repathWhileMoving = repathWhileMoving;
} }
// CanEnter(target) should to be true; otherwise, Enter may abort. // CanEnter(target) should to be true; otherwise, Enter may abort.
@@ -169,7 +169,7 @@ namespace OpenRA.Mods.Common.Activities
case ReserveStatus.None: case ReserveStatus.None:
return EnterState.Done; // No available target -> abort to next activity return EnterState.Done; // No available target -> abort to next activity
case ReserveStatus.TooFar: case ReserveStatus.TooFar:
inner = move.MoveToTarget(self, targetCenter ? Target.FromPos(target.CenterPosition) : target); // Approach inner = move.MoveToTarget(self, repathWhileMoving ? target : Target.FromPos(target.CenterPosition)); // Approach
return EnterState.ApproachingOrEntering; return EnterState.ApproachingOrEntering;
case ReserveStatus.Pending: case ReserveStatus.Pending:
return EnterState.ApproachingOrEntering; // Retry next tick return EnterState.ApproachingOrEntering; // Retry next tick

4
OpenRA.Mods.Common/Activities/EnterTransport.cs
View File

@@ -22,8 +22,8 @@ namespace OpenRA.Mods.Common.Activities
Actor transport; Actor transport;
Cargo cargo; Cargo cargo;
public EnterTransport(Actor self, Actor transport, int maxTries = 0, bool targetCenter = false) public EnterTransport(Actor self, Actor transport, int maxTries = 0, bool repathWhileMoving = true)
: base(self, transport, EnterBehaviour.Exit, maxTries, targetCenter) : base(self, transport, EnterBehaviour.Exit, maxTries, repathWhileMoving)
{ {
this.transport = transport; this.transport = transport;
this.maxTries = maxTries; this.maxTries = maxTries;

2
OpenRA.Mods.Common/Scripting/Properties/MobileProperties.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.Common.Scripting
[Desc("Move to and enter the transport.")] [Desc("Move to and enter the transport.")]
public void EnterTransport(Actor transport) public void EnterTransport(Actor transport)
{ {
Self.QueueActivity(new EnterTransport(Self, transport, 1, true)); Self.QueueActivity(new EnterTransport(Self, transport, 1, false));
} }
[Desc("Whether the actor can move (false if immobilized).")] [Desc("Whether the actor can move (false if immobilized).")]

2
OpenRA.Mods.Common/Traits/Passenger.cs
View File

@@ -107,7 +107,7 @@ namespace OpenRA.Mods.Common.Traits
self.CancelActivity(); self.CancelActivity();
var transports = order.OrderString == "EnterTransports"; var transports = order.OrderString == "EnterTransports";
self.QueueActivity(new EnterTransport(self, order.TargetActor, transports ? Info.MaxAlternateTransportAttempts : 0, transports)); self.QueueActivity(new EnterTransport(self, order.TargetActor, transports ? Info.MaxAlternateTransportAttempts : 0, !transports));
} }
} }