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

Allow forced landing on helipads and enforce takeoff otherwise.

Browse Source
This commit is contained in:
tovl
2019-06-30 11:56:50 +00:00
committed by reaperrr
parent 79a48765d9
commit 76422933f6
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,6 +142,8 @@ namespace OpenRA.Mods.Common.Activities
aircraft.MakeReservation(dest);
QueueChild(self, new Land(self, Target.FromActor(dest), offset, facing), true);
QueueChild(self, new Resupply(self, dest, WDist.Zero), true);
if (aircraft.Info.TakeOffOnResupply && !alwaysLand)
QueueChild(self, new TakeOff(self));
}
else
QueueChild(self, new Fly(self, Target.FromActor(dest)), true);

12
OpenRA.Mods.Common/Activities/Resupply.cs
View File

@@ -117,11 +117,7 @@ namespace OpenRA.Mods.Common.Activities
{
var aircraft = self.TraitOrDefault<Aircraft>();
if (aircraft != null)
{
aircraft.AllowYieldingReservation();
if (aircraft.Info.TakeOffOnResupply)
Queue(self, new TakeOff(self));
}
return NextActivity;
}
@@ -129,6 +125,14 @@ namespace OpenRA.Mods.Common.Activities
return this;
}
public override void Cancel(Actor self, bool keepQueue = false)
{
if (NextActivity != null)
return;
base.Cancel(self, keepQueue);
}
void RepairTick(Actor self)
{
// First active.