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

Allow non-VTOL to LandOnCondition

Browse Source 
Note: This might still break in unexpected ways,
since non-VTOLs implicitly rely on ReturnToBase
to calculate the approach vector for them.
This commit is contained in:
reaperrr
2019-04-26 01:41:59 +02:00
committed by Paul Chote
parent 0c2666b97e
commit 7becbe6b14
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,13 +317,13 @@ namespace OpenRA.Mods.Common.Traits
self.QueueActivity(new TakeOff(self)); self.QueueActivity(new TakeOff(self));
} }
// Add land activity if LandOnCondidion resolves to true and the actor can land at the current location. // Add land activity if LandOnCondition resolves to true and the actor can land at the current location.
if (!ForceLanding && landNow.HasValue && landNow.Value && airborne && CanLand(self.Location) if (!ForceLanding && landNow.HasValue && landNow.Value && airborne && CanLand(self.Location)
&& !((self.CurrentActivity is Land && Info.VTOL) || self.CurrentActivity is Turn)) && !((self.CurrentActivity is Land) || self.CurrentActivity is Turn))
{ {
self.CancelActivity(); self.CancelActivity();
if (Info.TurnToLand) if (Info.VTOL && Info.TurnToLand)
self.QueueActivity(new Turn(self, Info.InitialFacing)); self.QueueActivity(new Turn(self, Info.InitialFacing));
self.QueueActivity(new Land(self)); self.QueueActivity(new Land(self));
@@ -625,9 +625,9 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
if (!atLandAltitude && Info.VTOL && Info.LandWhenIdle) if (!atLandAltitude && Info.LandWhenIdle)
{ {
if (Info.TurnToLand) if (Info.VTOL && Info.TurnToLand)
self.QueueActivity(new Turn(self, Info.InitialFacing)); self.QueueActivity(new Turn(self, Info.InitialFacing));
self.QueueActivity(new Land(self)); self.QueueActivity(new Land(self));