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

Merge HeliReturnToBase into ReturnToBase

Browse Source
This commit is contained in:
reaperrr
2019-02-18 19:30:57 +01:00
committed by reaperrr
parent 2a942bd04a
commit 2cdae0b380
6 changed files with 68 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -844,10 +844,7 @@ namespace OpenRA.Mods.Common.Traits
if (Reservable.IsAvailableFor(targetActor, self))
self.SetTargetLine(Target.FromActor(targetActor), Color.Green);
if (!Info.CanHover && !Info.VTOL)
self.QueueActivity(order.Queued, new ReturnToBase(self, Info.AbortOnResupply, targetActor));
else
self.QueueActivity(order.Queued, new HeliReturnToBase(self, Info.AbortOnResupply, targetActor));
self.QueueActivity(order.Queued, new ReturnToBase(self, Info.AbortOnResupply, targetActor));
}
else if (order.OrderString == "Stop")
{
@@ -865,10 +862,7 @@ namespace OpenRA.Mods.Common.Traits
if (!order.Queued)
UnReserve();
if (!Info.CanHover)
self.QueueActivity(order.Queued, new ReturnToBase(self, Info.AbortOnResupply, null, false));
else
self.QueueActivity(order.Queued, new HeliReturnToBase(self, Info.AbortOnResupply, null, false));
self.QueueActivity(order.Queued, new ReturnToBase(self, Info.AbortOnResupply, null, false));
}
}