From 8be080ede18213f954fb58ac2df975098b9a6a60 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Fri, 12 Jan 2024 12:07:48 -0800 Subject: [PATCH] Remove all lobby menu options Encounter: add Pro lobby menu option Encounter: set gametypesetting allowInGameTeamChange Encounter: set dvar ui_gametype_team_change if not dedicated --- README.md | 6 +- english/localizedstrings/reimagined.str | 3 + scripts/zm/zgrief/zgrief_reimagined.gsc | 9 +- ui_mp/t6/menus/privategamelobby_project.lua | 143 ++------------------ 4 files changed, 27 insertions(+), 134 deletions(-) diff --git a/README.md b/README.md index 25943d5c..3be0661a 100644 --- a/README.md +++ b/README.md @@ -1033,9 +1033,9 @@ * Players retain perks ### Encounter Pro -* Removed unlimited sprint -* Removed Mystery Box -* Removed Pack-a-Punch +* No Mystery Box +* No Pack-a-Punch +* Limited sprint ## Launching New Maps diff --git a/english/localizedstrings/reimagined.str b/english/localizedstrings/reimagined.str index d8708e7d..2fa4b08c 100644 --- a/english/localizedstrings/reimagined.str +++ b/english/localizedstrings/reimagined.str @@ -31,6 +31,9 @@ LANG_ENGLISH "Containment Pro" REFERENCE ZMUI_ZMEAT_PRO LANG_ENGLISH "Meat Pro" +REFERENCE ZMUI_PRO_DESC +LANG_ENGLISH "No Mystery Box, No Pack-a-Punch, and limited sprint." + REFERENCE ZMUI_ZCLASSIC LANG_ENGLISH "Tranzit" diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index 1d87b843..29d4b94a 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -346,7 +346,14 @@ set_grief_vars() if (getDvar("ui_gametype_team_change") == "") { - setDvar("ui_gametype_team_change", 0); + if (isDedicated()) + { + setDvar("ui_gametype_team_change", 0); + } + else + { + setDvar("ui_gametype_team_change", 1); + } } level.allow_teamchange = getDvarInt("ui_gametype_team_change"); diff --git a/ui_mp/t6/menus/privategamelobby_project.lua b/ui_mp/t6/menus/privategamelobby_project.lua index bb1681e4..d10c5fa0 100644 --- a/ui_mp/t6/menus/privategamelobby_project.lua +++ b/ui_mp/t6/menus/privategamelobby_project.lua @@ -1,143 +1,20 @@ CoD.PrivateGameLobby.GameTypeSettings = {} -CoD.PrivateGameLobby.GameTypeSettings[1] = {} -CoD.PrivateGameLobby.GameTypeSettings[1].id = "zmDifficulty" -CoD.PrivateGameLobby.GameTypeSettings[1].name = "ZMUI_DIFFICULTY_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[1].hintText = "ZMUI_DIFFICULTY_DESC" -CoD.PrivateGameLobby.GameTypeSettings[1].labels = {} -CoD.PrivateGameLobby.GameTypeSettings[1].labels[1] = "ZMUI_DIFFICULTY_EASY_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[1].labels[2] = "ZMUI_DIFFICULTY_NORMAL_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[1].values = {} -CoD.PrivateGameLobby.GameTypeSettings[1].values[1] = 0 -CoD.PrivateGameLobby.GameTypeSettings[1].values[2] = 1 -CoD.PrivateGameLobby.GameTypeSettings[1].gameTypes = {} -CoD.PrivateGameLobby.GameTypeSettings[1].gameTypes[1] = "zclassic" -CoD.PrivateGameLobby.GameTypeSettings[1].gameTypes[2] = "zstandard" -CoD.PrivateGameLobby.GameTypeSettings[1].gameTypes[3] = "zgrief" -CoD.PrivateGameLobby.GameTypeSettings[2] = {} -CoD.PrivateGameLobby.GameTypeSettings[2].id = "startRound" -CoD.PrivateGameLobby.GameTypeSettings[2].name = "ZMUI_STARTING_ROUND_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[2].hintText = "ZMUI_STARTING_ROUND_DESC" -CoD.PrivateGameLobby.GameTypeSettings[2].labels = {} -CoD.PrivateGameLobby.GameTypeSettings[2].labels[1] = "1" -CoD.PrivateGameLobby.GameTypeSettings[2].labels[2] = "5" -CoD.PrivateGameLobby.GameTypeSettings[2].labels[3] = "10" -CoD.PrivateGameLobby.GameTypeSettings[2].labels[4] = "15" -CoD.PrivateGameLobby.GameTypeSettings[2].labels[5] = "20" -CoD.PrivateGameLobby.GameTypeSettings[2].labels[6] = "25" -CoD.PrivateGameLobby.GameTypeSettings[2].labels[7] = "30" -CoD.PrivateGameLobby.GameTypeSettings[2].values = {} -CoD.PrivateGameLobby.GameTypeSettings[2].values[1] = 1 -CoD.PrivateGameLobby.GameTypeSettings[2].values[2] = 5 -CoD.PrivateGameLobby.GameTypeSettings[2].values[3] = 10 -CoD.PrivateGameLobby.GameTypeSettings[2].values[4] = 15 -CoD.PrivateGameLobby.GameTypeSettings[2].values[5] = 20 -CoD.PrivateGameLobby.GameTypeSettings[2].values[6] = 25 -CoD.PrivateGameLobby.GameTypeSettings[2].values[7] = 30 -CoD.PrivateGameLobby.GameTypeSettings[2].gameTypes = {} -CoD.PrivateGameLobby.GameTypeSettings[2].gameTypes[1] = "zclassic" -CoD.PrivateGameLobby.GameTypeSettings[2].gameTypes[2] = "zstandard" -CoD.PrivateGameLobby.GameTypeSettings[2].gameTypes[3] = "zgrief" -CoD.PrivateGameLobby.GameTypeSettings[3] = {} -CoD.PrivateGameLobby.GameTypeSettings[3].id = "magic" -CoD.PrivateGameLobby.GameTypeSettings[3].name = "ZMUI_MAGIC_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[3].hintText = "ZMUI_MAGIC_DESC" -CoD.PrivateGameLobby.GameTypeSettings[3].labels = {} -CoD.PrivateGameLobby.GameTypeSettings[3].labels[1] = "MENU_ENABLED_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[3].labels[2] = "MENU_DISABLED_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[3].values = {} -CoD.PrivateGameLobby.GameTypeSettings[3].values[1] = 1 -CoD.PrivateGameLobby.GameTypeSettings[3].values[2] = 0 -CoD.PrivateGameLobby.GameTypeSettings[3].gameTypes = {} -CoD.PrivateGameLobby.GameTypeSettings[3].gameTypes[1] = "zstandard" -CoD.PrivateGameLobby.GameTypeSettings[3].gameTypes[2] = "zgrief" -CoD.PrivateGameLobby.GameTypeSettings[4] = {} -CoD.PrivateGameLobby.GameTypeSettings[4].id = "headshotsonly" -CoD.PrivateGameLobby.GameTypeSettings[4].name = "ZMUI_HEADSHOTS_ONLY_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[4].hintText = "ZMUI_HEADSHOTS_ONLY_DESC" -CoD.PrivateGameLobby.GameTypeSettings[4].labels = {} -CoD.PrivateGameLobby.GameTypeSettings[4].labels[1] = "MENU_DISABLED_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[4].labels[2] = "MENU_ENABLED_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[4].values = {} -CoD.PrivateGameLobby.GameTypeSettings[4].values[1] = 0 -CoD.PrivateGameLobby.GameTypeSettings[4].values[2] = 1 -CoD.PrivateGameLobby.GameTypeSettings[4].gameTypes = {} -CoD.PrivateGameLobby.GameTypeSettings[4].gameTypes[1] = "zclassic" -CoD.PrivateGameLobby.GameTypeSettings[4].gameTypes[2] = "zstandard" -CoD.PrivateGameLobby.GameTypeSettings[4].gameTypes[3] = "zgrief" -CoD.PrivateGameLobby.GameTypeSettings[5] = {} -CoD.PrivateGameLobby.GameTypeSettings[5].id = "allowdogs" -CoD.PrivateGameLobby.GameTypeSettings[5].name = "ZMUI_DOGS_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[5].hintText = "ZMUI_DOGS_DESC" -CoD.PrivateGameLobby.GameTypeSettings[5].labels = {} -CoD.PrivateGameLobby.GameTypeSettings[5].labels[1] = "MENU_DISABLED_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[5].labels[2] = "MENU_ENABLED_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[5].values = {} -CoD.PrivateGameLobby.GameTypeSettings[5].values[1] = 0 -CoD.PrivateGameLobby.GameTypeSettings[5].values[2] = 1 -CoD.PrivateGameLobby.GameTypeSettings[5].gameTypes = {} -CoD.PrivateGameLobby.GameTypeSettings[5].gameTypes[1] = "zstandard" -CoD.PrivateGameLobby.GameTypeSettings[5].maps = {} -CoD.PrivateGameLobby.GameTypeSettings[5].maps[1] = "zm_transit" -CoD.PrivateGameLobby.GameTypeSettings[6] = {} -CoD.PrivateGameLobby.GameTypeSettings[6].id = "cleansedLoadout" -CoD.PrivateGameLobby.GameTypeSettings[6].name = "ZMUI_CLEANSED_LOADOUT_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[6].hintText = "ZMUI_CLEANSED_LOADOUT_DESC" -CoD.PrivateGameLobby.GameTypeSettings[6].labels = {} -CoD.PrivateGameLobby.GameTypeSettings[6].labels[1] = "ZMUI_CLEANSED_LOADOUT_SHOTGUN_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[6].labels[2] = "ZMUI_CLEANSED_LOADOUT_GUN_GAME_CAPS" -CoD.PrivateGameLobby.GameTypeSettings[6].values = {} -CoD.PrivateGameLobby.GameTypeSettings[6].values[1] = 0 -CoD.PrivateGameLobby.GameTypeSettings[6].values[2] = 1 -CoD.PrivateGameLobby.GameTypeSettings[6].gameTypes = {} -CoD.PrivateGameLobby.GameTypeSettings[6].gameTypes[1] = "zcleansed" CoD.PrivateGameLobby.DvarDefaults = {} -CoD.PrivateGameLobby.DvarDefaults["sv_cheats"] = 0 --- CoD.PrivateGameLobby.DvarDefaults["zombies_minplayers"] = 1 --- CoD.PrivateGameLobby.Dvars = {} --- CoD.PrivateGameLobby.Dvars[1] = {} --- CoD.PrivateGameLobby.Dvars[1].id = "zombies_minplayers" --- CoD.PrivateGameLobby.Dvars[1].name = "MIN PLAYERS" --- CoD.PrivateGameLobby.Dvars[1].hintText = "The game will wait at the loadscreen until the amount of players ingame is reached." --- CoD.PrivateGameLobby.Dvars[1].labels = {} --- CoD.PrivateGameLobby.Dvars[1].labels[1] = "1" --- CoD.PrivateGameLobby.Dvars[1].labels[2] = "2" --- CoD.PrivateGameLobby.Dvars[1].labels[3] = "3" --- CoD.PrivateGameLobby.Dvars[1].labels[4] = "4" --- CoD.PrivateGameLobby.Dvars[1].labels[5] = "5" --- CoD.PrivateGameLobby.Dvars[1].labels[6] = "6" --- CoD.PrivateGameLobby.Dvars[1].labels[7] = "7" --- CoD.PrivateGameLobby.Dvars[1].labels[8] = "8" --- CoD.PrivateGameLobby.Dvars[1].values = {} --- CoD.PrivateGameLobby.Dvars[1].values[1] = 1 --- CoD.PrivateGameLobby.Dvars[1].values[2] = 2 --- CoD.PrivateGameLobby.Dvars[1].values[3] = 3 --- CoD.PrivateGameLobby.Dvars[1].values[4] = 4 --- CoD.PrivateGameLobby.Dvars[1].values[5] = 5 --- CoD.PrivateGameLobby.Dvars[1].values[6] = 6 --- CoD.PrivateGameLobby.Dvars[1].values[7] = 7 --- CoD.PrivateGameLobby.Dvars[1].values[8] = 8 -CoD.PrivateGameLobby.DvarDefaults["sv_allowAimAssist"] = 1 +CoD.PrivateGameLobby.DvarDefaults["ui_gametype_pro"] = 0 CoD.PrivateGameLobby.Dvars = {} CoD.PrivateGameLobby.Dvars[1] = {} -CoD.PrivateGameLobby.Dvars[1].id = "sv_allowAimAssist" -CoD.PrivateGameLobby.Dvars[1].name = Engine.Localize("MENU_TARGET_ASSIST_CAPS") -CoD.PrivateGameLobby.Dvars[1].hintText = "Allow aim assist option for all controller players." +CoD.PrivateGameLobby.Dvars[1].id = "ui_gametype_pro" +CoD.PrivateGameLobby.Dvars[1].name = "MPUI_PRO_CAPS" +CoD.PrivateGameLobby.Dvars[1].hintText = "ZMUI_PRO_DESC" CoD.PrivateGameLobby.Dvars[1].labels = {} CoD.PrivateGameLobby.Dvars[1].labels[1] = "MENU_DISABLED_CAPS" CoD.PrivateGameLobby.Dvars[1].labels[2] = "MENU_ENABLED_CAPS" CoD.PrivateGameLobby.Dvars[1].values = {} CoD.PrivateGameLobby.Dvars[1].values[1] = 0 CoD.PrivateGameLobby.Dvars[1].values[2] = 1 -CoD.PrivateGameLobby.Dvars[2] = {} -CoD.PrivateGameLobby.Dvars[2].id = "sv_cheats" -CoD.PrivateGameLobby.Dvars[2].name = "CHEATS" -CoD.PrivateGameLobby.Dvars[2].hintText = "Enable cheats on server." -CoD.PrivateGameLobby.Dvars[2].labels = {} -CoD.PrivateGameLobby.Dvars[2].labels[1] = "MENU_DISABLED_CAPS" -CoD.PrivateGameLobby.Dvars[2].labels[2] = "MENU_ENABLED_CAPS" -CoD.PrivateGameLobby.Dvars[2].values = {} -CoD.PrivateGameLobby.Dvars[2].values[1] = 0 -CoD.PrivateGameLobby.Dvars[2].values[2] = 1 +CoD.PrivateGameLobby.Dvars[1].gameTypes = {} +CoD.PrivateGameLobby.Dvars[1].gameTypes[1] = "zgrief" + CoD.PrivateGameLobby.ButtonPrompt_TeamPrev = function (f1_arg0, ClientInstance) if Engine.PartyHostIsReadyToStart() == true then return @@ -390,6 +267,12 @@ local AddGameOptionsButtons = function (PrivateGameLobbyButtonPane, GameOptions, end CoD.PrivateGameLobby.PopulateButtons_Project_Zombie = function (PrivateGameLobbyButtonPane, IsHost) + if UIExpression.DvarString(nil, "ui_gametype") == CoD.Zombie.GAMETYPE_ZGRIEF then + Engine.SetGametypeSetting("allowInGameTeamChange", 1) + else + Engine.SetGametypeSetting("allowInGameTeamChange", 0) + end + if IsHost == true then PrivateGameLobbyButtonPane.body.changeMapButton = PrivateGameLobbyButtonPane.body.buttonList:addButton(Engine.Localize("ZMUI_MAP_CAPS")) PrivateGameLobbyButtonPane.body.changeMapButton.hintText = Engine.Localize("ZMUI_MAP_SELECTION_DESC")