diff --git a/boiii/lobby_scripts/server_lobby_selector/__init__.lua b/boiii/lobby_scripts/server_lobby_selector/__init__.lua index cfcb4d4..f0cf354 100644 --- a/boiii/lobby_scripts/server_lobby_selector/__init__.lua +++ b/boiii/lobby_scripts/server_lobby_selector/__init__.lua @@ -1,39 +1,39 @@ -Lobby.Process.CreateDedicatedModsLobby = function (f8_arg0, f8_arg1) +Lobby.Process.CreateDedicatedModsLobby = function (controller, toTarget) local lobby_mode = Engine.DvarString( nil, "sv_lobby_mode" ) if lobby_mode ~= "" then if lobby_mode == "zm" then - f8_arg1 = LobbyData.UITargets.UI_ZMLOBBYONLINECUSTOMGAME + toTarget = LobbyData.UITargets.UI_ZMLOBBYONLINECUSTOMGAME elseif lobby_mode == "cp" then - f8_arg1 = LobbyData.UITargets.UI_CPLOBBYONLINECUSTOMGAME + toTarget = LobbyData.UITargets.UI_CPLOBBYONLINECUSTOMGAME elseif lobby_mode == "cpzm" then - f8_arg1 = LobbyData.UITargets.UI_CP2LOBBYONLINECUSTOMGAME + toTarget = LobbyData.UITargets.UI_CP2LOBBYONLINECUSTOMGAME elseif lobby_mode == "fr" then - f8_arg1 = LobbyData.UITargets.UI_FRLOBBYONLINEGAME - f8_arg1.maxClients = Engine.DvarInt( nil, "com_maxclients" ) + toTarget = LobbyData.UITargets.UI_FRLOBBYONLINEGAME + toTarget.maxClients = Engine.DvarInt( nil, "com_maxclients" ) elseif lobby_mode == "doa" then - f8_arg1 = LobbyData.UITargets.UI_DOALOBBYONLINE + toTarget = LobbyData.UITargets.UI_DOALOBBYONLINE elseif lobby_mode == "mp" then - f8_arg1 = LobbyData.UITargets.UI_MPLOBBYONLINEMODGAME + toTarget = LobbyData.UITargets.UI_MPLOBBYONLINEMODGAME elseif lobby_mode == "arena" then - f8_arg1 = LobbyData.UITargets.UI_MPLOBBYONLINEARENAGAME + toTarget = LobbyData.UITargets.UI_MPLOBBYONLINEARENAGAME end end - local f8_local0 = Dvar.sv_playlist - Engine.SetPlaylistID(f8_local0:get()) - local f8_local1 = Lobby.Actions.ExecuteScript(function () - Lobby.ProcessNavigate.SetupLobbyMapAndGameType(f8_arg0, f8_arg1) + local playlistID = Dvar.sv_playlist + Engine.SetPlaylistID(playlistID:get()) + local lobbyInit = Lobby.Actions.ExecuteScript(function () + Lobby.ProcessNavigate.SetupLobbyMapAndGameType(controller, toTarget) end) - local f8_local2 = Lobby.Actions.SetNetworkMode(f8_arg0, Enum.LobbyNetworkMode.LOBBY_NETWORKMODE_LIVE) - local f8_local3 = Lobby.Actions.LobbySettings(f8_arg0, f8_arg1) - local f8_local4 = Lobby.Actions.UpdateUI(f8_arg0, f8_arg1) - local f8_local5 = Lobby.Actions.LobbyHostStart(f8_arg0, f8_arg1.mainMode, f8_arg1.lobbyType, f8_arg1.lobbyMode, f8_arg1.maxClients) - local f8_local6 = Lobby.Actions.AdvertiseLobby(true) - local f8_local7 = Lobby.Actions.ExecuteScript(function () - Engine.QoSProbeListenerEnable(f8_arg1.lobbyType, true) + local setNetworkMode = Lobby.Actions.SetNetworkMode(controller, Enum.LobbyNetworkMode.LOBBY_NETWORKMODE_LIVE) + local lobbySettings = Lobby.Actions.LobbySettings(controller, toTarget) + local updateUI = Lobby.Actions.UpdateUI(controller, toTarget) + local createGameHost = Lobby.Actions.LobbyHostStart(controller, toTarget.mainMode, toTarget.lobbyType, toTarget.lobbyMode, toTarget.maxClients) + local lobbyAdvertise = Lobby.Actions.AdvertiseLobby(true) + local hostingEvent = Lobby.Actions.ExecuteScript(function () + Engine.QoSProbeListenerEnable(toTarget.lobbyType, true) Engine.SetDvar("live_dedicatedReady", 1) - Engine.RunPlaylistRules(f8_arg0) - Engine.RunPlaylistSettings(f8_arg0) - Lobby.Timer.HostingLobby({controller = f8_arg0, lobbyType = f8_arg1.lobbyType, mainMode = f8_arg1.mainMode, lobbyTimerType = f8_arg1.lobbyTimerType}) + Engine.RunPlaylistRules(controller) + Engine.RunPlaylistSettings(controller) + Lobby.Timer.HostingLobby({controller = controller, lobbyType = toTarget.lobbyType, mainMode = toTarget.mainMode, lobbyTimerType = toTarget.lobbyTimerType}) if Engine.DvarInt( nil, "sv_skip_lobby" ) == 1 then -- Engine.ComError( Enum.errorCode.ERROR_SCRIPT, "Using sv_skip_lobby" ) local map_rotation_string = Engine.DvarString( nil, "sv_maprotation" ) @@ -51,14 +51,14 @@ Lobby.Process.CreateDedicatedModsLobby = function (f8_arg0, f8_arg1) Engine.Exec(0, "launchgame") end end) - Lobby.Process.AddActions(f8_local2, f8_local3) - Lobby.Process.AddActions(f8_local3, f8_local1) - Lobby.Process.AddActions(f8_local1, f8_local4) - Lobby.Process.AddActions(f8_local4, f8_local5) - Lobby.Process.AddActions(f8_local5, f8_local6) - Lobby.Process.AddActions(f8_local6, f8_local7) - Lobby.Process.AddActions(f8_local7, nil) - return {head = f8_local2, interrupt = Lobby.Interrupt.NONE, force = true, cancellable = true} + Lobby.Process.AddActions(setNetworkMode, lobbySettings) + Lobby.Process.AddActions(lobbySettings, lobbyInit) + Lobby.Process.AddActions(lobbyInit, updateUI) + Lobby.Process.AddActions(updateUI, createGameHost) + Lobby.Process.AddActions(createGameHost, lobbyAdvertise) + Lobby.Process.AddActions(lobbyAdvertise, hostingEvent) + Lobby.Process.AddActions(hostingEvent, nil) + return {head = setNetworkMode, interrupt = Lobby.Interrupt.NONE, force = true, cancellable = true} end function split_string(str, delimiter)