tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some string crimes (#2638)

Browse Source 
* Fix some string crimes

* fuk

* stringbuilder score

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2020-12-08 21:58:55 +11:00
committed by GitHub
parent ae57355ce5
commit 9788cf8ead
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Content.Client/Arcade/BlockGameMenu.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using Content.Client.GameObjects.Components.Arcade; using Content.Client.GameObjects.Components.Arcade;
using Content.Client.Utility; using Content.Client.Utility;
using Content.Shared.Arcade; using Content.Shared.Arcade;
@@ -519,34 +520,40 @@ namespace Content.Client.Arcade
{ {
var globalPlacementText = globalPlacement == null ? "-" : $"#{globalPlacement}"; var globalPlacementText = globalPlacement == null ? "-" : $"#{globalPlacement}";
var localPlacementText = localPlacement == null ? "-" : $"#{localPlacement}"; 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) public void UpdatePoints(int points)
{ {
_pointsLabel.Text = Loc.GetString("Points") + $": {points}"; _pointsLabel.Text = Loc.GetString("Points: {0}", points);
} }
public void UpdateLevel(int level) public void UpdateLevel(int level)
{ {
_levelLabel.Text = Loc.GetString("Level") + $" {level + 1}"; _levelLabel.Text = Loc.GetString("Level {0}", level + 1);
} }
public void UpdateHighscores(List<BlockGameMessages.HighScoreEntry> localHighscores, public void UpdateHighscores(List<BlockGameMessages.HighScoreEntry> localHighscores,
List<BlockGameMessages.HighScoreEntry> globalHighscores) List<BlockGameMessages.HighScoreEntry> globalHighscores)
{ {
var localHighscoreText = Loc.GetString("Station") + ":\n"; var localHighscoreText = new StringBuilder(Loc.GetString("Station\n"));
var globalHighscoreText = Loc.GetString("Nanotrasen") + ":\n"; var globalHighscoreText = new StringBuilder(Loc.GetString("Nanotrasen:\n"));
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
localHighscoreText += $"#{i + 1} " + (localHighscores.Count > i if (localHighscores.Count > i)
? $"{localHighscores[i].Name} - {localHighscores[i].Score}\n" : "??? - 0\n"); localHighscoreText.AppendLine(Loc.GetString("#{0}: {1} - {2}", i + 1, localHighscores[i].Name, localHighscores[i].Score));
globalHighscoreText += $"#{i + 1} " + (globalHighscores.Count > i else
? $"{globalHighscores[i].Name} - {globalHighscores[i].Score}\n" : "??? - 0\n"); 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; _localHighscoresLabel.Text = localHighscoreText.ToString();
_globalHighscoresLabel.Text = globalHighscoreText; _globalHighscoresLabel.Text = globalHighscoreText.ToString();
} }
protected override void KeyBindDown(GUIBoundKeyEventArgs args) protected override void KeyBindDown(GUIBoundKeyEventArgs args)