Merge pull request #13 from JariKCoding/main

changed missing lua variable names to official variable names
This commit is contained in:
Dss0 2023-04-12 21:26:01 +02:00 committed by GitHub
commit 6404f97185
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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