Fixes issues with support powers and adds property to all IOrderGenerator classes to determine priority over selection in the left-click order scheme.

Bynnar18 · Bynnar18 · commit 0abe8f9b2b0d · 2015-03-01T14:58:19.000-06:00
diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs
@@ -96,10 +96,10 @@ public static bool InputOverridesSelection(World world, int2 xy, MouseInput mi)
 
 			var o = OrderForUnit(underCursor, target, mi);
 
-			if (o == null || o.Trait is IMove)
-				return true;
+			if (o != null && o.Order.OverrideSelection)
+				return false;
 
-			return false;
+			return true;
 		}
 
 		static UnitOrderResult OrderForUnit(Actor self, Target target, MouseInput mi)
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -79,6 +79,7 @@ public interface IOrderTargeter
 		int OrderPriority { get; }
 		bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor);
 		bool IsQueued { get; }
+		bool OverrideSelection { get; }
 	}
 
 	public interface IResolveOrder { void ResolveOrder(Actor self, Order order); }
diff --git a/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs b/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
@@ -68,9 +68,15 @@ public override bool HandleMouseInput(MouseInput mi)
 
 				dragStart = xy;
 
-				// Place buildings
-				if (!useClassicMouseStyle || !World.Selection.Actors.Any())
+				// Place buildings, use support powers, and other non-unit things
+				if (!(World.OrderGenerator is UnitOrderGenerator))
+				{
 					ApplyOrders(World, xy, mi);
+					dragStart = dragEnd = null;
+					YieldMouseFocus(mi);
+					lastMousePosition = xy;
+					return true;
+				}
 			}
 
 			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Move && dragStart.HasValue)
@@ -114,8 +120,6 @@ public override bool HandleMouseInput(MouseInput mi)
 						World.Selection.Combine(World, newSelection, mi.Modifiers.HasModifier(Modifiers.Shift), dragStart == xy);
 					}
 				}
-				else if (useClassicMouseStyle)
-						ApplyOrders(World, xy, mi);
 
 				dragStart = dragEnd = null;
 				YieldMouseFocus(mi);
diff --git a/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs
@@ -45,6 +45,10 @@ public IonCannonPower(Actor self, IonCannonPowerInfo info) : base(self, info) {
 
 		public override IOrderGenerator OrderGenerator(string order, SupportPowerManager manager)
 		{
+			// Clear selection if using Left-Click Orders
+			if (Game.Settings.Game.UseClassicMouseStyle)
+				manager.Self.World.Selection.Clear();
+
 			Sound.PlayToPlayer(manager.Self.Owner, Info.SelectTargetSound);
 			var info = Info as IonCannonPowerInfo;
 			return new SelectGenericPowerTarget(order, manager, info.Cursor, MouseButton.Left);
diff --git a/OpenRA.Mods.Common/Orders/DeployOrderTargeter.cs b/OpenRA.Mods.Common/Orders/DeployOrderTargeter.cs
@@ -32,6 +32,7 @@ public DeployOrderTargeter(string order, int priority, Func<bool> useDeployCurso
 
 		public string OrderID { get; private set; }
 		public int OrderPriority { get; private set; }
+		public bool OverrideSelection { get { return true; } }
 
 		public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
 		{
diff --git a/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
@@ -34,6 +34,10 @@ public PlaceBuildingOrderGenerator(ProductionQueue queue, string name)
 			producer = queue.Actor;
 			building = name;
 
+			// Clear selection if using Left-Click Orders
+			if (Game.Settings.Game.UseClassicMouseStyle)
+				producer.World.Selection.Clear();
+
 			var map = producer.World.Map;
 			var tileset = producer.World.TileSet.Id.ToLowerInvariant();
 			buildingInfo = map.Rules.Actors[building].Traits.Get<BuildingInfo>();
diff --git a/OpenRA.Mods.Common/Orders/UnitOrderTargeter.cs b/OpenRA.Mods.Common/Orders/UnitOrderTargeter.cs
@@ -31,6 +31,7 @@ public UnitOrderTargeter(string order, int priority, string cursor, bool targetE
 		public string OrderID { get; private set; }
 		public int OrderPriority { get; private set; }
 		public bool? ForceAttack = null;
+		public bool OverrideSelection { get { return true; } }
 
 		public abstract bool CanTargetActor(Actor self, Actor target, TargetModifiers modifiers, ref string cursor);
 		public abstract bool CanTargetFrozenActor(Actor self, FrozenActor target, TargetModifiers modifiers, ref string cursor);
diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
@@ -302,6 +302,7 @@ class AircraftMoveOrderTargeter : IOrderTargeter
 	{
 		public string OrderID { get { return "Move"; } }
 		public int OrderPriority { get { return 4; } }
+		public bool OverrideSelection { get { return false; } }
 
 		readonly AircraftInfo info;
 
diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
@@ -194,6 +194,7 @@ public AttackOrderTargeter(AttackBase ab, string order, int priority, bool negat
 
 			public string OrderID { get; private set; }
 			public int OrderPriority { get; private set; }
+			public bool OverrideSelection { get { return true; } }
 
 			bool CanTargetActor(Actor self, Target target, TargetModifiers modifiers, ref string cursor)
 			{
diff --git a/OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs b/OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
@@ -56,6 +56,7 @@ class RallyPointOrderTargeter : IOrderTargeter
 		{
 			public string OrderID { get { return "SetRallyPoint"; } }
 			public int OrderPriority { get { return 0; } }
+			public bool OverrideSelection { get { return true; } }
 
 			public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
 			{
diff --git a/OpenRA.Mods.Common/Traits/Harvester.cs b/OpenRA.Mods.Common/Traits/Harvester.cs
@@ -445,6 +445,7 @@ class HarvestOrderTargeter : IOrderTargeter
 			public string OrderID { get { return "Harvest"; } }
 			public int OrderPriority { get { return 10; } }
 			public bool IsQueued { get; protected set; }
+			public bool OverrideSelection { get { return true; } }
 
 			public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
 			{
diff --git a/OpenRA.Mods.Common/Traits/Mobile.cs b/OpenRA.Mods.Common/Traits/Mobile.cs
@@ -619,6 +619,7 @@ class MoveOrderTargeter : IOrderTargeter
 		{
 			readonly MobileInfo unitType;
 			readonly bool rejectMove;
+			public bool OverrideSelection { get { return false; } }
 
 			public MoveOrderTargeter(Actor self, MobileInfo unitType)
 			{
diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/GrantUpgradePower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/GrantUpgradePower.cs
@@ -102,6 +102,10 @@ class SelectTarget : IOrderGenerator
 
 			public SelectTarget(World world, string order, SupportPowerManager manager, GrantUpgradePower power)
 			{
+				// Clear selection if using Left-Click Orders
+				if (Game.Settings.Game.UseClassicMouseStyle)
+					manager.Self.World.Selection.Clear();
+
 				this.manager = manager;
 				this.order = order;
 				this.power = power;
diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
@@ -239,6 +239,10 @@ public class SelectGenericPowerTarget : IOrderGenerator
 
 		public SelectGenericPowerTarget(string order, SupportPowerManager manager, string cursor, MouseButton button)
 		{
+			// Clear selection if using Left-Click Orders
+			if (Game.Settings.Game.UseClassicMouseStyle)
+				manager.Self.World.Selection.Clear();
+
 			this.manager = manager;
 			this.order = order;
 			this.cursor = cursor;
diff --git a/OpenRA.Mods.RA/Traits/Minelayer.cs b/OpenRA.Mods.RA/Traits/Minelayer.cs
@@ -197,6 +197,7 @@ class BeginMinefieldOrderTargeter : IOrderTargeter
 		{
 			public string OrderID { get { return "BeginMinefield"; } }
 			public int OrderPriority { get { return 5; } }
+			public bool OverrideSelection { get { return true; } }
 
 			public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
 			{
diff --git a/OpenRA.Mods.RA/Traits/PortableChrono.cs b/OpenRA.Mods.RA/Traits/PortableChrono.cs
@@ -119,6 +119,7 @@ class PortableChronoOrderTargeter : IOrderTargeter
 		public string OrderID { get { return "PortableChronoTeleport"; } }
 		public int OrderPriority { get { return 5; } }
 		public bool IsQueued { get; protected set; }
+		public bool OverrideSelection { get { return true; } }
 
 		public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
 		{
diff --git a/OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs b/OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs
@@ -101,6 +101,10 @@ class SelectTarget : IOrderGenerator
 
 			public SelectTarget(World world, string order, SupportPowerManager manager, ChronoshiftPower power)
 			{
+				// Clear selection if using Left-Click Orders
+				if (Game.Settings.Game.UseClassicMouseStyle)
+					manager.Self.World.Selection.Clear();
+
 				this.manager = manager;
 				this.order = order;
 				this.power = power;

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ public interface IOrderTargeter`
`79`	`79`	`int OrderPriority { get; }`
`80`	`80`	`bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor);`
`81`	`81`	`bool IsQueued { get; }`
	`82`	`+ bool OverrideSelection { get; }`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`public interface IResolveOrder { void ResolveOrder(Actor self, Order order); }`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public DeployOrderTargeter(string order, int priority, Func<bool> useDeployCurso`
`32`	`32`
`33`	`33`	`public string OrderID { get; private set; }`
`34`	`34`	`public int OrderPriority { get; private set; }`
	`35`	`+ public bool OverrideSelection { get { return true; } }`
`35`	`36`
`36`	`37`	`public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)`
`37`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,7 @@ class AircraftMoveOrderTargeter : IOrderTargeter`
`302`	`302`	`{`
`303`	`303`	`public string OrderID { get { return "Move"; } }`
`304`	`304`	`public int OrderPriority { get { return 4; } }`
	`305`	`+ public bool OverrideSelection { get { return false; } }`
`305`	`306`
`306`	`307`	`readonly AircraftInfo info;`
`307`	`308`
Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,7 @@ public AttackOrderTargeter(AttackBase ab, string order, int priority, bool negat`
`194`	`194`
`195`	`195`	`public string OrderID { get; private set; }`
`196`	`196`	`public int OrderPriority { get; private set; }`
	`197`	`+ public bool OverrideSelection { get { return true; } }`
`197`	`198`
`198`	`199`	`bool CanTargetActor(Actor self, Target target, TargetModifiers modifiers, ref string cursor)`
`199`	`200`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ class RallyPointOrderTargeter : IOrderTargeter`
`56`	`56`	`{`
`57`	`57`	`public string OrderID { get { return "SetRallyPoint"; } }`
`58`	`58`	`public int OrderPriority { get { return 0; } }`
	`59`	`+ public bool OverrideSelection { get { return true; } }`
`59`	`60`
`60`	`61`	`public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)`
`61`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -445,6 +445,7 @@ class HarvestOrderTargeter : IOrderTargeter`
`445`	`445`	`public string OrderID { get { return "Harvest"; } }`
`446`	`446`	`public int OrderPriority { get { return 10; } }`
`447`	`447`	`public bool IsQueued { get; protected set; }`
	`448`	`+ public bool OverrideSelection { get { return true; } }`
`448`	`449`
`449`	`450`	`public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)`
`450`	`451`	`{`
Original file line number	Diff line number	Diff line change
`@@ -619,6 +619,7 @@ class MoveOrderTargeter : IOrderTargeter`
`619`	`619`	`{`
`620`	`620`	`readonly MobileInfo unitType;`
`621`	`621`	`readonly bool rejectMove;`
	`622`	`+ public bool OverrideSelection { get { return false; } }`
`622`	`623`
`623`	`624`	`public MoveOrderTargeter(Actor self, MobileInfo unitType)`
`624`	`625`	`{`
Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,7 @@ class BeginMinefieldOrderTargeter : IOrderTargeter`
`197`	`197`	`{`
`198`	`198`	`public string OrderID { get { return "BeginMinefield"; } }`
`199`	`199`	`public int OrderPriority { get { return 5; } }`
	`200`	`+ public bool OverrideSelection { get { return true; } }`
`200`	`201`
`201`	`202`	`public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)`
`202`	`203`	`{`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ class PortableChronoOrderTargeter : IOrderTargeter`
`119`	`119`	`public string OrderID { get { return "PortableChronoTeleport"; } }`
`120`	`120`	`public int OrderPriority { get { return 5; } }`
`121`	`121`	`public bool IsQueued { get; protected set; }`
	`122`	`+ public bool OverrideSelection { get { return true; } }`
`122`	`123`
`123`	`124`	`public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)`
`124`	`125`	`{`