Begin imposing sanity on order ordering

OpenRA.Game/Actor.cs

@@ -122,6 +122,7 @@ namespace OpenRA
 				.FirstOrDefault();
 			
 			return TraitsImplementing<IIssueOrder>()
+				.OrderByDescending( x => x.OrderPriority( this, xy, mi, underCursor ) )
 				.Select( x => x.IssueOrder( this, xy, mi, underCursor ) )
 				.FirstOrDefault( x => x != null );
 		}

OpenRA.Game/Traits/Mobile.cs

@@ -113,22 +113,21 @@ namespace OpenRA.Traits
 			self.CenterLocation = Util.CenterOfCell(fromCell);
 		}
 
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			// Force move takes precidence
+			return mi.Modifiers.HasModifier(Modifiers.Alt) ? int.MaxValue : 0;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (Info.OnRails) return null;
 			
 			if (mi.Button == MouseButton.Left) return null;
 
-			// force-fire should *always* take precedence over move.
+			if (!CanEnterCell(xy))
-			if (mi.Modifiers.HasModifier(Modifiers.Ctrl)) return null;
+				return null;
 			
-			if (underCursor != null && underCursor.Owner != null)
-			{
-				// force-move
-				if (!mi.Modifiers.HasModifier(Modifiers.Alt)) return null;
-				if (!CanEnterCell(underCursor.Location, null, true)) return null;
-			}
-			if (MovementSpeedForCell(self, toCell) == 0) return null;		/* allow disabling move orders from modifiers */
 			if (xy == toCell) return null;
 			
 			return new Order("Move", self, xy, mi.Modifiers.HasModifier(Modifiers.Shift));

OpenRA.Game/Traits/PrimaryBuilding.cs

@@ -25,6 +25,11 @@ namespace OpenRA.Traits
 			yield return (isPrimary) ? TagType.Primary : TagType.None;
 		}
 		
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 0;
+		}
+
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button == MouseButton.Right && underCursor == self)

OpenRA.Game/Traits/RallyPoint.cs

@@ -42,6 +42,11 @@ namespace OpenRA.Traits
 					anim.Image, Util.CenterOfCell(rallyPoint));
 		}
 
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 0;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button == MouseButton.Left || underCursor != null) return null;

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -33,7 +33,11 @@ namespace OpenRA.Traits
 
 	public interface ITick { void Tick(Actor self); }
 	public interface IRender { IEnumerable<Renderable> Render(Actor self); }
-	public interface IIssueOrder { Order IssueOrder( Actor self, int2 xy, MouseInput mi, Actor underCursor ); }
+	public interface IIssueOrder
+	{
+		Order IssueOrder( Actor self, int2 xy, MouseInput mi, Actor underCursor );
+		int OrderPriority( Actor self, int2 xy, MouseInput mi, Actor underCursor );
+	}
 	public interface IResolveOrder { void ResolveOrder(Actor self, Order order); }
 	public interface IOrderCursor { string CursorForOrder(Actor self, Order order); }
 	public interface IOrderVoice { string VoicePhraseForOrder(Actor self, Order order); }

OpenRA.Mods.RA/AttackBase.cs

@@ -174,6 +174,11 @@ namespace OpenRA.Mods.RA
 			return info.FireDelay;
 		}
 
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return mi.Modifiers.HasModifier(Modifiers.Ctrl) ? int.MaxValue : 1;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button == MouseButton.Left) return null;

OpenRA.Mods.RA/C4Demolition.cs

@@ -23,6 +23,11 @@ namespace OpenRA.Mods.RA
 
 	class C4Demolition : IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice
 	{
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button != MouseButton.Right) return null;

OpenRA.Mods.RA/Cargo.cs

@@ -26,6 +26,11 @@ namespace OpenRA.Mods.RA
 		List<Actor> cargo = new List<Actor>();
 		public IEnumerable<Actor> Passengers { get { return cargo; } }
 
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button == MouseButton.Right && underCursor == self)

OpenRA.Mods.RA/ChronoshiftDeploy.cs

@@ -33,6 +33,11 @@ namespace OpenRA.Mods.RA
 				chargeTick--;
 		}
 
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button == MouseButton.Right && xy == self.Location)

OpenRA.Mods.RA/EngineerCapture.cs

@@ -19,6 +19,11 @@ namespace OpenRA.Mods.RA
 	class EngineerCaptureInfo : TraitInfo<EngineerCapture> {}
 	class EngineerCapture : IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice
 	{
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button != MouseButton.Right) return null;

OpenRA.Mods.RA/EngineerRepair.cs

@@ -20,6 +20,11 @@ namespace OpenRA.Mods.RA
 
 	class EngineerRepair : IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice
 	{
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button != MouseButton.Right) return null;

OpenRA.Mods.RA/Harvester.cs

@@ -93,6 +93,11 @@ namespace OpenRA.Mods.RA
 			contents.Clear();
 		}
 		
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button == MouseButton.Left) return null;

OpenRA.Mods.RA/Helicopter.cs

@@ -39,10 +39,15 @@ namespace OpenRA.Mods.RA
 			Info = info;
 		}
 
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			// Force move takes precidence
+			return mi.Modifiers.HasModifier(Modifiers.Alt) ? int.MaxValue : 0;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button == MouseButton.Left) return null;
-			if (mi.Modifiers.HasModifier(Modifiers.Ctrl)) return null;
 
 			if (underCursor == null)
 				if (self.TraitOrDefault<IMove>().CanEnterCell(xy))

OpenRA.Mods.RA/Minelayer.cs

@@ -32,6 +32,11 @@ namespace OpenRA.Mods.RA
 		public int2[] minefield = null;
 		[Sync] int2 minefieldStart;
 
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button == MouseButton.Right && underCursor == null && mi.Modifiers.HasModifier(Modifiers.Ctrl))

OpenRA.Mods.RA/Passenger.cs

@@ -25,6 +25,11 @@ namespace OpenRA.Mods.RA
 
 	class Passenger : IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice
 	{
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{		
 			if (mi.Button != MouseButton.Right) 

OpenRA.Mods.RA/Plane.cs

@@ -46,6 +46,12 @@ namespace OpenRA.Mods.RA
 			}
 		}
 
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			// Force move takes precidence
+			return mi.Modifiers.HasModifier(Modifiers.Alt) ? int.MaxValue : 0;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button == MouseButton.Left) return null;

OpenRA.Mods.RA/Render/RenderSpy.cs

@@ -46,6 +46,11 @@ namespace OpenRA.Mods.RA.Render
 				disguisedAs = order.TargetActor == self ? null : order.TargetActor;
 		}
 		
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (underCursor != null && underCursor.HasTrait<RenderInfantry>())

OpenRA.Mods.RA/Repairable.cs

@@ -31,11 +31,15 @@ namespace OpenRA.Mods.RA
 			Health = self.Trait<Health>();
 		}
 		
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button != MouseButton.Right) return null;
 			if (underCursor == null) return null;
-			if (mi.Modifiers.HasModifier(Modifiers.Ctrl)) return null;	// force-fire, so don't do this.
 
 			if (self.Info.Traits.Get<RepairableInfo>().RepairBuildings.Contains(underCursor.Info.Name)
 				&& underCursor.Owner == self.Owner)

OpenRA.Mods.RA/RepairableNear.cs

@@ -24,6 +24,11 @@ namespace OpenRA.Mods.RA
 
 	class RepairableNear : IIssueOrder, IResolveOrder, IOrderCursor
 	{
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button != MouseButton.Right) return null;

OpenRA.Mods.RA/Spy.cs

@@ -19,6 +19,11 @@ namespace OpenRA.Mods.RA
 
 	class Spy : IIssueOrder, IResolveOrder, IOrderCursor
 	{
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button != MouseButton.Right) return null;

OpenRA.Mods.RA/Transforms.cs

@@ -38,6 +38,11 @@ namespace OpenRA.Mods.RA
 			bi = Rules.Info[info.IntoActor].Traits.GetOrDefault<BuildingInfo>();
 		}
 		
+		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
+		{
+			return 5;
+		}
+		
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
 			if (mi.Button == MouseButton.Right && self == underCursor)