Merge HeliReturnToBase into ReturnToBase

This commit is contained in:
reaperrr
2019-02-18 19:30:57 +01:00
committed by reaperrr
parent 2a942bd04a
commit 2cdae0b380
6 changed files with 68 additions and 155 deletions

View File

@@ -83,7 +83,7 @@ namespace OpenRA.Mods.Common.Activities
// If all valid weapons have depleted their ammo and Rearmable trait exists, return to RearmActor to reload and then resume the activity
if (rearmable != null && !useLastVisibleTarget && attackAircraft.Armaments.All(x => x.IsTraitPaused || !x.Weapon.IsValidAgainst(target, self.World, self)))
{
QueueChild(self, new HeliReturnToBase(self, aircraft.Info.AbortOnResupply), true);
QueueChild(self, new ReturnToBase(self, aircraft.Info.AbortOnResupply), true);
return this;
}