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

Revert FlightDynamics

Browse Source 
This needs more thought and most parts might get superseded
by other approaches.

Kept CanSlide separation from CanHover.
This commit is contained in:
reaperrr
2019-07-12 23:10:05 +02:00
committed by abcdefg30
parent aa5c8b4efa
commit cf4d73ab91
9 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Activities
// NOTE: desiredFacing = -1 means we should not prefer any particular facing and instead just
// use whatever facing gives us the most direct path to the landing site.
if (facing == -1 && aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.TurnToLand))
if (facing == -1 && aircraft.Info.TurnToLand)
desiredFacing = aircraft.Info.InitialFacing;
else
desiredFacing = facing;
@@ -130,7 +130,7 @@ namespace OpenRA.Mods.Common.Activities
}
// Move towards landing location
if (aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.VTOL) && (pos - targetPosition).HorizontalLengthSquared != 0)
if (aircraft.Info.VTOL && (pos - targetPosition).HorizontalLengthSquared != 0)
{
QueueChild(new Fly(self, Target.FromPos(targetPosition)));
@@ -140,7 +140,7 @@ namespace OpenRA.Mods.Common.Activities
return false;
}
if (!aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.VTOL) && !finishedApproach)
if (!aircraft.Info.VTOL && !finishedApproach)
{
// Calculate approach trajectory
var altitude = aircraft.Info.CruiseAltitude.Length;
@@ -207,7 +207,7 @@ namespace OpenRA.Mods.Common.Activities
if (!aircraft.CanLand(blockingCells, target.Actor))
{
// Maintain holding pattern.
if (aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.Hover))
if (aircraft.Info.CanHover)
QueueChild(new Wait(25));
else
QueueChild(new FlyCircle(self, 25));
@@ -226,7 +226,7 @@ namespace OpenRA.Mods.Common.Activities
}
// Final descent.
if (aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.VTOL))
if (aircraft.Info.VTOL)
{
var landAltitude = self.World.Map.DistanceAboveTerrain(targetPosition) + aircraft.LandAltitude;
if (Fly.VerticalTakeOffOrLandTick(self, aircraft, aircraft.Facing, landAltitude))