UI Refactor

Author: CnCRAZER

ClientFiles/Resources/GameLobbyBase.ini

@@ -2,16 +2,16 @@
 BasedOn=GenericWindow.ini
 
 [GameLobbyBase]
-PlayerOptionLocationX=12	    ; def=25
+PlayerOptionLocationX=20;12	    ; def=25
 PlayerOptionLocationY=25	    ; def=24
 PlayerOptionVerticalMargin=9	; def=12
 PlayerOptionHorizontalMargin=5	; def=3
 PlayerOptionCaptionLocationY=6  ; def=6
-PlayerNameWidth=127             ; def=136
+PlayerNameWidth=100             ; def=136
 SideWidth=120	                ; def=91
-ColorWidth=80	                ; def=79
-StartWidth=50	                ; def=49
-TeamWidth=50	                ; def=46
+ColorWidth=85;80	            ; def=79
+StartWidth=35;50	            ; def=49
+TeamWidth=35;50	                ; def=46
 
 ; controls
 $CC00=btnLaunchGame:GameLaunchButton
@@ -128,7 +128,7 @@ $X=getRight(lbMapList) - getWidth($Self)
 $Y=getY(lbMapList) - getHeight($Self) - EMPTY_SPACE_TOP
 
 [lblGameModeSelect]
-Text=Game mode:
+Text=GAME MODE:
 $X=getX(ddGameMode) - getWidth($Self) - LABEL_SPACING
 $Y=getY(ddGameMode) + 1
 
@@ -203,8 +203,8 @@ $CC00=btnPlayerExtraOptionsOpen:XNAClientButton
 [PlayerExtraOptionsPanel]
 $Width=238
 $Height=247
-$X=getRight(PlayerOptionsPanel) - getWidth($Self)
-$Y=getY(PlayerOptionsPanel)
+$X=getX(PlayerOptionsPanel) + 10;getRight(PlayerOptionsPanel) - getWidth($Self)
+$Y=getY(PlayerOptionsPanel) + 10
 
 [PlayerExtraOptionsPanel_btnClose]
 Location=220,0
@@ -244,13 +244,13 @@ Location=12,189
 [btnPlayerExtraOptionsOpen]
 $Width=OPEN_BUTTON_WIDTH
 $Height=OPEN_BUTTON_HEIGHT
-$X=getWidth($ParentControl) - getWidth($Self)
+$X=0;getWidth($ParentControl) - getWidth($Self)
 $Y=0
 IdleTexture=optionsButton.png
 HoverTexture=optionsButton_c.png
 
 [GameOptionsPanel]
-$Width=330
+$Width=380
 $Height=270
 $X=getWidth($ParentControl) - getWidth($Self) - LOBBY_EMPTY_SPACE_SIDES
 $Y=EMPTY_SPACE_TOP
@@ -259,18 +259,23 @@ SolidColorBackgroundTexture=0,0,0,128
 ; Left column checkboxes
 $CC-GO01=chkShortGame:GameLobbyCheckBox
 $CC-GO02=chkRedeplMCV:GameLobbyCheckBox
-$CC-GO03=chkSuperWeapons:GameLobbyCheckBox
-$CC-GO04=chkCrates:GameLobbyCheckBox
-$CC-GO05=chkBuildOffAlly:GameLobbyCheckBox
-$CC-GO06=chkMultiEngineer:GameLobbyCheckBox
+$CC-GO04=chkSuperWeapons:GameLobbyCheckBox
+$CC-GO05=chkCrates:GameLobbyCheckBox
+$CC-GO06=chkBuildOffAlly:GameLobbyCheckBox
+
+; Middle column checkboxes
+;$CC-GO07=chkMultiEngineer:GameLobbyCheckBox
+;$CC-GO08=chkIngameAllying:GameLobbyCheckBox
+;$CC-GO09=chkDestroyableBridges:GameLobbyCheckBox
+;$CC-GO10=chkRA2Mode:GameLobbyCheckBox
+;$CC-GO11=chkNoSpawnPreview:GameLobbyCheckBox
 
 ; Right column checkboxes
-$CC-GO07=chkIngameAllying:GameLobbyCheckBox
-$CC-GO08=chkStolenTech:GameLobbyCheckBox
-$CC-GO09=chkNavalCombat:GameLobbyCheckBox
-$CC-GO10=chkDestroyableBridges:GameLobbyCheckBox
-$CC-GO11=chkBrutalAI:GameLobbyCheckBox
-$CC-GO12=chkNoSpawnPreview:GameLobbyCheckBox
+;$CC-GO12=chkNoYuri:GameLobbyCheckBox
+;$CC-GO13=chkNoFrance:GameLobbyCheckBox
+;$CC-GO14=chkNoSpy:GameLobbyCheckBox
+;$CC-GO15=chkNoDogEngiEat:GameLobbyCheckBox
+;$CC-GO16=chkStolenTech:GameLobbyCheckBox
 
 ; Dropdowns
 $CC-GODD01=cmbCredits:GameLobbyDropDown
@@ -322,7 +327,7 @@ $X=getX(chkShortGame)
 $Y=getBottom(chkRedeplMCV) + GAME_OPTION_ROW_SPACING
 
 [chkCrates]
-Text=Crates Appear
+Text=Crates
 SpawnIniOption=Crates
 Checked=False
 ToolTip=Random power-up crates will appear.
@@ -337,6 +342,10 @@ ToolTip=Allow players to build near their allies' Construction Yards.
 $X=getX(chkShortGame)
 $Y=getBottom(chkCrates) + GAME_OPTION_ROW_SPACING
 
+;============================
+; MIDDLE Column Checkboxes
+;============================
+
 [chkMultiEngineer]
 Text=Multi Engineer
 SpawnIniOption=MultiEngineer
@@ -345,10 +354,6 @@ ToolTip=Capturing structures requires 3 Engineers instead of 1.
 $X=getX(chkShortGame)
 $Y=getBottom(chkBuildOffAlly) + GAME_OPTION_ROW_SPACING
 
-;============================
-; Right Column Checkboxes
-;============================
-
 [chkIngameAllying]
 Text=Ingame Allying
 SpawnIniOption=AlliesAllowed
@@ -358,42 +363,23 @@ ToolTip=Players can form and break alliances in game.
 $X=getX(chkShortGame) + GAME_OPTION_COLUMN_SPACING
 $Y=getY(chkShortGame)
 
-[chkStolenTech]
-Text=Stolen Tech
-CustomIniPath=INI/Game Options/StolenTech.ini
-Checked=True
-ToolTip=Allow infiltration of battle labs for stolen tech infantry.
-Reversed=yes
-$X=getX(chkIngameAllying)
-$Y=getBottom(chkIngameAllying) + GAME_OPTION_ROW_SPACING
-
-[chkNavalCombat]
-Text=Naval Combat
-CustomIniPath=INI/Game Options/NavalCombat.ini
-Checked=True
-ToolTip=Allow shipyards and naval units to be built.
-Reversed=yes
-$X=getX(chkIngameAllying)
-$Y=getBottom(chkStolenTech) + GAME_OPTION_ROW_SPACING
-
 [chkDestroyableBridges]
 Text=Destroyable Bridges
-CustomIniPath=INI/Game Options/DestroyableBridges.ini
+SpawnIniOption=BridgeDestroy
 Checked=True
 Location=1038,86
 ToolTip=Allow bridges to be destroyed by conventional weapons & force firing.
-Reversed=yes
 $X=getX(chkIngameAllying)
 $Y=getBottom(chkNavalCombat) + GAME_OPTION_ROW_SPACING
 
-[chkBrutalAI]
-Text=Brutal AI
-CustomIniPath=INI/Game Options/BrutalAI.ini
-Checked=False
-Location=1038,107
-ToolTip=Makes the AI harder across all levels.
+[chkRA2Mode]
+SpawnIniOption=Ra2Mode
+DefaultValue=False
+ToolTip=Red Alert 2 Classic Mode will turn gameplay into Red Alert 2.
+Text=Red Alert 2
+DisallowedSideIndex=9
 $X=getX(chkIngameAllying)
-$Y=getBottom(chkDestroyableBridges) + GAME_OPTION_ROW_SPACING
+$Y=getBottom(chkNavalCombat) + GAME_OPTION_ROW_SPACING
 
 [chkNoSpawnPreview]
 Text=No Spawn Previews
@@ -404,6 +390,52 @@ ToolTip=Do not display players' starting locations in loading screen map preview
 $X=getX(chkIngameAllying)
 $Y=getBottom(chkBrutalAI) + GAME_OPTION_ROW_SPACING
 
+;============================
+; Right Column Checkboxes
+;============================
+
+[chkNoYuri]
+Text=No Yuri
+CustomIniPath=INI/Game Options/NoYuri.ini
+ToolTip=Yuri is disabled
+DefaultValue=False
+DisallowedSideIndices=9
+$X=getX(chkIngameAllying)
+$Y=getBottom(chkIngameAllying) + GAME_OPTION_ROW_SPACING
+
+[chkNoFrance]
+Text=No France
+CustomIniPath=INI/Game Options/NoFrance.ini
+ToolTip=France is disabled
+DefaultValue=False
+DisallowedSideIndices=2
+$X=getX(chkIngameAllying)
+$Y=getBottom(chkIngameAllying) + GAME_OPTION_ROW_SPACING
+
+[chkNoSpy]
+Text=No Spy
+CustomIniPath=INI/Game Options/NoSpy.ini
+DefaultValue=False
+ToolTip=Spies are disabled
+$X=getX(chkIngameAllying)
+$Y=getBottom(chkIngameAllying) + GAME_OPTION_ROW_SPACING
+
+[chkNoDogEngiEat]
+Text=No Dog Engineer Kills
+CustomIniPath=INI/Game Options/NoDogEngiEat.ini
+Checked=False
+ToolTip=Dogs will be unable to kill Engineers.
+$X=getX(chkIngameAllying)
+$Y=getBottom(chkIngameAllying) + GAME_OPTION_ROW_SPACING
+
+[chkStolenTech]
+Text=Stolen Tech
+CustomIniPath=INI/Game Options/StolenTech.ini
+Checked=True
+ToolTip=Allow infiltration of battle labs for stolen tech infantry.
+Reversed=yes
+$X=getX(chkIngameAllying)
+$Y=getBottom(chkIngameAllying) + GAME_OPTION_ROW_SPACING
 
 ;============================
 ; Dropdowns

ClientFiles/Resources/MultiplayerGameLobby.ini

@@ -10,10 +10,10 @@ PlayerOptionHorizontalMargin=5	; def=3
 PlayerOptionCaptionLocationY=6	; def=6
 PlayerStatusIndicatorX=8
 PlayerStatusIndicatorY=0
-PlayerNameWidth=135             ; def=136
+PlayerNameWidth=100;135         ; def=136
 SideWidth=110	                ; def=91
 ColorWidth=80	                ; def=79
-StartWidth=45	                ; def=49
+StartWidth=35	                ; def=49
 TeamWidth=35	                ; def=46
 
 ; controls