From 9788cf8eada468f949fca4f3488537c5838ca408 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 8 Dec 2020 21:58:55 +1100 Subject: [PATCH] Fix some string crimes (#2638) * Fix some string crimes * fuk * stringbuilder score Co-authored-by: Metal Gear Sloth --- Content.Client/Arcade/BlockGameMenu.cs | 29 ++++++++++++++++---------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs index 29841bccf1..5c5829205a 100644 --- a/Content.Client/Arcade/BlockGameMenu.cs +++ b/Content.Client/Arcade/BlockGameMenu.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using System.Text; using Content.Client.GameObjects.Components.Arcade; using Content.Client.Utility; using Content.Shared.Arcade; @@ -519,34 +520,40 @@ namespace Content.Client.Arcade { var globalPlacementText = globalPlacement == null ? "-" : $"#{globalPlacement}"; var localPlacementText = localPlacement == null ? "-" : $"#{localPlacement}"; - _finalScoreLabel.Text = Loc.GetString("Global") + $": {globalPlacementText}\n" + Loc.GetString("Local") + $": {localPlacementText}\n" + Loc.GetString("Points") + $": {amount}"; + _finalScoreLabel.Text = + Loc.GetString("Global: {0}\nLocal: {1}\nPoints: {2}", globalPlacementText, localPlacementText, amount); } public void UpdatePoints(int points) { - _pointsLabel.Text = Loc.GetString("Points") + $": {points}"; + _pointsLabel.Text = Loc.GetString("Points: {0}", points); } public void UpdateLevel(int level) { - _levelLabel.Text = Loc.GetString("Level") + $" {level + 1}"; + _levelLabel.Text = Loc.GetString("Level {0}", level + 1); } public void UpdateHighscores(List localHighscores, List globalHighscores) { - var localHighscoreText = Loc.GetString("Station") + ":\n"; - var globalHighscoreText = Loc.GetString("Nanotrasen") + ":\n"; + var localHighscoreText = new StringBuilder(Loc.GetString("Station\n")); + var globalHighscoreText = new StringBuilder(Loc.GetString("Nanotrasen:\n")); for (int i = 0; i < 5; i++) { - localHighscoreText += $"#{i + 1} " + (localHighscores.Count > i - ? $"{localHighscores[i].Name} - {localHighscores[i].Score}\n" : "??? - 0\n"); - globalHighscoreText += $"#{i + 1} " + (globalHighscores.Count > i - ? $"{globalHighscores[i].Name} - {globalHighscores[i].Score}\n" : "??? - 0\n"); + if (localHighscores.Count > i) + localHighscoreText.AppendLine(Loc.GetString("#{0}: {1} - {2}", i + 1, localHighscores[i].Name, localHighscores[i].Score)); + else + localHighscoreText.AppendLine(Loc.GetString("#{0}: ??? - 0", i + 1)); + + if (globalHighscores.Count > i) + globalHighscoreText.AppendLine(Loc.GetString("#{0}: {1} - {2}", i + 1, globalHighscores[i].Name, globalHighscores[i].Score)); + else + globalHighscoreText.AppendLine(Loc.GetString("#{0}: ??? - 0", i + 1)); } - _localHighscoresLabel.Text = localHighscoreText; - _globalHighscoresLabel.Text = globalHighscoreText; + _localHighscoresLabel.Text = localHighscoreText.ToString(); + _globalHighscoresLabel.Text = globalHighscoreText.ToString(); } protected override void KeyBindDown(GUIBoundKeyEventArgs args)