diff --git a/processed/join.lua b/processed/join.lua index ad5c2dc..6306ca8 100644 --- a/processed/join.lua +++ b/processed/join.lua @@ -71,9 +71,8 @@ pcall(function() settings().Network.MtuOverride = 1400 end end) -local client = game:GetService("NetworkClient") -local visit = game:GetService("Visit") -local setMessage +client = game:GetService("NetworkClient") +visit = game:GetService("Visit") setMessage = function(message) return game:SetMessage((function() if not false then @@ -83,11 +82,9 @@ setMessage = function(message) end end)()) end -local showErrorWindow showErrorWindow = function(message, _, _) return game:SetMessage(message) end -local reportError reportError = function(err, message) print("***ERROR*** " .. tostring(err)) if not test then @@ -97,7 +94,6 @@ reportError = function(err, message) wait(4) return showErrorWindow("Error: " .. tostring(err), message, "Other") end -local onDisconnection onDisconnection = function(_, lostConnection) if lostConnection then return showErrorWindow("You have lost the connection to the game", "LostConnection", "LostConnection") @@ -105,7 +101,6 @@ onDisconnection = function(_, lostConnection) return showErrorWindow("This game has shut down", "Kick", "Kick") end end -local requestCharacter requestCharacter = function(replicator) local connection connection = player.Changed:connect(function(property) @@ -127,7 +122,6 @@ requestCharacter = function(replicator) return end end -local onConnectionAccepted onConnectionAccepted = function(url, replicator) local connectResolved = true local waitingForMarker = true @@ -157,17 +151,14 @@ onConnectionAccepted = function(url, replicator) wait(0.5) end end -local onConnectionFailed onConnectionFailed = function(_, err) return showErrorWindow("Failed to connect to the Game. (ID=" .. tostring(err) .. ")", "ID" .. tostring(err), "Other") end -local onConnectionRejected onConnectionRejected = function() connectionFailed:disconnect() return showErrorWindow("This game is not available. Please try another", "WrongVersion", "WrongVersion") end local idled = false -local onPlayerIdled onPlayerIdled = function(time) if time > 20 * 60 then showErrorWindow(string.format("You were disconnected for being idle %d minutes", time / 60), "Idle", "Idle") diff --git a/yue/join.yue b/yue/join.yue index 79964e4..a672a2e 100644 --- a/yue/join.yue +++ b/yue/join.yue @@ -4,7 +4,7 @@ import "macros" as { $ } -- onPlayerAdded = (player) -> -- -- override -$lua "-- MultiplayerSharedScript.lua inserted here ------ Prepended to Join.lua --" +$lua[[-- MultiplayerSharedScript.lua inserted here ------ Prepended to Join.lua --]] try game\SetPlaceID _PLACE_ID, false @@ -80,11 +80,11 @@ try -- globals ----------------------------------------- -client = game\GetService "NetworkClient" -visit = game\GetService "Visit" +global client = game\GetService "NetworkClient" +global visit = game\GetService "Visit" -- functions --------------------------------------- -setMessage = (message) -> +global setMessage = (message) -> -- todo: animated "..." game\SetMessage if not false message @@ -93,11 +93,11 @@ setMessage = (message) -> "Teleporting ..." -showErrorWindow = (message, _, _) -> +global showErrorWindow = (message, _, _) -> game\SetMessage message -reportError = (err, message) -> +global reportError = (err, message) -> print "***ERROR*** #{err}" if not test visit\SetUploadUrl "" @@ -108,14 +108,14 @@ reportError = (err, message) -> -- called when the client connection closes -onDisconnection = (_, lostConnection) -> +global onDisconnection = (_, lostConnection) -> if lostConnection showErrorWindow "You have lost the connection to the game", "LostConnection", "LostConnection" else showErrorWindow "This game has shut down", "Kick", "Kick" -requestCharacter = (replicator) -> +global requestCharacter = (replicator) -> -- prepare code for when the Character appears local connection connection = player.Changed\connect (property) -> @@ -139,7 +139,7 @@ requestCharacter = (replicator) -> -- called when the client connection is established -onConnectionAccepted = (url, replicator) -> +global onConnectionAccepted = (url, replicator) -> connectResolved = true waitingForMarker = true @@ -178,18 +178,18 @@ onConnectionAccepted = (url, replicator) -> -- called when the client connection fails -onConnectionFailed = (_, err) -> +global onConnectionFailed = (_, err) -> showErrorWindow "Failed to connect to the Game. (ID=#{err})", "ID#{err}", "Other" -- called when the client connection is rejected -onConnectionRejected = -> +global onConnectionRejected = -> connectionFailed\disconnect! showErrorWindow "This game is not available. Please try another", "WrongVersion", "WrongVersion" idled = false -onPlayerIdled = (time) -> +global onPlayerIdled = (time) -> if time > 20 * 60 showErrorWindow string.format("You were disconnected for being idle %d minutes", time / 60), "Idle", "Idle" client\disconnect!