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

Fix FlyAttack not calling TakeOff for landed aircraft

Browse Source
This commit is contained in:
Oliver Brakmann
2016-09-03 22:06:43 +02:00
parent 6d15406ffe
commit e7d07e5a01
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Activities/Air/FlyAttack.cs
View File

@@ -19,6 +19,7 @@ namespace OpenRA.Mods.Common.Activities
public class FlyAttack : Activity
{
readonly Target target;
readonly Aircraft aircraft;
readonly AttackPlane attackPlane;
readonly AmmoPool[] ammoPools;
@@ -28,6 +29,7 @@ namespace OpenRA.Mods.Common.Activities
public FlyAttack(Actor self, Target target)
{
this.target = target;
aircraft = self.Trait<Aircraft>();
attackPlane = self.TraitOrDefault<AttackPlane>();
ammoPools = self.TraitsImplementing<AmmoPool>().ToArray();
ticksUntilTurn = attackPlane.AttackPlaneInfo.AttackTurnDelay;
@@ -56,6 +58,10 @@ namespace OpenRA.Mods.Common.Activities
inner = ActivityUtils.SequenceActivities(new FlyTimed(ticksUntilTurn, self), new Fly(self, target), new FlyTimed(ticksUntilTurn, self));
else
inner = ActivityUtils.SequenceActivities(new Fly(self, target), new FlyTimed(ticksUntilTurn, self));
// HACK: This needs to be done in this round-about way because TakeOff doesn't behave as expected when it doesn't have a NextActivity.
if (self.World.Map.DistanceAboveTerrain(self.CenterPosition).Length < aircraft.Info.MinAirborneAltitude)
inner = ActivityUtils.SequenceActivities(new TakeOff(self), inner);
}
inner = ActivityUtils.RunActivity(self, inner);