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

Replace various Aircraft fields with FlightDynamics

Browse Source 
Replaces various booleans with a FlightDynamics flag list.
This commit is contained in:
reaperrr
2019-06-14 10:36:54 +02:00
committed by abcdefg30
parent 824db72a4c
commit 0ebeb30880
8 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.Common/Activities/Air/Fly.cs
View File

@@ -53,7 +53,8 @@ namespace OpenRA.Mods.Common.Activities
public static void FlyTick(Actor self, Aircraft aircraft, int desiredFacing, WDist desiredAltitude, WVec moveOverride, int turnSpeedOverride = -1)
{
var dat = self.World.Map.DistanceAboveTerrain(aircraft.CenterPosition);
var move = aircraft.Info.CanHover ? aircraft.FlyStep(desiredFacing) : aircraft.FlyStep(aircraft.Facing);
var isSlider = aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.Slide);
var move = isSlider ? aircraft.FlyStep(desiredFacing) : aircraft.FlyStep(aircraft.Facing);
if (moveOverride != WVec.Zero)
move = moveOverride;
@@ -115,7 +116,7 @@ namespace OpenRA.Mods.Common.Activities
// If the aircraft lands when idle and is idle, we let the default idle handler manage this.
// TODO: Remove this after fixing all activities to work properly with arbitrary starting altitudes.
var skipHeightAdjustment = aircraft.Info.LandWhenIdle && self.CurrentActivity.IsCanceling && self.CurrentActivity.NextActivity == null;
if (aircraft.Info.CanHover && !skipHeightAdjustment && dat != aircraft.Info.CruiseAltitude)
if (aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.Hover) && !skipHeightAdjustment && dat != aircraft.Info.CruiseAltitude)
{
if (dat <= aircraft.LandAltitude)
QueueChild(new TakeOff(self, target));
@@ -160,19 +161,22 @@ namespace OpenRA.Mods.Common.Activities
if (insideMaxRange && !insideMinRange)
return true;
var move = aircraft.Info.CanHover ? aircraft.FlyStep(desiredFacing) : aircraft.FlyStep(aircraft.Facing);
var isSlider = aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.Slide);
var move = isSlider ? aircraft.FlyStep(desiredFacing) : aircraft.FlyStep(aircraft.Facing);
// Inside the minimum range, so reverse if CanHover
if (aircraft.Info.CanHover && insideMinRange)
// Inside the minimum range, so reverse if we have Slide flag
if (isSlider && insideMinRange)
{
FlyTick(self, aircraft, desiredFacing, aircraft.Info.CruiseAltitude, -move);
return false;
}
// The next move would overshoot, so consider it close enough or set final position if CanHover
// The next move would overshoot, so consider it close enough or set final position if we have Slide flag
if (delta.HorizontalLengthSquared < move.HorizontalLengthSquared)
{
if (aircraft.Info.CanHover)
// For VTOL landing to succeed, it must reach the exact target position,
// so for the final move it needs to behave as if it had the Slide flag.
if (isSlider || aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.VTOL))
{
// Set final (horizontal) position
if (delta.HorizontalLengthSquared != 0)
@@ -193,7 +197,7 @@ namespace OpenRA.Mods.Common.Activities
return true;
}
if (!aircraft.Info.CanHover)
if (!isSlider)
{
// Using the turn rate, compute a hypothetical circle traced by a continuous turn.
// If it contains the destination point, it's unreachable without more complex manuvering.

2
OpenRA.Mods.Common/Activities/Air/FlyCircle.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Activities
// We can't possibly turn this fast
var desiredFacing = aircraft.Facing + 64;
// This override is necessary, otherwise CanHover aircraft would circle sideways
// This override is necessary, otherwise aircraft with Slide flag would circle sideways
var move = aircraft.FlyStep(aircraft.Facing);
Fly.FlyTick(self, aircraft, desiredFacing, aircraft.Info.CruiseAltitude, move, turnSpeedOverride);

4
OpenRA.Mods.Common/Activities/Air/FlyFollow.cs
View File

@@ -84,7 +84,9 @@ namespace OpenRA.Mods.Common.Activities
// otherwise if it is hidden or dead we give up
if (checkTarget.IsInRange(pos, maxRange) && !checkTarget.IsInRange(pos, minRange))
{
Fly.FlyTick(self, aircraft, aircraft.Facing, aircraft.Info.CruiseAltitude);
if (!aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.Hover))
Fly.FlyTick(self, aircraft, aircraft.Facing, aircraft.Info.CruiseAltitude);
return useLastVisibleTarget;
}

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.TurnToLand)
if (facing == -1 && aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.TurnToLand))
desiredFacing = aircraft.Info.InitialFacing;
else
desiredFacing = facing;
@@ -130,7 +130,7 @@ namespace OpenRA.Mods.Common.Activities
}
// Move towards landing location
if (aircraft.Info.VTOL && (pos - targetPosition).HorizontalLengthSquared != 0)
if (aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.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.VTOL && !finishedApproach)
if (!aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.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.CanHover)
if (aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.Hover))
QueueChild(new Wait(25));
else
QueueChild(new FlyCircle(self, 25));
@@ -226,7 +226,7 @@ namespace OpenRA.Mods.Common.Activities
}
// Final descent.
if (aircraft.Info.VTOL)
if (aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.VTOL))
{
var landAltitude = self.World.Map.DistanceAboveTerrain(targetPosition) + aircraft.LandAltitude;
if (Fly.VerticalTakeOffOrLandTick(self, aircraft, aircraft.Facing, landAltitude))

8
OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
View File

@@ -82,7 +82,7 @@ namespace OpenRA.Mods.Common.Activities
if (nearestResupplier != null)
{
if (aircraft.Info.CanHover)
if (aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.Hover))
{
var distanceFromResupplier = (nearestResupplier.CenterPosition - self.CenterPosition).HorizontalLength;
var distanceLength = aircraft.Info.WaitDistanceFromResupplyBase.Length;
@@ -113,15 +113,15 @@ namespace OpenRA.Mods.Common.Activities
{
var exit = dest.FirstExitOrDefault(null);
var offset = exit != null ? exit.Info.SpawnOffset : WVec.Zero;
if (aircraft.Info.TurnToDock)
if (aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.TurnToDock))
facing = aircraft.Info.InitialFacing;
if (!aircraft.Info.VTOL)
if (!aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.VTOL))
facing = 192;
aircraft.MakeReservation(dest);
QueueChild(new Land(self, Target.FromActor(dest), offset, facing));
QueueChild(new Resupply(self, dest, WDist.Zero));
if (aircraft.Info.TakeOffOnResupply && !alwaysLand)
if (aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.TakeOffOnResupply) && !alwaysLand)
QueueChild(new TakeOff(self));
return true;

4
OpenRA.Mods.Common/Activities/Air/TakeOff.cs
View File

@@ -75,7 +75,7 @@ namespace OpenRA.Mods.Common.Activities
if (dat < aircraft.Info.CruiseAltitude)
{
// If we're a VTOL, rise before flying forward
if (aircraft.Info.VTOL)
if (aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.VTOL))
{
Fly.VerticalTakeOffOrLandTick(self, aircraft, aircraft.Facing, aircraft.Info.CruiseAltitude);
return false;
@@ -90,7 +90,7 @@ namespace OpenRA.Mods.Common.Activities
// Checking for NextActivity == null again in case another activity was queued while taking off
if (moveToRallyPoint && NextActivity == null)
{
if (!aircraft.Info.VTOL && assignTargetOnFirstRun)
if (!aircraft.Info.FlightDynamics.HasFlag(FlightDynamic.VTOL) && assignTargetOnFirstRun)
return true;
QueueChild(new AttackMoveActivity(self, () => move.MoveToTarget(self, target)));