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

Fix ProductionAirdrop aircraft removal timing

Browse Source 
...when leaving map before finishing TakeOff.
This commit is contained in:
reaperrr
2019-07-22 00:45:23 +02:00
committed by abcdefg30
parent ff1d4ec9ae
commit 64780fc865
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs
View File

@@ -83,7 +83,7 @@ namespace OpenRA.Mods.Cnc.Traits
Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.ReadyAudio, self.Owner.Faction.InternalName); Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.ReadyAudio, self.Owner.Faction.InternalName);
})); }));
actor.QueueActivity(new Fly(actor, Target.FromCell(w, endPos))); actor.QueueActivity(new FlyOffMap(actor, Target.FromCell(w, endPos)));
actor.QueueActivity(new RemoveSelf()); actor.QueueActivity(new RemoveSelf());
}); });

30
OpenRA.Mods.Common/Activities/Air/FlyOffMap.cs
View File

@@ -11,16 +11,43 @@
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class FlyOffMap : Activity public class FlyOffMap : Activity
{ {
readonly Aircraft aircraft; readonly Aircraft aircraft;
readonly Target target;
readonly bool hasTarget;
public FlyOffMap(Actor self) public FlyOffMap(Actor self)
{ {
aircraft = self.Trait<Aircraft>(); aircraft = self.Trait<Aircraft>();
ChildHasPriority = false;
}
public FlyOffMap(Actor self, Target target)
{
aircraft = self.Trait<Aircraft>();
ChildHasPriority = false;
this.target = target;
hasTarget = true;
}
protected override void OnFirstRun(Actor self)
{
if (hasTarget)
{
QueueChild(new Fly(self, target));
return;
}
// VTOLs must take off first if they're not at cruise altitude
if (aircraft.Info.VTOL && self.World.Map.DistanceAboveTerrain(aircraft.CenterPosition) != aircraft.Info.CruiseAltitude)
QueueChild(new TakeOff(self));
QueueChild(new FlyTimed(-1, self));
} }
public override bool Tick(Actor self) public override bool Tick(Actor self)
@@ -35,8 +62,7 @@ namespace OpenRA.Mods.Common.Activities
if (IsCanceling || !self.World.Map.Contains(self.Location)) if (IsCanceling || !self.World.Map.Contains(self.Location))
return true; return true;
Fly.FlyTick(self, aircraft, aircraft.Facing, aircraft.Info.CruiseAltitude); return TickChild(self);
return false;
} }
} }
} }