Make aircraft continue attack on same target after re-arming

This commit is contained in:
Oliver Brakmann
2016-09-04 12:08:20 +02:00
parent e7d07e5a01
commit 7f64495d6f
2 changed files with 3 additions and 4 deletions

View File

@@ -40,10 +40,9 @@ namespace OpenRA.Mods.Common.Activities
if (!target.IsValidFor(self))
return NextActivity;
// Move to the next activity only if all ammo pools are depleted and none reload automatically
// TODO: This should check whether there is ammo left that is actually suitable for the target
if (ammoPools.All(x => !x.Info.SelfReloads && !x.HasAmmo()))
return ActivityUtils.SequenceActivities(new ReturnToBase(self), NextActivity);
return ActivityUtils.SequenceActivities(new ReturnToBase(self), this);
if (attackPlane != null)
attackPlane.DoAttack(self, target);