Add RejectsOrders to disallow orders for offmap aircraft etc

OpenRA.Game/OpenRA.Game.csproj

@@ -170,6 +170,7 @@
     <Compile Include="Traits\EditorTilesetFilter.cs" />
     <Compile Include="Traits\Health.cs" />
     <Compile Include="Traits\LintAttributes.cs" />
+    <Compile Include="Traits\RejectsOrders.cs" />
     <Compile Include="Traits\Player\DeveloperMode.cs" />
     <Compile Include="Traits\Player\PlayerResources.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />

OpenRA.Game/Traits/RejectsOrders.cs

@@ -0,0 +1,43 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Linq;
+using OpenRA.Network;
+
+namespace OpenRA.Traits
+{
+	public class RejectsOrdersInfo : ITraitInfo
+	{
+		public readonly string[] Except = { };
+
+		public object Create(ActorInitializer init) { return new RejectsOrders(this); }
+	}
+
+	public class RejectsOrders
+	{
+		public string[] Except { get { return info.Except; } }
+
+		readonly RejectsOrdersInfo info;
+
+		public RejectsOrders(RejectsOrdersInfo info)
+		{
+			this.info = info;
+		}
+	}
+
+	public static class RejectsOrdersExts
+	{
+		public static bool AcceptsOrder(this Actor self, string orderString)
+		{
+			var r = self.TraitOrDefault<RejectsOrders>();
+			return r == null || r.Except.Contains(orderString);
+		}
+	}
+}

OpenRA.Game/Traits/ValidateOrder.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System.Collections.Generic;
 using OpenRA.Network;
 
 namespace OpenRA.Traits
@@ -40,7 +39,7 @@ namespace OpenRA.Traits
 				return false;
 			}
 
-			return true;
+			return order.Subject.AcceptsOrder(order.OrderString);
 		}
 	}
 }

mods/cnc/rules/aircraft.yaml

@@ -166,6 +166,7 @@ C17:
 	-TargetableUnit:
 	-GainsExperience:
 	FlyAwayOnIdle:
+	RejectsOrders:
 
 A10:
 	Inherits: ^Plane
@@ -194,6 +195,7 @@ A10:
 	-Selectable:
 	-GainsExperience:
 	FlyAwayOnIdle:
+	RejectsOrders:
 
 TRAN.Husk:
 	Inherits: ^HelicopterHusk

mods/cnc/rules/ships.yaml

@@ -29,6 +29,7 @@ BOAT:
 	AutoTarget:
 		AllowMovement: false
 	WithSmoke:
+	RejectsOrders:
 
 LST:
 	Inherits: ^Ship
@@ -68,4 +69,4 @@ LST:
 		PipCount: 5
 	AttackMove:
 		JustMove: true
-
+	RejectsOrders:

mods/d2k/rules/aircraft.yaml

@@ -60,6 +60,7 @@ FRIGATE:
 	-Selectable:
 	-GainsExperience:
 	FlyAwayOnIdle:
+	RejectsOrders:
 
 ORNI:
 	Inherits: ^Helicopter
@@ -120,6 +121,7 @@ ORNI.bomber:
 		Name: Ornithopter
 	LeavesHusk:
 		HuskActor: ORNI.bomber.Husk
+	RejectsOrders:
 
 CARRYALL.infantry:
 	ParaDrop:
@@ -149,6 +151,7 @@ CARRYALL.infantry:
 		Name: Carryall
 	LeavesHusk:
 		HuskActor: CARRYALL.infantry.Husk
+	RejectsOrders:
 
 BADR:
 	Inherits: CARRYALL.infantry

mods/ra/rules/aircraft.yaml

@@ -33,6 +33,7 @@ BADR:
 		Interval: 2
 	-EjectOnDeath:
 	-GpsDot:
+	RejectsOrders:
 
 BADR.Bomber:
 	CarpetBomb:
@@ -70,6 +71,7 @@ BADR.Bomber:
 		Interval: 2
 	-EjectOnDeath:
 	-GpsDot:
+	RejectsOrders:
 
 MIG:
 	Inherits: ^Plane
@@ -341,6 +343,7 @@ U2:
 	SmokeTrailWhenDamaged:
 		Offset: -1c43,0,0
 		Interval: 2
+	RejectsOrders:
 
 BADR.Husk:
 	Inherits: ^PlaneHusk