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

Fixes flag in spec ui

Browse Source
This commit is contained in:
teinarss
2019-07-03 18:58:12 +02:00
committed by reaperrr
parent c5558e2145
commit 551d72b061
2 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
View File

@@ -271,7 +271,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
combatStatsHeaders.Visible = true; combatStatsHeaders.Visible = true;
var template = SetupPlayerScrollItemWidget(combatPlayerTemplate, player); var template = SetupPlayerScrollItemWidget(combatPlayerTemplate, player);
LobbyUtils.AddPlayerFlagAndName(template, player); AddPlayerFlagAndName(template, player);
var playerName = template.Get<LabelWidget>("PLAYER"); var playerName = template.Get<LabelWidget>("PLAYER");
playerName.GetColor = () => Color.White; playerName.GetColor = () => Color.White;
@@ -299,7 +299,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
productionStatsHeaders.Visible = true; productionStatsHeaders.Visible = true;
var template = SetupPlayerScrollItemWidget(productionPlayerTemplate, player); var template = SetupPlayerScrollItemWidget(productionPlayerTemplate, player);
LobbyUtils.AddPlayerFlagAndName(template, player); AddPlayerFlagAndName(template, player);
var playerName = template.Get<LabelWidget>("PLAYER"); var playerName = template.Get<LabelWidget>("PLAYER");
playerName.GetColor = () => Color.White; playerName.GetColor = () => Color.White;
@@ -320,7 +320,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
supportPowerStatsHeaders.Visible = true; supportPowerStatsHeaders.Visible = true;
var template = SetupPlayerScrollItemWidget(supportPowersPlayerTemplate, player); var template = SetupPlayerScrollItemWidget(supportPowersPlayerTemplate, player);
LobbyUtils.AddPlayerFlagAndName(template, player); AddPlayerFlagAndName(template, player);
var playerName = template.Get<LabelWidget>("PLAYER"); var playerName = template.Get<LabelWidget>("PLAYER");
playerName.GetColor = () => Color.White; playerName.GetColor = () => Color.White;
@@ -341,7 +341,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
economyStatsHeaders.Visible = true; economyStatsHeaders.Visible = true;
var template = SetupPlayerScrollItemWidget(economyPlayerTemplate, player); var template = SetupPlayerScrollItemWidget(economyPlayerTemplate, player);
LobbyUtils.AddPlayerFlagAndName(template, player); AddPlayerFlagAndName(template, player);
var playerName = template.Get<LabelWidget>("PLAYER"); var playerName = template.Get<LabelWidget>("PLAYER");
playerName.GetColor = () => Color.White; playerName.GetColor = () => Color.White;
@@ -377,7 +377,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
basicStatsHeaders.Visible = true; basicStatsHeaders.Visible = true;
var template = SetupPlayerScrollItemWidget(basicPlayerTemplate, player); var template = SetupPlayerScrollItemWidget(basicPlayerTemplate, player);
LobbyUtils.AddPlayerFlagAndName(template, player); AddPlayerFlagAndName(template, player);
var playerName = template.Get<LabelWidget>("PLAYER"); var playerName = template.Get<LabelWidget>("PLAYER");
playerName.GetColor = () => Color.White; playerName.GetColor = () => Color.White;
@@ -460,6 +460,32 @@ namespace OpenRA.Mods.Common.Widgets.Logic
} }
} }
static void AddPlayerFlagAndName(ScrollItemWidget template, Player player)
{
var flag = template.Get<ImageWidget>("FLAG");
flag.GetImageCollection = () => "flags";
flag.GetImageName = () => player.Faction.InternalName;
var client = player.World.LobbyInfo.ClientWithIndex(player.ClientIndex);
var playerName = template.Get<LabelWidget>("PLAYER");
var playerNameFont = Game.Renderer.Fonts[playerName.Font];
var suffixLength = new CachedTransform<string, int>(s => playerNameFont.Measure(s).X);
var name = new CachedTransform<Pair<string, int>, string>(c =>
WidgetUtils.TruncateText(c.First, playerName.Bounds.Width - c.Second, playerNameFont));
playerName.GetText = () =>
{
var suffix = player.WinState == WinState.Undefined ? "" : " (" + player.WinState + ")";
if (client != null && client.State == Session.ClientState.Disconnected)
suffix = " (Gone)";
var sl = suffixLength.Update(suffix);
return name.Update(Pair.New(player.PlayerName, sl)) + suffix;
};
playerName.GetColor = () => player.Color;
}
string AverageOrdersPerMinute(double orders) string AverageOrdersPerMinute(double orders)
{ {
return (world.WorldTick == 0 ? 0 : orders / (world.WorldTick / 1500.0)).ToString("F1"); return (world.WorldTick == 0 ? 0 : orders / (world.WorldTick / 1500.0)).ToString("F1");

29
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
View File

@@ -583,35 +583,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
HideChildWidget(parent, "STATUS_IMAGE"); HideChildWidget(parent, "STATUS_IMAGE");
} }
public static void AddPlayerFlagAndName(ScrollItemWidget template, Player player)
{
var flag = template.Get<ImageWidget>("FLAG");
flag.GetImageCollection = () => "flags";
if (player.World.RenderPlayer != null && player.World.RenderPlayer.Stances[player] != Stance.Ally)
flag.GetImageName = () => player.DisplayFaction.InternalName;
else
flag.GetImageName = () => player.Faction.InternalName;
var client = player.World.LobbyInfo.ClientWithIndex(player.ClientIndex);
var playerName = template.Get<LabelWidget>("PLAYER");
var playerNameFont = Game.Renderer.Fonts[playerName.Font];
var suffixLength = new CachedTransform<string, int>(s => playerNameFont.Measure(s).X);
var name = new CachedTransform<Pair<string, int>, string>(c =>
WidgetUtils.TruncateText(c.First, playerName.Bounds.Width - c.Second, playerNameFont));
playerName.GetText = () =>
{
var suffix = player.WinState == WinState.Undefined ? "" : " (" + player.WinState + ")";
if (client != null && client.State == Session.ClientState.Disconnected)
suffix = " (Gone)";
var sl = suffixLength.Update(suffix);
return name.Update(Pair.New(player.PlayerName, sl)) + suffix;
};
playerName.GetColor = () => player.Color;
}
public static string GetExternalIP(Session.Client client, OrderManager orderManager) public static string GetExternalIP(Session.Client client, OrderManager orderManager)
{ {
var address = client != null ? client.IpAddress : ""; var address = client != null ? client.IpAddress : "";