From 80b54fa880e9d7a2fb269a5f5da6b15bf37bc315 Mon Sep 17 00:00:00 2001 From: JMM889901 Date: Sun, 17 Jul 2022 14:00:32 +0100 Subject: [PATCH 1/8] More mode images i hate github i hate github i hate github --- .../mod/resource/ui/menus/mode_select.menu | 357 ++++++++++++++++++ .../scripts/vscripts/ui/menu_mode_select.nut | 36 +- 2 files changed, 391 insertions(+), 2 deletions(-) create mode 100644 Northstar.Client/mod/resource/ui/menus/mode_select.menu diff --git a/Northstar.Client/mod/resource/ui/menus/mode_select.menu b/Northstar.Client/mod/resource/ui/menus/mode_select.menu new file mode 100644 index 000000000..35373a26b --- /dev/null +++ b/Northstar.Client/mod/resource/ui/menus/mode_select.menu @@ -0,0 +1,357 @@ +resource/ui/menus/mode_select.menu +{ + menu + { + ControlName Frame + xpos 0 + ypos 0 + zpos 3 + wide f0 + tall f0 + autoResize 0 + pinCorner 0 + visible 1 + enabled 1 + PaintBackgroundType 0 + infocus_bgcolor_override "0 0 0 0" + outoffocus_bgcolor_override "0 0 0 0" + + MenuCommon + { + ControlName CNestedPanel + xpos 0 + ypos 0 + wide f0 + tall f0 + visible 1 + controlSettingsFile "resource/ui/menus/panels/menu_common.res" + } + + MatchmakingStatus + { + ControlName CNestedPanel + xpos 0 + ypos 0 + wide f0 + tall f0 + visible 1 + controlSettingsFile "resource/ui/menus/panels/matchmaking_status.res" + } + + NextModeImageFrame + { + ControlName RuiPanel + xpos 800 + ypos 160 + wide 860 + tall 418 + labelText "" + visible 1 + bgcolor_override "0 0 0 0" + paintbackground 1 + rui "ui/basic_border_box.rpak" + } + + NextModeImage + { + ControlName RuiPanel + pin_to_sibling NextModeImageFrame + pin_corner_to_sibling BOTTOM + pin_to_sibling_corner BOTTOM +// xpos -12 + ypos -12 + wide 480 + tall 240 + visible 1 + scaleImage 1 + rui "ui/basic_menu_image.rpak" + zpos 2 + } + NextModeImageCallsign //For calling card icons + { + ControlName RuiPanel +// xpos -12 + ypos -12 + wide 480 + tall 240 + visible 1 + scaleImage 1 + zpos 2 + pin_to_sibling NextModeImageFrame + pin_corner_to_sibling BOTTOM + pin_to_sibling_corner BOTTOM + rui "ui/callsign_icon_button.rpak" //For callsign mode images + } + ModeIconImage + { + ControlName RuiPanel + pin_to_sibling NextModeImage + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_LEFT + xpos 0 + ypos -16 + wide 72 + tall 72 + visible 1 + scaleImage 1 + rui "ui/basic_image_add.rpak" + zpos 3 + } + + NextModeName + { + ControlName Label + pin_to_sibling NextModeImageFrame + pin_corner_to_sibling TOP + pin_to_sibling_corner TOP + ypos -20 + wide 840 + auto_tall_tocontents 1 + visible 1 + labelText "Foo" + textAlignment center + centerWrap 1 + font Default_43_DropShadow + allcaps 1 + fgcolor_override "255 255 255 255" + } + + NextModeDesc + { + ControlName Label + pin_to_sibling NextModeName + pin_corner_to_sibling TOP + pin_to_sibling_corner BOTTOM + xpos 0 + ypos 0 + wide 840 + wrap 1 + auto_tall_tocontents 1 + visible 1 + labelText "Bar" + textAlignment center + centerWrap 1 + font Default_27 + allcaps 0 + fgcolor_override "255 255 255 255" + } + + MenuTitle + { + ControlName Label + InheritProperties MenuTitle + labelText "#SELECT_GAME_MODE" + } + + ButtonRowAnchor + { + ControlName Label + labelText "" + + xpos 96 + ypos 160 + } + + BtnMode1 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 0 + navUp BtnMode15 + navDown BtnMode2 + + pin_to_sibling ButtonRowAnchor + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_LEFT + } + BtnMode2 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 1 + pin_to_sibling BtnMode1 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode1 + navDown BtnMode3 + } + BtnMode3 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 2 + pin_to_sibling BtnMode2 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode2 + navDown BtnMode4 + } + BtnMode4 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 3 + pin_to_sibling BtnMode3 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + //ypos 11 + navUp BtnMode3 + navDown BtnMode5 + } + BtnMode5 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 4 + pin_to_sibling BtnMode4 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode4 + navDown BtnMode6 + } + BtnMode6 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 5 + pin_to_sibling BtnMode5 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode5 + navDown BtnMode7 + } + BtnMode7 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 6 + pin_to_sibling BtnMode6 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode6 + navDown BtnMode8 + } + BtnMode8 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 7 + pin_to_sibling BtnMode7 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode7 + navDown BtnMode9 + } + BtnMode9 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 8 + pin_to_sibling BtnMode8 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode8 + navDown BtnMode10 + } + BtnMode10 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 9 + pin_to_sibling BtnMode9 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode9 + navDown BtnMode11 + } + BtnMode11 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 10 + pin_to_sibling BtnMode10 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode10 + navDown BtnMode12 + } + BtnMode12 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 11 + pin_to_sibling BtnMode11 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode11 + navDown BtnMode13 + } + BtnMode13 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 12 + pin_to_sibling BtnMode12 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode12 + navDown BtnMode14 + } + BtnMode14 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 13 + pin_to_sibling BtnMode13 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode13 + navDown BtnMode15 + } + BtnMode15 + { + ControlName RuiButton + InheritProperties RuiSmallButton + classname ModeButton + scriptID 14 + pin_to_sibling BtnMode14 + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + navUp BtnMode14 + navDown BtnMode1 + } + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + ButtonTooltip + { + ControlName CNestedPanel + InheritProperties ButtonTooltip + } + + FooterButtons + { + ControlName CNestedPanel + xpos 0 + ypos r119 + wide f0 + tall 36 + visible 1 + controlSettingsFile "resource/ui/menus/panels/footer_buttons.res" + } + } +} diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut index 605af3832..7d8dbaf83 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut @@ -1,7 +1,10 @@ global function InitModesMenu +global function RegisterPlaylistBannerImage +global function GetPlaylistBannerImage struct { int currentModePage + table bannerPlaylistImages } file const int MODES_PER_PAGE = 15 @@ -22,6 +25,20 @@ void function InitModesMenu() AddMenuFooterOption( menu, BUTTON_SHOULDER_RIGHT, "#PRIVATE_MATCH_PAGE_NEXT", "#PRIVATE_MATCH_PAGE_NEXT", CycleModesForward ) } +bool function RegisterPlaylistBannerImage(string name, asset image) +{ + if( name in file.bannerPlaylistImages ) + return false + file.bannerPlaylistImages[name] <- image + return true +} +asset function GetPlaylistBannerImage(string name) +{ + if(!( name in file.bannerPlaylistImages )) + return $"" + return file.bannerPlaylistImages[name] +} + void function OnOpenModesMenu() { UpdateVisibleModes() @@ -66,6 +83,7 @@ void function ModeButton_GetFocus( var button ) var menu = GetMenu( "ModesMenu" ) var nextModeImage = Hud_GetChild( menu, "NextModeImage" ) + var nextModeImageAlt = Hud_GetChild( menu, "NextModeImageCallsign" ) var nextModeIcon = Hud_GetChild( menu, "ModeIconImage" ) var nextModeName = Hud_GetChild( menu, "NextModeName" ) var nextModeDesc = Hud_GetChild( menu, "NextModeDesc" ) @@ -77,8 +95,22 @@ void function ModeButton_GetFocus( var button ) string modeName = modesArray[modeId] - asset playlistImage = GetPlaylistImage( modeName ) - RuiSetImage( Hud_GetRui( nextModeImage ), "basicImage", playlistImage ) + + string imagename = GetPlaylistVarOrUseValue( modeName, "image", "default" ) + if(GetPlaylistBannerImage(imagename) == $"") + { + asset playlistImage = GetPlaylistImage( modeName ) + RuiSetImage( Hud_GetRui( nextModeImage ), "basicImage", playlistImage ) + Hud_SetVisible(nextModeImage, true) + Hud_SetVisible(nextModeImageAlt, false) + } + else + { + asset playlistImage = GetPlaylistBannerImage(imagename) + RuiSetImage( Hud_GetRui( nextModeImageAlt ), "iconImage", playlistImage ) + Hud_SetVisible(nextModeImageAlt, true) + Hud_SetVisible(nextModeImage, false) + } RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( modeName ) ) Hud_SetText( nextModeName, GetGameModeDisplayName( modeName ) ) From 79bbf41e3b62de4115e9f3ece253bfebd45e2bc9 Mon Sep 17 00:00:00 2001 From: JMM889901 <41163714+JMM889901@users.noreply.github.com> Date: Sun, 17 Jul 2022 14:08:46 +0100 Subject: [PATCH 2/8] tabs looked weird some lines were incorrectly tabbed --- .../mod/scripts/vscripts/ui/menu_mode_select.nut | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut index 7d8dbaf83..26104da01 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut @@ -102,14 +102,14 @@ void function ModeButton_GetFocus( var button ) asset playlistImage = GetPlaylistImage( modeName ) RuiSetImage( Hud_GetRui( nextModeImage ), "basicImage", playlistImage ) Hud_SetVisible(nextModeImage, true) - Hud_SetVisible(nextModeImageAlt, false) + Hud_SetVisible(nextModeImageAlt, false) } else { asset playlistImage = GetPlaylistBannerImage(imagename) RuiSetImage( Hud_GetRui( nextModeImageAlt ), "iconImage", playlistImage ) Hud_SetVisible(nextModeImageAlt, true) - Hud_SetVisible(nextModeImage, false) + Hud_SetVisible(nextModeImage, false) } RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( modeName ) ) Hud_SetText( nextModeName, GetGameModeDisplayName( modeName ) ) @@ -162,4 +162,4 @@ void function CycleModesForward( var button ) file.currentModePage++ UpdateVisibleModes() -} \ No newline at end of file +} From 14eaae577b16c0126596d02631d629e7fe6a23f4 Mon Sep 17 00:00:00 2001 From: JMM889901 Date: Sat, 13 Aug 2022 19:16:59 +0100 Subject: [PATCH 3/8] Reworked + Now enables icon changes --- .../mod/resource/ui/menus/server_browser.menu | 16 +++++ .../scripts/vscripts/ui/menu_mode_select.nut | 46 +++++++------ .../vscripts/ui/menu_ns_serverbrowser.nut | 68 ++++++++++++++----- .../vscripts/ui/menu_private_match.nut | 20 +++++- 4 files changed, 108 insertions(+), 42 deletions(-) diff --git a/Northstar.Client/mod/resource/ui/menus/server_browser.menu b/Northstar.Client/mod/resource/ui/menus/server_browser.menu index 4a84a714a..614e8e922 100644 --- a/Northstar.Client/mod/resource/ui/menus/server_browser.menu +++ b/Northstar.Client/mod/resource/ui/menus/server_browser.menu @@ -2491,6 +2491,22 @@ resource/ui/menus/mods_browse.menu pin_corner_to_sibling BOTTOM_RIGHT pin_to_sibling_corner TOP_RIGHT } + NextModeIconPatch + { + ControlName RuiPanel + wide 72 + tall 72 + visible 0 + scaleImage 1 + image "" + zpos 1 + + rui "ui/callsign_icon_button.rpak" + + pin_to_sibling NextGameModeName + pin_corner_to_sibling BOTTOM_RIGHT + pin_to_sibling_corner TOP_RIGHT + } ServerName { diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut index 26104da01..05792773d 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut @@ -1,10 +1,8 @@ global function InitModesMenu -global function RegisterPlaylistBannerImage -global function GetPlaylistBannerImage + struct { int currentModePage - table bannerPlaylistImages } file const int MODES_PER_PAGE = 15 @@ -25,19 +23,6 @@ void function InitModesMenu() AddMenuFooterOption( menu, BUTTON_SHOULDER_RIGHT, "#PRIVATE_MATCH_PAGE_NEXT", "#PRIVATE_MATCH_PAGE_NEXT", CycleModesForward ) } -bool function RegisterPlaylistBannerImage(string name, asset image) -{ - if( name in file.bannerPlaylistImages ) - return false - file.bannerPlaylistImages[name] <- image - return true -} -asset function GetPlaylistBannerImage(string name) -{ - if(!( name in file.bannerPlaylistImages )) - return $"" - return file.bannerPlaylistImages[name] -} void function OnOpenModesMenu() { @@ -85,6 +70,7 @@ void function ModeButton_GetFocus( var button ) var nextModeImage = Hud_GetChild( menu, "NextModeImage" ) var nextModeImageAlt = Hud_GetChild( menu, "NextModeImageCallsign" ) var nextModeIcon = Hud_GetChild( menu, "ModeIconImage" ) + var nextModeIconAlt = Hud_GetChild( menu, "ModeIconImagePatch" ) var nextModeName = Hud_GetChild( menu, "NextModeName" ) var nextModeDesc = Hud_GetChild( menu, "NextModeDesc" ) @@ -96,22 +82,38 @@ void function ModeButton_GetFocus( var button ) string modeName = modesArray[modeId] - string imagename = GetPlaylistVarOrUseValue( modeName, "image", "default" ) - if(GetPlaylistBannerImage(imagename) == $"") + string imageName = GetPlaylistVarOrUseValue( modeName, "imageOverride", "default" ) + if(imageName == "default") { asset playlistImage = GetPlaylistImage( modeName ) RuiSetImage( Hud_GetRui( nextModeImage ), "basicImage", playlistImage ) + Hud_SetVisible(nextModeImage, true) - Hud_SetVisible(nextModeImageAlt, false) + Hud_SetVisible(nextModeImageAlt, false) } else { - asset playlistImage = GetPlaylistBannerImage(imagename) + asset playlistImage = StringToAsset(imageName) RuiSetImage( Hud_GetRui( nextModeImageAlt ), "iconImage", playlistImage ) + Hud_SetVisible(nextModeImageAlt, true) - Hud_SetVisible(nextModeImage, false) + Hud_SetVisible(nextModeImage, false) } - RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( modeName ) ) + string iconName = GetPlaylistVarOrUseValue( modeName, "IconOverride", "default" ) + if(iconName == "default") + { + RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( modeName ) ) + Hud_SetVisible(nextModeIcon, true) + Hud_SetVisible(nextModeIconAlt, false) + } + else + { + var rui = Hud_GetRui( nextModeIconAlt ) + RuiSetImage( rui, "iconImage", StringToAsset(iconName) ) + Hud_SetVisible(nextModeIcon, false) + Hud_SetVisible(nextModeIconAlt, true) + } + Hud_SetText( nextModeName, GetGameModeDisplayName( modeName ) ) string mapName = PrivateMatch_GetSelectedMap() diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut index cdeb8b3e0..97f44061e 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut @@ -756,7 +756,18 @@ void function FilterServerList() foreach ( ServerInfo server in servers ) { - totalPlayers += server.playerCount + serverStruct tempServer + tempServer.serverIndex = i + tempServer.serverProtected = NSServerRequiresPassword( i ) + tempServer.serverName = NSGetServerName( i ) + tempServer.serverPlayers = NSGetServerPlayerCount( i ) + tempServer.serverPlayersMax = NSGetServerMaxPlayerCount( i ) + tempServer.serverMap = NSGetServerMap( i ) + //tempServer.serverGamemode = GetGameModeDisplayName( NSGetServerPlaylist ( i ) ) + tempServer.serverGamemode = NSGetServerPlaylist ( i ) + + totalPlayers += tempServer.serverPlayers + // Filters if ( filterArguments.hideEmpty && server.playerCount == 0 ) @@ -778,13 +789,12 @@ void function FilterServerList() if ( filterArguments.useSearch ) { array sName - sName.append( server.name.tolower() ) - sName.append( Localize( GetMapDisplayName( server.map ) ).tolower() ) - sName.append( server.map.tolower() ) - sName.append( server.playlist.tolower() ) - sName.append( Localize( server.playlist ).tolower() ) - sName.append( server.description.tolower() ) - sName.append( server.region.tolower() ) + sName.append( tempServer.serverName.tolower() ) + sName.append( Localize( GetMapDisplayName( tempServer.serverMap ) ).tolower() ) + sName.append( tempServer.serverMap.tolower() ) + sName.append( GetGameModeDisplayName( tempServer.serverGamemode ).tolower() ) + sName.append( Localize( GetGameModeDisplayName( tempServer.serverGamemode ) ).tolower() ) + sName.append( NSGetServerDescription( i ).tolower() ) string sTerm = filterArguments.searchTerm.tolower() @@ -832,12 +842,11 @@ void function UpdateShownPage() Hud_SetEnabled( file.serverButtons[ i ], true ) Hud_SetVisible( file.serverButtons[ i ], true ) - Hud_SetVisible( file.serversProtected[ i ], server.requiresPassword ) - Hud_SetText( file.serversName[ i ], server.name ) - Hud_SetText( file.playerCountLabels[ i ], format( "%i/%i", server.playerCount, server.maxPlayerCount ) ) - Hud_SetText( file.serversMap[ i ], GetMapDisplayName( server.map ) ) - Hud_SetText( file.serversGamemode[ i ], GetGameModeDisplayName( server.playlist ) ) - Hud_SetText( file.serversRegion[ i ], server.region ) + Hud_SetVisible( file.serversProtected[ i ], file.serversArrayFiltered[ buttonIndex ].serverProtected ) + Hud_SetText( file.serversName[ i ], file.serversArrayFiltered[ buttonIndex ].serverName ) + Hud_SetText( file.playerCountLabels[ i ], format( "%i/%i", file.serversArrayFiltered[ buttonIndex ].serverPlayers, file.serversArrayFiltered[ buttonIndex ].serverPlayersMax ) ) + Hud_SetText( file.serversMap[ i ], GetMapDisplayName( file.serversArrayFiltered[ buttonIndex ].serverMap ) ) + Hud_SetText( file.serversGamemode[ i ], GetGameModeDisplayName( file.serversArrayFiltered[ buttonIndex ].serverGamemode ) ) } @@ -926,9 +935,32 @@ void function DisplayFocusedServerInfo( int scriptID ) Hud_SetText( Hud_GetChild( menu, "ServerName" ), server.name ) // mode name/image - string mode = server.playlist + string mode = GetGameModeDisplayName( file.serversArrayFiltered[ serverIndex ].serverGamemode ) + string playlist = file.serversArrayFiltered[ serverIndex ].serverGamemode + print("mode "+mode) Hud_SetVisible( Hud_GetChild( menu, "NextModeIcon" ), true ) - RuiSetImage( Hud_GetRui( Hud_GetChild( menu, "NextModeIcon" ) ), "basicImage", GetPlaylistThumbnailImage( mode ) ) + //RuiSetImage( Hud_GetRui( Hud_GetChild( menu, "NextModeIcon" ) ), "basicImage", GetPlaylistThumbnailImage( mode ) ) + + var nextModeIconAlt = Hud_GetChild( menu, "NextModeIconPatch" ) + var nextModeIcon = Hud_GetChild( menu, "NextModeIcon" ) + string iconName = GetPlaylistVarOrUseValue( playlist, "iconOverride", "default" ) + + if(iconName == "default") + { + RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( playlist ) ) + + Hud_SetVisible(nextModeIcon, true) + Hud_SetVisible(nextModeIconAlt, false) + } + else + { + RuiSetImage( Hud_GetRui( nextModeIconAlt ), "iconImage", StringToAsset(iconName) ) + + Hud_SetVisible(nextModeIcon, false) + Hud_SetVisible(nextModeIconAlt, true) + } + + Hud_SetVisible( Hud_GetChild( menu, "NextGameModeName" ), true ) if ( mode.len() != 0 ) @@ -1240,8 +1272,8 @@ int function ServerSortLogic ( ServerInfo a, ServerInfo b ) direction = filterDirection.serverMap break; case sortingBy.GAMEMODE: - aTemp = Localize( a.playlist ).tolower() - bTemp = Localize( b.playlist ).tolower() + aTemp = Localize( GetGameModeDisplayName( a.serverGamemode ) ).tolower() + bTemp = Localize( GetGameModeDisplayName( b.serverGamemode ) ).tolower() direction = filterDirection.serverGamemode break; case sortingBy.REGION: diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut index e3c1f268e..09d623695 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut @@ -510,9 +510,25 @@ void function SetMapInfo( string mapName ) void function SetModeInfo( string modeName ) { + var nextModeIconAlt = Hud_GetChild( file.menu, "NextModeIconPatch" ) var nextModeIcon = Hud_GetChild( file.menu, "NextModeIcon" ) - RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( modeName ) ) - Hud_Show( nextModeIcon ) + string iconName = GetPlaylistVarOrUseValue( modeName, "iconOverride", "default" ) + + if(iconName == "default") + { + RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( modeName ) ) + + Hud_SetVisible(nextModeIcon, true) + Hud_SetVisible(nextModeIconAlt, false) + } + else + { + RuiSetImage( Hud_GetRui( nextModeIconAlt ), "iconImage", StringToAsset(iconName) ) + + Hud_SetVisible(nextModeIcon, false) + Hud_SetVisible(nextModeIconAlt, true) + } + //Hud_Show( nextModeIcon ) Hud_SetText( file.nextGameModeLabel, GetGameModeDisplayName( modeName ) ) } From 728c196d9b95a4b1a96f73a8244b7f2ec292f20c Mon Sep 17 00:00:00 2001 From: JMM889901 <41163714+JMM889901@users.noreply.github.com> Date: Thu, 10 Nov 2022 14:46:48 +0000 Subject: [PATCH 4/8] Apply suggestions from code review Co-authored-by: uniboi <64006268+uniboi@users.noreply.github.com> --- .../mod/resource/ui/menus/mode_select.menu | 6 ----- .../scripts/vscripts/ui/menu_mode_select.nut | 24 +++++++++---------- .../vscripts/ui/menu_ns_serverbrowser.nut | 11 ++++----- .../vscripts/ui/menu_private_match.nut | 11 ++++----- 4 files changed, 21 insertions(+), 31 deletions(-) diff --git a/Northstar.Client/mod/resource/ui/menus/mode_select.menu b/Northstar.Client/mod/resource/ui/menus/mode_select.menu index 35373a26b..e52ac41a6 100644 --- a/Northstar.Client/mod/resource/ui/menus/mode_select.menu +++ b/Northstar.Client/mod/resource/ui/menus/mode_select.menu @@ -19,22 +19,16 @@ resource/ui/menus/mode_select.menu MenuCommon { ControlName CNestedPanel - xpos 0 - ypos 0 wide f0 tall f0 - visible 1 controlSettingsFile "resource/ui/menus/panels/menu_common.res" } MatchmakingStatus { ControlName CNestedPanel - xpos 0 - ypos 0 wide f0 tall f0 - visible 1 controlSettingsFile "resource/ui/menus/panels/matchmaking_status.res" } diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut index 05792773d..9028b3adc 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut @@ -83,35 +83,35 @@ void function ModeButton_GetFocus( var button ) string imageName = GetPlaylistVarOrUseValue( modeName, "imageOverride", "default" ) - if(imageName == "default") + if( imageName == "default" ) { asset playlistImage = GetPlaylistImage( modeName ) RuiSetImage( Hud_GetRui( nextModeImage ), "basicImage", playlistImage ) - Hud_SetVisible(nextModeImage, true) - Hud_SetVisible(nextModeImageAlt, false) + Hud_Show( nextModeImage ) + Hud_Hide( nextModeImageAlt ) } else { - asset playlistImage = StringToAsset(imageName) + asset playlistImage = StringToAsset( imageName ) RuiSetImage( Hud_GetRui( nextModeImageAlt ), "iconImage", playlistImage ) - Hud_SetVisible(nextModeImageAlt, true) - Hud_SetVisible(nextModeImage, false) + Hud_Show( nextModeImageAlt ) + Hud_Hide( nextModeImage ) } string iconName = GetPlaylistVarOrUseValue( modeName, "IconOverride", "default" ) - if(iconName == "default") + if( iconName == "default" ) { RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( modeName ) ) - Hud_SetVisible(nextModeIcon, true) - Hud_SetVisible(nextModeIconAlt, false) + Hud_Showe( nextModeIcon ) + Hud_Hide( nextModeIconAlt ) } else { var rui = Hud_GetRui( nextModeIconAlt ) - RuiSetImage( rui, "iconImage", StringToAsset(iconName) ) - Hud_SetVisible(nextModeIcon, false) - Hud_SetVisible(nextModeIconAlt, true) + RuiSetImage( rui, "iconImage", StringToAsset( iconName ) ) + Hud_Show( nextModeIcon ) + Hud_Hide( nextModeIconAlt ) } Hud_SetText( nextModeName, GetGameModeDisplayName( modeName ) ) diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut index 97f44061e..95109bbdb 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut @@ -763,7 +763,6 @@ void function FilterServerList() tempServer.serverPlayers = NSGetServerPlayerCount( i ) tempServer.serverPlayersMax = NSGetServerMaxPlayerCount( i ) tempServer.serverMap = NSGetServerMap( i ) - //tempServer.serverGamemode = GetGameModeDisplayName( NSGetServerPlaylist ( i ) ) tempServer.serverGamemode = NSGetServerPlaylist ( i ) totalPlayers += tempServer.serverPlayers @@ -937,9 +936,7 @@ void function DisplayFocusedServerInfo( int scriptID ) // mode name/image string mode = GetGameModeDisplayName( file.serversArrayFiltered[ serverIndex ].serverGamemode ) string playlist = file.serversArrayFiltered[ serverIndex ].serverGamemode - print("mode "+mode) Hud_SetVisible( Hud_GetChild( menu, "NextModeIcon" ), true ) - //RuiSetImage( Hud_GetRui( Hud_GetChild( menu, "NextModeIcon" ) ), "basicImage", GetPlaylistThumbnailImage( mode ) ) var nextModeIconAlt = Hud_GetChild( menu, "NextModeIconPatch" ) var nextModeIcon = Hud_GetChild( menu, "NextModeIcon" ) @@ -949,15 +946,15 @@ void function DisplayFocusedServerInfo( int scriptID ) { RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( playlist ) ) - Hud_SetVisible(nextModeIcon, true) - Hud_SetVisible(nextModeIconAlt, false) + Hud_Show( nextModeIcon ) + Hud_Hide( nextModeIconAlt ) } else { RuiSetImage( Hud_GetRui( nextModeIconAlt ), "iconImage", StringToAsset(iconName) ) - Hud_SetVisible(nextModeIcon, false) - Hud_SetVisible(nextModeIconAlt, true) + Hud_Hide( nextModeIcon ) + Hud_Show( nextModeIconAlt ) } diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut index 09d623695..8d82b8618 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut @@ -514,21 +514,20 @@ void function SetModeInfo( string modeName ) var nextModeIcon = Hud_GetChild( file.menu, "NextModeIcon" ) string iconName = GetPlaylistVarOrUseValue( modeName, "iconOverride", "default" ) - if(iconName == "default") + if( iconName == "default" ) { RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( modeName ) ) - Hud_SetVisible(nextModeIcon, true) - Hud_SetVisible(nextModeIconAlt, false) + Hud_Show( nextModeIcon ) + Hud_Hide( nextModeIconAlt ) } else { RuiSetImage( Hud_GetRui( nextModeIconAlt ), "iconImage", StringToAsset(iconName) ) - Hud_SetVisible(nextModeIcon, false) - Hud_SetVisible(nextModeIconAlt, true) + Hud_Hide( nextModeIcon ) + Hud_Show( nextModeIconAlt ) } - //Hud_Show( nextModeIcon ) Hud_SetText( file.nextGameModeLabel, GetGameModeDisplayName( modeName ) ) } From e3d78646b35313cb995d055e0fbf1d2e67f63f1a Mon Sep 17 00:00:00 2001 From: JMM889901 <41163714+JMM889901@users.noreply.github.com> Date: Thu, 17 Nov 2022 15:26:01 +0000 Subject: [PATCH 5/8] Update Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut Co-authored-by: uniboi <64006268+uniboi@users.noreply.github.com> --- Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut index 8d82b8618..91e723039 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_private_match.nut @@ -523,7 +523,7 @@ void function SetModeInfo( string modeName ) } else { - RuiSetImage( Hud_GetRui( nextModeIconAlt ), "iconImage", StringToAsset(iconName) ) + RuiSetImage( Hud_GetRui( nextModeIconAlt ), "iconImage", StringToAsset( iconName ) ) Hud_Hide( nextModeIcon ) Hud_Show( nextModeIconAlt ) From 6ee360cf3fabc0cf1b2e15a8dc4f4e7d9eacde77 Mon Sep 17 00:00:00 2001 From: JMM889901 <41163714+JMM889901@users.noreply.github.com> Date: Fri, 18 Nov 2022 11:52:33 +0000 Subject: [PATCH 6/8] Update Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut Co-authored-by: uniboi <64006268+uniboi@users.noreply.github.com> --- Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut index 9028b3adc..e706e55c0 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_mode_select.nut @@ -103,7 +103,7 @@ void function ModeButton_GetFocus( var button ) if( iconName == "default" ) { RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( modeName ) ) - Hud_Showe( nextModeIcon ) + Hud_Show( nextModeIcon ) Hud_Hide( nextModeIconAlt ) } else From cc8fc9c468a47ddbb7af081519071c40dde643e2 Mon Sep 17 00:00:00 2001 From: JMM889901 <41163714+JMM889901@users.noreply.github.com> Date: Sat, 26 Nov 2022 12:09:59 +0000 Subject: [PATCH 7/8] Forgor to upload Only change from default should be ``` NextModeIconPatch { ControlName RuiPanel wide 72 tall 72 visible 0 scaleImage 1 image "" rui "ui/basic_image_add.rpak" pin_to_sibling NextGameModeName pin_corner_to_sibling BOTTOM_RIGHT pin_to_sibling_corner TOP_RIGHT } ``` --- .../mod/resource/ui/menus/private_lobby.menu | 292 ++++++++++++++++++ 1 file changed, 292 insertions(+) create mode 100644 Northstar.Client/mod/resource/ui/menus/private_lobby.menu diff --git a/Northstar.Client/mod/resource/ui/menus/private_lobby.menu b/Northstar.Client/mod/resource/ui/menus/private_lobby.menu new file mode 100644 index 000000000..6f6e5bc81 --- /dev/null +++ b/Northstar.Client/mod/resource/ui/menus/private_lobby.menu @@ -0,0 +1,292 @@ +#base "combo_buttons.res" +resource/ui/menus/private_lobby.menu +{ + menu + { + ControlName Frame + xpos 0 + ypos 0 + zpos 3 + wide f0 + tall f0 + autoResize 0 + pinCorner 0 + visible 1 + enabled 1 + PaintBackgroundType 0 + infocus_bgcolor_override "0 0 0 0" + outoffocus_bgcolor_override "0 0 0 0" + + Vignette + { + ControlName ImagePanel + InheritProperties MenuVignette + } + + MenuTitle + { + ControlName Label + InheritProperties MenuTitle + labelText "#PRIVATE_LOBBY" + } + + ImgTopBar + { + ControlName ImagePanel + InheritProperties MenuTopBar + } + + MatchmakingStatus + { + ControlName CNestedPanel + wide f0 + tall f0 + visible 1 + controlSettingsFile "resource/ui/menus/panels/matchmaking_status.res" + } + + CreditsAvailable + { + ControlName RuiPanel + InheritProperties CreditsAvailableProperties + } + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + Screen + { + ControlName ImagePanel + wide f0 + tall f0 + visible 1 + scaleImage 1 + fillColor "0 0 0 0" + drawColor "0 0 0 0" + } + + CallsignCard + { + ControlName RuiPanel + rui "ui/callsign_basic.rpak" + pin_to_sibling Screen + pin_corner_to_sibling TOP_RIGHT + pin_to_sibling_corner TOP_RIGHT + xpos -96 + ypos -166 + wide 320 + tall 172 + visible 1 + scaleImage 1 + image vgui/white + fillColor "255 255 255 255" + zpos -1 + } + + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + ButtonRowAnchor + { + ControlName Label + labelText "" + + xpos 96 + ypos 215 + } + + StartMatchButton + { + ControlName RuiButton + InheritProperties RuiStartMatchButton + visible 1 + tabposition 1 + ypos 10 + + navRight ListFriendlies + + pin_to_sibling ButtonRowAnchor + pin_corner_to_sibling BOTTOM_LEFT + pin_to_sibling_corner TOP_LEFT + } + + NextMapImage + { + ControlName RuiPanel + wide 500 + tall 288 + visible 0 + scaleImage 1 + image "" + zpos -1 + + rui "ui/basic_menu_image.rpak" + + pin_to_sibling MatchEnemiesPanel + pin_corner_to_sibling BOTTOM_LEFT + pin_to_sibling_corner TOP_LEFT + + ypos 16 + } + NextMapName + { + ControlName Label + pin_to_sibling NextMapImage + pin_corner_to_sibling BOTTOM_RIGHT + pin_to_sibling_corner BOTTOM_RIGHT + + xpos -12 + ypos 0 + + auto_wide_tocontents 1 + auto_tall_tocontents 1 + labelText "" + font Default_43_DropShadow + allcaps 1 + fgcolor_override "255 255 255 255" + } + NextGameModeName + { + ControlName Label + pin_to_sibling NextMapName + pin_corner_to_sibling BOTTOM_RIGHT + pin_to_sibling_corner TOP_RIGHT + + ypos -8 + + auto_wide_tocontents 1 + auto_tall_tocontents 1 + labelText "" + use_proportional_insets 1 + textinsetx 2 + font Default_28_DropShadow + allcaps 1 + fgcolor_override "255 255 255 255" + } + NextModeIcon + { + ControlName RuiPanel + wide 72 + tall 72 + visible 0 + scaleImage 1 + image "" + + rui "ui/basic_image_add.rpak" + + pin_to_sibling NextGameModeName + pin_corner_to_sibling BOTTOM_RIGHT + pin_to_sibling_corner TOP_RIGHT + } + NextModeIconPatch + { + ControlName RuiPanel + wide 72 + tall 72 + visible 0 + scaleImage 1 + image "" + + rui "ui/basic_image_add.rpak" + + pin_to_sibling NextGameModeName + pin_corner_to_sibling BOTTOM_RIGHT + pin_to_sibling_corner TOP_RIGHT + } + + MatchSettings + { + ControlName RuiPanel + InheritProperties MenuTooltipLarge + + rui "ui/private_settings_description.rpak" + + pin_to_sibling NextMapImage + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_RIGHT + xpos 16 + ypos 0 + + wide 500 + tall 288 + + visible 0 + } + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + SpectatorLabel + { + ControlName Label + pin_to_sibling MatchFriendliesPanel + pin_corner_to_sibling BOTTOM_LEFT + pin_to_sibling_corner TOP_LEFT + + xpos 0 + ypos 0 + + textAlignment center + + wide 500 + tall 40 + labelText "#LOBBY_SPECTATOR" + font Default_26 + allcaps 1 + fgcolor_override "255 255 255 255" + } + MatchFriendliesPanel + { + ControlName CNestedPanel + + pin_to_sibling ButtonRowAnchor + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner BOTTOM_LEFT + + ypos 435 + + InheritProperties LobbyPlayerListBackground + controlSettingsFile "resource/ui/menus/panels/match_friendlies.res" + } + + MatchEnemiesPanel + { + ControlName CNestedPanel + + pin_to_sibling MatchFriendliesPanel + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_RIGHT + + xpos 16 + + InheritProperties LobbyPlayerListBackground + controlSettingsFile "resource/ui/menus/panels/match_enemies.res" + } + + LobbyChatBox [$WINDOWS] + { + ControlName CBaseHudChat + InheritProperties ChatBox + + destination "match" + messageModeAlwaysOn 1 + + pin_to_sibling MatchEnemiesPanel + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_RIGHT + + xpos 16 + } + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + ButtonTooltip + { + ControlName CNestedPanel + InheritProperties ButtonTooltip + } + + FooterButtons + { + ControlName CNestedPanel + InheritProperties FooterButtons + } + } +} From ca70578b1c45128a31b9fc5da464c33d0f790cea Mon Sep 17 00:00:00 2001 From: JMM889901 <41163714+JMM889901@users.noreply.github.com> Date: Mon, 12 Aug 2024 18:43:20 +0100 Subject: [PATCH 8/8] This is a cursed PR what is even --- .../mod/resource/ui/menus/mode_select.menu | 15 ++++++ .../vscripts/ui/menu_ns_serverbrowser.nut | 46 ++++++++----------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/Northstar.Client/mod/resource/ui/menus/mode_select.menu b/Northstar.Client/mod/resource/ui/menus/mode_select.menu index e52ac41a6..fb525f31c 100644 --- a/Northstar.Client/mod/resource/ui/menus/mode_select.menu +++ b/Northstar.Client/mod/resource/ui/menus/mode_select.menu @@ -91,6 +91,21 @@ resource/ui/menus/mode_select.menu rui "ui/basic_image_add.rpak" zpos 3 } + ModeIconImagePatch //For patch icons + { + ControlName RuiPanel + xpos 0 + ypos -16 + wide 72 + tall 72 + visible 1 + scaleImage 1 + zpos 3 + pin_to_sibling NextModeImage + pin_corner_to_sibling TOP_LEFT + pin_to_sibling_corner TOP_LEFT + rui "ui/callsign_icon_button.rpak" + } NextModeName { diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut index 95109bbdb..3cfe03e2d 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut @@ -756,16 +756,7 @@ void function FilterServerList() foreach ( ServerInfo server in servers ) { - serverStruct tempServer - tempServer.serverIndex = i - tempServer.serverProtected = NSServerRequiresPassword( i ) - tempServer.serverName = NSGetServerName( i ) - tempServer.serverPlayers = NSGetServerPlayerCount( i ) - tempServer.serverPlayersMax = NSGetServerMaxPlayerCount( i ) - tempServer.serverMap = NSGetServerMap( i ) - tempServer.serverGamemode = NSGetServerPlaylist ( i ) - - totalPlayers += tempServer.serverPlayers + totalPlayers += server.playerCount // Filters @@ -788,12 +779,13 @@ void function FilterServerList() if ( filterArguments.useSearch ) { array sName - sName.append( tempServer.serverName.tolower() ) - sName.append( Localize( GetMapDisplayName( tempServer.serverMap ) ).tolower() ) - sName.append( tempServer.serverMap.tolower() ) - sName.append( GetGameModeDisplayName( tempServer.serverGamemode ).tolower() ) - sName.append( Localize( GetGameModeDisplayName( tempServer.serverGamemode ) ).tolower() ) - sName.append( NSGetServerDescription( i ).tolower() ) + sName.append( server.name.tolower() ) + sName.append( Localize( GetMapDisplayName( server.map ) ).tolower() ) + sName.append( server.map.tolower() ) + sName.append( server.playlist.tolower() ) + sName.append( Localize( server.playlist ).tolower() ) + sName.append( server.description.tolower() ) + sName.append( server.region.tolower() ) string sTerm = filterArguments.searchTerm.tolower() @@ -841,11 +833,12 @@ void function UpdateShownPage() Hud_SetEnabled( file.serverButtons[ i ], true ) Hud_SetVisible( file.serverButtons[ i ], true ) - Hud_SetVisible( file.serversProtected[ i ], file.serversArrayFiltered[ buttonIndex ].serverProtected ) - Hud_SetText( file.serversName[ i ], file.serversArrayFiltered[ buttonIndex ].serverName ) - Hud_SetText( file.playerCountLabels[ i ], format( "%i/%i", file.serversArrayFiltered[ buttonIndex ].serverPlayers, file.serversArrayFiltered[ buttonIndex ].serverPlayersMax ) ) - Hud_SetText( file.serversMap[ i ], GetMapDisplayName( file.serversArrayFiltered[ buttonIndex ].serverMap ) ) - Hud_SetText( file.serversGamemode[ i ], GetGameModeDisplayName( file.serversArrayFiltered[ buttonIndex ].serverGamemode ) ) + Hud_SetVisible( file.serversProtected[ i ], server.requiresPassword ) + Hud_SetText( file.serversName[ i ], server.name ) + Hud_SetText( file.playerCountLabels[ i ], format( "%i/%i", server.playerCount, server.maxPlayerCount ) ) + Hud_SetText( file.serversMap[ i ], GetMapDisplayName( server.map ) ) + Hud_SetText( file.serversGamemode[ i ], GetGameModeDisplayName( server.playlist ) ) + Hud_SetText( file.serversRegion[ i ], server.region ) } @@ -934,17 +927,16 @@ void function DisplayFocusedServerInfo( int scriptID ) Hud_SetText( Hud_GetChild( menu, "ServerName" ), server.name ) // mode name/image - string mode = GetGameModeDisplayName( file.serversArrayFiltered[ serverIndex ].serverGamemode ) - string playlist = file.serversArrayFiltered[ serverIndex ].serverGamemode + string mode = server.playlist Hud_SetVisible( Hud_GetChild( menu, "NextModeIcon" ), true ) var nextModeIconAlt = Hud_GetChild( menu, "NextModeIconPatch" ) var nextModeIcon = Hud_GetChild( menu, "NextModeIcon" ) - string iconName = GetPlaylistVarOrUseValue( playlist, "iconOverride", "default" ) + string iconName = GetPlaylistVarOrUseValue( mode, "iconOverride", "default" ) if(iconName == "default") { - RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( playlist ) ) + RuiSetImage( Hud_GetRui( nextModeIcon ), "basicImage", GetPlaylistThumbnailImage( mode ) ) Hud_Show( nextModeIcon ) Hud_Hide( nextModeIconAlt ) @@ -1269,8 +1261,8 @@ int function ServerSortLogic ( ServerInfo a, ServerInfo b ) direction = filterDirection.serverMap break; case sortingBy.GAMEMODE: - aTemp = Localize( GetGameModeDisplayName( a.serverGamemode ) ).tolower() - bTemp = Localize( GetGameModeDisplayName( b.serverGamemode ) ).tolower() + aTemp = Localize( a.playlist ).tolower() + bTemp = Localize( b.playlist ).tolower() direction = filterDirection.serverGamemode break; case sortingBy.REGION: