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

Allow VTOLs to land with force-move

Browse Source
This commit is contained in:
tovl
2019-06-30 10:11:42 +00:00
committed by reaperrr
parent 8e5875453a
commit 79a48765d9
13 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.Common/Activities/Air/Land.cs
View File

@@ -119,20 +119,22 @@ namespace OpenRA.Mods.Common.Activities
// Look for free landing cell
if (target.Type == TargetType.Terrain && !landingInitiated)
{
var targetLocation = aircraft.FindLandingLocation(landingCell, landRange);
if (!targetLocation.HasValue)
var newLocation = aircraft.FindLandingLocation(landingCell, landRange);
// Cannot land so fly towards the last target location instead.
if (!newLocation.HasValue)
{
// Maintain holding pattern.
if (aircraft.Info.CanHover)
QueueChild(self, new Wait(25), true);
else
QueueChild(self, new FlyCircle(self, 25), true);
Cancel(self, true);
QueueChild(self, aircraft.MoveTo(landingCell, 0), true);
return this;
}
target = Target.FromCell(self.World, targetLocation.Value);
targetPosition = target.CenterPosition + offset;
landingCell = self.World.Map.CellContaining(targetPosition);
if (newLocation.Value != landingCell)
{
target = Target.FromCell(self.World, newLocation.Value);
targetPosition = target.CenterPosition + offset;
landingCell = self.World.Map.CellContaining(targetPosition);
}
}
// Move towards landing location