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

Remove HeliFlyAndLandWhenIdle

Browse Source 
Already obsolete, as aircraft with CanHover do properly become idle
and land when LandOnIdle is set to 'true'.
They currently need VTOL too, but all CanHover-aircraft
in the shipping mods have that and it will be fixed soon as well.
This commit is contained in:
reaperrr
2019-05-01 14:50:03 +02:00
committed by Paul Chote
parent 27cfa9b1f0
commit 5698ea0910
2 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Mods.Common/Activities/Air/HeliFly.cs
View File

@@ -145,30 +145,4 @@ namespace OpenRA.Mods.Common.Activities
yield return target;
}
}
public class HeliFlyAndLandWhenIdle : HeliFly
{
private readonly AircraftInfo info;
public HeliFlyAndLandWhenIdle(Actor self, Target t, AircraftInfo info)
: base(self, t)
{
this.info = info;
}
public override Activity Tick(Actor self)
{
var activity = base.Tick(self);
if (activity == null && !IsCanceling && info.LandWhenIdle)
{
if (info.TurnToLand)
self.QueueActivity(new Turn(self, info.InitialFacing));
self.QueueActivity(new Land(self));
activity = NextActivity;
}
return activity;
}
}
}

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

@@ -946,7 +946,7 @@ namespace OpenRA.Mods.Common.Traits
if (!Info.CanHover)
self.QueueActivity(order.Queued, new Fly(self, target));
else
self.QueueActivity(order.Queued, new HeliFlyAndLandWhenIdle(self, target, Info));
self.QueueActivity(order.Queued, new HeliFly(self, target));
}
else if (order.OrderString == "Enter" || order.OrderString == "Repair")
{
@@ -1012,7 +1012,7 @@ namespace OpenRA.Mods.Common.Traits
if (!Info.CanHover)
self.QueueActivity(new Fly(self, target));
else
self.QueueActivity(new HeliFlyAndLandWhenIdle(self, target, Info));
self.QueueActivity(new HeliFly(self, target));
UnReserve();
}