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

Rework aircraft rally point handling.

Browse Source
This commit is contained in:
Paul Chote
2019-08-11 14:08:51 +00:00
committed by reaperrr
parent 08db7586d4
commit 78302ea593
3 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
OpenRA.Mods.Common/Activities/Air/TakeOff.cs
View File

@@ -9,7 +9,6 @@
*/
#endregion
using System;
using System.Collections.Generic;
using OpenRA.Activities;
using OpenRA.Mods.Common.Traits;
@@ -22,40 +21,24 @@ namespace OpenRA.Mods.Common.Activities
{
readonly Aircraft aircraft;
readonly IMove move;
Target target;
bool moveToRallyPoint;
bool assignTargetOnFirstRun;
Target fallbackTarget;
bool movedToTarget = false;
public TakeOff(Actor self, Target target)
public TakeOff(Actor self, Target fallbackTarget)
{
aircraft = self.Trait<Aircraft>();
move = self.Trait<IMove>();
this.target = target;
this.fallbackTarget = fallbackTarget;
}
public TakeOff(Actor self)
: this(self, Target.Invalid)
{
assignTargetOnFirstRun = true;
}
: this(self, Target.Invalid) { }
protected override void OnFirstRun(Actor self)
{
if (aircraft.ForceLanding)
return;
if (assignTargetOnFirstRun)
{
var host = aircraft.GetActorBelow();
var rp = host != null ? host.TraitOrDefault<RallyPoint>() : null;
var rallyPointDestination = rp != null ? rp.Location :
(host != null ? self.World.Map.CellContaining(host.CenterPosition) : self.Location);
target = Target.FromCell(self.World, rallyPointDestination);
moveToRallyPoint = self.CurrentActivity.NextActivity == null && rallyPointDestination != self.Location;
}
// We are taking off, so remove reservation and influence in ground cells.
aircraft.UnReserve();
aircraft.RemoveInfluence();
@@ -82,21 +65,16 @@ namespace OpenRA.Mods.Common.Activities
Fly.VerticalTakeOffOrLandTick(self, aircraft, aircraft.Facing, aircraft.Info.CruiseAltitude);
return false;
}
else
{
Fly.FlyTick(self, aircraft, aircraft.Facing, aircraft.Info.CruiseAltitude);
return false;
}
Fly.FlyTick(self, aircraft, aircraft.Facing, aircraft.Info.CruiseAltitude);
return false;
}
// Checking for NextActivity == null again in case another activity was queued while taking off
if (moveToRallyPoint && NextActivity == null)
// Only move to the fallback target if we don't have anything better to do
if (NextActivity == null && fallbackTarget.IsValidFor(self) && !movedToTarget)
{
if (!aircraft.Info.VTOL && assignTargetOnFirstRun)
return true;
QueueChild(new AttackMoveActivity(self, () => move.MoveToTarget(self, target, targetLineColor: Color.OrangeRed)));
moveToRallyPoint = false;
QueueChild(new AttackMoveActivity(self, () => move.MoveToTarget(self, fallbackTarget, targetLineColor: Color.OrangeRed)));
movedToTarget = true;
return false;
}
@@ -105,11 +83,11 @@ namespace OpenRA.Mods.Common.Activities
public override IEnumerable<TargetLineNode> TargetLineNodes(Actor self)
{
if (ChildActivity == null && moveToRallyPoint)
yield return new TargetLineNode(target, Color.OrangeRed);
else
if (ChildActivity != null)
foreach (var n in ChildActivity.TargetLineNodes(self))
yield return n;
else
yield return new TargetLineNode(fallbackTarget, Color.OrangeRed);
}
}
}

18
OpenRA.Mods.Common/Activities/Resupply.cs
View File

@@ -169,12 +169,21 @@ namespace OpenRA.Mods.Common.Activities
void OnResupplyEnding(Actor self, bool isHostInvalid = false)
{
var rp = host.Actor.TraitOrDefault<RallyPoint>();
if (aircraft != null)
{
aircraft.AllowYieldingReservation();
if (wasRepaired || isHostInvalid ||
(!stayOnResupplier && aircraft.Info.TakeOffOnResupply))
QueueChild(new TakeOff(self));
if (wasRepaired || isHostInvalid || (!stayOnResupplier && aircraft.Info.TakeOffOnResupply))
{
if (rp != null)
QueueChild(move.MoveTo(rp.Location, repairableNear != null ? null : host.Actor));
else
QueueChild(new TakeOff(self));
}
// Aircraft without TakeOffOnResupply remain on the resupplier until something else needs it
// The rally point location is queried by the aircraft before it takes off
else
aircraft.AllowYieldingReservation();
}
else if (!stayOnResupplier && !isHostInvalid)
{
@@ -183,7 +192,6 @@ namespace OpenRA.Mods.Common.Activities
// If there's a next activity and we're not RepairableNear, first leave host if the next activity is not a Move.
if (self.CurrentActivity.NextActivity == null)
{
var rp = host.Actor.TraitOrDefault<RallyPoint>();
if (rp != null)
QueueChild(move.MoveTo(rp.Location, repairableNear != null ? null : host.Actor));
else if (repairableNear == null)