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

Make aircraft always take off after repair

Browse Source 
Reservable logic doesn't handle repairs, and we
don't want aircraft to block repair bays etc. until it does.
This commit is contained in:
reaperrr
2019-07-13 19:54:39 +02:00
committed by Paul Chote
parent a010c72780
commit c51f2c036a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ namespace OpenRA.Mods.Common.Activities
readonly IMove move;
readonly Aircraft aircraft;
readonly bool stayOnResupplier;
readonly bool wasRepaired;
int remainingTicks;
bool played;
@@ -60,8 +61,14 @@ namespace OpenRA.Mods.Common.Activities
&& (repairableNear == null || !repairableNear.Info.RepairActors.Contains(host.Info.Name)));
if (!cannotRepairAtHost)
{
activeResupplyTypes |= ResupplyType.Repair;
// HACK: Reservable logic can't handle repairs, so force a take-off if resupply included repairs.
// TODO: Make reservation logic or future docking logic properly handle this.
wasRepaired = true;
}
var cannotRearmAtHost = rearmable == null || !rearmable.Info.RearmActors.Contains(host.Info.Name) || rearmable.RearmableAmmoPools.All(p => p.FullAmmo());
if (!cannotRearmAtHost)
activeResupplyTypes |= ResupplyType.Rearm;
@@ -149,7 +156,8 @@ namespace OpenRA.Mods.Common.Activities
if (aircraft != null)
{
aircraft.AllowYieldingReservation();
if (!stayOnResupplier && aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.TakeOffOnResupply))
if (wasRepaired ||
(!stayOnResupplier && aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.TakeOffOnResupply)))
QueueChild(new TakeOff(self));
}
else if (!stayOnResupplier)