Skip to content

Commit

Permalink
Observer: display army value in a new dedicated graph tab
Browse files Browse the repository at this point in the history
  • Loading branch information
@ubitux
ubitux committed Jan 1, 2019
1 parent 97a572d commit 007123c
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 2 deletions.
26 changes: 24 additions & 2 deletions OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
View file
Expand Up @@ -31,12 +31,14 @@ public class ObserverStatsLogic : ChromeLogic
readonly ContainerWidget productionStatsHeaders;
readonly ContainerWidget combatStatsHeaders;
readonly ContainerWidget earnedThisMinuteGraphHeaders;
readonly ContainerWidget armyThisMinuteGraphHeaders;
readonly ScrollPanelWidget playerStatsPanel;
readonly ScrollItemWidget basicPlayerTemplate;
readonly ScrollItemWidget economyPlayerTemplate;
readonly ScrollItemWidget productionPlayerTemplate;
readonly ScrollItemWidget combatPlayerTemplate;
readonly ContainerWidget earnedThisMinuteGraphTemplate;
readonly ContainerWidget armyThisMinuteGraphTemplate;
readonly ScrollItemWidget teamTemplate;
readonly IEnumerable<Player> players;
readonly World world;
Expand Down Expand Up @@ -64,6 +66,7 @@ public class ObserverStatsLogic : ChromeLogic
productionStatsHeaders = widget.Get<ContainerWidget>("PRODUCTION_STATS_HEADERS");
combatStatsHeaders = widget.Get<ContainerWidget>("COMBAT_STATS_HEADERS");
earnedThisMinuteGraphHeaders = widget.Get<ContainerWidget>("EARNED_THIS_MIN_GRAPH_HEADERS");
armyThisMinuteGraphHeaders = widget.Get<ContainerWidget>("ARMY_THIS_MIN_GRAPH_HEADERS");

playerStatsPanel = widget.Get<ScrollPanelWidget>("PLAYER_STATS_PANEL");
playerStatsPanel.Layout = new GridLayout(playerStatsPanel);
Expand All @@ -73,6 +76,7 @@ public class ObserverStatsLogic : ChromeLogic
productionPlayerTemplate = playerStatsPanel.Get<ScrollItemWidget>("PRODUCTION_PLAYER_TEMPLATE");
combatPlayerTemplate = playerStatsPanel.Get<ScrollItemWidget>("COMBAT_PLAYER_TEMPLATE");
earnedThisMinuteGraphTemplate = playerStatsPanel.Get<ContainerWidget>("EARNED_THIS_MIN_GRAPH_TEMPLATE");
armyThisMinuteGraphTemplate = playerStatsPanel.Get<ContainerWidget>("ARMY_THIS_MIN_GRAPH_TEMPLATE");

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

Expand All @@ -98,7 +102,8 @@ public class ObserverStatsLogic : ChromeLogic
createStatsOption("Economy", economyStatsHeaders, () => DisplayStats(EconomyStats)),
createStatsOption("Production", productionStatsHeaders, () => DisplayStats(ProductionStats)),
createStatsOption("Combat", combatStatsHeaders, () => DisplayStats(CombatStats)),
createStatsOption("Earnings (graph)", earnedThisMinuteGraphHeaders, () => EarnedThisMinuteGraph())
createStatsOption("Earnings (graph)", earnedThisMinuteGraphHeaders, () => EarnedThisMinuteGraph()),
createStatsOption("Army (graph)", armyThisMinuteGraphHeaders, () => ArmyThisMinuteGraph()),
};

Func<StatsDropDownOption, ScrollItemWidget, ScrollItemWidget> setupItem = (option, template) =>
Expand All @@ -108,7 +113,7 @@ public class ObserverStatsLogic : ChromeLogic
return item;
};

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

var close = widget.GetOrNull<ButtonWidget>("CLOSE");
Expand Down Expand Up @@ -151,6 +156,7 @@ void ClearStats()
productionStatsHeaders.Visible = false;
combatStatsHeaders.Visible = false;
earnedThisMinuteGraphHeaders.Visible = false;
armyThisMinuteGraphHeaders.Visible = false;
}

void EarnedThisMinuteGraph()
Expand All @@ -169,6 +175,22 @@ void EarnedThisMinuteGraph()
playerStatsPanel.ScrollToTop();
}

void ArmyThisMinuteGraph()
{
armyThisMinuteGraphHeaders.Visible = true;
var template = armyThisMinuteGraphTemplate.Clone();

var graph = template.Get<LineGraphWidget>("ARMY_THIS_MIN_GRAPH");
graph.GetSeries = () =>
players.Select(p => new LineGraphSeries(
p.PlayerName,
p.Color.RGB,
(p.PlayerActor.TraitOrDefault<PlayerStatistics>() ?? new PlayerStatistics(p.PlayerActor)).ArmySamples.Select(s => (float)s)));

playerStatsPanel.AddChild(template);
playerStatsPanel.ScrollToTop();
}

void DisplayStats(Func<Player, ScrollItemWidget> createItem)
{
var teams = players.GroupBy(p => (world.LobbyInfo.ClientWithIndex(p.ClientIndex) ?? new Session.Client()).Team).OrderBy(g => g.Key);
Expand Down
34 changes: 34 additions & 0 deletions mods/cnc/chrome/ingame-observerstats.yaml
View file
Expand Up @@ -284,6 +284,20 @@ Background@INGAME_OBSERVERSTATS_BG:
Font: Bold
Text: Earnings received each minute
Align: Center
Container@ARMY_THIS_MIN_GRAPH_HEADERS:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Label@EARNED_THIS_MIN_HEADER:
X: 0
Y: 40
Width: PARENT_RIGHT
Height: 25
Font: Bold
Text: Army value over time
Align: Center
ScrollPanel@PLAYER_STATS_PANEL:
X: 15
Y: 70
Expand Down Expand Up @@ -565,6 +579,26 @@ Background@INGAME_OBSERVERSTATS_BG:
YAxisLabel: $
LabelFont: TinyBold
AxisFont: Bold
Container@ARMY_THIS_MIN_GRAPH_TEMPLATE:
X: 10
Y: 10
Width: PARENT_RIGHT - 100
Height: PARENT_BOTTOM - 60
Children:
LineGraph@ARMY_THIS_MIN_GRAPH:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
ValueFormat: ${0}
XAxisValueFormat: {0}
YAxisValueFormat: ${0:F0}
XAxisSize: 20
YAxisSize: 10
XAxisLabel: m
YAxisLabel: $
LabelFont: TinyBold
AxisFont: Bold
Button@CLOSE:
X: 0
Y: PARENT_BOTTOM - 36
Expand Down
34 changes: 34 additions & 0 deletions mods/common/chrome/ingame-observerstats.yaml
View file
Expand Up @@ -284,6 +284,20 @@ Background@INGAME_OBSERVERSTATS_BG:
Font: Bold
Text: Earnings received each minute
Align: Center
Container@ARMY_THIS_MIN_GRAPH_HEADERS:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Label@EARNED_THIS_MIN_HEADER:
X: 0
Y: 40
Width: PARENT_RIGHT
Height: 25
Font: Bold
Text: Army value over time
Align: Center
ScrollPanel@PLAYER_STATS_PANEL:
X: 25
Y: 70
Expand Down Expand Up @@ -565,6 +579,26 @@ Background@INGAME_OBSERVERSTATS_BG:
YAxisLabel: $
LabelFont: TinyBold
AxisFont: Bold
Container@ARMY_THIS_MIN_GRAPH_TEMPLATE:
X: 0
Y: 0
Width: PARENT_RIGHT - 100
Height: PARENT_BOTTOM - 50
Children:
LineGraph@ARMY_THIS_MIN_GRAPH:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
ValueFormat: ${0}
XAxisValueFormat: {0}
YAxisValueFormat: ${0:F0}
XAxisSize: 20
YAxisSize: 10
XAxisLabel: m
YAxisLabel: $
LabelFont: TinyBold
AxisFont: Bold
Button@CLOSE:
X: PARENT_RIGHT - 145
Y: PARENT_BOTTOM - 45
Expand Down
34 changes: 34 additions & 0 deletions mods/ts/chrome/ingame-observerstats.yaml
View file
Expand Up @@ -284,6 +284,20 @@ Background@INGAME_OBSERVERSTATS_BG:
Font: Bold
Text: Earnings received each minute
Align: Center
Container@ARMY_THIS_MIN_GRAPH_HEADERS:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Label@EARNED_THIS_MIN_HEADER:
X: 0
Y: 40
Width: PARENT_RIGHT
Height: 25
Font: Bold
Text: Army value over time
Align: Center
ScrollPanel@PLAYER_STATS_PANEL:
X: 25
Y: 70
Expand Down Expand Up @@ -567,6 +581,26 @@ Background@INGAME_OBSERVERSTATS_BG:
YAxisLabel: $
LabelFont: TinyBold
AxisFont: Bold
Container@ARMY_THIS_MIN_GRAPH_TEMPLATE:
X: 0
Y: 0
Width: PARENT_RIGHT - 100
Height: PARENT_BOTTOM - 50
Children:
LineGraph@ARMY_THIS_MIN_GRAPH:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
ValueFormat: ${0}
XAxisValueFormat: {0}
YAxisValueFormat: ${0:F0}
XAxisSize: 20
YAxisSize: 10
XAxisLabel: m
YAxisLabel: $
LabelFont: TinyBold
AxisFont: Bold
Button@CLOSE:
X: PARENT_RIGHT - 145
Y: PARENT_BOTTOM - 45
Expand Down

0 comments on commit 007123c

Please sign in to comment.