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

Rename FlyCircle to FlyIdle and make it tick TickIdle

Browse Source 
It now handles both hovering and circling aircraft, for consistency.
This commit is contained in:
reaperrr
2019-07-18 17:36:09 +02:00
committed by teinarss
parent ce29dcad87
commit 801f5ba525
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenRA.Mods.Common/Activities/Air/FlyCircle.cs → OpenRA.Mods.Common/Activities/Air/FlyIdle.cs
View File

@@ -9,22 +9,26 @@
*/ */
#endregion #endregion
using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class FlyCircle : Activity public class FlyIdle : Activity
{ {
readonly Aircraft aircraft; readonly Aircraft aircraft;
readonly int turnSpeedOverride; readonly INotifyIdle[] tickIdles;
readonly int turnSpeed;
int remainingTicks; int remainingTicks;
public FlyCircle(Actor self, int ticks = -1, int turnSpeedOverride = -1) public FlyIdle(Actor self, int ticks = -1)
{ {
aircraft = self.Trait<Aircraft>(); aircraft = self.Trait<Aircraft>();
tickIdles = self.TraitsImplementing<INotifyIdle>().ToArray();
turnSpeed = aircraft.Info.IdleTurnSpeed > -1 ? aircraft.Info.IdleTurnSpeed : aircraft.TurnSpeed;
remainingTicks = ticks; remainingTicks = ticks;
this.turnSpeedOverride = turnSpeedOverride;
} }
public override bool Tick(Actor self) public override bool Tick(Actor self)
@@ -32,26 +36,25 @@ namespace OpenRA.Mods.Common.Activities
if (remainingTicks == 0 || (NextActivity != null && remainingTicks < 0)) if (remainingTicks == 0 || (NextActivity != null && remainingTicks < 0))
return true; return true;
// Refuse to take off if it would land immediately again. if (aircraft.ForceLanding || IsCanceling)
if (aircraft.ForceLanding)
{
Cancel(self);
return true;
}
if (IsCanceling)
return true; return true;
if (remainingTicks > 0) if (remainingTicks > 0)
remainingTicks--; remainingTicks--;
foreach (var tickIdle in tickIdles)
tickIdle.TickIdle(self);
if (!aircraft.Info.CanHover)
{
// We can't possibly turn this fast // We can't possibly turn this fast
var desiredFacing = aircraft.Facing + 64; var desiredFacing = aircraft.Facing + 64;
// This override is necessary, otherwise aircraft with CanSlide would circle sideways // This override is necessary, otherwise aircraft with CanSlide would circle sideways
var move = aircraft.FlyStep(aircraft.Facing); var move = aircraft.FlyStep(aircraft.Facing);
Fly.FlyTick(self, aircraft, desiredFacing, aircraft.Info.CruiseAltitude, move, turnSpeedOverride); Fly.FlyTick(self, aircraft, desiredFacing, aircraft.Info.CruiseAltitude, move, turnSpeed);
}
return false; return false;
} }

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

@@ -215,10 +215,7 @@ namespace OpenRA.Mods.Common.Activities
if (!aircraft.CanLand(blockingCells, target.Actor)) if (!aircraft.CanLand(blockingCells, target.Actor))
{ {
// Maintain holding pattern. // Maintain holding pattern.
if (aircraft.Info.CanHover) QueueChild(new FlyIdle(self, 25));
QueueChild(new Wait(25));
else
QueueChild(new FlyCircle(self, 25));
self.NotifyBlocker(blockingCells); self.NotifyBlocker(blockingCells);
finishedApproach = false; finishedApproach = false;

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

@@ -100,7 +100,7 @@ namespace OpenRA.Mods.Common.Activities
} }
QueueChild(new Fly(self, Target.FromActor(nearestResupplier), WDist.Zero, aircraft.Info.WaitDistanceFromResupplyBase, targetLineColor: Color.Green)); QueueChild(new Fly(self, Target.FromActor(nearestResupplier), WDist.Zero, aircraft.Info.WaitDistanceFromResupplyBase, targetLineColor: Color.Green));
QueueChild(new FlyCircle(self, aircraft.Info.NumberOfTicksToVerifyAvailableAirport)); QueueChild(new FlyIdle(self, aircraft.Info.NumberOfTicksToVerifyAvailableAirport));
return false; return false;
} }

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

@@ -712,8 +712,8 @@ namespace OpenRA.Mods.Common.Traits
self.QueueActivity(new TakeOff(self)); self.QueueActivity(new TakeOff(self));
else if (Info.IdleBehavior == IdleBehaviorType.Land && Info.LandableTerrainTypes.Count > 0) else if (Info.IdleBehavior == IdleBehaviorType.Land && Info.LandableTerrainTypes.Count > 0)
self.QueueActivity(new Land(self)); self.QueueActivity(new Land(self));
else if (!Info.CanHover) else
self.QueueActivity(new FlyCircle(self, -1, Info.IdleTurnSpeed > -1 ? Info.IdleTurnSpeed : TurnSpeed)); self.QueueActivity(new FlyIdle(self));
} }
} }