Add spawnini and spawnmap dropdown support #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Closed

CnCRAZER wants to merge 19 commits into CnCNet:develop from CnCRAZER:develop

+50 −20

Contributor

CnCRAZER commented Jul 27, 2025

Introduces new DataWriteMode of SPAWN_SPAWNMAP
This new DataWriteModewill keep backwards compatability by not interfering with other DataWriteMode functionality.

Allows dropdowns in GameLobbyDropDown.cs to have:

SpawnIniOption to write 'xyz' key to spawn.ini
SpawnIniValues supporting multiple values / indexes to write 'xyz123' value to the key 'xyz' to spawn.ini
ItemLabels to exist for explanation in clients UI(crates being enabled / disabled / extra crates / extreme crates)
Items to have ini files declared which append spawnmap.ini according to the index selected.

Example below is now possible:

[cmbCratesModifier]
ToolTip=Adjust the number of crates.
OptionName=Crate Settings
ItemLabels=Disabled,Enabled - Default,Enabled - Extra,Enabled - Extreme
Items=INI\Game Options\Crates\Disabled.ini,INI\Game Options\Crates\Enabled.ini,INI\Game Options\Crates\Increased.ini,INI\Game Options\Crates\Super Increased.ini
DefaultIndex=0
SpawnIniOption=Crates
SpawnIniValues=false,true,true,true
DataWriteMode=SPAWN_SPAWNMAP

CnCRAZER added 15 commits

July 22, 2025 19:08


          Add spawn.ini values to be set with dropdown selections

d587487

Previously, dropdown selections could only append to spawnmap.ini and if a spawnini setting was to be written, it was whatever value there was set.

Now, there is support for this:
[Example]
OptionName=Crates                        ; ← this is what your dropdown will display
SpawnIniOption=Crates                    ; ← the key under [Settings] in spawnmap.ini
SpawnIniOptionValues=False,True,True,True
ItemLabels=Disabled,Enabled - Default,Enabled - Extra,Enabled - Extreme
DefaultIndex=0
DataWriteMode=STRING
Items=INI\Game Options\Crates\Disabled.ini,INI\Game Options\Crates\Enabled.ini,INI\Game Options\Crates\Increased.ini,INI\Game Options\Crates\Super Increased.ini

Picking Disabled, or the first selection, will write Crates=False to spawn.ini while also appending spawnmap.ini respective to the ini file in the ItemsLabel list.

Picking Enabled - Default, or any of the others, will write Crates=True to spawn.ini while also appending spawnmap.ini respective to the ini file in the ItemsLabel list.


          Update GameLobbyDropDown.cs

e5fec50


          Merge branch 'CnCNet:develop' into develop

dd69514


          Update GameLobbyDropDown.cs

50dd8b0


          Merge branch 'develop' of https://github.com/CnCRAZER/xna-cncnet-client…

3cf011f

… into develop


          Update GameLobbyDropDown.cs

69554ff


          Update GameLobbyDropDown.cs

6220a3f


          Update GameLobbyDropDown.cs

8b1e51b


          remove double public enum's for dropdown datawrite modes

c7544b5


          syntax error fix lul

e2e181d


          Update GameLobbyDropDown.cs


          Update GameLobbyDropDown.cs

c2cdc0e


          Update GameLobbyDropDown.cs

a85a786


          Update GameLobbyDropDown.cs

24cc6bb


          Update GameLobbyDropDown.cs

1f8058a

CnCRAZER requested a review from Starkku

July 27, 2025 08:48

github-actions bot commented Jul 27, 2025 •

edited

Loading

Nightly build for this pull request:

artifacts.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.

CnCRAZER requested a review from SadPencil

July 27, 2025 09:06

CnCRAZER requested a review from ZivDero

August 4, 2025 22:41


          restore comments, whoops

5582fb4

SadPencil requested changes

View reviewed changes

DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyDropDown.cs Show resolved Hide resolved

DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyDropDown.cs Outdated Show resolved Hide resolved

DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyDropDown.cs

                       public void ApplySpawnIniCode(IniFile spawnIni)
                       {
-                          if (dataWriteMode == DropDownDataWriteMode.MAPCODE || SelectedIndex < 0 || SelectedIndex >= Items.Count)
+                          if (SelectedIndex < 0 || SelectedIndex >= Items.Count)

Member

SadPencil Aug 16, 2025

Are you sure to remove this check, instead of checking dataWriteMode == DropDownDataWriteMode.MAPCODE || dataWriteMode == DropDownDataWriteMode.SPAWN_SPAWNMAP? I haven't looked into details so no matter either choice is selected, could you provide some explanations on this line?

CnCRAZER added 2 commits

August 16, 2025 10:14


          Merge branch 'CnCNet:develop' into develop

997fa1a


          Restore xml comments

532b324

Accidently deleted

SadPencil reviewed

View reviewed changes

DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyDropDown.cs Outdated Show resolved Hide resolved


          Update GameLobbyDropDown.cs

8a2d212

SadPencil reviewed

View reviewed changes

DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyDropDown.cs

@@ @@ -124,12 +138,20 @@ public void ApplySpawnIniCode(IniFile spawnIni) @@
                               case DropDownDataWriteMode.INDEX:
                                   spawnIni.SetIntValue("Settings", spawnIniOption, SelectedIndex);
                                   break;
-                              default:

Member

SadPencil Aug 16, 2025

your PR seems to break the default case. Move your SPAWN_SPAWNMAP right after the INDEX case and before the default case. Keep the default and STRING cases untouched

SadPencil reviewed

View reviewed changes

DXMainClient/DXGUI/Multiplayer/GameLobby/GameLobbyDropDown.cs

-                          string customIniPath;
-                          customIniPath = Items[SelectedIndex].Tag.ToString();
+                          if ((dataWriteMode != DropDownDataWriteMode.MAPCODE &&
+                               dataWriteMode != DropDownDataWriteMode.SPAWN_SPAWNMAP) ||

Member

SadPencil Aug 16, 2025 •

edited

Loading

I am not sure if adding dataWriteMode != DropDownDataWriteMode.SPAWN_SPAWNMAP) works as intended.

Needs an answer to the following question: on the condition dataWriteMode == DropDownDataWriteMode.SPAWN_SPAWNMAP, should MapCodeHelper.ApplyMapCode be called or not?

        /// The dropdown value is filename of a mapcode INI file, which will be applied to the map. 
        /// Nothing is written to spawn INI.
        /// </summary>
        MAPCODE,

        /// <summary>
        /// The dropdown will support spawninioption values and spawninivalues being set based on their index.
        /// Also writes ini file content to spawnmap.ini based on the index selected.
        /// </summary>
        SPAWN_SPAWNMAP,

From the XML comment here it seems to indicate only in the MAPCODE case we need to call MapCodeHelper.ApplyMapCode(). Not very sure on this one.

Contributor Author

CnCRAZER commented Sep 6, 2025

Honestly I've kind of forgotten about this. Closing for now.

CnCRAZER closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet