Add LandOnCondition to the trait Aircraft which triggers a landing and prevents takeoffs while the condition is met

OpenRA.Mods.Common/Activities/Air/Fly.cs

@@ -57,6 +57,13 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			// Refuse to take off if it would land immediately again.
+			if (plane.ForceLanding)
+			{
+				Cancel(self);
+				return NextActivity;
+			}
+
 			if (IsCanceled || !target.IsValidFor(self))
 				return NextActivity;
 

OpenRA.Mods.Common/Activities/Air/FlyAttack.cs

@@ -36,6 +36,13 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			// Refuse to take off if it would land immediately again.
+			if (aircraft.ForceLanding)
+			{
+				Cancel(self);
+				return NextActivity;
+			}
+
 			if (!target.IsValidFor(self))
 				return NextActivity;
 

OpenRA.Mods.Common/Activities/Air/FlyCircle.cs

@@ -28,6 +28,13 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			// Refuse to take off if it would land immediately again.
+			if (plane.ForceLanding)
+			{
+				Cancel(self);
+				return NextActivity;
+			}
+
 			if (IsCanceled)
 				return NextActivity;
 

OpenRA.Mods.Common/Activities/Air/FlyFollow.cs

@@ -32,6 +32,13 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			// Refuse to take off if it would land immediately again.
+			if (plane.ForceLanding)
+			{
+				Cancel(self);
+				return NextActivity;
+			}
+
 			if (IsCanceled || !target.IsValidFor(self))
 				return NextActivity;
 

OpenRA.Mods.Common/Activities/Air/FlyOffMap.cs

@@ -25,6 +25,13 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			// Refuse to take off if it would land immediately again.
+			if (plane.ForceLanding)
+			{
+				Cancel(self);
+				return NextActivity;
+			}
+
 			if (IsCanceled || !self.World.Map.Contains(self.Location))
 				return NextActivity;
 

OpenRA.Mods.Common/Activities/Air/FlyTimed.cs

@@ -29,6 +29,13 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			// Refuse to take off if it would land immediately again.
+			if (plane.ForceLanding)
+			{
+				Cancel(self);
+				return NextActivity;
+			}
+
 			if (IsCanceled || remainingTicks-- == 0)
 				return NextActivity;
 

OpenRA.Mods.Common/Activities/Air/HeliAttack.cs

@@ -52,6 +52,13 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			// Refuse to take off if it would land immediately again.
+			if (helicopter.ForceLanding)
+			{
+				Cancel(self);
+				return NextActivity;
+			}
+
 			if (IsCanceled || !target.IsValidFor(self))
 				return NextActivity;
 

OpenRA.Mods.Common/Activities/Air/HeliFly.cs

@@ -54,6 +54,13 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			// Refuse to take off if it would land immediately again.
+			if (helicopter.ForceLanding)
+			{
+				Cancel(self);
+				return NextActivity;
+			}
+
 			if (IsCanceled || !target.IsValidFor(self))
 				return NextActivity;
 

OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs

@@ -27,6 +27,13 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			// Refuse to take off if it would land immediately again.
+			if (helicopter.ForceLanding)
+			{
+				Cancel(self);
+				return NextActivity;
+			}
+
 			if (IsCanceled)
 				return NextActivity;
 

OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs

@@ -42,6 +42,11 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			// Refuse to take off if it would land immediately again.
+			// Special case: Don't kill other deploy hotkey activities.
+			if (heli.ForceLanding)
+				return NextActivity;
+
 			if (IsCanceled)
 				return NextActivity;
 

OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs

@@ -110,6 +110,11 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			// Refuse to take off if it would land immediately again.
+			// Special case: Don't kill other deploy hotkey activities.
+			if (plane.ForceLanding)
+				return NextActivity;
+
 			if (IsCanceled || self.IsDead)
 				return NextActivity;
 

OpenRA.Mods.Common/Activities/Air/TakeOff.cs

@@ -28,6 +28,13 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			// Refuse to take off if it would land immediately again.
+			if (aircraft.ForceLanding)
+			{
+				Cancel(self);
+				return NextActivity;
+			}
+
 			aircraft.UnReserve();
 
 			var host = aircraft.GetActorBelow();