epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unhardcode spectator combined/world view hotkeys.

Browse Source
This commit is contained in:
Paul Chote
2017-07-23 22:06:33 +01:00
committed by reaperrr
parent 0525408664
commit 1bd1a185f5
7 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Settings.cs
View File

@@ -232,8 +232,8 @@ namespace OpenRA
public Hotkey StanceAttackAnythingKey = new Hotkey(Keycode.A, Modifiers.Alt);
public Hotkey GuardKey = new Hotkey(Keycode.D, Modifiers.None);
public Hotkey ObserverCombinedView = new Hotkey(Keycode.MINUS, Modifiers.None);
public Hotkey ObserverWorldView = new Hotkey(Keycode.EQUALS, Modifiers.None);
public Hotkey ObserverCombinedViewKey = new Hotkey(Keycode.MINUS, Modifiers.None);
public Hotkey ObserverWorldViewKey = new Hotkey(Keycode.EQUALS, Modifiers.None);
public Hotkey CycleStatusBarsKey = new Hotkey(Keycode.COMMA, Modifiers.None);
public Hotkey TogglePixelDoubleKey = new Hotkey(Keycode.PERIOD, Modifiers.None);

19
OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs
View File

@@ -13,17 +13,22 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Mods.Common.Lint;
using OpenRA.Network;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets.Logic
{
[ChromeLogicArgsHotkeys("CombinedViewKey", "WorldViewKey")]
public class ObserverShroudSelectorLogic : ChromeLogic
{
readonly CameraOption combined, disableShroud;
readonly IOrderedEnumerable<IGrouping<int, CameraOption>> teams;
readonly bool limitViews;
readonly NamedHotkey combinedViewKey = new NamedHotkey();
readonly NamedHotkey worldViewKey = new NamedHotkey();
CameraOption selected;
class CameraOption
@@ -57,8 +62,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}
[ObjectCreator.UseCtor]
public ObserverShroudSelectorLogic(Widget widget, World world)
public ObserverShroudSelectorLogic(Widget widget, World world, Dictionary<string, MiniYaml> logicArgs)
{
MiniYaml yaml;
var ks = Game.Settings.Keys;
if (logicArgs.TryGetValue("CombinedViewKey", out yaml))
combinedViewKey = new NamedHotkey(yaml.Value, ks);
if (logicArgs.TryGetValue("WorldViewKey", out yaml))
worldViewKey = new NamedHotkey(yaml.Value, ks);
limitViews = world.Map.Visibility.HasFlag(MapVisibility.MissionSelector);
var groups = new Dictionary<string, IEnumerable<CameraOption>>();
@@ -136,7 +149,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (e.Event == KeyInputEvent.Down && !e.IsRepeat)
{
var h = Hotkey.FromKeyInput(e);
if (h == Game.Settings.Keys.ObserverCombinedView && !limitViews)
if (h == combinedViewKey.GetValue() && !limitViews)
{
selected = combined;
selected.OnClick();
@@ -144,7 +157,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return true;
}
if (h == Game.Settings.Keys.ObserverWorldView && !limitViews)
if (h == worldViewKey.GetValue() && !limitViews)
{
selected = disableShroud;
selected.OnClick();

4
OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
View File

@@ -495,8 +495,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
var hotkeys = new Dictionary<string, string>()
{
{ "ObserverCombinedView", "All Players" },
{ "ObserverWorldView", "Disable Shroud" },
{ "ObserverCombinedViewKey", "All Players" },
{ "ObserverWorldViewKey", "Disable Shroud" },
{ "PauseKey", "Pause/Play" },
{ "ReplaySpeedSlowKey", "Slow speed" },
{ "ReplaySpeedRegularKey", "Regular speed" },

2
mods/cnc/chrome/ingame.yaml
View File

@@ -224,6 +224,8 @@ Container@OBSERVER_WIDGETS:
Font: TinyBold
DropDownButton@SHROUD_SELECTOR:
Logic: ObserverShroudSelectorLogic
CombinedViewKey: ObserverCombinedView
WorldViewKey: ObserverWorldView
X: WINDOW_RIGHT - WIDTH - 5
Y: 260
Width: 256

2
mods/common/chrome/ingame-observer.yaml
View File

@@ -60,6 +60,8 @@ Container@OBSERVER_WIDGETS:
Children:
DropDownButton@SHROUD_SELECTOR:
Logic: ObserverShroudSelectorLogic
CombinedViewKey: ObserverCombinedView
WorldViewKey: ObserverWorldView
X: 15
Y: 15
Width: 220

2
mods/ra/chrome/ingame-observer.yaml
View File

@@ -78,6 +78,8 @@ Container@OBSERVER_WIDGETS:
Height: 220
DropDownButton@SHROUD_SELECTOR:
Logic: ObserverShroudSelectorLogic
CombinedViewKey: ObserverCombinedView
WorldViewKey: ObserverWorldView
X: 6
Y: 262
Width: 226

2
mods/ts/chrome/ingame-observer.yaml
View File

@@ -60,6 +60,8 @@ Container@OBSERVER_WIDGETS:
Children:
DropDownButton@SHROUD_SELECTOR:
Logic: ObserverShroudSelectorLogic
CombinedViewKey: ObserverCombinedView
WorldViewKey: ObserverWorldView
X: 15
Y: 15
Width: 220