Remove ResupplyAircraft and AllowYieldingReservation

The few extra things those two activities did can be done
in Resupply, making them redundant.
This commit is contained in:
reaperrr
2019-04-22 20:12:21 +02:00
committed by Paul Chote
parent 4a06c66dbd
commit bc0d8ca015
9 changed files with 22 additions and 94 deletions

View File

@@ -95,7 +95,17 @@ namespace OpenRA.Mods.Common.Activities
notifyResupply.ResupplyTick(host.Actor, self, activeResupplyTypes);
if (activeResupplyTypes == 0)
{
var aircraft = self.TraitOrDefault<Aircraft>();
if (aircraft != null)
{
aircraft.AllowYieldingReservation();
if (aircraft.Info.TakeOffOnResupply)
Queue(self, new TakeOff(self, (a, b, c) => NextActivity == null && b.NextActivity == null));
}
return NextActivity;
}
return this;
}