Skip to content

Commit

Permalink
Add Statistics options hotkeys
Browse files Browse the repository at this point in the history
  • Loading branch information
@rob-v @reaperrr
rob-v authored and reaperrr committed Sep 24, 2017
1 parent b86d632 commit c9b4568
Show file tree
Hide file tree
Showing 11 changed files with 170 additions and 93 deletions.
5 changes: 5 additions & 0 deletions OpenRA.Game/Settings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,11 @@ public class KeySettings

public Hotkey ObserverCombinedViewKey = new Hotkey(Keycode.MINUS, Modifiers.None);
public Hotkey ObserverWorldViewKey = new Hotkey(Keycode.EQUALS, Modifiers.None);
public Hotkey StatisticsBasicKey = new Hotkey(Keycode.F1, Modifiers.None);
public Hotkey StatisticsEconomyKey = new Hotkey(Keycode.F2, Modifiers.None);
public Hotkey StatisticsProductionKey = new Hotkey(Keycode.F3, Modifiers.None);
public Hotkey StatisticsCombatKey = new Hotkey(Keycode.F4, Modifiers.None);
public Hotkey StatisticsGraphKey = new Hotkey(Keycode.UNKNOWN, Modifiers.None);

public Hotkey CycleStatusBarsKey = new Hotkey(Keycode.COMMA, Modifiers.None);
public Hotkey TogglePixelDoubleKey = new Hotkey(Keycode.PERIOD, Modifiers.None);
Expand Down
37 changes: 34 additions & 3 deletions OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
#endregion

using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Lint;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
using OpenRA.Widgets;

namespace OpenRA.Mods.Common.Widgets.Logic
{
[ChromeLogicArgsHotkeys("StatisticsBasicKey", "StatisticsEconomyKey", "StatisticsProductionKey", "StatisticsCombatKey", "StatisticsGraphKey")]
public class MenuButtonsChromeLogic : ChromeLogic
{
readonly World world;
Expand All @@ -26,13 +28,20 @@ public class MenuButtonsChromeLogic : ChromeLogic
Widget currentWidget;

[ObjectCreator.UseCtor]
public MenuButtonsChromeLogic(Widget widget, World world)
public MenuButtonsChromeLogic(Widget widget, World world, Dictionary<string, MiniYaml> logicArgs)
{
this.world = world;

worldRoot = Ui.Root.Get("WORLD_ROOT");
menuRoot = Ui.Root.Get("MENU_ROOT");

MiniYaml yaml;
var ks = Game.Settings.Keys;
string[] keyNames = Enum.GetNames(typeof(ObserverStatsPanel));
var statsHotkeys = new NamedHotkey[keyNames.Length];
for (var i = 0; i < keyNames.Length; i++)
statsHotkeys[i] = logicArgs.TryGetValue("Statistics" + keyNames[i] + "Key", out yaml) ? new NamedHotkey(yaml.Value, ks) : new NamedHotkey();

// System buttons
var options = widget.GetOrNull<MenuButtonWidget>("OPTIONS_BUTTON");
if (options != null)
Expand Down Expand Up @@ -85,7 +94,29 @@ public MenuButtonsChromeLogic(Widget widget, World world)
if (stats != null)
{
stats.IsDisabled = () => disableSystemButtons || world.Map.Visibility.HasFlag(MapVisibility.MissionSelector);
stats.OnClick = () => OpenMenuPanel(stats);
stats.OnClick = () => OpenMenuPanel(stats, new WidgetArgs() { { "activePanel", ObserverStatsPanel.Basic } });
}

var keyListener = widget.GetOrNull<LogicKeyListenerWidget>("OBSERVER_KEY_LISTENER");
if (keyListener != null)
{
keyListener.AddHandler(e =>
{
if (e.Event == KeyInputEvent.Down && !e.IsRepeat)
{
var key = Hotkey.FromKeyInput(e);
for (var i = 0; i < statsHotkeys.Length; i++)
{
if (key == statsHotkeys[i].GetValue())
{
OpenMenuPanel(stats, new WidgetArgs() { { "activePanel", i } });
return true;
}
}
}
return false;
});
}
}

Expand Down
157 changes: 74 additions & 83 deletions OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,37 +14,48 @@
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Lint;
using OpenRA.Mods.Common.Traits;
using OpenRA.Network;
using OpenRA.Traits;
using OpenRA.Widgets;

namespace OpenRA.Mods.Common.Widgets.Logic
{
public enum ObserverStatsPanel { Basic, Economy, Production, Combat, Graph }

[ChromeLogicArgsHotkeys("StatisticsBasicKey", "StatisticsEconomyKey", "StatisticsProductionKey", "StatisticsCombatKey", "StatisticsGraphKey")]
public class ObserverStatsLogic : ChromeLogic
{
ContainerWidget basicStatsHeaders;
ContainerWidget economyStatsHeaders;
ContainerWidget productionStatsHeaders;
ContainerWidget combatStatsHeaders;
ContainerWidget earnedThisMinuteGraphHeaders;
ScrollPanelWidget playerStatsPanel;
ScrollItemWidget basicPlayerTemplate;
ScrollItemWidget economyPlayerTemplate;
ScrollItemWidget productionPlayerTemplate;
ScrollItemWidget combatPlayerTemplate;
ContainerWidget earnedThisMinuteGraphTemplate;
ScrollItemWidget teamTemplate;
DropDownButtonWidget statsDropDown;
IEnumerable<Player> players;
World world;
WorldRenderer worldRenderer;
readonly ContainerWidget basicStatsHeaders;
readonly ContainerWidget economyStatsHeaders;
readonly ContainerWidget productionStatsHeaders;
readonly ContainerWidget combatStatsHeaders;
readonly ContainerWidget earnedThisMinuteGraphHeaders;
readonly ScrollPanelWidget playerStatsPanel;
readonly ScrollItemWidget basicPlayerTemplate;
readonly ScrollItemWidget economyPlayerTemplate;
readonly ScrollItemWidget productionPlayerTemplate;
readonly ScrollItemWidget combatPlayerTemplate;
readonly ContainerWidget earnedThisMinuteGraphTemplate;
readonly ScrollItemWidget teamTemplate;
readonly IEnumerable<Player> players;
readonly World world;
readonly WorldRenderer worldRenderer;

[ObjectCreator.UseCtor]
public ObserverStatsLogic(World world, WorldRenderer worldRenderer, Widget widget, Action onExit)
public ObserverStatsLogic(World world, WorldRenderer worldRenderer, Widget widget, Action onExit, ObserverStatsPanel activePanel, Dictionary<string, MiniYaml> logicArgs)
{
this.world = world;
this.worldRenderer = worldRenderer;

MiniYaml yaml;
var ks = Game.Settings.Keys;
string[] keyNames = Enum.GetNames(typeof(ObserverStatsPanel));
var statsHotkeys = new NamedHotkey[keyNames.Length];
for (var i = 0; i < keyNames.Length; i++)
statsHotkeys[i] = logicArgs.TryGetValue("Statistics" + keyNames[i] + "Key", out yaml) ? new NamedHotkey(yaml.Value, ks) : new NamedHotkey();

players = world.Players.Where(p => !p.NonCombatant);

basicStatsHeaders = widget.Get<ContainerWidget>("BASIC_STATS_HEADERS");
Expand All @@ -64,79 +75,40 @@ public ObserverStatsLogic(World world, WorldRenderer worldRenderer, Widget widge

teamTemplate = playerStatsPanel.Get<ScrollItemWidget>("TEAM_TEMPLATE");

statsDropDown = widget.Get<DropDownButtonWidget>("STATS_DROPDOWN");
statsDropDown.GetText = () => "Basic";
statsDropDown.OnMouseDown = _ =>
var statsDropDown = widget.Get<DropDownButtonWidget>("STATS_DROPDOWN");
Func<string, ContainerWidget, Action, StatsDropDownOption> createStatsOption = (title, headers, a) =>
{
var options = new List<StatsDropDownOption>
return new StatsDropDownOption
{
new StatsDropDownOption
{
Title = "Basic",
IsSelected = () => basicStatsHeaders.Visible,
OnClick = () =>
{
ClearStats();
statsDropDown.GetText = () => "Basic";
DisplayStats(BasicStats);
}
},
new StatsDropDownOption
{
Title = "Economy",
IsSelected = () => economyStatsHeaders.Visible,
OnClick = () =>
{
ClearStats();
statsDropDown.GetText = () => "Economy";
DisplayStats(EconomyStats);
}
},
new StatsDropDownOption
Title = title,
IsSelected = () => headers.Visible,
OnClick = () =>
{
Title = "Production",
IsSelected = () => productionStatsHeaders.Visible,
OnClick = () =>
{
ClearStats();
statsDropDown.GetText = () => "Production";
DisplayStats(ProductionStats);
}
},
new StatsDropDownOption
{
Title = "Combat",
IsSelected = () => combatStatsHeaders.Visible,
OnClick = () =>
{
ClearStats();
statsDropDown.GetText = () => "Combat";
DisplayStats(CombatStats);
}
},
new StatsDropDownOption
{
Title = "Earnings (graph)",
IsSelected = () => earnedThisMinuteGraphHeaders.Visible,
OnClick = () =>
{
ClearStats();
statsDropDown.GetText = () => "Earnings (graph)";
EarnedThisMinuteGraph();
}
ClearStats();
statsDropDown.GetText = () => title;
a();
}
};
Func<StatsDropDownOption, ScrollItemWidget, ScrollItemWidget> setupItem = (option, template) =>
{
var item = ScrollItemWidget.Setup(template, option.IsSelected, option.OnClick);
item.Get<LabelWidget>("LABEL").GetText = () => option.Title;
return item;
};
statsDropDown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 150, options, setupItem);
};

ClearStats();
DisplayStats(BasicStats);
var statsDropDownOptions = new StatsDropDownOption[]
{
createStatsOption("Basic", basicStatsHeaders, () => DisplayStats(BasicStats)),
createStatsOption("Economy", economyStatsHeaders, () => DisplayStats(EconomyStats)),
createStatsOption("Production", productionStatsHeaders, () => DisplayStats(ProductionStats)),
createStatsOption("Combat", combatStatsHeaders, () => DisplayStats(CombatStats)),
createStatsOption("Earnings (graph)", earnedThisMinuteGraphHeaders, () => EarnedThisMinuteGraph())
};

Func<StatsDropDownOption, ScrollItemWidget, ScrollItemWidget> setupItem = (option, template) =>
{
var item = ScrollItemWidget.Setup(template, option.IsSelected, option.OnClick);
item.Get<LabelWidget>("LABEL").GetText = () => option.Title;
return item;
};

statsDropDown.OnMouseDown = _ => statsDropDown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 150, statsDropDownOptions, setupItem);
statsDropDownOptions[(int)activePanel].OnClick();

var close = widget.GetOrNull<ButtonWidget>("CLOSE");
if (close != null)
Expand All @@ -146,6 +118,25 @@ public ObserverStatsLogic(World world, WorldRenderer worldRenderer, Widget widge
Ui.Root.RemoveChild(widget);
onExit();
};

var keyListener = statsDropDown.Get<LogicKeyListenerWidget>("STATS_DROPDOWN_KEYHANDLER");
keyListener.AddHandler(e =>
{
if (e.Event == KeyInputEvent.Down && !e.IsRepeat)
{
var key = Hotkey.FromKeyInput(e);
for (var i = 0; i < statsHotkeys.Length; i++)
{
if (key == statsHotkeys[i].GetValue())
{
statsDropDownOptions[i].OnClick();
return true;
}
}
}
return false;
});
}

void ClearStats()
Expand Down
7 changes: 6 additions & 1 deletion OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,12 @@ Action InitInputPanel(Widget panel)
{ "ReplaySpeedSlowKey", "Slow speed" },
{ "ReplaySpeedRegularKey", "Regular speed" },
{ "ReplaySpeedFastKey", "Fast speed" },
{ "ReplaySpeedMaxKey", "Maximum speed" }
{ "ReplaySpeedMaxKey", "Maximum speed" },
{ "StatisticsBasicKey", "Basic statistics" },
{ "StatisticsEconomyKey", "Economy statistics" },
{ "StatisticsProductionKey", "Production statistics" },
{ "StatisticsCombatKey", "Combat statistics" },
{ "StatisticsGraphKey", "Statistics graph" }
};

var header = ScrollItemWidget.Setup(hotkeyHeader, returnTrue, doNothing);
Expand Down
7 changes: 7 additions & 0 deletions mods/cnc/chrome/ingame-observerstats.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Background@INGAME_OBSERVERSTATS_BG:
Logic: ObserverStatsLogic
StatisticsBasicKey: StatisticsBasic
StatisticsEconomyKey: StatisticsEconomy
StatisticsProductionKey: StatisticsProduction
StatisticsCombatKey: StatisticsCombat
StatisticsGraphKey: StatisticsGraph
X: (WINDOW_RIGHT - WIDTH) / 2
Y: (WINDOW_BOTTOM - HEIGHT) / 2
Width: 1005
Expand All @@ -24,6 +29,8 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 185
Height: 25
Font: Bold
Children:
LogicKeyListener@STATS_DROPDOWN_KEYHANDLER:
Container@BASIC_STATS_HEADERS:
X: 0
Y: 0
Expand Down
8 changes: 7 additions & 1 deletion mods/cnc/chrome/ingame.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,13 @@ Container@PERF_WIDGETS:

Container@OBSERVER_WIDGETS:
Logic: MenuButtonsChromeLogic
StatisticsBasicKey: StatisticsBasic
StatisticsEconomyKey: StatisticsEconomy
StatisticsProductionKey: StatisticsProduction
StatisticsCombatKey: StatisticsCombat
StatisticsGraphKey: StatisticsGraph
Children:
LogicKeyListener@OBSERVER_KEY_LISTENER:
MenuButton@OPTIONS_BUTTON:
Key: escape
X: WINDOW_RIGHT - 260 - WIDTH
Expand All @@ -123,7 +129,7 @@ Container@OBSERVER_WIDGETS:
ImageCollection: order-icons
ImageName: options
MenuButton@OBSERVER_STATS_BUTTON:
Key: F1
Key: StatisticsBasic
X: WINDOW_RIGHT - 260 - WIDTH
Y: 35
Width: 30
Expand Down
10 changes: 8 additions & 2 deletions mods/common/chrome/ingame-observer.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Container@OBSERVER_WIDGETS:
Logic: MenuButtonsChromeLogic
StatisticsBasicKey: StatisticsBasic
StatisticsEconomyKey: StatisticsEconomy
StatisticsProductionKey: StatisticsProduction
StatisticsCombatKey: StatisticsCombat
StatisticsGraphKey: StatisticsGraph
Children:
LogicKeyListener@OBSERVER_KEY_LISTENER:
MenuButton@OPTIONS_BUTTON:
Width: 160
Height: 25
Expand All @@ -9,16 +15,16 @@ Container@OBSERVER_WIDGETS:
Key: escape
DisableWorldSounds: true
MenuButton@OBSERVER_STATS_BUTTON:
Key: StatisticsBasic
MenuContainer: INGAME_OBSERVERSTATS_BG
HideIngameUI: False
Pause: False
X: 162
Y: 0
Width: 160
Height: 25
Text: Statistics (F1)
Text: Statistics
Font: Bold
Key: f1
Container@GAME_TIMER_BLOCK:
Logic: GameTimerLogic
X: (WINDOW_RIGHT - WIDTH) / 2
Expand Down
7 changes: 7 additions & 0 deletions mods/common/chrome/ingame-observerstats.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Background@INGAME_OBSERVERSTATS_BG:
Logic: ObserverStatsLogic
StatisticsBasicKey: StatisticsBasic
StatisticsEconomyKey: StatisticsEconomy
StatisticsProductionKey: StatisticsProduction
StatisticsCombatKey: StatisticsCombat
StatisticsGraphKey: StatisticsGraph
X: 25
Y: 50
Width: 1025
Expand All @@ -24,6 +29,8 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 185
Height: 25
Font: Bold
Children:
LogicKeyListener@STATS_DROPDOWN_KEYHANDLER:
Container@BASIC_STATS_HEADERS:
X: 0
Y: 0
Expand Down
Loading

0 comments on commit c9b4568

Please sign in to comment.