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

Rename 'economic' to 'economy' in stats panel

Browse Source
This commit is contained in:
Scott_NZ
2012-12-05 16:11:08 +13:00
parent 0f9da06309
commit 4c7f215559
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs
View File

@@ -23,13 +23,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic
public class ObserverStatsLogic public class ObserverStatsLogic
{ {
ContainerWidget basicStatsHeaders; ContainerWidget basicStatsHeaders;
ContainerWidget economicStatsHeaders; ContainerWidget economyStatsHeaders;
ContainerWidget productionStatsHeaders; ContainerWidget productionStatsHeaders;
ContainerWidget combatStatsHeaders; ContainerWidget combatStatsHeaders;
ContainerWidget earnedThisMinuteGraphHeaders; ContainerWidget earnedThisMinuteGraphHeaders;
ScrollPanelWidget playerStatsPanel; ScrollPanelWidget playerStatsPanel;
ScrollItemWidget basicPlayerTemplate; ScrollItemWidget basicPlayerTemplate;
ScrollItemWidget economicPlayerTemplate; ScrollItemWidget economyPlayerTemplate;
ScrollItemWidget productionPlayerTemplate; ScrollItemWidget productionPlayerTemplate;
ScrollItemWidget combatPlayerTemplate; ScrollItemWidget combatPlayerTemplate;
ContainerWidget earnedThisMinuteGraphTemplate; ContainerWidget earnedThisMinuteGraphTemplate;
@@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
players = world.Players.Where(p => !p.NonCombatant); players = world.Players.Where(p => !p.NonCombatant);
basicStatsHeaders = widget.Get<ContainerWidget>("BASIC_STATS_HEADERS"); basicStatsHeaders = widget.Get<ContainerWidget>("BASIC_STATS_HEADERS");
economicStatsHeaders = widget.Get<ContainerWidget>("ECONOMIC_STATS_HEADERS"); economyStatsHeaders = widget.Get<ContainerWidget>("ECONOMY_STATS_HEADERS");
productionStatsHeaders = widget.Get<ContainerWidget>("PRODUCTION_STATS_HEADERS"); productionStatsHeaders = widget.Get<ContainerWidget>("PRODUCTION_STATS_HEADERS");
combatStatsHeaders = widget.Get<ContainerWidget>("COMBAT_STATS_HEADERS"); combatStatsHeaders = widget.Get<ContainerWidget>("COMBAT_STATS_HEADERS");
earnedThisMinuteGraphHeaders = widget.Get<ContainerWidget>("EARNED_THIS_MIN_GRAPH_HEADERS"); earnedThisMinuteGraphHeaders = widget.Get<ContainerWidget>("EARNED_THIS_MIN_GRAPH_HEADERS");
@@ -54,7 +54,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
playerStatsPanel.Layout = new GridLayout(playerStatsPanel); playerStatsPanel.Layout = new GridLayout(playerStatsPanel);
basicPlayerTemplate = playerStatsPanel.Get<ScrollItemWidget>("BASIC_PLAYER_TEMPLATE"); basicPlayerTemplate = playerStatsPanel.Get<ScrollItemWidget>("BASIC_PLAYER_TEMPLATE");
economicPlayerTemplate = playerStatsPanel.Get<ScrollItemWidget>("ECONOMIC_PLAYER_TEMPLATE"); economyPlayerTemplate = playerStatsPanel.Get<ScrollItemWidget>("ECONOMY_PLAYER_TEMPLATE");
productionPlayerTemplate = playerStatsPanel.Get<ScrollItemWidget>("PRODUCTION_PLAYER_TEMPLATE"); productionPlayerTemplate = playerStatsPanel.Get<ScrollItemWidget>("PRODUCTION_PLAYER_TEMPLATE");
combatPlayerTemplate = playerStatsPanel.Get<ScrollItemWidget>("COMBAT_PLAYER_TEMPLATE"); combatPlayerTemplate = playerStatsPanel.Get<ScrollItemWidget>("COMBAT_PLAYER_TEMPLATE");
earnedThisMinuteGraphTemplate = playerStatsPanel.Get<ContainerWidget>("EARNED_THIS_MIN_GRAPH_TEMPLATE"); earnedThisMinuteGraphTemplate = playerStatsPanel.Get<ContainerWidget>("EARNED_THIS_MIN_GRAPH_TEMPLATE");
@@ -80,13 +80,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic
}, },
new StatsDropDownOption new StatsDropDownOption
{ {
Title = "Economic", Title = "Economy",
IsSelected = () => economicStatsHeaders.Visible, IsSelected = () => economyStatsHeaders.Visible,
OnClick = () => OnClick = () =>
{ {
ClearStats(); ClearStats();
statsDropDown.GetText = () => "Economic"; statsDropDown.GetText = () => "Economy";
DisplayStats(EconomicStats); DisplayStats(EconomyStats);
} }
}, },
new StatsDropDownOption new StatsDropDownOption
@@ -140,7 +140,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ {
playerStatsPanel.Children.Clear(); playerStatsPanel.Children.Clear();
basicStatsHeaders.Visible = false; basicStatsHeaders.Visible = false;
economicStatsHeaders.Visible = false; economyStatsHeaders.Visible = false;
productionStatsHeaders.Visible = false; productionStatsHeaders.Visible = false;
combatStatsHeaders.Visible = false; combatStatsHeaders.Visible = false;
earnedThisMinuteGraphHeaders.Visible = false; earnedThisMinuteGraphHeaders.Visible = false;
@@ -212,10 +212,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
return template; return template;
} }
ScrollItemWidget EconomicStats(Player player) ScrollItemWidget EconomyStats(Player player)
{ {
economicStatsHeaders.Visible = true; economyStatsHeaders.Visible = true;
var template = SetupPlayerScrollItemWidget(economicPlayerTemplate, player); var template = SetupPlayerScrollItemWidget(economyPlayerTemplate, player);
AddPlayerFlagAndName(template, player); AddPlayerFlagAndName(template, player);

4
mods/ra/chrome/ingame.yaml
View File

@@ -476,7 +476,7 @@ Container@OBSERVER_ROOT:
Font:Bold Font:Bold
Text:Actions/min Text:Actions/min
Align:Right Align:Right
Container@ECONOMIC_STATS_HEADERS: Container@ECONOMY_STATS_HEADERS:
X:0 X:0
Y:0 Y:0
Width:PARENT_RIGHT Width:PARENT_RIGHT
@@ -717,7 +717,7 @@ Container@OBSERVER_ROOT:
Width:40 Width:40
Height:PARENT_BOTTOM Height:PARENT_BOTTOM
Align:Right Align:Right
ScrollItem@ECONOMIC_PLAYER_TEMPLATE: ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X:0 X:0
Y:0 Y:0
Width:PARENT_RIGHT-35 Width:PARENT_RIGHT-35