Added a 'Select Mod' button to Adv Options.

Author: GoogleFrog

LuaMenu/configs/gameConfig/zk/mainConfig.lua

@@ -13,6 +13,7 @@ local backgroundConfig                = VFS.Include(LUA_DIRNAME .. "configs/game
 local gameUnitInformation             = VFS.Include(LUA_DIRNAME .. "configs/gameConfig/" .. shortname .. "/gameUnitInformation.lua")
 local badges                          = VFS.Include(LUA_DIRNAME .. "configs/gameConfig/" .. shortname .. "/badges.lua")
 local GetRankAndImage                 = VFS.Include(LUA_DIRNAME .. "configs/gameConfig/" .. shortname .. "/profilePage.lua")
+local modBlacklist                    = VFS.Include(LUA_DIRNAME .. "configs/gameConfig/" .. shortname .. "/modBlacklist.lua")
 
 local link_reportPlayer, link_userPage, link_homePage, link_replays, link_maps, link_particularMapPage, link_matchmakerMapBans = VFS.Include(LUA_DIRNAME .. "configs/gameConfig/" .. shortname .. "/linkFunctions.lua")
 
@@ -117,6 +118,7 @@ local externalFuncAndData = {
 	-- I assume ZK doesn't want to show this as it was removed
 	hideGameExistanceDisplay = true,
 	disableColorChoosing = true,
+	modBlacklist = modBlacklist,
 }
 
 function externalFuncAndData.CheckAvailability()

LuaMenu/configs/gameConfig/zk/modBlacklist.lua

@@ -0,0 +1,6 @@
+return {
+	["Zero-K Benchmark v3"] = true,
+	["Zero-K Benchmark v2"] = true,
+	["Zero-K Benchmark v1"] = true,
+	["Quick Rocket Tutorial"] = true,
+}

LuaMenu/widgets/chobby/components/game_list_window.lua

@@ -1,13 +1,13 @@
 GameListWindow = ListWindow:extends{}
 
-function GameListWindow:init(failFunction, sucessFunction)
+function GameListWindow:init(failFunction, sucessFunction, blacklist)
 
 	self:super('init', WG.Chobby.lobbyInterfaceHolder, "Select Game", false, "main_window", nil, {6, 7, 7, 4})
 	self.window:SetPos(nil, nil, 500, 700)
 
 	for i, archive in pairs(VFS.GetAllArchives()) do
 		local info = VFS.GetArchiveInfo(archive)
-		if info and info.modtype == 1 then
+		if info and info.modtype == 1 and not (blacklist and blacklist[info.name]) then
 			local pickMapButton = Button:New {
 				x = 0,
 				y = 0,

LuaMenu/widgets/chobby/i18n/chililobby.lua

@@ -8,6 +8,7 @@ return {
 		retry = "Retry",
 		reset = "Reset",
 		close = "Close",
+		select_mod = "Select Mod",
 		continue = "Continue",
 		yes = "Yes",
 		no = "No",

LuaMenu/widgets/gui_modoptions_panel.lua

@@ -380,11 +380,27 @@ local function CreateModoptionWindow()
 		modoptionsSelectionWindow:Dispose()
 	end
 
-	local buttonAccept
+	local buttonAccept, buttonMods, modSelection
+
+	function GetModSelection()
+		local function SetGameFail()
+		end
+
+		local function SetGameSucess(name)
+			buttonMods.caption = name
+			modSelection = name
+		end
+
+		local Configuration = WG.Chobby.Configuration
+		WG.Chobby.GameListWindow(SetGameFail, SetGameSucess, Configuration and Configuration.gameConfig.modBlacklist)
+	end
 
 	local function AcceptFunc()
 		screen0:FocusControl(buttonAccept) -- Defocus the text entry
 		battleLobby:SetModOptions(localModoptions)
+		if modSelection then
+			battleLobby:SelectGame(modSelection)
+		end
 		modoptionsSelectionWindow:Dispose()
 	end
 
@@ -393,9 +409,28 @@ local function CreateModoptionWindow()
 			UpdateControlValue(key, value)
 		end
 		localModoptions = {}
+		
+		modSelection = false
+		buttonMods.caption = i18n("select_mod")
 	end
 
-	buttonReset = Button:New {
+	buttonMods = Button:New {
+		x = 10,
+		right = 513,
+		bottom = 1,
+		height = 70,
+		caption = i18n("select_mod"),
+		font = WG.Chobby.Configuration:GetFont(3),
+		parent = modoptionsSelectionWindow,
+		classname = "option_button",
+		OnClick = {
+			function()
+				GetModSelection()
+			end
+		},
+	}
+
+	Button:New {
 		right = 294,
 		width = 135,
 		bottom = 1,

LuaMenu/widgets/gui_settings_window.lua

@@ -1081,7 +1081,7 @@ local function GetVoidTabControls()
 		valign = "top",
 		align = "left",
 		font = Configuration:GetFont(2),
-		caption = "Server Address",
+		caption = "Server Address                                                                           (zero-k.info or test.zero-k.info for testing)",
 	}
 	children[#children + 1] = EditBox:New {
 		x = COMBO_X,
@@ -1112,7 +1112,7 @@ local function GetVoidTabControls()
 		valign = "top",
 		align = "left",
 		font = Configuration:GetFont(2),
-		caption = "Server Port",
+		caption = "Server Port                                                                                  (8200 or 8202 for testing)",
 	}
 	children[#children + 1] = EditBox:New {
 		x = COMBO_X,

libs/liblobby/lobby/interface_skirmish.lua

@@ -373,6 +373,13 @@ function InterfaceSkirmish:SelectMap(mapName)
 	})
 end
 
+function InterfaceSkirmish:SelectGame(gameName)
+	self:_OnUpdateBattleInfo(self:GetMyBattleID(), {
+		gameName = gameName,
+	})
+	return self
+end
+
 -- Skirmish only
 function InterfaceSkirmish:SetBattleState(myUserName, gameName, mapName, title)
 	local myBattleID = 1

libs/liblobby/lobby/interface_zerok.lua

@@ -404,6 +404,11 @@ function Interface:StartBattle()
 	return self
 end
 
+function Interface:SelectGame(gameName)
+	self:SayBattle("!game " .. gameName)
+	return self
+end
+
 ------------------------
 -- Channel & private chat commands
 ------------------------

libs/liblobby/lobby/lobby.lua

@@ -115,6 +115,10 @@ function Lobby:SelectMap(mapName)
 	self:SayBattle("!map " .. mapName)
 end
 
+function Lobby:SelectGame(gameName)
+	return self
+end
+
 function Lobby:SetBattleType(typeName)
 	self:SayBattle("!type " .. typeName)
 end