diff --git a/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs index c26a47d968..0cd5eb5d78 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs @@ -23,13 +23,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic public class ObserverStatsLogic { ContainerWidget basicStatsHeaders; - ContainerWidget economicStatsHeaders; + ContainerWidget economyStatsHeaders; ContainerWidget productionStatsHeaders; ContainerWidget combatStatsHeaders; ContainerWidget earnedThisMinuteGraphHeaders; ScrollPanelWidget playerStatsPanel; ScrollItemWidget basicPlayerTemplate; - ScrollItemWidget economicPlayerTemplate; + ScrollItemWidget economyPlayerTemplate; ScrollItemWidget productionPlayerTemplate; ScrollItemWidget combatPlayerTemplate; ContainerWidget earnedThisMinuteGraphTemplate; @@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic players = world.Players.Where(p => !p.NonCombatant); basicStatsHeaders = widget.Get("BASIC_STATS_HEADERS"); - economicStatsHeaders = widget.Get("ECONOMIC_STATS_HEADERS"); + economyStatsHeaders = widget.Get("ECONOMY_STATS_HEADERS"); productionStatsHeaders = widget.Get("PRODUCTION_STATS_HEADERS"); combatStatsHeaders = widget.Get("COMBAT_STATS_HEADERS"); earnedThisMinuteGraphHeaders = widget.Get("EARNED_THIS_MIN_GRAPH_HEADERS"); @@ -54,7 +54,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic playerStatsPanel.Layout = new GridLayout(playerStatsPanel); basicPlayerTemplate = playerStatsPanel.Get("BASIC_PLAYER_TEMPLATE"); - economicPlayerTemplate = playerStatsPanel.Get("ECONOMIC_PLAYER_TEMPLATE"); + economyPlayerTemplate = playerStatsPanel.Get("ECONOMY_PLAYER_TEMPLATE"); productionPlayerTemplate = playerStatsPanel.Get("PRODUCTION_PLAYER_TEMPLATE"); combatPlayerTemplate = playerStatsPanel.Get("COMBAT_PLAYER_TEMPLATE"); earnedThisMinuteGraphTemplate = playerStatsPanel.Get("EARNED_THIS_MIN_GRAPH_TEMPLATE"); @@ -80,13 +80,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic }, new StatsDropDownOption { - Title = "Economic", - IsSelected = () => economicStatsHeaders.Visible, + Title = "Economy", + IsSelected = () => economyStatsHeaders.Visible, OnClick = () => { ClearStats(); - statsDropDown.GetText = () => "Economic"; - DisplayStats(EconomicStats); + statsDropDown.GetText = () => "Economy"; + DisplayStats(EconomyStats); } }, new StatsDropDownOption @@ -140,7 +140,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic { playerStatsPanel.Children.Clear(); basicStatsHeaders.Visible = false; - economicStatsHeaders.Visible = false; + economyStatsHeaders.Visible = false; productionStatsHeaders.Visible = false; combatStatsHeaders.Visible = false; earnedThisMinuteGraphHeaders.Visible = false; @@ -212,10 +212,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic return template; } - ScrollItemWidget EconomicStats(Player player) + ScrollItemWidget EconomyStats(Player player) { - economicStatsHeaders.Visible = true; - var template = SetupPlayerScrollItemWidget(economicPlayerTemplate, player); + economyStatsHeaders.Visible = true; + var template = SetupPlayerScrollItemWidget(economyPlayerTemplate, player); AddPlayerFlagAndName(template, player); diff --git a/mods/ra/chrome/ingame.yaml b/mods/ra/chrome/ingame.yaml index 635f4765c2..60e862e6c1 100644 --- a/mods/ra/chrome/ingame.yaml +++ b/mods/ra/chrome/ingame.yaml @@ -476,7 +476,7 @@ Container@OBSERVER_ROOT: Font:Bold Text:Actions/min Align:Right - Container@ECONOMIC_STATS_HEADERS: + Container@ECONOMY_STATS_HEADERS: X:0 Y:0 Width:PARENT_RIGHT @@ -717,7 +717,7 @@ Container@OBSERVER_ROOT: Width:40 Height:PARENT_BOTTOM Align:Right - ScrollItem@ECONOMIC_PLAYER_TEMPLATE: + ScrollItem@ECONOMY_PLAYER_TEMPLATE: X:0 Y:0 Width:PARENT_RIGHT-35