From 70b40a54be56cd138735b87a66f0c4f24ea28dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 8 Apr 2013 09:37:54 +0200 Subject: [PATCH] build palette hotkeys require ALT modifier to avoid conflicts changed back the unit action hotkeys scatter / stance cycle --- OpenRA.Game/GameRules/Settings.cs | 4 ++-- OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/OpenRA.Game/GameRules/Settings.cs b/OpenRA.Game/GameRules/Settings.cs index 1cb8eae1d5..de52bbdb12 100644 --- a/OpenRA.Game/GameRules/Settings.cs +++ b/OpenRA.Game/GameRules/Settings.cs @@ -146,9 +146,9 @@ namespace OpenRA.GameRules public string AttackMoveKey = "a"; public string StopKey = "s"; - public string ScatterKey = "d"; + public string ScatterKey = "x"; public string DeployKey = "f"; - public string StanceCycleKey = "g"; + public string StanceCycleKey = "z"; public string CycleTabsKey = "tab"; } diff --git a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs index 7f88479712..ead5721ed8 100755 --- a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs +++ b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs @@ -150,8 +150,9 @@ namespace OpenRA.Mods.RA.Widgets TabChange(e.Modifiers.HasModifier(Modifiers.Shift)); return true; } - - return DoBuildingHotkey(e.KeyName, world); + if (e.Modifiers == Modifiers.Alt) + return DoBuildingHotkey(e.KeyName, world); + return false; } public override bool HandleMouseInput(MouseInput mi) @@ -454,7 +455,7 @@ namespace OpenRA.Mods.RA.Widgets WidgetUtils.DrawPanel("dialog4", new Rectangle(Game.viewport.Width - 300, pos.Y, 300, longDescSize + 65)); Game.Renderer.Fonts["Bold"].DrawText( - tooltip.Name + ((buildable.Hotkey != null) ? " ({0})".F(buildable.Hotkey.ToUpper()) : ""), + tooltip.Name + ((buildable.Hotkey != null) ? " (ALT + {0})".F(buildable.Hotkey.ToUpper()) : ""), p.ToInt2() + new int2(5, 5), Color.White); var resources = pl.PlayerActor.Trait();