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

Execute BlockGame game actions only if _running is true, added localization functions and italian strings to the blockgame UI (#2601)

Browse Source 
* BlockGamePlayerAction are only executed if _running is true, added italian localization file for blockgame UI

* Added localization functions and files for BlockGame arcade. Removed unused public variable added in the previous commit.

* Added new line to end of file blockgame.yml

* Update Content.Client/Arcade/BlockGameMenu.cs

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Moved EndLeft,EndRight and SoftdropEnd actions out of the condition as per suggestion by Paul.

* Added Loc.GetString() to "Nanotrasen" and "Nanotrasen Block Game" to enable transliteration of the name in other alphabets as per suggestion of Remie.

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
This commit is contained in:
Morshu32
2020-11-27 11:36:04 +01:00
committed by GitHub
parent 6fd4467ee0
commit 6b413033d1
3 changed files with 89 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Utility;
@@ -55,7 +56,7 @@ namespace Content.Client.Arcade
public BlockGameMenu(BlockGameBoundUserInterface owner)
{
Title = "Nanotrasen Block Game";
Title = Loc.GetString("Nanotrasen Block Game");
_owner = owner;
var resourceCache = IoCManager.Resolve<IResourceCache>();
@@ -115,7 +116,7 @@ namespace Content.Client.Arcade
SizeFlagsVertical = SizeFlags.ShrinkCenter
};
menuContainer.AddChild(new Label{Text = "Highscores"});
menuContainer.AddChild(new Label{Text = Loc.GetString("Highscores")});
menuContainer.AddChild(new Control{CustomMinimumSize = new Vector2(1,10)});
var highScoreBox = new HBoxContainer();
@@ -135,7 +136,7 @@ namespace Content.Client.Arcade
menuContainer.AddChild(new Control{CustomMinimumSize = new Vector2(1,10)});
_highscoreBackButton = new Button
{
Text = "Back",
Text = Loc.GetString("Back"),
TextAlign = Label.AlignMode.Center
};
_highscoreBackButton.OnPressed += (e) => _owner.SendAction(BlockGamePlayerAction.Pause);
@@ -180,7 +181,7 @@ namespace Content.Client.Arcade
SizeFlagsVertical = SizeFlags.ShrinkCenter
};
menuContainer.AddChild(new Label{Text = "Gameover!",Align = Label.AlignMode.Center});
menuContainer.AddChild(new Label{Text = Loc.GetString("Gameover!"),Align = Label.AlignMode.Center});
menuContainer.AddChild(new Control{CustomMinimumSize = new Vector2(1,10)});
@@ -190,7 +191,7 @@ namespace Content.Client.Arcade
_finalNewGameButton = new Button
{
Text = "New Game",
Text = Loc.GetString("New Game"),
TextAlign = Label.AlignMode.Center
};
_finalNewGameButton.OnPressed += (e) =>
@@ -241,7 +242,7 @@ namespace Content.Client.Arcade
_newGameButton = new Button
{
Text = "New Game",
Text = Loc.GetString("New Game"),
TextAlign = Label.AlignMode.Center
};
_newGameButton.OnPressed += (e) =>
@@ -253,7 +254,7 @@ namespace Content.Client.Arcade
_scoreBoardButton = new Button
{
Text = "Scoreboard",
Text = Loc.GetString("Scoreboard"),
TextAlign = Label.AlignMode.Center
};
_scoreBoardButton.OnPressed += (e) => _owner.SendAction(BlockGamePlayerAction.ShowHighscores);
@@ -263,7 +264,7 @@ namespace Content.Client.Arcade
_unpauseButton = new Button
{
Text = "Unpause",
Text = Loc.GetString("Unpause"),
TextAlign = Label.AlignMode.Center,
Visible = false
};
@@ -341,7 +342,7 @@ namespace Content.Client.Arcade
_pauseButton = new Button
{
Text = "Pause",
Text = Loc.GetString("Pause"),
TextAlign = Label.AlignMode.Center
};
_pauseButton.OnPressed += (e) => TryPause();
@@ -413,7 +414,7 @@ namespace Content.Client.Arcade
nextBlockPanel.AddChild(nextCenterContainer);
grid.AddChild(nextBlockPanel);
grid.AddChild(new Label{Text = "Next", Align = Label.AlignMode.Center});
grid.AddChild(new Label{Text = Loc.GetString("Next"), Align = Label.AlignMode.Center});
return grid;
}
@@ -451,7 +452,7 @@ namespace Content.Client.Arcade
holdBlockPanel.AddChild(holdCenterContainer);
grid.AddChild(holdBlockPanel);
grid.AddChild(new Label{Text = "Hold", Align = Label.AlignMode.Center});
grid.AddChild(new Label{Text = Loc.GetString("Hold"), Align = Label.AlignMode.Center});
return grid;
}
@@ -518,24 +519,24 @@ namespace Content.Client.Arcade
{
var globalPlacementText = globalPlacement == null ? "-" : $"#{globalPlacement}";
var localPlacementText = localPlacement == null ? "-" : $"#{localPlacement}";
_finalScoreLabel.Text = $"Global: {globalPlacementText}\nLocal: {localPlacementText}\nPoints: {amount}";
_finalScoreLabel.Text = Loc.GetString("Global") + $": {globalPlacementText}\n" + Loc.GetString("Local") + $": {localPlacementText}\n" + Loc.GetString("Points") + $": {amount}";
}
public void UpdatePoints(int points)
{
_pointsLabel.Text = $"Points: {points}";
_pointsLabel.Text = Loc.GetString("Points") + $": {points}";
}
public void UpdateLevel(int level)
{
_levelLabel.Text = $"Level {level + 1}";
_levelLabel.Text = Loc.GetString("Level") + $" {level + 1}";
}
public void UpdateHighscores(List<BlockGameMessages.HighScoreEntry> localHighscores,
List<BlockGameMessages.HighScoreEntry> globalHighscores)
{
var localHighscoreText = "Station:\n";
var globalHighscoreText = "Nanotrasen:\n";
var localHighscoreText = Loc.GetString("Station") + ":\n";
var globalHighscoreText = Loc.GetString("Nanotrasen") + ":\n";
for (int i = 0; i < 5; i++)
{
localHighscoreText += $"#{i + 1} " + (localHighscores.Count > i