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

Avoid landing-dances when issuing mixed full/empty aircraft RTB orders.

Browse Source
This commit is contained in:
Paul Chote
2016-09-18 14:11:29 +01:00
parent 2d00a24855
commit eeaa461311
3 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
View File

@@ -22,13 +22,15 @@ namespace OpenRA.Mods.Common.Activities
{
readonly Aircraft plane;
readonly AircraftInfo planeInfo;
readonly bool alwaysLand;
bool isCalculated;
Actor dest;
WPos w1, w2, w3;
public ReturnToBase(Actor self, Actor dest = null)
public ReturnToBase(Actor self, Actor dest = null, bool alwaysLand = true)
{
this.dest = dest;
this.alwaysLand = alwaysLand;
plane = self.Trait<Aircraft>();
planeInfo = self.Info.TraitInfo<AircraftInfo>();
}
@@ -51,8 +53,6 @@ namespace OpenRA.Mods.Common.Activities
if (dest == null)
return;
plane.MakeReservation(dest);
var landPos = dest.CenterPosition;
var altitude = planeInfo.CruiseAltitude.Length;
@@ -94,6 +94,18 @@ namespace OpenRA.Mods.Common.Activities
isCalculated = true;
}
bool ShouldLandAtBuilding(Actor self, Actor dest)
{
if (alwaysLand)
return true;
if (planeInfo.RepairBuildings.Contains(dest.Info.Name) && self.GetDamageState() != DamageState.Undamaged)
return true;
return planeInfo.RearmBuildings.Contains(dest.Info.Name) && self.TraitsImplementing<AmmoPool>()
.Any(p => !p.Info.SelfReloads && !p.FullAmmo());
}
public override Activity Tick(Actor self)
{
if (IsCanceled || self.IsDead)
@@ -128,8 +140,15 @@ namespace OpenRA.Mods.Common.Activities
// Fix a problem when the airplane is send to resupply near the airport
landingProcedures.Add(new Fly(self, Target.FromPos(w3), WDist.Zero, new WDist(turnRadius / 2)));
landingProcedures.Add(new Land(self, Target.FromActor(dest)));
landingProcedures.Add(new ResupplyAircraft(self));
if (ShouldLandAtBuilding(self, dest))
{
plane.MakeReservation(dest);
landingProcedures.Add(new Land(self, Target.FromActor(dest)));
landingProcedures.Add(new ResupplyAircraft(self));
}
landingProcedures.Add(NextActivity);
return ActivityUtils.SequenceActivities(landingProcedures.ToArray());