Master1013+new hotkey layout and functions+palette tab integration+classic mouse style

OpenRA.FileFormats/Graphics/IInputHandler.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

OpenRA.Game/GameRules/Settings.cs

@@ -49,7 +49,7 @@ public class DebugSettings
 		public bool PerfText = false;
 		public bool PerfGraph = false;
 		public float LongTickThreshold = 0.001f;
-        public bool SanityCheckUnsyncedCode = false;
+		public bool SanityCheckUnsyncedCode = false;
 		public int Samples = 25;
 	}
 
@@ -79,7 +79,7 @@ public class SoundSettings
 	public class PlayerSettings
 	{
 		public string Name = "Newbie";
-        public ColorRamp ColorRamp = new ColorRamp(75, 255, 180, 25);
+		public ColorRamp ColorRamp = new ColorRamp(75, 255, 180, 25);
 		public string LastServer = "localhost:1234";
 	}
 
@@ -91,14 +91,31 @@ public class GameSettings
 
 		public bool TeamChatToggle = false;
 
-        public bool ViewportEdgeScroll = true;
-        public MouseScrollType MouseScroll = MouseScrollType.Standard;
+		public bool ViewportEdgeScroll = true;
+		public MouseScrollType MouseScroll = MouseScrollType.Standard;
 		public float ViewportEdgeScrollStep = 10f;
 
 		// Internal game settings
 		public int Timestep = 40;
 	}
 
+	public class KeySettings
+	{
+		public string AttackMoveKey = "q";
+		public string StopKey = "w";
+		public string ScatterKey = "e";
+		public string StanceCycleKey = "r";
+		public string DeployKey = "t";
+
+		public string DefenseTabKey = "x";
+
+		public Modifiers ModifierToBuild = Modifiers.None;
+		public Modifiers ModifierToCycle = Modifiers.Alt;
+		public Modifiers ModifierToSelectTab = Modifiers.Ctrl;
+
+		public bool UseClassicMouseStyle = false;
+	}
+
 	public class Settings
 	{
 		string SettingsFile;
@@ -108,6 +125,7 @@ public class Settings
 		public SoundSettings Sound = new SoundSettings();
 		public GraphicSettings Graphics = new GraphicSettings();
 		public ServerSettings Server = new ServerSettings();
+		public KeySettings Keys = new KeySettings();
 		public DebugSettings Debug = new DebugSettings();
 		public Dictionary<string, object> Sections;
 		public Settings(string file, Arguments args)
@@ -120,6 +138,7 @@ public Settings(string file, Arguments args)
 				{"Sound", Sound},
 				{"Graphics", Graphics},
 				{"Server", Server},
+				{"Keys", Keys},
 				{"Debug", Debug},
 			};
 

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -80,7 +80,8 @@ static UnitOrderResult OrderForUnit( Actor self, int2 xy, MouseInput mi, Actor u
 			if (self.Destroyed)
 				return null;
 
-			if( mi.Button == MouseButton.Right )
+			if(( !Game.Settings.Keys.UseClassicMouseStyle && mi.Button == MouseButton.Right )
+				|| (Game.Settings.Keys.UseClassicMouseStyle && mi.Button == MouseButton.Left))
 			{
 				foreach( var o in self.TraitsImplementing<IIssueOrder>()
 					.SelectMany( trait => trait.Orders

OpenRA.Game/Selection.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs

@@ -52,12 +52,20 @@ public override void Draw()
 		public override bool HandleMouseInput(MouseInput mi)
 		{
 			var xy = Game.viewport.ViewToWorldPx(mi);
+
+			var UseClassicMouseStyle = Game.Settings.Keys.UseClassicMouseStyle;
+
+			bool UnitsUnderCursor = (world.FindUnitsAtMouse(mi.Location).FirstOrDefault() != null) ? true : false;
+			bool Box = (SelectionBox != null) ? true : false;
+			bool MultiClick = (mi.MultiTapCount >= 2) ? true : false;
+
 			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Down)
 			{
 				if (!TakeFocus(mi))
 					return false;
 
 				dragStart = dragEnd = xy;
+
 				ApplyOrders(world, xy, mi);
 			}
 
@@ -68,13 +76,21 @@ public override bool HandleMouseInput(MouseInput mi)
 			{
 				if (world.OrderGenerator is UnitOrderGenerator)
 				{
-					if (mi.MultiTapCount == 2)
+					if (!UseClassicMouseStyle || (UseClassicMouseStyle && (UnitsUnderCursor || Box)))
 					{
-						var unit = world.FindUnitsAtMouse(mi.Location).FirstOrDefault();
+						var newSelection = SelectActorsInBox(world, dragStart, xy);
+						world.Selection.Combine(world, newSelection,
+										mi.Modifiers.HasModifier(Modifiers.Shift), dragStart == xy);
+					}
 
+					if (MultiClick)
+					{
+						var unit = world.FindUnitsAtMouse(mi.Location).FirstOrDefault();
 						Rectangle visibleWorld = Game.viewport.ViewBounds(world);
-						var newSelection = world.FindUnits(Game.viewport.ViewToWorldPx(new int2(visibleWorld.Left, visibleWorld.Top)),
-									Game.viewport.ViewToWorldPx(new int2(visibleWorld.Right, visibleWorld.Bottom)))
+						var newSelection = world.FindUnits(Game.viewport
+									.ViewToWorldPx(new int2(visibleWorld.Left, visibleWorld.Top)),
+									Game.viewport.ViewToWorldPx(new int2(visibleWorld.Right,
+									visibleWorld.Bottom)))
 									.Where(a => a.HasTrait<Selectable>()
 										&& a.World.LocalShroud.IsVisible(a)
 										&& unit != null
@@ -83,10 +99,10 @@ public override bool HandleMouseInput(MouseInput mi)
 
 						world.Selection.Combine(world, newSelection, true, false);
 					}
-					else
+
+					if (UseClassicMouseStyle && !UnitsUnderCursor && !Box)
 					{
-						var newSelection = SelectActorsInBox(world, dragStart, xy);
-						world.Selection.Combine(world, newSelection, mi.Modifiers.HasModifier(Modifiers.Shift), dragStart == xy);
+						ApplyOrders(world, xy, mi);
 					}
 				}
 
@@ -98,8 +114,13 @@ public override bool HandleMouseInput(MouseInput mi)
 				dragStart = dragEnd = xy;
 
 			if (mi.Button == MouseButton.Right && mi.Event == MouseInputEvent.Down)
-				if (SelectionBox == null)	/* don't issue orders while selecting */
+			{
+				if (UseClassicMouseStyle)
+					world.Selection.Clear();
+
+				if (!Box)	/* don't issue orders while selecting */
 					ApplyOrders(world, xy, mi);
+			}
 
 			return true;
 		}
@@ -133,7 +154,7 @@ public override string GetCursor(int2 pos)
 				var mi = new MouseInput
 				{
 					Location = pos,
-					Button = MouseButton.Right,
+					Button = Game.Settings.Keys.UseClassicMouseStyle ? MouseButton.Left : MouseButton.Right,
 					Modifiers = Game.GetModifierKeys()
 				};
 

OpenRA.Game/World.cs

@@ -209,10 +209,10 @@ public int SyncHash()
 			}
 		}
 
-        public IEnumerable<TraitPair<T>> ActorsWithTrait<T>()
-        {
-            return traitDict.ActorsWithTraitMultiple<T>(this);
-        }
+		public IEnumerable<TraitPair<T>> ActorsWithTrait<T>()
+		{
+			return traitDict.ActorsWithTraitMultiple<T>(this);
+		}
 	}
 
 	public struct TraitPair<T>

OpenRA.Mods.RA/AirportBuilding.cs

@@ -0,0 +1,18 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 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 OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	/* tag trait for "airports": hpad/afld */
+	public class AirportBuildingInfo : TraitInfo<AirportBuilding> { }
+	public class AirportBuilding { }
+}

OpenRA.Mods.RA/BarracksBuilding.cs

@@ -0,0 +1,18 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 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 OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	/* tag trait for "barracks": barr/tent */
+	public class BarracksBuildingInfo : TraitInfo<BarracksBuilding> { }
+	public class BarracksBuilding { }
+}

OpenRA.Mods.RA/BaseBuilding.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -14,5 +14,8 @@ namespace OpenRA.Mods.RA
 {
 	/* tag trait for "bases": mcv/fact */
 	public class BaseBuildingInfo : TraitInfo<BaseBuilding> { }
-	public class BaseBuilding { }
+	public class BaseBuilding
+	{
+		public string BuildingType;
+	}
 }

OpenRA.Mods.RA/DockBuilding.cs

@@ -0,0 +1,18 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 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 OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	/* tag trait for "docks": spen/syrd */
+	public class DockBuildingInfo : TraitInfo<DockBuilding> { }
+	public class DockBuilding { }
+}

OpenRA.Mods.RA/Orders/SellOrderGenerator.cs

@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made

OpenRA.Mods.RA/ProductionBuilding.cs

@@ -0,0 +1,22 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 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 OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+        /* tag trait for "ProductionBuildings": mcv/fact, barr/tent, weap, spen/syrd, hpad/afld */
+        public class ProductionBuildingInfo : TraitInfo<ProductionBuilding>
+        {
+                public string BuildingType;
+        }
+
+        public class ProductionBuilding { }
+}

OpenRA.Mods.RA/WarFactoryBuilding.cs

@@ -0,0 +1,18 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 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 OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	/* tag trait for "war factories": weap */
+	public class WarFactoryBuildingInfo : TraitInfo<WarFactoryBuilding> { }
+	public class WarFactoryBuilding { }
+}

OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs

@@ -147,13 +147,14 @@ public void SetCurrentTab(ProductionQueue queue)
 		public override bool HandleKeyPress(KeyInput e)
 		{
 			if (e.Event == KeyInputEvent.Up) return false;
+
 			if (e.KeyName == "tab")
 			{
 				TabChange(e.Modifiers.HasModifier(Modifiers.Shift));
 				return true;
 			}
 
-			return DoBuildingHotkey(e.KeyName, world);
+			return DoBuildingHotkey(e.KeyName, world, e);
 		}
 
 		public override bool HandleMouseInput(MouseInput mi)
@@ -500,31 +501,36 @@ void DrawProductionTooltip(World world, string unit, int2 pos)
 				p.ToInt2(), Color.White);
 		}
 
-        bool DoBuildingHotkey(string key, World world)
-        {
+		bool DoBuildingHotkey(string key, World world, KeyInput e)
+		{
 			if (!paletteOpen) return false;
 			if (CurrentQueue == null) return false;
 
-            var toBuild = CurrentQueue.BuildableItems().FirstOrDefault(b => b.Traits.Get<BuildableInfo>().Hotkey == key);
+			if (world.Selection.Actors.Any( a => a.Owner == world.LocalPlayer && !a.HasTrait<Building>() )) return false;
+
+			var toBuild = CurrentQueue.BuildableItems().FirstOrDefault(b => b.Traits.Get<BuildableInfo>().Hotkey == key);
+
+			var KeyConfig = Game.Settings.Keys;
 
-            if ( toBuild != null )
+			if ( (toBuild != null)
+				&& (!toBuild.Traits.Contains<ProductionBuildingInfo>() || (e.Modifiers == KeyConfig.ModifierToBuild)) )
 			{
 				Sound.Play(TabClick);
-		    	HandleBuildPalette(world, toBuild.Name, true);
+				HandleBuildPalette(world, toBuild.Name, true);
 				return true;
 			}
 
 			return false;
-        }
+		}
 
 		void TabChange(bool shift)
-        {
-			var queues = VisibleQueues.Concat(VisibleQueues);
-			if (shift) queues.Reverse();
-			var nextQueue = queues.SkipWhile( q => q != CurrentQueue )
-				.ElementAtOrDefault(1);
-			if (nextQueue != null)
-				SetCurrentTab( nextQueue );
-        }
+		{
+				var queues = VisibleQueues.Concat(VisibleQueues);
+				if (shift) queues.Reverse();
+				var nextQueue = queues.SkipWhile( q => q != CurrentQueue )
+					.ElementAtOrDefault(1);
+				if (nextQueue != null)
+					SetCurrentTab( nextQueue );
+		}
 	}
 }