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

Rework aircraft rally point handling.

Browse Source
This commit is contained in:
Paul Chote
2019-08-11 14:08:51 +00:00
committed by reaperrr
parent 08db7586d4
commit 78302ea593
3 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -357,7 +357,7 @@ namespace OpenRA.Mods.Common.Traits
MakeReservation(host);
if (Info.TakeOffOnCreation)
self.QueueActivity(new TakeOff(self));
UnReserve(true);
}
// Add land activity if LandOnCondition resolves to true and the actor can land at the current location.
@@ -521,13 +521,21 @@ namespace OpenRA.Mods.Common.Traits
if (reservation == null)
return;
// Move to the host's rally point if it has one
var rp = ReservedActor != null ? ReservedActor.TraitOrDefault<RallyPoint>() : null;
reservation.Dispose();
reservation = null;
ReservedActor = null;
MayYieldReservation = false;
if (takeOff && self.World.Map.DistanceAboveTerrain(CenterPosition).Length <= LandAltitude.Length)
self.QueueActivity(new TakeOff(self));
{
if (rp != null)
self.QueueActivity(new TakeOff(self, Target.FromCell(self.World, rp.Location)));
else
self.QueueActivity(new TakeOff(self));
}
}
bool AircraftCanEnter(Actor a, TargetModifiers modifiers)