Select & show preferred skill level when making a game #598

GrantBartlett · 2024-12-31T18:12:35Z

Simple icon indicator to show preferred skill level when making online games

Screenshots

Select player skill preference when hosting

Beginner

Intermediate

Pro

github-actions · 2024-12-31T18:22:02Z

Nightly build for this pull request:

artifacts-YR.zip
artifacts-Ares.zip
artifacts-TS.zip
This comment is automatic and is meant to allow guests to get latest automatic builds without registering. It is updated on every successful build.

SadPencil

Does it come with the localization support?

GrantBartlett · 2025-01-03T12:19:09Z

Does it come with the localization support?
public string OnlineGameDifficultyOptions => clientDefinitionsIni.GetStringValue(SETTINGS, "OnlineGameDifficultyOptions", "Any,Beginner,Intermediate,Pro (Competitive)");

Is there a way to have something like this but translated? If there is an example I can follow I can update it

SadPencil · 2025-01-03T12:55:51Z

Does it come with the localization support?
public string OnlineGameDifficultyOptions => clientDefinitionsIni.GetStringValue(SETTINGS, "OnlineGameDifficultyOptions", "Any,Beginner,Intermediate,Pro (Competitive)");

Is there a way to have something like this but translated? If there is an example I can follow I can update it

#598 (comment)

foreach(string difficulty in OnlineGameDifficultyOptions)
                ddGameDifficulty.AddItem(difficulty);

change it to something like:

for i, difficulty:
  string localizedDifficulty=difficulty.L10N("INI:ClientDefinitions:Difficulty{i}");

Metadorius · 2025-01-03T12:56:52Z

ClientCore/ClientConfiguration.cs

@@ -330,6 +330,8 @@ private List<TranslationGameFile> ParseTranslationGameFiles()

        public string AllowedCustomGameModes => clientDefinitionsIni.GetStringValue(SETTINGS, "AllowedCustomGameModes", "Standard,Custom Map");

+        public string OnlineGameDifficultyOptions => clientDefinitionsIni.GetStringValue(SETTINGS, "OnlineGameDifficultyOptions", "Any,Beginner,Intermediate,Pro (Competitive)");


Pretty sure this should be an array or list of strings already.
Also I don't think you should be adding (competitive), just beginner/intermediate/pro is enough. Beginner games can be competitive too, and pro players can be playing casually for fun without any sweat.

DXMainClient/DXGUI/Multiplayer/CnCNet/GameCreationWindow.cs

DXMainClient/DXGUI/Multiplayer/GameListBox.cs

DXMainClient/Program.cs

DXMainClient/DXGUI/Multiplayer/GameLobby/CnCNetGameLobby.cs

SadPencil

Localization questions remain. Others are fine.

SadPencil · 2025-01-03T15:04:28Z

DXMainClient/DXGUI/Multiplayer/GameInformationPanel.cs

@@ -132,6 +142,8 @@ public void SetInfo(GenericHostedGame game)
            {
                lblPlayerNames[i].Visible = false;
            }
+
+            lblGameDifficulty.Text = "Preferred Skill Level:".L10N("Client:Main:GameInfoDifficulty") + " " + OnlineGameDifficultyOptions[game.GameDifficulty];


Localization required

DXMainClient/DXGUI/Multiplayer/CnCNet/GameCreationWindow.cs

SadPencil · 2025-01-03T16:28:49Z

DXMainClient/DXGUI/Multiplayer/GameInformationPanel.cs

@@ -143,7 +143,8 @@ public void SetInfo(GenericHostedGame game)
                lblPlayerNames[i].Visible = false;
            }

-            lblGameDifficulty.Text = "Preferred Skill Level:".L10N("Client:Main:GameInfoDifficulty") + " " + OnlineGameDifficultyOptions[game.GameDifficulty];
+            lblGameDifficulty.Text = "Preferred Skill Level: ".L10N("Client:Main:GameInfoDifficulty") 
+                + " ".L10N($"INI:ClientDefinitions:Difficulty:{game.GameDifficulty}");


Metadorius · 2025-01-03T20:32:51Z

DXMainClient/DXGUI/Multiplayer/GameListBox.cs

+                if (gd != null)
+                {
+                    txGameDifficultyIcons.Add(gd);
+                }
+                else
+                {
+                    Logger.Log($"Failed to load texture for game difficulty index {i}");
+                }


Suggested change

if (gd != null)

{

txGameDifficultyIcons.Add(gd);

}

else

{

Logger.Log($"Failed to load texture for game difficulty index {i}");

}

if (gd != null)

txGameDifficultyIcons.Add(gd);

else

Logger.Log($"Failed to load texture for game difficulty index {i}");

Metadorius · 2025-01-03T20:33:35Z

DXMainClient/DXGUI/Multiplayer/GameListBox.cs

@@ -332,6 +359,19 @@ public override void Draw(GameTime gameTime)
                        height, txPasswordedGame.Width, txPasswordedGame.Height),
                        Color.White);
                }
+                else
+                {
+                    Logger.Log("GameDifficulty **  Drawing game difficulty icon: " + hostedGame.GameDifficulty);


DO NOT

Suggested change

Logger.Log("GameDifficulty ** Drawing game difficulty icon: " + hostedGame.GameDifficulty);

If you need an explanation -- you're logging every single frame, this will absolutely tank the performance.

Metadorius · 2025-01-03T20:34:53Z

DXMainClient/DXGUI/Multiplayer/GameListBox.cs

+                        DrawTexture(txGameDifficulty,
+                            new Rectangle(Width - txGameDifficulty.Width - TextBorderDistance - (scrollBarDrawn ? ScrollBar.Width : 0),
+                            height, txGameDifficulty.Width, txGameDifficulty.Height),
+                            Color.White);


How does this look with locked/passworded/incompatible game icons?

For passworded games it doesn't show the icon. No need.
Incompatible/locked icons are on the left hand side.
The only icons on the right would be the difficulty icons OR password.

Right, but in future we should generalize this like RA2/YR icons implementation I've told you about earlier. The one where a broadcasted game option could add an icon, and every game option including those ones could draw an icon not impacting other game options.

Metadorius · 2025-01-03T20:35:31Z

DXMainClient/Resources/DTA/gameDifficulty0.png

"Any" should not have an icon at all IMO, it's "don't care" so shouldn't be the same as newbie icon.

Metadorius · 2025-01-03T21:07:32Z

DXMainClient/DXGUI/Multiplayer/CnCNet/GameCreationWindow.cs

+            GameCreated?.Invoke(this, 
+                new GameCreationEventArgs(gameName,int.Parse(ddMaxPlayers.SelectedItem.Text), 
+                tbPassword.Text,tunnelHandler.Tunnels[lbTunnelList.SelectedIndex],
+                ddGameDifficulty.SelectedIndex)
+            );


Suggested change

GameCreated?.Invoke(this,

new GameCreationEventArgs(gameName,int.Parse(ddMaxPlayers.SelectedItem.Text),

tbPassword.Text,tunnelHandler.Tunnels[lbTunnelList.SelectedIndex],

ddGameDifficulty.SelectedIndex)

);

GameCreated?.Invoke(this,

new GameCreationEventArgs(gameName, int.Parse(ddMaxPlayers.SelectedItem.Text),

tbPassword.Text, tunnelHandler.Tunnels[lbTunnelList.SelectedIndex],

ddGameDifficulty.SelectedIndex)

);

Metadorius · 2025-01-03T21:08:53Z

DXMainClient/DXGUI/Multiplayer/GameInformationPanel.cs

+
+            string difficulty = OnlineGameDifficultyOptions[game.GameDifficulty];
+            string localizedDifficulty = difficulty.L10N($"INI:ClientDefinitions:Difficulty:{game.GameDifficulty}");
+            lblGameDifficulty.Text = "Preferred Skill Level: ".L10N("Client:Main:GameInfoDifficulty") + " " + localizedDifficulty;


Suggested change

lblGameDifficulty.Text = "Preferred Skill Level: ".L10N("Client:Main:GameInfoDifficulty") + " " + localizedDifficulty;

lblGameDifficulty.Text = "Preferred Skill Level:".L10N("Client:Main:GameInfoDifficulty") + " " + localizedDifficulty;

Metadorius · 2025-01-03T21:11:35Z

DXMainClient/DXGUI/Multiplayer/GameListBox.cs

+                {
+                    Texture2D txGameDifficulty = txGameDifficultyIcons[hostedGame.GameDifficulty];
+
+                    if (txGameDifficulty != null && hostedGame.GameDifficulty > 0) // Don't show GameDifficulty Any


No, why? You're making an assumption about what difficulties will be set by modder. You already have no image (or you should not have an image), why add an additional check?

Suggested change

if (txGameDifficulty != null && hostedGame.GameDifficulty > 0) // Don't show GameDifficulty Any

if (txGameDifficulty != null)

Metadorius

@Rampastring and myself think all references to "game difficulty" should be replaced with "preferred skill level" or just "skill level" as they are already in the text itself, but this also should be reflected on the code level and the INI level to not be confusing. Game difficulty usually is relevant in "against AI" scenarios, and skill level is more universal.

First pass on hosts setting game difficulty preferences

82eaf5e

GrantBartlett changed the title ~~First pass on hosts setting game difficulty preferences~~ Select preferred skill level when making a game Dec 31, 2024

GrantBartlett changed the title ~~Select preferred skill level when making a game~~ Select & show preferred skill level when making a game Dec 31, 2024

Add icons

6694617

GrantBartlett requested a review from SadPencil January 3, 2025 11:25

SadPencil reviewed Jan 3, 2025

View reviewed changes

Metadorius requested changes Jan 3, 2025

View reviewed changes

Addresses pr comments

76a958c

GrantBartlett requested review from SadPencil and Metadorius January 3, 2025 15:00

SadPencil requested changes Jan 3, 2025

View reviewed changes

GrantBartlett added 3 commits January 3, 2025 15:56

Use index

3f86c7a

Post merge latest develop

acf12e2

Translation

ef209f1

GrantBartlett requested a review from SadPencil January 3, 2025 16:24

SadPencil requested changes Jan 3, 2025

View reviewed changes

Fix translation

196e937

GrantBartlett requested a review from SadPencil January 3, 2025 16:39

SadPencil approved these changes Jan 3, 2025

View reviewed changes

SadPencil assigned Metadorius Jan 3, 2025

Metadorius requested changes Jan 3, 2025

View reviewed changes

PR feedback

56f269a

Metadorius requested changes Jan 3, 2025

View reviewed changes

GrantBartlett added 3 commits January 3, 2025 21:26

Don't show an icon for 'any'

0702208

Rename

76c6f52

Don't show game icon for 'any'

1bf71bb

GrantBartlett added 3 commits January 3, 2025 22:00

Update icons

8db27d5

Further naming update

593cd89

Spacing fix

e739fb7

GrantBartlett requested a review from Metadorius January 3, 2025 22:09

Metadorius approved these changes Jan 3, 2025

View reviewed changes

SadPencil merged commit ff5f14c into develop Jan 3, 2025
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Select & show preferred skill level when making a game #598

Select & show preferred skill level when making a game #598

GrantBartlett commented Dec 31, 2024 •

edited

Loading

github-actions bot commented Dec 31, 2024 •

edited

Loading

SadPencil left a comment

GrantBartlett commented Jan 3, 2025

SadPencil commented Jan 3, 2025 •

edited

Loading

Metadorius Jan 3, 2025

SadPencil left a comment

SadPencil Jan 3, 2025

SadPencil Jan 3, 2025

Metadorius Jan 3, 2025

Metadorius Jan 3, 2025

Metadorius Jan 3, 2025

Metadorius Jan 3, 2025

GrantBartlett Jan 3, 2025

Metadorius Jan 3, 2025

Metadorius Jan 3, 2025

Metadorius Jan 3, 2025

Metadorius Jan 3, 2025

Metadorius Jan 3, 2025 •

edited

Loading

Metadorius left a comment •

edited

Loading

		@@ -330,6 +330,8 @@ private List<TranslationGameFile> ParseTranslationGameFiles()

		public string AllowedCustomGameModes => clientDefinitionsIni.GetStringValue(SETTINGS, "AllowedCustomGameModes", "Standard,Custom Map");

		public string OnlineGameDifficultyOptions => clientDefinitionsIni.GetStringValue(SETTINGS, "OnlineGameDifficultyOptions", "Any,Beginner,Intermediate,Pro (Competitive)");

	lblGameDifficulty.Text = "Preferred Skill Level: ".L10N("Client:Main:GameInfoDifficulty") + " " + localizedDifficulty;
	lblGameDifficulty.Text = "Preferred Skill Level:".L10N("Client:Main:GameInfoDifficulty") + " " + localizedDifficulty;

	if (txGameDifficulty != null && hostedGame.GameDifficulty > 0) // Don't show GameDifficulty Any
	if (txGameDifficulty != null)

Select & show preferred skill level when making a game #598

Select & show preferred skill level when making a game #598

Conversation

GrantBartlett commented Dec 31, 2024 • edited Loading

Screenshots

Select player skill preference when hosting

Beginner

Intermediate

Pro

github-actions bot commented Dec 31, 2024 • edited Loading

SadPencil left a comment

Choose a reason for hiding this comment

GrantBartlett commented Jan 3, 2025

SadPencil commented Jan 3, 2025 • edited Loading

Choose a reason for hiding this comment

SadPencil left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Metadorius Jan 3, 2025 • edited Loading

Choose a reason for hiding this comment

Metadorius left a comment • edited Loading

Choose a reason for hiding this comment

GrantBartlett commented Dec 31, 2024 •

edited

Loading

github-actions bot commented Dec 31, 2024 •

edited

Loading

SadPencil commented Jan 3, 2025 •

edited

Loading

Metadorius Jan 3, 2025 •

edited

Loading

Metadorius left a comment •

edited

Loading