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

Add AbortOnResupply property to cancel aircraft activities on resupply.

Browse Source
This commit is contained in:
Paul Chote
2016-09-25 15:44:46 +01:00
parent 6eafaeecf6
commit ea65ac542e
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ namespace OpenRA.Mods.Common.Activities
new Turn(self, initialFacing), new Turn(self, initialFacing),
new HeliLand(self, false), new HeliLand(self, false),
new ResupplyAircraft(self), new ResupplyAircraft(self),
NextActivity); !heli.Info.AbortOnResupply ? NextActivity : null);
} }
return ActivityUtils.SequenceActivities( return ActivityUtils.SequenceActivities(

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

@@ -149,7 +149,8 @@ namespace OpenRA.Mods.Common.Activities
landingProcedures.Add(new ResupplyAircraft(self)); landingProcedures.Add(new ResupplyAircraft(self));
} }
landingProcedures.Add(NextActivity); if (!planeInfo.AbortOnResupply)
landingProcedures.Add(NextActivity);
return ActivityUtils.SequenceActivities(landingProcedures.ToArray()); return ActivityUtils.SequenceActivities(landingProcedures.ToArray());
} }

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

@@ -69,6 +69,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Does this actor need to turn before landing?")] [Desc("Does this actor need to turn before landing?")]
public readonly bool TurnToLand = false; public readonly bool TurnToLand = false;
[Desc("Does this actor cancel its previous activity after resupplying?")]
public readonly bool AbortOnResupply = false;
public readonly WDist LandAltitude = WDist.Zero; public readonly WDist LandAltitude = WDist.Zero;
[Desc("How fast this actor ascends or descends when using horizontal take off/landing.")] [Desc("How fast this actor ascends or descends when using horizontal take off/landing.")]