diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs index 37046f0fcb..0b6b2a475f 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs @@ -18,7 +18,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - [ChromeLogicArgsHotkeys("StatisticsBasicKey", "StatisticsEconomyKey", "StatisticsProductionKey", "StatisticsCombatKey", "StatisticsGraphKey")] + [ChromeLogicArgsHotkeys("StatisticsBasicKey", "StatisticsEconomyKey", "StatisticsProductionKey", "StatisticsCombatKey", "StatisticsGraphKey", "StatisticsArmyGraphKey")] public class MenuButtonsChromeLogic : ChromeLogic { readonly World world; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs index 6c188eb5c2..695b12317c 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs @@ -21,9 +21,9 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic { - public enum ObserverStatsPanel { Basic, Economy, Production, Combat, Graph } + public enum ObserverStatsPanel { Basic, Economy, Production, Combat, Graph, ArmyGraph } - [ChromeLogicArgsHotkeys("StatisticsBasicKey", "StatisticsEconomyKey", "StatisticsProductionKey", "StatisticsCombatKey", "StatisticsGraphKey")] + [ChromeLogicArgsHotkeys("StatisticsBasicKey", "StatisticsEconomyKey", "StatisticsProductionKey", "StatisticsCombatKey", "StatisticsGraphKey", "StatisticsArmyGraphKey")] public class ObserverStatsLogic : ChromeLogic { readonly ContainerWidget basicStatsHeaders; diff --git a/mods/cnc/chrome/ingame-observerstats.yaml b/mods/cnc/chrome/ingame-observerstats.yaml index ccd57ff6ca..9ebe42eb9a 100644 --- a/mods/cnc/chrome/ingame-observerstats.yaml +++ b/mods/cnc/chrome/ingame-observerstats.yaml @@ -5,6 +5,7 @@ Background@INGAME_OBSERVERSTATS_BG: StatisticsProductionKey: StatisticsProduction StatisticsCombatKey: StatisticsCombat StatisticsGraphKey: StatisticsGraph + StatisticsArmyGraphKey: StatisticsArmyGraph X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2 Width: 1005 diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index 87b5bfa275..09fad4302d 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -111,6 +111,7 @@ Container@OBSERVER_WIDGETS: StatisticsProductionKey: StatisticsProduction StatisticsCombatKey: StatisticsCombat StatisticsGraphKey: StatisticsGraph + StatisticsArmyGraphKey: StatisticsArmyGraph Children: LogicKeyListener@OBSERVER_KEY_LISTENER: MenuButton@OPTIONS_BUTTON: diff --git a/mods/common/chrome/ingame-observer.yaml b/mods/common/chrome/ingame-observer.yaml index 00ade9875e..9ed0be5f3f 100644 --- a/mods/common/chrome/ingame-observer.yaml +++ b/mods/common/chrome/ingame-observer.yaml @@ -5,6 +5,7 @@ Container@OBSERVER_WIDGETS: StatisticsProductionKey: StatisticsProduction StatisticsCombatKey: StatisticsCombat StatisticsGraphKey: StatisticsGraph + StatisticsArmyGraphKey: StatisticsArmyGraph Children: LogicKeyListener@OBSERVER_KEY_LISTENER: MenuButton@OPTIONS_BUTTON: diff --git a/mods/common/chrome/ingame-observerstats.yaml b/mods/common/chrome/ingame-observerstats.yaml index 63a9b34f2f..2530b3f58e 100644 --- a/mods/common/chrome/ingame-observerstats.yaml +++ b/mods/common/chrome/ingame-observerstats.yaml @@ -5,6 +5,7 @@ Background@INGAME_OBSERVERSTATS_BG: StatisticsProductionKey: StatisticsProduction StatisticsCombatKey: StatisticsCombat StatisticsGraphKey: StatisticsGraph + StatisticsArmyGraphKey: StatisticsArmyGraph X: 25 Y: 50 Width: 1025 diff --git a/mods/common/hotkeys/observer.yaml b/mods/common/hotkeys/observer.yaml index 51cd63a8ec..6888c97963 100644 --- a/mods/common/hotkeys/observer.yaml +++ b/mods/common/hotkeys/observer.yaml @@ -41,3 +41,7 @@ StatisticsCombat: F4 StatisticsGraph: F5 Description: Statistics graph Types: Observer, Replay + +StatisticsArmyGraph: F6 + Description: Army value graph + Types: Observer, Replay diff --git a/mods/ra/chrome/ingame-observer.yaml b/mods/ra/chrome/ingame-observer.yaml index 9bb2b456a4..a54f385a3c 100644 --- a/mods/ra/chrome/ingame-observer.yaml +++ b/mods/ra/chrome/ingame-observer.yaml @@ -36,6 +36,7 @@ Container@OBSERVER_WIDGETS: StatisticsProductionKey: StatisticsProduction StatisticsCombatKey: StatisticsCombat StatisticsGraphKey: StatisticsGraph + StatisticsArmyGraphKey: StatisticsArmyGraph X: 9 Y: 7 Children: diff --git a/mods/ts/chrome/ingame-observer.yaml b/mods/ts/chrome/ingame-observer.yaml index ce91009c2d..203212f661 100644 --- a/mods/ts/chrome/ingame-observer.yaml +++ b/mods/ts/chrome/ingame-observer.yaml @@ -5,6 +5,7 @@ Container@OBSERVER_WIDGETS: StatisticsProductionKey: StatisticsProduction StatisticsCombatKey: StatisticsCombat StatisticsGraphKey: StatisticsGraph + StatisticsArmyGraphKey: StatisticsArmyGraph Children: LogicKeyListener@OBSERVER_KEY_LISTENER: MenuButton@OPTIONS_BUTTON: diff --git a/mods/ts/chrome/ingame-observerstats.yaml b/mods/ts/chrome/ingame-observerstats.yaml index 222ea44443..a921ba2c44 100644 --- a/mods/ts/chrome/ingame-observerstats.yaml +++ b/mods/ts/chrome/ingame-observerstats.yaml @@ -5,6 +5,7 @@ Background@INGAME_OBSERVERSTATS_BG: StatisticsProductionKey: StatisticsProduction StatisticsCombatKey: StatisticsCombat StatisticsGraphKey: StatisticsGraph + StatisticsArmyGraphKey: StatisticsArmyGraph X: 25 Y: 50 Width: 1025