diff --git a/luau/107893730.luau b/luau/107893730.luau index e62864c..14b91b8 100644 --- a/luau/107893730.luau +++ b/luau/107893730.luau @@ -47,7 +47,7 @@ local smallScreenThreshold = 450 -- user facing images local function assetUrl(id: number) - return `https://banland.xyz/asset?id={id}` + return `http://banland.xyz/asset?id={id}` end local errorImageUrl = assetUrl(42557901) diff --git a/luau/157877000.luau b/luau/157877000.luau index 38f57d5..1cbf0fd 100644 --- a/luau/157877000.luau +++ b/luau/157877000.luau @@ -267,7 +267,7 @@ function initializeDeveloperConsole() Position = UDim2.new(0, 0, 0.5, -8), Rotation = 180, Size = UDim2.new(1, 0, 0, 16), - Image = "https://banland.xyz/Asset?id=151205881", + Image = "http://banland.xyz/Asset?id=151205881", } local Dev_DownButton = Create "ImageButton" { @@ -286,7 +286,7 @@ function initializeDeveloperConsole() Position = UDim2.new(0, 3, 0, 3), Size = UDim2.new(0, 14, 0, 14), Rotation = 180, - Image = "https://banland.xyz/Asset?id=151205813", + Image = "http://banland.xyz/Asset?id=151205813", } local Dev_UpButton = Create "ImageButton" { @@ -304,7 +304,7 @@ function initializeDeveloperConsole() BackgroundTransparency = 1, Position = UDim2.new(0, 3, 0, 3), Size = UDim2.new(0, 14, 0, 14), - Image = "https://banland.xyz/Asset?id=151205813", + Image = "http://banland.xyz/Asset?id=151205813", } local Dev_TextBox = Create "Frame" { @@ -341,7 +341,7 @@ function initializeDeveloperConsole() Position = UDim2.new(0, 0, 0, 0), Size = UDim2.new(1, 0, 1, 0), Rotation = 0, - Image = "https://banland.xyz/Asset?id=152093917", + Image = "http://banland.xyz/Asset?id=152093917", } local Dev_ResizeButton = Create "ImageButton" { @@ -360,7 +360,7 @@ function initializeDeveloperConsole() Position = UDim2.new(0, 6, 0, 6), Size = UDim2.new(0.8, 0, 0.8, 0), Rotation = 135, - Image = "https://banland.xyz/Asset?id=151205813", + Image = "http://banland.xyz/Asset?id=151205813", } Create "TextButton" { @@ -415,7 +415,7 @@ function initializeDeveloperConsole() BackgroundTransparency = 1, Position = UDim2.new(0, 3, 0, 3), Size = UDim2.new(0, 14, 0, 14), - Image = "https://banland.xyz/Asset?id=151205852", + Image = "http://banland.xyz/Asset?id=151205852", } Create "TextButton" { diff --git a/luau/37801172.luau b/luau/37801172.luau index e1c470c..c88341a 100644 --- a/luau/37801172.luau +++ b/luau/37801172.luau @@ -71,40 +71,36 @@ else end) end -if game.CoreGui.Version >= 3 and game.PlaceId ~= 130815926 then --todo: remove placeid hack for halloween - -- Backpack Builder, creates most of the backpack gui - scriptContext:AddCoreScript( - 53878047, - screenGui, - "CoreScripts/BackpackScripts/BackpackBuilder" - ) +-- Backpack Builder, creates most of the backpack gui +scriptContext:AddCoreScript( + 53878047, + screenGui, + "CoreScripts/BackpackScripts/BackpackBuilder" +) - waitForChild(screenGui, "CurrentLoadout") - waitForChild(screenGui, "Backpack") - local Backpack = screenGui.Backpack +waitForChild(screenGui, "CurrentLoadout") +waitForChild(screenGui, "Backpack") +local Backpack = screenGui.Backpack - -- Manager handles all big backpack state changes, other scripts subscribe to this and do things accordingly - if game.CoreGui.Version >= 7 then - scriptContext:AddCoreScript( - 89449093, - Backpack, - "CoreScripts/BackpackScripts/BackpackManager" - ) - end +-- Manager handles all big backpack state changes, other scripts subscribe to this and do things accordingly +scriptContext:AddCoreScript( + 89449093, + Backpack, + "CoreScripts/BackpackScripts/BackpackManager" +) - -- Backpack Gear (handles all backpack gear tab stuff) - game:GetService("ScriptContext"):AddCoreScript( - 89449008, - Backpack, - "CoreScripts/BackpackScripts/BackpackGear" - ) - -- Loadout Script, used for gear hotkeys - scriptContext:AddCoreScript( - 53878057, - screenGui.CurrentLoadout, - "CoreScripts/BackpackScripts/LoadoutScript" - ) -end +-- Backpack Gear (handles all backpack gear tab stuff) +scriptContext:AddCoreScript( + 89449008, + Backpack, + "CoreScripts/BackpackScripts/BackpackGear" +) +-- Loadout Script, used for gear hotkeys +scriptContext:AddCoreScript( + 53878057, + screenGui.CurrentLoadout, + "CoreScripts/BackpackScripts/LoadoutScript" +) local IsPersonalServer = not not game.Workspace:FindFirstChild "PSVariable" if IsPersonalServer then diff --git a/luau/45284430.luau b/luau/45284430.luau index 097dfb5..fa9f70c 100644 --- a/luau/45284430.luau +++ b/luau/45284430.luau @@ -149,13 +149,13 @@ RbxGui.CreateStyledMessageDialog = function(title, message, style, buttons) styleImage.Position = UDim2.new(0, 5, 0, 15) if style == "error" or style == "Error" then styleImage.Size = UDim2.new(0, 71, 0, 71) - styleImage.Image = "https://banland.xyz/asset?id=42565285" + styleImage.Image = "http://banland.xyz/asset?id=42565285" elseif style == "notify" or style == "Notify" then styleImage.Size = UDim2.new(0, 71, 0, 71) - styleImage.Image = "https://banland.xyz/asset?id=42604978" + styleImage.Image = "http://banland.xyz/asset?id=42604978" elseif style == "confirm" or style == "Confirm" then styleImage.Size = UDim2.new(0, 74, 0, 76) - styleImage.Image = "https://banland.xyz/asset?id=42557901" + styleImage.Image = "http://banland.xyz/asset?id=42557901" else return RbxGui.CreateMessageDialog(title, message, buttons) end @@ -264,7 +264,7 @@ RbxGui.CreateDropDownMenu = function(items, onSelect, forRoblox) local dropDownIcon = Instance.new "ImageLabel" dropDownIcon.Name = "Icon" dropDownIcon.Active = false - dropDownIcon.Image = "https://banland.xyz/asset/?id=45732894" + dropDownIcon.Image = "http://banland.xyz/asset/?id=45732894" dropDownIcon.BackgroundTransparency = 1 dropDownIcon.Size = UDim2.new(0, 11, 0, 6) dropDownIcon.Position = UDim2.new(1, -11, 0.5, -2) @@ -1533,7 +1533,7 @@ RbxGui.CreateScrollingFrame = function(orderList, scrollStyle) local scrollStamp = 0 local scrollDrag = Instance.new "ImageButton" - scrollDrag.Image = "https://banland.xyz/asset/?id=61367186" + scrollDrag.Image = "http://banland.xyz/asset/?id=61367186" scrollDrag.Size = UDim2.new(1, 0, 0, 16) scrollDrag.BackgroundTransparency = 1 scrollDrag.Name = "ScrollDrag" @@ -2964,7 +2964,7 @@ RbxGui.CreateSetPanel = function( local cancelImage = Instance.new "ImageLabel" cancelImage.Name = "CancelImage" cancelImage.BackgroundTransparency = 1 - cancelImage.Image = "https://banland.xyz/asset?id=54135717" + cancelImage.Image = "http://banland.xyz/asset?id=54135717" cancelImage.Position = UDim2.new(0, -2, 0, -2) cancelImage.Size = UDim2.new(0, 16, 0, 16) cancelImage.ZIndex = 6 @@ -3200,7 +3200,7 @@ RbxGui.CreateSetPanel = function( local function createDropDownMenuButton(parent) local dropDownButton = Instance.new "ImageButton" dropDownButton.Name = "DropDownButton" - dropDownButton.Image = "https://banland.xyz/asset/?id=67581509" + dropDownButton.Image = "http://banland.xyz/asset/?id=67581509" dropDownButton.BackgroundTransparency = 1 dropDownButton.Size = UDim2.new(0, 16, 0, 16) dropDownButton.Position = UDim2.new(1, -24, 0, 6) @@ -3766,58 +3766,58 @@ RbxGui.CreateTerrainMaterialSelector = function(size, position) materialToImageMap[v] = {} if v == "Grass" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=56563112" + "http://banland.xyz/asset/?id=56563112" elseif v == "Sand" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=62356652" + "http://banland.xyz/asset/?id=62356652" elseif v == "Brick" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=65961537" + "http://banland.xyz/asset/?id=65961537" elseif v == "Granite" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67532153" + "http://banland.xyz/asset/?id=67532153" elseif v == "Asphalt" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67532038" + "http://banland.xyz/asset/?id=67532038" elseif v == "Iron" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67532093" + "http://banland.xyz/asset/?id=67532093" elseif v == "Aluminum" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67531995" + "http://banland.xyz/asset/?id=67531995" elseif v == "Gold" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67532118" + "http://banland.xyz/asset/?id=67532118" elseif v == "Plastic (red)" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67531848" + "http://banland.xyz/asset/?id=67531848" elseif v == "Plastic (blue)" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67531924" + "http://banland.xyz/asset/?id=67531924" elseif v == "Plank" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67532015" + "http://banland.xyz/asset/?id=67532015" elseif v == "Log" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67532051" + "http://banland.xyz/asset/?id=67532051" elseif v == "Gravel" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67532206" + "http://banland.xyz/asset/?id=67532206" elseif v == "Cinder Block" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67532103" + "http://banland.xyz/asset/?id=67532103" elseif v == "Stone Wall" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67531804" + "http://banland.xyz/asset/?id=67531804" elseif v == "Concrete" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=67532059" + "http://banland.xyz/asset/?id=67532059" elseif v == "Water" then materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=81407474" + "http://banland.xyz/asset/?id=81407474" else materialToImageMap[v].Regular = - "https://banland.xyz/asset/?id=66887593" -- fill in the rest here!! + "http://banland.xyz/asset/?id=66887593" -- fill in the rest here!! end end @@ -3938,7 +3938,7 @@ end RbxGui.CreateLoadingFrame = function(name, size, position) game:GetService("ContentProvider") - :Preload "https://banland.xyz/asset/?id=35238053" + :Preload "http://banland.xyz/asset/?id=35238053" local loadingFrame = Instance.new "Frame" loadingFrame.Name = "LoadingFrame" @@ -3965,7 +3965,7 @@ RbxGui.CreateLoadingFrame = function(name, size, position) local loadingGreenBar = Instance.new "ImageLabel" loadingGreenBar.Name = "LoadingGreenBar" - loadingGreenBar.Image = "https://banland.xyz/asset/?id=35238053" + loadingGreenBar.Image = "http://banland.xyz/asset/?id=35238053" loadingGreenBar.Position = UDim2.new(0, 0, 0, 0) loadingGreenBar.Size = UDim2.new(0, 0, 1, 0) loadingGreenBar.Visible = false diff --git a/luau/46295863.luau b/luau/46295863.luau index 528de79..d7b8bc1 100644 --- a/luau/46295863.luau +++ b/luau/46295863.luau @@ -1,6 +1,10 @@ -- CoreGui.RobloxGui.CoreScripts/Settings print "[Mercury]: Loaded corescript 46295863" +local CoreGui = game:GetService "CoreGui" +local GuiService = game:GetService "GuiService" +local Players = game:GetService "Players" + local function waitForChild(instance, name) while not instance:FindFirstChild(name) do instance.ChildAdded:wait() @@ -23,10 +27,10 @@ local RbxGui local helpButton, updateCameraDropDownSelection, updateVideoCaptureDropDownSelection local tweenTime = 0.2 -local mouseLockLookScreenUrl = "https://banland.xyz/asset?id=54071825" -local classicLookScreenUrl = "https://banland.xyz/Asset?id=45915798" +local mouseLockLookScreenUrl = "http://banland.xyz/asset?id=54071825" +local classicLookScreenUrl = "http://banland.xyz/Asset?id=45915798" -local hasGraphicsSlider = (game:GetService("CoreGui").Version >= 5) +local hasGraphicsSlider = true local GraphicsQualityLevels = 10 -- how many levels we allow on graphics slider local recordingVideo = false @@ -415,17 +419,17 @@ local function createHelpDialog(baseZIndex) buttons[2] = {} buttons[2].Text = "Move" buttons[2].Function = function() - image.Image = "https://banland.xyz/Asset?id=45915811" + image.Image = "http://banland.xyz/Asset?id=45915811" end buttons[3] = {} buttons[3].Text = "Gear" buttons[3].Function = function() - image.Image = "https://banland.xyz/Asset?id=45917596" + image.Image = "http://banland.xyz/Asset?id=45917596" end buttons[4] = {} buttons[4].Text = "Zoom" buttons[4].Function = function() - image.Image = "https://banland.xyz/Asset?id=45915825" + image.Image = "http://banland.xyz/Asset?id=45915825" end CreateTextButtons(buttonRow, buttons, UDim.new(0, 0), UDim.new(1, 0)) @@ -904,201 +908,127 @@ local function createGameSettingsMenu(baseZIndex, _) local studioCheckbox - if hasGraphicsSlider then - local qualityText = Instance.new "TextLabel" - qualityText.Name = "QualityText" - qualityText.Text = "Graphics Quality" - qualityText.Size = UDim2.new(0, 128, 0, 18) - qualityText.Position = UDim2.new(0, 30, 0, 239) - qualityText.Font = Enum.Font.Arial - qualityText.FontSize = Enum.FontSize.Size18 - qualityText.TextColor3 = Color3.new(1, 1, 1) - qualityText.ZIndex = baseZIndex + 4 - qualityText.BackgroundTransparency = 1 - qualityText.Parent = gameSettingsMenuFrame - qualityText.Visible = not inStudioMode + local qualityText = Instance.new "TextLabel" + qualityText.Name = "QualityText" + qualityText.Text = "Graphics Quality" + qualityText.Size = UDim2.new(0, 128, 0, 18) + qualityText.Position = UDim2.new(0, 30, 0, 239) + qualityText.Font = Enum.Font.Arial + qualityText.FontSize = Enum.FontSize.Size18 + qualityText.TextColor3 = Color3.new(1, 1, 1) + qualityText.ZIndex = baseZIndex + 4 + qualityText.BackgroundTransparency = 1 + qualityText.Parent = gameSettingsMenuFrame + qualityText.Visible = not inStudioMode - local autoText = qualityText:clone() - autoText.Name = "AutoText" - autoText.Text = "Auto" - autoText.Position = UDim2.new(0, 183, 0, 214) - autoText.TextColor3 = Color3.new(128 / 255, 128 / 255, 128 / 255) - autoText.Size = UDim2.new(0, 34, 0, 18) - autoText.Parent = gameSettingsMenuFrame - autoText.Visible = not inStudioMode + local autoText = qualityText:clone() + autoText.Name = "AutoText" + autoText.Text = "Auto" + autoText.Position = UDim2.new(0, 183, 0, 214) + autoText.TextColor3 = Color3.new(128 / 255, 128 / 255, 128 / 255) + autoText.Size = UDim2.new(0, 34, 0, 18) + autoText.Parent = gameSettingsMenuFrame + autoText.Visible = not inStudioMode - local fasterText = autoText:clone() - fasterText.Name = "FasterText" - fasterText.Text = "Faster" - fasterText.Position = UDim2.new(0, 185, 0, 274) - fasterText.TextColor3 = Color3.new(95, 95, 95) - fasterText.FontSize = Enum.FontSize.Size14 - fasterText.Parent = gameSettingsMenuFrame - fasterText.Visible = not inStudioMode + local fasterText = autoText:clone() + fasterText.Name = "FasterText" + fasterText.Text = "Faster" + fasterText.Position = UDim2.new(0, 185, 0, 274) + fasterText.TextColor3 = Color3.new(95, 95, 95) + fasterText.FontSize = Enum.FontSize.Size14 + fasterText.Parent = gameSettingsMenuFrame + fasterText.Visible = not inStudioMode - local fasterShortcut = fullscreenShortcut:clone() - fasterShortcut.Name = "FasterShortcutText" - fasterShortcut.Text = "F10 + Shift" - fasterShortcut.Position = UDim2.new(0, 185, 0, 283) - fasterShortcut.Parent = gameSettingsMenuFrame - fasterShortcut.Visible = not inStudioMode + local fasterShortcut = fullscreenShortcut:clone() + fasterShortcut.Name = "FasterShortcutText" + fasterShortcut.Text = "F10 + Shift" + fasterShortcut.Position = UDim2.new(0, 185, 0, 283) + fasterShortcut.Parent = gameSettingsMenuFrame + fasterShortcut.Visible = not inStudioMode - local betterQualityText = autoText:clone() - betterQualityText.Name = "BetterQualityText" - betterQualityText.Text = "Better Quality" - betterQualityText.TextWrap = true - betterQualityText.Size = UDim2.new(0, 41, 0, 28) - betterQualityText.Position = UDim2.new(0, 390, 0, 269) - betterQualityText.TextColor3 = Color3.new(95, 95, 95) - betterQualityText.FontSize = Enum.FontSize.Size14 - betterQualityText.Parent = gameSettingsMenuFrame - betterQualityText.Visible = not inStudioMode + local betterQualityText = autoText:clone() + betterQualityText.Name = "BetterQualityText" + betterQualityText.Text = "Better Quality" + betterQualityText.TextWrap = true + betterQualityText.Size = UDim2.new(0, 41, 0, 28) + betterQualityText.Position = UDim2.new(0, 390, 0, 269) + betterQualityText.TextColor3 = Color3.new(95, 95, 95) + betterQualityText.FontSize = Enum.FontSize.Size14 + betterQualityText.Parent = gameSettingsMenuFrame + betterQualityText.Visible = not inStudioMode - local betterQualityShortcut = fullscreenShortcut:clone() - betterQualityShortcut.Name = "BetterQualityShortcut" - betterQualityShortcut.Text = "F10" - betterQualityShortcut.Position = UDim2.new(0, 394, 0, 288) - betterQualityShortcut.Parent = gameSettingsMenuFrame - betterQualityShortcut.Visible = not inStudioMode + local betterQualityShortcut = fullscreenShortcut:clone() + betterQualityShortcut.Name = "BetterQualityShortcut" + betterQualityShortcut.Text = "F10" + betterQualityShortcut.Position = UDim2.new(0, 394, 0, 288) + betterQualityShortcut.Parent = gameSettingsMenuFrame + betterQualityShortcut.Visible = not inStudioMode - local autoGraphicsButton = createTextButton( - "X", - Enum.ButtonStyle.RobloxButton, - Enum.FontSize.Size18, - UDim2.new(0, 25, 0, 25), - UDim2.new(0, 187, 0, 239) + local autoGraphicsButton = createTextButton( + "X", + Enum.ButtonStyle.RobloxButton, + Enum.FontSize.Size18, + UDim2.new(0, 25, 0, 25), + UDim2.new(0, 187, 0, 239) + ) + autoGraphicsButton.Name = "AutoGraphicsButton" + autoGraphicsButton.ZIndex = baseZIndex + 4 + autoGraphicsButton.Parent = gameSettingsMenuFrame + autoGraphicsButton.Visible = not inStudioMode + + local graphicsSlider, graphicsLevel = RbxGui.CreateSlider( + GraphicsQualityLevels, + 150, + UDim2.new(0, 230, 0, 280) + ) -- graphics - 1 because slider starts at 1 instead of 0 + graphicsSlider.Parent = gameSettingsMenuFrame + graphicsSlider.Bar.ZIndex = baseZIndex + 4 + graphicsSlider.Bar.Slider.ZIndex = baseZIndex + 5 + graphicsSlider.Visible = not inStudioMode + graphicsLevel.Value = + math.floor((settings().Rendering:GetMaxQualityLevel() - 1) / 2) + + local graphicsSetter = Instance.new "TextBox" + graphicsSetter.Name = "GraphicsSetter" + graphicsSetter.BackgroundColor3 = Color3.new(0, 0, 0) + graphicsSetter.BorderColor3 = Color3.new(128 / 255, 128 / 255, 128 / 255) + graphicsSetter.Size = UDim2.new(0, 50, 0, 25) + graphicsSetter.Position = UDim2.new(0, 450, 0, 269) + graphicsSetter.TextColor3 = Color3.new(1, 1, 1) + graphicsSetter.Font = Enum.Font.Arial + graphicsSetter.FontSize = Enum.FontSize.Size18 + graphicsSetter.Text = "Auto" + graphicsSetter.ZIndex = 1 + graphicsSetter.TextWrap = true + graphicsSetter.Parent = gameSettingsMenuFrame + graphicsSetter.Visible = not inStudioMode + + local isAutoGraphics = true + if not inStudioMode then + isAutoGraphics = ( + UserSettings().GameSettings.SavedQualityLevel + == Enum.SavedQualitySetting.Automatic ) - autoGraphicsButton.Name = "AutoGraphicsButton" - autoGraphicsButton.ZIndex = baseZIndex + 4 - autoGraphicsButton.Parent = gameSettingsMenuFrame - autoGraphicsButton.Visible = not inStudioMode + else + settings().Rendering.EnableFRM = false + end - local graphicsSlider, graphicsLevel = RbxGui.CreateSlider( - GraphicsQualityLevels, - 150, - UDim2.new(0, 230, 0, 280) - ) -- graphics - 1 because slider starts at 1 instead of 0 - graphicsSlider.Parent = gameSettingsMenuFrame - graphicsSlider.Bar.ZIndex = baseZIndex + 4 - graphicsSlider.Bar.Slider.ZIndex = baseZIndex + 5 - graphicsSlider.Visible = not inStudioMode - graphicsLevel.Value = - math.floor((settings().Rendering:GetMaxQualityLevel() - 1) / 2) + local listenToGraphicsLevelChange = true - local graphicsSetter = Instance.new "TextBox" - graphicsSetter.Name = "GraphicsSetter" - graphicsSetter.BackgroundColor3 = Color3.new(0, 0, 0) - graphicsSetter.BorderColor3 = - Color3.new(128 / 255, 128 / 255, 128 / 255) - graphicsSetter.Size = UDim2.new(0, 50, 0, 25) - graphicsSetter.Position = UDim2.new(0, 450, 0, 269) - graphicsSetter.TextColor3 = Color3.new(1, 1, 1) - graphicsSetter.Font = Enum.Font.Arial - graphicsSetter.FontSize = Enum.FontSize.Size18 - graphicsSetter.Text = "Auto" - graphicsSetter.ZIndex = 1 - graphicsSetter.TextWrap = true - graphicsSetter.Parent = gameSettingsMenuFrame - graphicsSetter.Visible = not inStudioMode - - local isAutoGraphics = true - if not inStudioMode then - isAutoGraphics = ( - UserSettings().GameSettings.SavedQualityLevel - == Enum.SavedQualitySetting.Automatic - ) + local function setAutoGraphicsGui(active) + isAutoGraphics = active + if active then + autoGraphicsButton.Text = "X" + betterQualityText.ZIndex = 1 + betterQualityShortcut.ZIndex = 1 + fasterShortcut.ZIndex = 1 + fasterText.ZIndex = 1 + graphicsSlider.Bar.ZIndex = 1 + graphicsSlider.Bar.Slider.ZIndex = 1 + graphicsSetter.ZIndex = 1 + graphicsSetter.Text = "Auto" else - settings().Rendering.EnableFRM = false - end - - local listenToGraphicsLevelChange = true - - local function setAutoGraphicsGui(active) - isAutoGraphics = active - if active then - autoGraphicsButton.Text = "X" - betterQualityText.ZIndex = 1 - betterQualityShortcut.ZIndex = 1 - fasterShortcut.ZIndex = 1 - fasterText.ZIndex = 1 - graphicsSlider.Bar.ZIndex = 1 - graphicsSlider.Bar.Slider.ZIndex = 1 - graphicsSetter.ZIndex = 1 - graphicsSetter.Text = "Auto" - else - autoGraphicsButton.Text = "" - graphicsSlider.Bar.ZIndex = baseZIndex + 4 - graphicsSlider.Bar.Slider.ZIndex = baseZIndex + 5 - betterQualityShortcut.ZIndex = baseZIndex + 4 - fasterShortcut.ZIndex = baseZIndex + 4 - betterQualityText.ZIndex = baseZIndex + 4 - fasterText.ZIndex = baseZIndex + 4 - graphicsSetter.ZIndex = baseZIndex + 4 - end - end - - local function goToAutoGraphics() - setAutoGraphicsGui(true) - - UserSettings().GameSettings.SavedQualityLevel = - Enum.SavedQualitySetting.Automatic - - settings().Rendering.QualityLevel = Enum.QualityLevel.Automatic - end - - local function setGraphicsQualityLevel(newLevel) - local percentage = newLevel / GraphicsQualityLevels - local newSetting = math.floor( - (settings().Rendering:GetMaxQualityLevel() - 1) * percentage - ) - if newSetting == 20 then -- Level 20 is the same as level 21, except it doesn't render ambient occlusion - newSetting = 21 - elseif newLevel == 1 then -- make sure we can go to lowest settings (for terrible computers) - newSetting = 1 - elseif newSetting > settings().Rendering:GetMaxQualityLevel() then - newSetting = settings().Rendering:GetMaxQualityLevel() - 1 - end - - UserSettings().GameSettings.SavedQualityLevel = newLevel - settings().Rendering.QualityLevel = newSetting - end - - local function goToManualGraphics(explicitLevel) - setAutoGraphicsGui(false) - - if explicitLevel then - graphicsLevel.Value = explicitLevel - else - graphicsLevel.Value = math.floor( - ( - settings().Rendering.AutoFRMLevel - / (settings().Rendering:GetMaxQualityLevel() - 1) - ) * GraphicsQualityLevels - ) - end - - if explicitLevel == graphicsLevel.Value then -- make sure we are actually in right graphics mode - setGraphicsQualityLevel(graphicsLevel.Value) - end - - if not explicitLevel then - UserSettings().GameSettings.SavedQualityLevel = - graphicsLevel.Value - end - graphicsSetter.Text = tostring(graphicsLevel.Value) - end - - local function showAutoGraphics() - autoText.ZIndex = baseZIndex + 4 - autoGraphicsButton.ZIndex = baseZIndex + 4 - end - - local function hideAutoGraphics() - autoText.ZIndex = 1 - autoGraphicsButton.ZIndex = 1 - end - - local function showManualGraphics() + autoGraphicsButton.Text = "" graphicsSlider.Bar.ZIndex = baseZIndex + 4 graphicsSlider.Bar.Slider.ZIndex = baseZIndex + 5 betterQualityShortcut.ZIndex = baseZIndex + 4 @@ -1107,249 +1037,319 @@ local function createGameSettingsMenu(baseZIndex, _) fasterText.ZIndex = baseZIndex + 4 graphicsSetter.ZIndex = baseZIndex + 4 end + end - local function hideManualGraphics() - betterQualityText.ZIndex = 1 - betterQualityShortcut.ZIndex = 1 - fasterShortcut.ZIndex = 1 - fasterText.ZIndex = 1 - graphicsSlider.Bar.ZIndex = 1 - graphicsSlider.Bar.Slider.ZIndex = 1 - graphicsSetter.ZIndex = 1 + local function goToAutoGraphics() + setAutoGraphicsGui(true) + + UserSettings().GameSettings.SavedQualityLevel = + Enum.SavedQualitySetting.Automatic + + settings().Rendering.QualityLevel = Enum.QualityLevel.Automatic + end + + local function setGraphicsQualityLevel(newLevel) + local percentage = newLevel / GraphicsQualityLevels + local newSetting = math.floor( + (settings().Rendering:GetMaxQualityLevel() - 1) * percentage + ) + if newSetting == 20 then -- Level 20 is the same as level 21, except it doesn't render ambient occlusion + newSetting = 21 + elseif newLevel == 1 then -- make sure we can go to lowest settings (for terrible computers) + newSetting = 1 + elseif newSetting > settings().Rendering:GetMaxQualityLevel() then + newSetting = settings().Rendering:GetMaxQualityLevel() - 1 end - local function translateSavedQualityLevelToInt(savedQualityLevel) - local sqs = Enum.SavedQualitySetting - if savedQualityLevel == sqs.QualityLevel1 then - return 1 - elseif savedQualityLevel == sqs.QualityLevel2 then - return 2 - elseif savedQualityLevel == sqs.QualityLevel3 then - return 3 - elseif savedQualityLevel == sqs.QualityLevel4 then - return 4 - elseif savedQualityLevel == sqs.QualityLevel5 then - return 5 - elseif savedQualityLevel == sqs.QualityLevel6 then - return 6 - elseif savedQualityLevel == sqs.QualityLevel7 then - return 7 - elseif savedQualityLevel == sqs.QualityLevel8 then - return 8 - elseif savedQualityLevel == sqs.QualityLevel9 then - return 9 - elseif savedQualityLevel == sqs.QualityLevel10 then - return 10 - end - return 0 - end + UserSettings().GameSettings.SavedQualityLevel = newLevel + settings().Rendering.QualityLevel = newSetting + end - local function enableGraphicsWidget() - settings().Rendering.EnableFRM = true + local function goToManualGraphics(explicitLevel) + setAutoGraphicsGui(false) - isAutoGraphics = ( - UserSettings().GameSettings.SavedQualityLevel - == Enum.SavedQualitySetting.Automatic - ) - if isAutoGraphics then - showAutoGraphics() - goToAutoGraphics() - else - showAutoGraphics() - showManualGraphics() - goToManualGraphics( - translateSavedQualityLevelToInt( - UserSettings().GameSettings.SavedQualityLevel - ) - ) - end - end - - local function disableGraphicsWidget() - hideManualGraphics() - hideAutoGraphics() - settings().Rendering.EnableFRM = false - end - - graphicsSetter.FocusLost:connect(function() - if isAutoGraphics then - graphicsSetter.Text = tostring(graphicsLevel.Value) - return - end - - local newGraphicsValue = tonumber(graphicsSetter.Text) - if newGraphicsValue == nil then - graphicsSetter.Text = tostring(graphicsLevel.Value) - return - end - - if newGraphicsValue < 1 then - newGraphicsValue = 1 - elseif - newGraphicsValue >= settings().Rendering:GetMaxQualityLevel() - then - newGraphicsValue = settings().Rendering:GetMaxQualityLevel() - 1 - end - - graphicsLevel.Value = newGraphicsValue - setGraphicsQualityLevel(graphicsLevel.Value) - graphicsSetter.Text = tostring(graphicsLevel.Value) - end) - - graphicsLevel.Changed:connect(function(_) - if isAutoGraphics then - return - end - if not listenToGraphicsLevelChange then - return - end - - graphicsSetter.Text = tostring(graphicsLevel.Value) - setGraphicsQualityLevel(graphicsLevel.Value) - end) - - -- setup our graphic mode on load - if - inStudioMode - or UserSettings().GameSettings.SavedQualityLevel - == Enum.SavedQualitySetting.Automatic - then - if inStudioMode then - settings().Rendering.EnableFRM = false - disableGraphicsWidget() - else - settings().Rendering.EnableFRM = true - goToAutoGraphics() - end + if explicitLevel then + graphicsLevel.Value = explicitLevel else - settings().Rendering.EnableFRM = true + graphicsLevel.Value = math.floor( + ( + settings().Rendering.AutoFRMLevel + / (settings().Rendering:GetMaxQualityLevel() - 1) + ) * GraphicsQualityLevels + ) + end + + if explicitLevel == graphicsLevel.Value then -- make sure we are actually in right graphics mode + setGraphicsQualityLevel(graphicsLevel.Value) + end + + if not explicitLevel then + UserSettings().GameSettings.SavedQualityLevel = graphicsLevel.Value + end + graphicsSetter.Text = tostring(graphicsLevel.Value) + end + + local function showAutoGraphics() + autoText.ZIndex = baseZIndex + 4 + autoGraphicsButton.ZIndex = baseZIndex + 4 + end + + local function hideAutoGraphics() + autoText.ZIndex = 1 + autoGraphicsButton.ZIndex = 1 + end + + local function showManualGraphics() + graphicsSlider.Bar.ZIndex = baseZIndex + 4 + graphicsSlider.Bar.Slider.ZIndex = baseZIndex + 5 + betterQualityShortcut.ZIndex = baseZIndex + 4 + fasterShortcut.ZIndex = baseZIndex + 4 + betterQualityText.ZIndex = baseZIndex + 4 + fasterText.ZIndex = baseZIndex + 4 + graphicsSetter.ZIndex = baseZIndex + 4 + end + + local function hideManualGraphics() + betterQualityText.ZIndex = 1 + betterQualityShortcut.ZIndex = 1 + fasterShortcut.ZIndex = 1 + fasterText.ZIndex = 1 + graphicsSlider.Bar.ZIndex = 1 + graphicsSlider.Bar.Slider.ZIndex = 1 + graphicsSetter.ZIndex = 1 + end + + local function translateSavedQualityLevelToInt(savedQualityLevel) + local sqs = Enum.SavedQualitySetting + if savedQualityLevel == sqs.QualityLevel1 then + return 1 + elseif savedQualityLevel == sqs.QualityLevel2 then + return 2 + elseif savedQualityLevel == sqs.QualityLevel3 then + return 3 + elseif savedQualityLevel == sqs.QualityLevel4 then + return 4 + elseif savedQualityLevel == sqs.QualityLevel5 then + return 5 + elseif savedQualityLevel == sqs.QualityLevel6 then + return 6 + elseif savedQualityLevel == sqs.QualityLevel7 then + return 7 + elseif savedQualityLevel == sqs.QualityLevel8 then + return 8 + elseif savedQualityLevel == sqs.QualityLevel9 then + return 9 + elseif savedQualityLevel == sqs.QualityLevel10 then + return 10 + end + return 0 + end + + local function enableGraphicsWidget() + settings().Rendering.EnableFRM = true + + isAutoGraphics = ( + UserSettings().GameSettings.SavedQualityLevel + == Enum.SavedQualitySetting.Automatic + ) + if isAutoGraphics then + showAutoGraphics() + goToAutoGraphics() + else + showAutoGraphics() + showManualGraphics() goToManualGraphics( translateSavedQualityLevelToInt( UserSettings().GameSettings.SavedQualityLevel ) ) end + end - autoGraphicsButton.MouseButton1Click:connect(function() - if inStudioMode and not game.Players.LocalPlayer then - return - end + local function disableGraphicsWidget() + hideManualGraphics() + hideAutoGraphics() + settings().Rendering.EnableFRM = false + end - if not isAutoGraphics then - goToAutoGraphics() - else - goToManualGraphics(graphicsLevel.Value) - end - end) - - game.GraphicsQualityChangeRequest:connect(function(graphicsIncrease) - if isAutoGraphics then - return - end -- only can set graphics in manual mode - - if graphicsIncrease then - if (graphicsLevel.Value + 1) > GraphicsQualityLevels then - return - end - graphicsLevel.Value += 1 - graphicsSetter.Text = tostring(graphicsLevel.Value) - setGraphicsQualityLevel(graphicsLevel.Value) - - game:GetService("GuiService"):SendNotification( - "Graphics Quality", - `Increased to ({graphicsSetter.Text})`, - "", - 2, - function() end - ) - else - if (graphicsLevel.Value - 1) <= 0 then - return - end - graphicsLevel.Value -= 1 - graphicsSetter.Text = tostring(graphicsLevel.Value) - setGraphicsQualityLevel(graphicsLevel.Value) - - game:GetService("GuiService"):SendNotification( - "Graphics Quality", - `Decreased to ({graphicsSetter.Text})`, - "", - 2, - function() end - ) - end - end) - - game.Players.PlayerAdded:connect(function(player) - if player == game.Players.LocalPlayer and inStudioMode then - enableGraphicsWidget() - end - end) - game.Players.PlayerRemoving:connect(function(player) - if player == game.Players.LocalPlayer and inStudioMode then - disableGraphicsWidget() - end - end) - - studioCheckbox = createTextButton( - "", - Enum.ButtonStyle.RobloxButton, - Enum.FontSize.Size18, - UDim2.new(0, 25, 0, 25), - UDim2.new(0, 30, 0, 176) - ) - studioCheckbox.Name = "StudioCheckbox" - studioCheckbox.ZIndex = baseZIndex + 4 - --studioCheckbox.Parent = gameSettingsMenuFrame -- todo: enable when studio h4x aren't an issue anymore - studioCheckbox:SetVerb "TogglePlayMode" - studioCheckbox.Visible = false -- todo: enabled when studio h4x aren't an issue anymore - - local wasManualGraphics = ( - settings().Rendering.QualityLevel ~= Enum.QualityLevel.Automatic - ) - if inStudioMode and not game.Players.LocalPlayer then - studioCheckbox.Text = "X" - disableGraphicsWidget() - elseif inStudioMode then - studioCheckbox.Text = "X" - enableGraphicsWidget() + graphicsSetter.FocusLost:connect(function() + if isAutoGraphics then + graphicsSetter.Text = tostring(graphicsLevel.Value) + return end - if hasGraphicsSlider then - UserSettings().GameSettings.StudioModeChanged:connect( - function(isStudioMode) - inStudioMode = isStudioMode - if isStudioMode then - wasManualGraphics = ( - settings().Rendering.QualityLevel - ~= Enum.QualityLevel.Automatic - ) - goToAutoGraphics() - studioCheckbox.Text = "X" - autoGraphicsButton.ZIndex = 1 - autoText.ZIndex = 1 - else - if wasManualGraphics then - goToManualGraphics() - end - studioCheckbox.Text = "" - autoGraphicsButton.ZIndex = baseZIndex + 4 - autoText.ZIndex = baseZIndex + 4 - end - end + + local newGraphicsValue = tonumber(graphicsSetter.Text) + if newGraphicsValue == nil then + graphicsSetter.Text = tostring(graphicsLevel.Value) + return + end + + if newGraphicsValue < 1 then + newGraphicsValue = 1 + elseif + newGraphicsValue >= settings().Rendering:GetMaxQualityLevel() + then + newGraphicsValue = settings().Rendering:GetMaxQualityLevel() - 1 + end + + graphicsLevel.Value = newGraphicsValue + setGraphicsQualityLevel(graphicsLevel.Value) + graphicsSetter.Text = tostring(graphicsLevel.Value) + end) + + graphicsLevel.Changed:connect(function(_) + if isAutoGraphics then + return + end + if not listenToGraphicsLevelChange then + return + end + + graphicsSetter.Text = tostring(graphicsLevel.Value) + setGraphicsQualityLevel(graphicsLevel.Value) + end) + + -- setup our graphic mode on load + if + inStudioMode + or UserSettings().GameSettings.SavedQualityLevel + == Enum.SavedQualitySetting.Automatic + then + if inStudioMode then + settings().Rendering.EnableFRM = false + disableGraphicsWidget() + else + settings().Rendering.EnableFRM = true + goToAutoGraphics() + end + else + settings().Rendering.EnableFRM = true + goToManualGraphics( + translateSavedQualityLevelToInt( + UserSettings().GameSettings.SavedQualityLevel + ) + ) + end + + autoGraphicsButton.MouseButton1Click:connect(function() + if inStudioMode and not game.Players.LocalPlayer then + return + end + + if not isAutoGraphics then + goToAutoGraphics() + else + goToManualGraphics(graphicsLevel.Value) + end + end) + + game.GraphicsQualityChangeRequest:connect(function(graphicsIncrease) + if isAutoGraphics then + return + end -- only can set graphics in manual mode + + if graphicsIncrease then + if (graphicsLevel.Value + 1) > GraphicsQualityLevels then + return + end + graphicsLevel.Value += 1 + graphicsSetter.Text = tostring(graphicsLevel.Value) + setGraphicsQualityLevel(graphicsLevel.Value) + + GuiService:SendNotification( + "Graphics Quality", + `Increased to ({graphicsSetter.Text})`, + "", + 2, + function() end ) else - studioCheckbox.MouseButton1Click:connect(function() - if not studioCheckbox.Active then - return - end + if (graphicsLevel.Value - 1) <= 0 then + return + end + graphicsLevel.Value -= 1 + graphicsSetter.Text = tostring(graphicsLevel.Value) + setGraphicsQualityLevel(graphicsLevel.Value) - if studioCheckbox.Text == "" then - studioCheckbox.Text = "X" - else - studioCheckbox.Text = "" - end - end) + GuiService:SendNotification( + "Graphics Quality", + `Decreased to ({graphicsSetter.Text})`, + "", + 2, + function() end + ) end + end) + + game.Players.PlayerAdded:connect(function(player) + if player == game.Players.LocalPlayer and inStudioMode then + enableGraphicsWidget() + end + end) + game.Players.PlayerRemoving:connect(function(player) + if player == game.Players.LocalPlayer and inStudioMode then + disableGraphicsWidget() + end + end) + + studioCheckbox = createTextButton( + "", + Enum.ButtonStyle.RobloxButton, + Enum.FontSize.Size18, + UDim2.new(0, 25, 0, 25), + UDim2.new(0, 30, 0, 176) + ) + studioCheckbox.Name = "StudioCheckbox" + studioCheckbox.ZIndex = baseZIndex + 4 + --studioCheckbox.Parent = gameSettingsMenuFrame -- todo: enable when studio h4x aren't an issue anymore + studioCheckbox:SetVerb "TogglePlayMode" + studioCheckbox.Visible = false -- todo: enabled when studio h4x aren't an issue anymore + + local wasManualGraphics = ( + settings().Rendering.QualityLevel ~= Enum.QualityLevel.Automatic + ) + if inStudioMode and not game.Players.LocalPlayer then + studioCheckbox.Text = "X" + disableGraphicsWidget() + elseif inStudioMode then + studioCheckbox.Text = "X" + enableGraphicsWidget() + end + if hasGraphicsSlider then + UserSettings().GameSettings.StudioModeChanged:connect( + function(isStudioMode) + inStudioMode = isStudioMode + if isStudioMode then + wasManualGraphics = ( + settings().Rendering.QualityLevel + ~= Enum.QualityLevel.Automatic + ) + goToAutoGraphics() + studioCheckbox.Text = "X" + autoGraphicsButton.ZIndex = 1 + autoText.ZIndex = 1 + else + if wasManualGraphics then + goToManualGraphics() + end + studioCheckbox.Text = "" + autoGraphicsButton.ZIndex = baseZIndex + 4 + autoText.ZIndex = baseZIndex + 4 + end + end + ) + else + studioCheckbox.MouseButton1Click:connect(function() + if not studioCheckbox.Active then + return + end + + if studioCheckbox.Text == "" then + studioCheckbox.Text = "X" + else + studioCheckbox.Text = "" + end + end) end local fullscreenCheckbox = createTextButton( @@ -1676,91 +1676,89 @@ if UserSettings then ) end) - if game.CoreGui.Version >= 4 then -- we can use escape! - game:GetService("GuiService").EscapeKeyPressed:connect(function() - if currentMenuSelection == nil then - game.GuiService:AddCenterDialog( - shield, - Enum.CenterDialogType.ModalDialog, - --showFunction - function() - settingsButton.Active = false - updateCameraDropDownSelection( - UserSettings().GameSettings.ControlMode.Name - ) + GuiService.EscapeKeyPressed:connect(function() + if currentMenuSelection == nil then + game.GuiService:AddCenterDialog( + shield, + Enum.CenterDialogType.ModalDialog, + --showFunction + function() + settingsButton.Active = false + updateCameraDropDownSelection( + UserSettings().GameSettings.ControlMode.Name + ) - if syncVideoCaptureSetting then - syncVideoCaptureSetting() - end - - goToMenu( - settingsFrame, - "GameMainMenu", - "right", - UDim2.new(0, 525, 0, 430) - ) - shield.Visible = true - shield.Active = true - settingsFrame.Parent:TweenPosition( - UDim2.new(0.5, -262, 0.5, -200), - Enum.EasingDirection.InOut, - Enum.EasingStyle.Sine, - tweenTime, - true - ) - settingsFrame.Parent:TweenSize( - UDim2.new(0, 525, 0, 430), - Enum.EasingDirection.InOut, - Enum.EasingStyle.Sine, - tweenTime, - true - ) - end, - --hideFunction - function() - settingsFrame.Parent:TweenPosition( - UDim2.new(0.5, -262, -0.5, -200), - Enum.EasingDirection.InOut, - Enum.EasingStyle.Sine, - tweenTime, - true - ) - settingsFrame.Parent:TweenSize( - UDim2.new(0, 525, 0, 430), - Enum.EasingDirection.InOut, - Enum.EasingStyle.Sine, - tweenTime, - true - ) - shield.Visible = false - settingsButton.Active = true + if syncVideoCaptureSetting then + syncVideoCaptureSetting() end - ) - elseif #lastMenuSelection > 0 then - if #centerDialogs > 0 then - for i = 1, #centerDialogs do - game.GuiService:RemoveCenterDialog(centerDialogs[i]) - centerDialogs[i].Visible = false - end - centerDialogs = {} - end - goToMenu( - lastMenuSelection[#lastMenuSelection]["container"], - lastMenuSelection[#lastMenuSelection]["name"], - lastMenuSelection[#lastMenuSelection]["direction"], - lastMenuSelection[#lastMenuSelection]["lastSize"] - ) - - table.remove(lastMenuSelection, #lastMenuSelection) - if #lastMenuSelection == 1 then -- apparently lua can't reduce count to 0... T_T - lastMenuSelection = {} + goToMenu( + settingsFrame, + "GameMainMenu", + "right", + UDim2.new(0, 525, 0, 430) + ) + shield.Visible = true + shield.Active = true + settingsFrame.Parent:TweenPosition( + UDim2.new(0.5, -262, 0.5, -200), + Enum.EasingDirection.InOut, + Enum.EasingStyle.Sine, + tweenTime, + true + ) + settingsFrame.Parent:TweenSize( + UDim2.new(0, 525, 0, 430), + Enum.EasingDirection.InOut, + Enum.EasingStyle.Sine, + tweenTime, + true + ) + end, + --hideFunction + function() + settingsFrame.Parent:TweenPosition( + UDim2.new(0.5, -262, -0.5, -200), + Enum.EasingDirection.InOut, + Enum.EasingStyle.Sine, + tweenTime, + true + ) + settingsFrame.Parent:TweenSize( + UDim2.new(0, 525, 0, 430), + Enum.EasingDirection.InOut, + Enum.EasingStyle.Sine, + tweenTime, + true + ) + shield.Visible = false + settingsButton.Active = true end - else - resumeGameFunction(shield) + ) + elseif #lastMenuSelection > 0 then + if #centerDialogs > 0 then + for i = 1, #centerDialogs do + game.GuiService:RemoveCenterDialog(centerDialogs[i]) + centerDialogs[i].Visible = false + end + centerDialogs = {} end - end) - end + + goToMenu( + lastMenuSelection[#lastMenuSelection]["container"], + lastMenuSelection[#lastMenuSelection]["name"], + lastMenuSelection[#lastMenuSelection]["direction"], + lastMenuSelection[#lastMenuSelection]["lastSize"] + ) + + table.remove(lastMenuSelection, #lastMenuSelection) + if #lastMenuSelection == 1 then -- apparently lua can't reduce count to 0... T_T + lastMenuSelection = {} + end + else + resumeGameFunction(shield) + end + end) local gameSettingsMenu = createGameSettingsMenu(baseZIndex, shield) gameSettingsMenu.Visible = false @@ -2007,7 +2005,7 @@ local createSaveDialogs = function() -8 ) spinnerImage.BackgroundTransparency = 1 - spinnerImage.Image = "https://banland.xyz/Asset?id=45880710" + spinnerImage.Image = "http://banland.xyz/Asset?id=45880710" spinnerImage.Parent = spinnerFrame spinnerIcons[spinnerNum] = spinnerImage @@ -2029,10 +2027,10 @@ local createSaveDialogs = function() while pos < 8 do if pos == spinPos or pos == ((spinPos + 1) % 8) then spinnerIcons[pos + 1].Image = - "https://banland.xyz/Asset?id=45880668" + "http://banland.xyz/Asset?id=45880668" else spinnerIcons[pos + 1].Image = - "https://banland.xyz/Asset?id=45880710" + "http://banland.xyz/Asset?id=45880710" end pos += 1 @@ -2222,10 +2220,9 @@ local createReportAbuseDialog = function() local updatePlayerSelection local function createPlayersDropDown() - local players = game:GetService "Players" local playerNames = {} local nameToPlayer = {} - local children = players:GetChildren() + local children = Players:GetChildren() local pos = 1 if children then for _, player in ipairs(children) do diff --git a/luau/48488235.luau b/luau/48488235.luau index a1d9c98..02f48f9 100644 --- a/luau/48488235.luau +++ b/luau/48488235.luau @@ -10,9 +10,9 @@ print "[Mercury]: Loaded corescript 48488235" local ADMINS = { taskmanager = 1, heliodex = 1, - multako = "https://banland.xyz/asset?id=6923328292", + multako = "http://banland.xyz/asset?id=6923328292", mercury = 1, - pizzaboxer = "https://banland.xyz/asset?id=6917566633", + pizzaboxer = "http://banland.xyz/asset?id=6917566633", } local Images = { @@ -87,7 +87,7 @@ end local function getMembershipTypeIcon(membershipType, playerName) if ADMINS[string.lower(playerName)] ~= nil then if ADMINS[string.lower(playerName)] == 1 then - return "https://banland.xyz/asset?id=6923330951" + return "http://banland.xyz/asset?id=6923330951" end return ADMINS[string.lower(playerName)] elseif membershipType == Enum.MembershipType.None then @@ -110,11 +110,11 @@ local function getFriendStatusIcon(friendStatus) then return "" elseif friendStatus == Enum.FriendStatus.Friend then - return "https://banland.xyz/asset?id=99749771" + return "http://banland.xyz/asset?id=99749771" elseif friendStatus == Enum.FriendStatus.FriendRequestSent then - return "https://banland.xyz/asset?id=99776888" + return "http://banland.xyz/asset?id=99776888" elseif friendStatus == Enum.FriendStatus.FriendRequestReceived then - return "https://banland.xyz/asset?id=99776838" + return "http://banland.xyz/asset?id=99776838" else error(`Unknown FriendStatus {friendStatus}`) end @@ -155,20 +155,20 @@ local function MakePopupButton(nparent, ntext, index, last) Parent = nparent, } if index == 0 then - tobj.Image = "https://banland.xyz/asset?id=97108784" + tobj.Image = "http://banland.xyz/asset?id=97108784" elseif last then if index % 2 == 1 then - tobj.Image = "https://banland.xyz/asset?id=" + tobj.Image = "http://banland.xyz/asset?id=" .. Images.LightPopupBottom else - tobj.Image = "https://banland.xyz/asset?id=" + tobj.Image = "http://banland.xyz/asset?id=" .. Images.DarkPopupBottom end else if index % 2 == 1 then - tobj.Image = "https://banland.xyz/asset?id=97112126" + tobj.Image = "http://banland.xyz/asset?id=97112126" else - tobj.Image = "https://banland.xyz/asset?id=97109338" + tobj.Image = "http://banland.xyz/asset?id=97109338" end end return tobj @@ -219,7 +219,7 @@ HeaderFrame = Create "Frame" { Position = UDim2.new(0, 0, 0, 0), Size = UDim2.new(1, 0, 0.07, 0), Parent = MainFrame, - MakeBackgroundGuiObj "https://banland.xyz/asset?id=94692054", + MakeBackgroundGuiObj "http://banland.xyz/asset?id=94692054", } local HeaderFrameHeight = HeaderFrame.Size.Y.Scale local MaximizeButton = Create "ImageButton" { @@ -276,7 +276,7 @@ local BottomFrame = Create "Frame" { Position = UDim2.new(0, 0, 0.07, 0), Size = UDim2.new(1, 0, 0.03, 0), Parent = BottomShiftFrame, - MakeBackgroundGuiObj "https://banland.xyz/asset?id=94754966", + MakeBackgroundGuiObj "http://banland.xyz/asset?id=94754966", } local ExtendButton = Create "ImageButton" { Name = "bigbutton", @@ -291,7 +291,7 @@ local ExtendTab = Create "ImageButton" { Name = "extendTab", Active = true, BackgroundTransparency = 1, - Image = "https://banland.xyz/asset?id=94692731", + Image = "http://banland.xyz/asset?id=94692731", Position = UDim2.new(0.608, 0, 0.3, 0), Size = UDim2.new(0.3, 0, 0.7, 0), Parent = BottomFrame, @@ -443,7 +443,7 @@ local MiddleBGTemplate = Create "Frame" { BackgroundTransparency = 1, Position = UDim2.new(100, 0, 0.07, 0), Size = UDim2.new(0.5, 0, 0.025, 0), --UDim2.new(1, 0, .03, 0), - MakeBackgroundGuiObj "https://banland.xyz/asset?id=94692025", + MakeBackgroundGuiObj "http://banland.xyz/asset?id=94692025", } -- REPORT ABUSE OBJECTS @@ -474,7 +474,7 @@ local AbuseSettingsFrame = Create "Frame" { Size = UDim2.new(1, 0, 1, 0), Active = true, BackgroundTransparency = 1, - MakeBackgroundGuiObj "https://banland.xyz/asset?id=96488767", -- 96480351'), + MakeBackgroundGuiObj "http://banland.xyz/asset?id=96488767", -- 96480351'), Create "TextLabel" { Name = "Title", Text = "Report Abuse", @@ -553,7 +553,7 @@ local SubmitReportButton = Create "ImageButton" { Position = UDim2.new(0.5, -200, 1, -80), Size = UDim2.new(0, 150, 0, 50), AutoButtonColor = false, - Image = "https://banland.xyz/asset?id=96502438", -- 96501119', + Image = "http://banland.xyz/asset?id=96502438", -- 96501119', Parent = AbuseSettingsFrame, } @@ -563,7 +563,7 @@ local CancelReportButton = Create "ImageButton" { Position = UDim2.new(0.5, 50, 1, -80), Size = UDim2.new(0, 150, 0, 50), AutoButtonColor = true, - Image = "https://banland.xyz/asset?id=96500683", + Image = "http://banland.xyz/asset?id=96500683", Parent = AbuseSettingsFrame, } @@ -599,7 +599,7 @@ local CalmingAbuseBox = Create "Frame" { BackgroundTransparency = 1, Position = UDim2.new(0.25, 0, 0.300000012, 0), Size = UDim2.new(0.5, 0, 0.370000005, 0), - MakeBackgroundGuiObj "https://banland.xyz/asset?id=96506233", + MakeBackgroundGuiObj "http://banland.xyz/asset?id=96506233", Create "TextLabel" { Name = "Header", Position = UDim2.new(0, 10, 0.05, 0), @@ -632,7 +632,7 @@ local CalmingAbuseBox = Create "Frame" { Position = UDim2.new(0.5, -75, 1, -80), Size = UDim2.new(0, 150, 0, 50), AutoButtonColor = true, - Image = "https://banland.xyz/asset?id=96507959", + Image = "http://banland.xyz/asset?id=96507959", }, } local NormalAbuseBox = Create "Frame" { @@ -640,7 +640,7 @@ local NormalAbuseBox = Create "Frame" { BackgroundTransparency = 1, Position = UDim2.new(0.25, 0, 0.300000012, 0), Size = UDim2.new(0.5, 0, 0.370000005, 0), - MakeBackgroundGuiObj "https://banland.xyz/asset?id=96506233", + MakeBackgroundGuiObj "http://banland.xyz/asset?id=96506233", Create "TextLabel" { Name = "Header", Position = UDim2.new(0, 10, 0.05, 0), @@ -673,7 +673,7 @@ local NormalAbuseBox = Create "Frame" { Position = UDim2.new(0.5, -75, 1, -80), Size = UDim2.new(0, 150, 0, 50), AutoButtonColor = true, - Image = "https://banland.xyz/asset?id=96507959", + Image = "http://banland.xyz/asset?id=96507959", }, } @@ -693,7 +693,7 @@ local debugFrame = Create "Frame" { BackgroundTransparency = 1, Position = UDim2.new(0.25, 0, 0.300000012, 0), Size = UDim2.new(0.5, 0, 0.370000005, 0), - MakeBackgroundGuiObj "https://banland.xyz/asset?id=96506233", + MakeBackgroundGuiObj "http://banland.xyz/asset?id=96506233", } local debugOutput = Create "TextLabel" { BackgroundTransparency = 0.8, @@ -746,8 +746,9 @@ local RbxGui = assert(LoadLibrary "RbxGui") local DefaultEntriesOnScreen = 8 for _, i in pairs(Images) do - Game:GetService("ContentProvider") - :Preload(`https://banland.xyz/asset?id={i}`) + Game:GetService("ContentProvider"):Preload( + `http://banland.xyz/asset?id={i}` + ) end -- ordered array of 'score data', each entry has: @@ -1014,25 +1015,24 @@ local function HighlightMyRank( MemberButton, AdminButton ) - BanPlayerButton.Image = - `https://banland.xyz/asset?id={Images.LightPopupMid}` - VisitorButton.Image = `https://banland.xyz/asset?id={Images.DarkPopupMid}` - MemberButton.Image = `https://banland.xyz/asset?id={Images.LightPopupMid}` - AdminButton.Image = `https://banland.xyz/asset?id={Images.DarkPopupBottom}` + BanPlayerButton.Image = `http://banland.xyz/asset?id={Images.LightPopupMid}` + VisitorButton.Image = `http://banland.xyz/asset?id={Images.DarkPopupMid}` + MemberButton.Image = `http://banland.xyz/asset?id={Images.LightPopupMid}` + AdminButton.Image = `http://banland.xyz/asset?id={Images.DarkPopupBottom}` local rank = player.PersonalServerRank if rank <= PrivilegeLevel.Banned then BanPlayerButton.Image = - `https://banland.xyz/asset?id={Images.LightBluePopupMid}` + `http://banland.xyz/asset?id={Images.LightBluePopupMid}` elseif rank <= PrivilegeLevel.Visitor then VisitorButton.Image = - `https://banland.xyz/asset?id={Images.DarkBluePopupMid}` + `http://banland.xyz/asset?id={Images.DarkBluePopupMid}` elseif rank <= PrivilegeLevel.Member then MemberButton.Image = - `https://banland.xyz/asset?id={Images.LightBluePopupMid}` + `http://banland.xyz/asset?id={Images.LightBluePopupMid}` elseif rank <= PrivilegeLevel.Admin then AdminButton.Image = - `https://banland.xyz/asset?id={Images.DarkBluePopupBottom}` + `http://banland.xyz/asset?id={Images.DarkBluePopupBottom}` end end @@ -1071,7 +1071,7 @@ end local function CloseAbuseDialog() AbuseName = nil SubmitReportButton.Active = false - SubmitReportButton.Image = "https://banland.xyz/asset?id=96502438" -- 96501119', + SubmitReportButton.Image = "http://banland.xyz/asset?id=96502438" -- 96501119', AbuseDescriptionBox:Destroy() CalmingAbuseBox.Parent = nil NormalAbuseBox.Parent = nil @@ -1153,7 +1153,7 @@ local function InitReportAbuse() AbuseName = abuseText if AbuseName and SelectedPlayer then SubmitReportButton.Active = true - SubmitReportButton.Image = "https://banland.xyz/asset?id=96501119" + SubmitReportButton.Image = "http://banland.xyz/asset?id=96501119" end end @@ -1449,16 +1449,16 @@ local function UpdateMaximize() BASE_TWEEN * 1.2, true ) - HeaderFrame.Background.Image = "https://banland.xyz/asset?id=" + HeaderFrame.Background.Image = "http://banland.xyz/asset?id=" .. Images.LargeHeader - BottomFrame.Background.Image = "https://banland.xyz/asset?id=" + BottomFrame.Background.Image = "http://banland.xyz/asset?id=" .. Images.LargeBottom for index, i in ipairs(MiddleFrameBackgrounds) do if (index % 2) ~= 1 then - i.Background.Image = "https://banland.xyz/asset?id=" + i.Background.Image = "http://banland.xyz/asset?id=" .. Images.LargeDark else - i.Background.Image = "https://banland.xyz/asset?id=" + i.Background.Image = "http://banland.xyz/asset?id=" .. Images.LargeLight end end @@ -1519,16 +1519,16 @@ local function UpdateMaximize() BASE_TWEEN * 1.2, true ) - HeaderFrame.Background.Image = "https://banland.xyz/asset?id=" + HeaderFrame.Background.Image = "http://banland.xyz/asset?id=" .. Images.NormalHeader - BottomFrame.Background.Image = "https://banland.xyz/asset?id=" + BottomFrame.Background.Image = "http://banland.xyz/asset?id=" .. Images.NormalBottom for index, i in ipairs(MiddleFrameBackgrounds) do if index % 2 ~= 1 then - i.Background.Image = "https://banland.xyz/asset?id=" + i.Background.Image = "http://banland.xyz/asset?id=" .. Images.midDark else - i.Background.Image = "https://banland.xyz/asset?id=" + i.Background.Image = "http://banland.xyz/asset?id=" .. Images.midLight end end @@ -1997,7 +1997,7 @@ UpdateMinimize = function() true ) FocusFrame.Size = UDim2.new(1, 0, HeaderFrameHeight, 0) - ExtendTab.Image = "https://banland.xyz/asset?id=94692731" + ExtendTab.Image = "http://banland.xyz/asset?id=94692731" else if not IsMaximized.Value then MainFrame:TweenSizeAndPosition( @@ -2022,7 +2022,7 @@ UpdateMinimize = function() ) BottomFrame.Position = UDim2.new(0, 0, bottomPositon, 0) FocusFrame.Size = UDim2.new(1, 0, bottomPositon + HeaderFrameHeight, 0) - ExtendTab.Image = "https://banland.xyz/asset?id=94825585" + ExtendTab.Image = "http://banland.xyz/asset?id=94825585" end end @@ -2617,18 +2617,18 @@ local function AddMiddleBGFrame() UDim2.new(0.5, 0, (#MiddleFrameBackgrounds * nBGFrame.Size.Y.Scale), 0) if (#MiddleFrameBackgrounds + 1) % 2 ~= 1 then if IsMaximized.Value then - nBGFrame.Background.Image = "https://banland.xyz/asset?id=" + nBGFrame.Background.Image = "http://banland.xyz/asset?id=" .. Images.LargeDark else - nBGFrame.Background.Image = "https://banland.xyz/asset?id=" + nBGFrame.Background.Image = "http://banland.xyz/asset?id=" .. Images.midDark end else if IsMaximized.Value then - nBGFrame.Background.Image = "https://banland.xyz/asset?id=" + nBGFrame.Background.Image = "http://banland.xyz/asset?id=" .. Images.LargeLight else - nBGFrame.Background.Image = "https://banland.xyz/asset?id=" + nBGFrame.Background.Image = "http://banland.xyz/asset?id=" .. Images.midLight end end diff --git a/luau/48488398.luau b/luau/48488398.luau index 6dc42bd..3245ae4 100644 --- a/luau/48488398.luau +++ b/luau/48488398.luau @@ -46,7 +46,7 @@ function makeFriend(fromPlayer, toPlayer) popup.PopupText.Text = `Accept Friend Request from {fromPlayer.Name}?` popup.PopupImage.Image = - `https://banland.xyz/thumbs/avatar.ashx?userId={fromPlayer.userId}&x=352&y=352` + `http://banland.xyz/thumbs/avatar.ashx?userId={fromPlayer.userId}&x=352&y=352` showTwoButtons() popup.Visible = true @@ -114,7 +114,7 @@ game.Players.FriendRequestEvent:connect(function(fromPlayer, toPlayer, event) game:GetService("GuiService"):SendNotification( "You are Friends", `With {toPlayer.Name}!`, - `https://banland.xyz/thumbs/avatar.ashx?userId={toPlayer.userId}&x=48&y=48`, + `http://banland.xyz/thumbs/avatar.ashx?userId={toPlayer.userId}&x=48&y=48`, 5, function() end ) @@ -127,7 +127,7 @@ game.Players.FriendRequestEvent:connect(function(fromPlayer, toPlayer, event) game:GetService("GuiService"):SendNotification( "Friend Request", `From {fromPlayer.Name}`, - `https://banland.xyz/thumbs/avatar.ashx?userId={fromPlayer.userId}&x=48&y=48`, + `http://banland.xyz/thumbs/avatar.ashx?userId={fromPlayer.userId}&x=48&y=48`, 8, function() makeFriend(fromPlayer, toPlayer) @@ -137,7 +137,7 @@ game.Players.FriendRequestEvent:connect(function(fromPlayer, toPlayer, event) game:GetService("GuiService"):SendNotification( "You are Friends", `With {fromPlayer.Name}!`, - `https://banland.xyz/thumbs/avatar.ashx?userId={fromPlayer.userId}&x=48&y=48`, + `http://banland.xyz/thumbs/avatar.ashx?userId={fromPlayer.userId}&x=48&y=48`, 5, function() end ) diff --git a/luau/48488451.luau b/luau/48488451.luau index f5d4a2e..f97f1fa 100644 --- a/luau/48488451.luau +++ b/luau/48488451.luau @@ -55,7 +55,7 @@ popupImage.Parent = popupFrame local backing = Instance.new "ImageLabel" backing.BackgroundTransparency = 1 backing.Size = UDim2.new(1, 0, 1, 0) -backing.Image = "https://banland.xyz/asset/?id=47574181" +backing.Image = "http://banland.xyz/asset/?id=47574181" backing.Name = "Backing" backing.ZIndex = 2 backing.Parent = popupImage diff --git a/luau/53878047.luau b/luau/53878047.luau index b45dfb9..b4dbaf2 100644 --- a/luau/53878047.luau +++ b/luau/53878047.luau @@ -4,10 +4,6 @@ print "[Mercury]: Loaded corescript 53878047" -- This script creates almost all gui elements found in the backpack (warning: there are a lot!) -- TODO: automate this process -if game.CoreGui.Version < 3 then - return -end -- peace out if we aren't using the right client - local ContentProvider = game:GetService "ContentProvider" local UserInputService = game:GetService "UserInputService" @@ -55,7 +51,7 @@ CurrentLoadout.Parent = gui local CLBackground = Instance.new "ImageLabel" CLBackground.Name = "Background" CLBackground.Size = UDim2.new(1.2, 0, 1.2, 0) -CLBackground.Image = "https://banland.xyz/asset/?id=96536002" +CLBackground.Image = "http://banland.xyz/asset/?id=96536002" CLBackground.BackgroundTransparency = 1 CLBackground.Position = UDim2.new(-0.1, 0, -0.1, 0) CLBackground.ZIndex = 0.0 @@ -65,7 +61,7 @@ CLBackground.Visible = false local BackgroundUp = Instance.new "ImageLabel" BackgroundUp.Size = UDim2.new(1, 0, 0.025, 1) BackgroundUp.Position = UDim2.new(0, 0, 0, 0) -BackgroundUp.Image = "https://banland.xyz/asset/?id=97662207" +BackgroundUp.Image = "http://banland.xyz/asset/?id=97662207" BackgroundUp.BackgroundTransparency = 1 BackgroundUp.Parent = CLBackground @@ -79,7 +75,7 @@ BackpackButton.RobloxLocked = true BackpackButton.Visible = false BackpackButton.Name = "BackpackButton" BackpackButton.BackgroundTransparency = 1 -BackpackButton.Image = "https://banland.xyz/asset/?id=97617958" +BackpackButton.Image = "http://banland.xyz/asset/?id=97617958" BackpackButton.Position = UDim2.new(0.5, -60, 1, -108) BackpackButton.Size = UDim2.new(0, 120, 0, 18) waitForChild(gui, "ControlFrame") @@ -138,14 +134,14 @@ TempSlot.ZIndex = 3.0 local slotBackground = Instance.new "ImageLabel" slotBackground.Name = "Background" slotBackground.BackgroundTransparency = 1 -slotBackground.Image = "https://banland.xyz/asset/?id=97613075" +slotBackground.Image = "http://banland.xyz/asset/?id=97613075" slotBackground.Size = UDim2.new(1, 0, 1, 0) slotBackground.Parent = TempSlot local HighLight = Instance.new "ImageLabel" HighLight.Name = "Highlight" HighLight.BackgroundTransparency = 1 -HighLight.Image = "https://banland.xyz/asset/?id=97643886" +HighLight.Image = "http://banland.xyz/asset/?id=97643886" HighLight.Size = UDim2.new(1, 0, 1, 0) --HighLight.Parent = TempSlot HighLight.Visible = false @@ -304,24 +300,6 @@ InventoryButton.Active = true InventoryButton.ZIndex = 3 InventoryButton.Parent = Tabs --- if game.CoreGui.Version >= 8 then --- local WardrobeButton = Instance.new "TextButton" --- WardrobeButton.RobloxLocked = true --- WardrobeButton.Name = "WardrobeButton" --- WardrobeButton.Size = UDim2.new(0, 90, 0, 30) --- WardrobeButton.Position = UDim2.new(0, 77, 1, -31) --- WardrobeButton.BackgroundColor3 = Color3.new(0, 0, 0) --- WardrobeButton.BorderColor3 = Color3.new(1, 1, 1) --- WardrobeButton.Font = Enum.Font.ArialBold --- WardrobeButton.FontSize = Enum.FontSize.Size18 --- WardrobeButton.Text = "Wardrobe" --- WardrobeButton.AutoButtonColor = false --- WardrobeButton.TextColor3 = Color3.new(1, 1, 1) --- WardrobeButton.Selected = false --- WardrobeButton.Active = true --- WardrobeButton.Parent = Tabs --- end - local closeButton = Instance.new "TextButton" closeButton.RobloxLocked = true closeButton.Name = "CloseButton" @@ -339,8 +317,8 @@ closeButton.Modal = true local XImage = Instance.new "ImageLabel" XImage.RobloxLocked = true XImage.Name = "XImage" -ContentProvider:Preload "https://banland.xyz/asset/?id=75547445" -XImage.Image = "https://banland.xyz/asset/?id=75547445" --TODO: move to rbxasset +ContentProvider:Preload "http://banland.xyz/asset/?id=75547445" +XImage.Image = "http://banland.xyz/asset/?id=75547445" --TODO: move to rbxasset XImage.BackgroundTransparency = 1 XImage.Position = UDim2.new(-0.25, -1, -0.25, -1) XImage.Size = UDim2.new(1.5, 2, 1.5, 2) @@ -442,7 +420,7 @@ GearButton.Parent = GearGrid slotBackground = Instance.new "ImageLabel" slotBackground.Name = "Background" slotBackground.BackgroundTransparency = 1 -slotBackground.Image = "https://banland.xyz/asset/?id=97613075" +slotBackground.Image = "http://banland.xyz/asset/?id=97613075" slotBackground.Size = UDim2.new(1, 0, 1, 0) slotBackground.Parent = GearButton @@ -618,426 +596,4 @@ AttributeThreeImage.BackgroundColor3 = Color3.new(0, 0.5, 0.5) AttributeThreeImage.Position = UDim2.new(0.75, 0, 0, 0) AttributeThreeImage.Parent = GearIcons -------------------------------- WARDROBE ------------------------------------------------------- -if game.CoreGui.Version < 8 then - -- no need for this to stick around, we aren't ready for wardrobe - script:remove() - return -end - -local function makeCharFrame(frameName, parent) - local frame = Instance.new "Frame" - frame.RobloxLocked = true - frame.Size = UDim2.new(1, 0, 1, -70) - frame.Position = UDim2.new(0, 0, 0, 20) - frame.Name = frameName - frame.BackgroundTransparency = 1 - frame.Parent = parent - frame.Visible = false - return frame -end -local function makeZone(zoneName, image, size, position, parent) - local zone = Instance.new "ImageLabel" - zone.RobloxLocked = true - zone.Name = zoneName - zone.Image = image - zone.Size = size - zone.BackgroundTransparency = 1 - zone.Position = position - zone.Parent = parent - return zone -end -local function makeStyledButton(buttonName, size, position, parent, buttonStyle) - local button = Instance.new "ImageButton" - button.RobloxLocked = true - button.Name = buttonName - button.Size = size - button.Position = position - if buttonStyle then - button.Style = buttonStyle - else - button.BackgroundColor3 = Color3.new(0, 0, 0) - button.BorderColor3 = Color3.new(1, 1, 1) - end - button.Parent = parent - return button -end -local function makeTextLabel(TextLabelName, text, position, parent) - local label = Instance.new "TextLabel" - label.RobloxLocked = true - label.BackgroundTransparency = 1 - label.Size = UDim2.new(0, 32, 0, 14) - label.Name = TextLabelName - label.Font = Enum.Font.Arial - label.TextColor3 = Color3.new(1, 1, 1) - label.FontSize = Enum.FontSize.Size14 - label.Text = text - label.Position = position - label.Parent = parent -end - -local Wardrobe = Instance.new "Frame" -Wardrobe.Name = "Wardrobe" -Wardrobe.RobloxLocked = true -Wardrobe.BackgroundTransparency = 1 -Wardrobe.Visible = false -Wardrobe.Size = UDim2.new(1, 0, 1, 0) -Wardrobe.Parent = Backpack - -local AssetList = Instance.new "Frame" -AssetList.RobloxLocked = true -AssetList.Name = "AssetList" -AssetList.Position = UDim2.new(0, 4, 0, 5) -AssetList.Size = UDim2.new(0, 85, 1, -5) -AssetList.BackgroundTransparency = 1 -AssetList.Visible = true -AssetList.Parent = Wardrobe - -local PreviewAssetFrame = Instance.new "Frame" -PreviewAssetFrame.RobloxLocked = true -PreviewAssetFrame.Name = "PreviewAssetFrame" -PreviewAssetFrame.BackgroundTransparency = 1 -PreviewAssetFrame.Position = UDim2.new(1, -240, 0, 30) -PreviewAssetFrame.Size = UDim2.new(0, 250, 0, 250) -PreviewAssetFrame.Parent = Wardrobe - -local PreviewAssetBacking = Instance.new "TextButton" -PreviewAssetBacking.RobloxLocked = true -PreviewAssetBacking.Name = "PreviewAssetBacking" -PreviewAssetBacking.Active = false -PreviewAssetBacking.Text = "" -PreviewAssetBacking.AutoButtonColor = false -PreviewAssetBacking.Size = UDim2.new(1, 0, 1, 0) -PreviewAssetBacking.Style = Enum.ButtonStyle.RobloxButton -PreviewAssetBacking.Visible = false -PreviewAssetBacking.ZIndex = 9 -PreviewAssetBacking.Parent = PreviewAssetFrame - -local PreviewAssetImage = Instance.new "ImageLabel" -PreviewAssetImage.RobloxLocked = true -PreviewAssetImage.Name = "PreviewAssetImage" -PreviewAssetImage.BackgroundTransparency = 0.8 -PreviewAssetImage.Position = UDim2.new(0.5, -100, 0, 0) -PreviewAssetImage.Size = UDim2.new(0, 200, 0, 200) -PreviewAssetImage.BorderSizePixel = 0 -PreviewAssetImage.ZIndex = 10 -PreviewAssetImage.Parent = PreviewAssetBacking - -local AssetNameLabel = Instance.new "TextLabel" -AssetNameLabel.Name = "AssetNameLabel" -AssetNameLabel.RobloxLocked = true -AssetNameLabel.BackgroundTransparency = 1 -AssetNameLabel.Position = UDim2.new(0, 0, 1, -20) -AssetNameLabel.Size = UDim2.new(0.5, 0, 0, 24) -AssetNameLabel.ZIndex = 10 -AssetNameLabel.Font = Enum.Font.Arial -AssetNameLabel.Text = "" -AssetNameLabel.TextColor3 = Color3.new(1, 1, 1) -AssetNameLabel.TextScaled = true -AssetNameLabel.Parent = PreviewAssetBacking - -local AssetTypeLabel = AssetNameLabel:clone() -AssetTypeLabel.RobloxLocked = true -AssetTypeLabel.Name = "AssetTypeLabel" -AssetTypeLabel.TextScaled = false -AssetTypeLabel.FontSize = Enum.FontSize.Size18 -AssetTypeLabel.Position = UDim2.new(0.5, 3, 1, -20) -AssetTypeLabel.Parent = PreviewAssetBacking - -local PreviewButton = Instance.new "TextButton" -PreviewButton.RobloxLocked = true -PreviewButton.Name = "PreviewButton" -PreviewButton.Text = "Rotate" -PreviewButton.BackgroundColor3 = Color3.new(0, 0, 0) -PreviewButton.BackgroundTransparency = 0.5 -PreviewButton.BorderColor3 = Color3.new(1, 1, 1) -PreviewButton.Position = UDim2.new(1.2, -62, 1, -50) -PreviewButton.Size = UDim2.new(0, 125, 0, 50) -PreviewButton.Font = Enum.Font.ArialBold -PreviewButton.FontSize = Enum.FontSize.Size24 -PreviewButton.TextColor3 = Color3.new(1, 1, 1) -PreviewButton.TextWrapped = true -PreviewButton.TextStrokeTransparency = 0 -PreviewButton.Parent = Wardrobe - -local CharacterPane = Instance.new "Frame" -CharacterPane.RobloxLocked = true -CharacterPane.Name = "CharacterPane" -CharacterPane.Position = UDim2.new(1, -220, 0, 32) -CharacterPane.Size = UDim2.new(0, 220, 1, -40) -CharacterPane.BackgroundTransparency = 1 -CharacterPane.Visible = true -CharacterPane.Parent = Wardrobe - ---CharacterPane Children -local FaceFrame = makeCharFrame("FacesFrame", CharacterPane) -ContentProvider:Preload "https://banland.xyz/asset/?id=75460621" -makeZone( - "FaceZone", - "https://banland.xyz/asset/?id=75460621", - UDim2.new(0, 157, 0, 137), - UDim2.new(0.5, -78, 0.5, -68), - FaceFrame -) -makeStyledButton( - "Face", - UDim2.new(0, 64, 0, 64), - UDim2.new(0.5, -32, 0.5, -135), - FaceFrame -) - -local HeadFrame = makeCharFrame("HeadsFrame", CharacterPane) -makeZone( - "FaceZone", - "https://banland.xyz/asset/?id=75460621", - UDim2.new(0, 157, 0, 137), - UDim2.new(0.5, -78, 0.5, -68), - HeadFrame -) -makeStyledButton( - "Head", - UDim2.new(0, 64, 0, 64), - UDim2.new(0.5, -32, 0.5, -135), - HeadFrame -) - -local HatsFrame = makeCharFrame("HatsFrame", CharacterPane) -ContentProvider:Preload "https://banland.xyz/asset/?id=75457888" -local HatsZone = makeZone( - "HatsZone", - "https://banland.xyz/asset/?id=75457888", - UDim2.new(0, 186, 0, 184), - UDim2.new(0.5, -93, 0.5, -100), - HatsFrame -) -makeStyledButton( - "Hat1Button", - UDim2.new(0, 64, 0, 64), - UDim2.new(0, -1, 0, -1), - HatsZone, - Enum.ButtonStyle.RobloxButton -) -makeStyledButton( - "Hat2Button", - UDim2.new(0, 64, 0, 64), - UDim2.new(0, 63, 0, -1), - HatsZone, - Enum.ButtonStyle.RobloxButton -) -makeStyledButton( - "Hat3Button", - UDim2.new(0, 64, 0, 64), - UDim2.new(0, 127, 0, -1), - HatsZone, - Enum.ButtonStyle.RobloxButton -) - -local PantsFrame = makeCharFrame("PantsFrame", CharacterPane) -ContentProvider:Preload "https://banland.xyz/asset/?id=75457920" -makeZone( - "PantsZone", - "https://banland.xyz/asset/?id=75457920", - UDim2.new(0, 121, 0, 99), - UDim2.new(0.5, -60, 0.5, -100), - PantsFrame -) - -local pantFrame = Instance.new "Frame" -pantFrame.RobloxLocked = true -pantFrame.Size = UDim2.new(0, 25, 0, 56) -pantFrame.Position = UDim2.new(0.5, -26, 0.5, 0) -pantFrame.BackgroundColor3 = Color3.new(0, 0, 0) -pantFrame.BorderColor3 = Color3.new(1, 1, 1) -pantFrame.Name = "PantFrame" -pantFrame.Parent = PantsFrame - -local otherPantFrame = pantFrame:clone() -otherPantFrame.Position = UDim2.new(0.5, 3, 0.5, 0) -otherPantFrame.RobloxLocked = true -otherPantFrame.Parent = PantsFrame - -local CurrentPants = Instance.new "ImageButton" -CurrentPants.RobloxLocked = true -CurrentPants.BackgroundTransparency = 1 -CurrentPants.ZIndex = 2 -CurrentPants.Name = "CurrentPants" -CurrentPants.Position = UDim2.new(0.5, -31, 0.5, -4) -CurrentPants.Size = UDim2.new(0, 54, 0, 59) -CurrentPants.Parent = PantsFrame - -local MeshFrame = makeCharFrame("PackagesFrame", CharacterPane) -local torsoButton = makeStyledButton( - "TorsoMeshButton", - UDim2.new(0, 64, 0, 64), - UDim2.new(0.5, -32, 0.5, -110), - MeshFrame, - Enum.ButtonStyle.RobloxButton -) -makeTextLabel("TorsoLabel", "Torso", UDim2.new(0.5, -16, 0, -25), torsoButton) -local leftLegButton = makeStyledButton( - "LeftLegMeshButton", - UDim2.new(0, 64, 0, 64), - UDim2.new(0.5, 0, 0.5, -25), - MeshFrame, - Enum.ButtonStyle.RobloxButton -) -makeTextLabel( - "LeftLegLabel", - "Left Leg", - UDim2.new(0.5, -16, 0, -25), - leftLegButton -) -local rightLegButton = makeStyledButton( - "RightLegMeshButton", - UDim2.new(0, 64, 0, 64), - UDim2.new(0.5, -64, 0.5, -25), - MeshFrame, - Enum.ButtonStyle.RobloxButton -) -makeTextLabel( - "RightLegLabel", - "Right Leg", - UDim2.new(0.5, -16, 0, -25), - rightLegButton -) -local rightArmButton = makeStyledButton( - "RightArmMeshButton", - UDim2.new(0, 64, 0, 64), - UDim2.new(0.5, -96, 0.5, -110), - MeshFrame, - Enum.ButtonStyle.RobloxButton -) -makeTextLabel( - "RightArmLabel", - "Right Arm", - UDim2.new(0.5, -16, 0, -25), - rightArmButton -) -local leftArmButton = makeStyledButton( - "LeftArmMeshButton", - UDim2.new(0, 64, 0, 64), - UDim2.new(0.5, 32, 0.5, -110), - MeshFrame, - Enum.ButtonStyle.RobloxButton -) -makeTextLabel( - "LeftArmLabel", - "Left Arm", - UDim2.new(0.5, -16, 0, -25), - leftArmButton -) - -local TShirtFrame = makeCharFrame("T-ShirtsFrame", CharacterPane) -ContentProvider:Preload "https://banland.xyz/asset/?id=75460642" -makeZone( - "TShirtZone", - "https://banland.xyz/asset/?id=75460642", - UDim2.new(0, 121, 0, 154), - UDim2.new(0.5, -60, 0.5, -100), - TShirtFrame -) -makeStyledButton( - "TShirtButton", - UDim2.new(0, 64, 0, 64), - UDim2.new(0.5, -32, 0.5, -64), - TShirtFrame -) - -local ShirtFrame = makeCharFrame("ShirtsFrame", CharacterPane) -makeZone( - "ShirtZone", - "https://banland.xyz/asset/?id=75460642", - UDim2.new(0, 121, 0, 154), - UDim2.new(0.5, -60, 0.5, -100), - ShirtFrame -) -makeStyledButton( - "ShirtButton", - UDim2.new(0, 64, 0, 64), - UDim2.new(0.5, -32, 0.5, -64), - ShirtFrame -) - -local ColorFrame = makeCharFrame("ColorFrame", CharacterPane) -ContentProvider:Preload "https://banland.xyz/asset/?id=76049888" -local ColorZone = makeZone( - "ColorZone", - "https://banland.xyz/asset/?id=76049888", - UDim2.new(0, 120, 0, 150), - UDim2.new(0.5, -60, 0.5, -100), - ColorFrame -) -makeStyledButton( - "Head", - UDim2.new(0.26, 0, 0.19, 0), - UDim2.new(0.37, 0, 0.02, 0), - ColorZone -).AutoButtonColor = - false -makeStyledButton( - "LeftArm", - UDim2.new(0.19, 0, 0.36, 0), - UDim2.new(0.78, 0, 0.26, 0), - ColorZone -).AutoButtonColor = - false -makeStyledButton( - "RightArm", - UDim2.new(0.19, 0, 0.36, 0), - UDim2.new(0.025, 0, 0.26, 0), - ColorZone -).AutoButtonColor = - false -makeStyledButton( - "Torso", - UDim2.new(0.43, 0, 0.36, 0), - UDim2.new(0.28, 0, 0.26, 0), - ColorZone -).AutoButtonColor = - false -makeStyledButton( - "RightLeg", - UDim2.new(0.19, 0, 0.31, 0), - UDim2.new(0.275, 0, 0.67, 0), - ColorZone -).AutoButtonColor = - false -makeStyledButton( - "LeftLeg", - UDim2.new(0.19, 0, 0.31, 0), - UDim2.new(0.525, 0, 0.67, 0), - ColorZone -).AutoButtonColor = - false - --- Character Panel label (shows what category we are currently browsing) -local CategoryLabel = Instance.new "TextLabel" -CategoryLabel.RobloxLocked = true -CategoryLabel.Name = "CategoryLabel" -CategoryLabel.BackgroundTransparency = 1 -CategoryLabel.Font = Enum.Font.ArialBold -CategoryLabel.FontSize = Enum.FontSize.Size18 -CategoryLabel.Position = UDim2.new(0, 0, 0, -7) -CategoryLabel.Size = UDim2.new(1, 0, 0, 20) -CategoryLabel.TextXAlignment = Enum.TextXAlignment.Center -CategoryLabel.Text = "All" -CategoryLabel.TextColor3 = Color3.new(1, 1, 1) -CategoryLabel.Parent = CharacterPane - ---Save Button -local SaveButton = Instance.new "TextButton" -SaveButton.RobloxLocked = true -SaveButton.Name = "SaveButton" -SaveButton.Size = UDim2.new(0.6, 0, 0, 50) -SaveButton.Position = UDim2.new(0.2, 0, 1, -50) -SaveButton.Style = Enum.ButtonStyle.RobloxButton -SaveButton.Selected = false -SaveButton.Font = Enum.Font.ArialBold -SaveButton.FontSize = Enum.FontSize.Size18 -SaveButton.Text = "Save" -SaveButton.TextColor3 = Color3.new(1, 1, 1) -SaveButton.Parent = CharacterPane - --- no need for this to stick around - -script:Destroy() +-- wardrobe is gone lmao diff --git a/luau/53878057.luau b/luau/53878057.luau index 398b0e2..b5ff238 100644 --- a/luau/53878057.luau +++ b/luau/53878057.luau @@ -1,10 +1,6 @@ -- CoreGui.RobloxGui.CurrentLoadout.CoreScripts/BackpackScript print "[Mercury]: Loaded corescript 53878057" -if game.CoreGui.Version < 3 then - return -end -- peace out if we aren't using the right client - -- A couple of necessary functions local function waitForChild(instance, name) while not instance:FindFirstChild(name) do diff --git a/luau/73157242.luau b/luau/73157242.luau index 3c3c913..e9b54da 100644 --- a/luau/73157242.luau +++ b/luau/73157242.luau @@ -853,7 +853,7 @@ RbxStamper.GetStampModel = function(assetId, terrainShape, useAssetVersionId) local inverseCornerWedgeMesh = Instance.new "SpecialMesh" inverseCornerWedgeMesh.MeshType = "FileMesh" inverseCornerWedgeMesh.MeshId = - "https://banland.xyz/asset?id=66832495" + "http://banland.xyz/asset?id=66832495" inverseCornerWedgeMesh.Scale = Vector3.new(2, 2, 2) inverseCornerWedgeMesh.Parent = newTerrainPiece end diff --git a/luau/89449093.luau b/luau/89449093.luau index 3b57179..5d2187b 100644 --- a/luau/89449093.luau +++ b/luau/89449093.luau @@ -1,11 +1,6 @@ -- CoreGui.RobloxGui.Backpack.CoreScripts/BackpackScripts/Back (2?) print "[Mercury]: Loaded corescript 89449093" --- This script manages context switches in the backpack (Gear to Wardrobe, etc.) and player state changes. Also manages global functions across different tabs (currently only search) -if game.CoreGui.Version < 7 then - return -end -- peace out if we aren't using the right client - local GuiService = game:GetService "GuiService" -- basic functions @@ -45,10 +40,6 @@ waitForChild(backpack.Tabs, "InventoryButton") local inventoryButton = backpack.Tabs.InventoryButton local wardrobeButton --- if game.CoreGui.Version >= 8 then --- waitForChild(backpack.Tabs, "WardrobeButton") --- wardrobeButton = backpack.Tabs.WardrobeButton --- end waitForChild(backpack.Parent, "ControlFrame") local backpackButton = waitForChild(backpack.Parent.ControlFrame, "BackpackButton") @@ -215,7 +206,7 @@ function showBackpack() backpackOpenEvent:Fire(currentTab) canToggle = true readyForNextEvent = true - backpackButton.Image = "https://banland.xyz/asset/?id=97644093" + backpackButton.Image = "http://banland.xyz/asset/?id=97644093" backpackButton.Position = UDim2.new(0.5, -60, 1, -backpackSize.Y.Offset - 103) end) @@ -240,7 +231,7 @@ function toggleBackpack() backpackIsOpen = not backpackIsOpen if backpackIsOpen then - loadoutBackground.Image = "https://banland.xyz/asset/?id=97623721" + loadoutBackground.Image = "http://banland.xyz/asset/?id=97623721" loadoutBackground.Position = UDim2.new(-0.03, 0, -0.17, 0) loadoutBackground.Size = UDim2.new(1.05, 0, 1.25, 0) loadoutBackground.ZIndex = 2.0 @@ -250,8 +241,8 @@ function toggleBackpack() backpackButton.Position = UDim2.new(0.5, -60, 1, -44) loadoutBackground.Visible = false backpackButton.Selected = false - backpackButton.Image = "https://banland.xyz/asset/?id=97617958" - loadoutBackground.Image = "https://banland.xyz/asset/?id=96536002" + backpackButton.Image = "http://banland.xyz/asset/?id=97617958" + loadoutBackground.Image = "http://banland.xyz/asset/?id=96536002" loadoutBackground.Position = UDim2.new(-0.1, 0, -0.1, 0) loadoutBackground.Size = UDim2.new(1.2, 0, 1.2, 0) hideBackpack() @@ -443,18 +434,6 @@ inventoryButton.MouseLeave:connect(function() mouseLeaveTab(inventoryButton) end) --- if game.CoreGui.Version >= 8 then --- wardrobeButton.MouseButton1Click:connect(function() --- newTabClicked "wardrobe" --- end) --- wardrobeButton.MouseEnter:connect(function() --- mouseOverTab(wardrobeButton) --- end) --- wardrobeButton.MouseLeave:connect(function() --- mouseLeaveTab(wardrobeButton) --- end) --- end - closeButton.MouseButton1Click:connect(closeBackpack) screen.Changed:connect(function(prop) diff --git a/luau/97188756.luau b/luau/97188756.luau index f45ffda..6675f76 100644 --- a/luau/97188756.luau +++ b/luau/97188756.luau @@ -1415,7 +1415,7 @@ function Chat:CreateSafeChatGui() Size = UDim2.new(0, 44, 0, 31), Position = UDim2.new(0, 1, 0.35, 0), BackgroundTransparency = 1, - Image = "https://banland.xyz/asset/?id=97080365", + Image = "http://banland.xyz/asset/?id=97080365", }, } @@ -1462,7 +1462,7 @@ function Chat:CreateTouchButton() Size = UDim2.new(1, 0, 1, 0), Position = UDim2.new(0, 0, 0, 0), BackgroundTransparency = 1, - Image = "https://banland.xyz/asset/?id=97078724", + Image = "http://banland.xyz/asset/?id=97078724", }, } self.TapToChatLabel = self.ChatTouchFrame.ChatLabel @@ -1567,7 +1567,7 @@ function Chat:CreateGui() Gui.Create "ImageLabel" { Name = "Background", - Image = "https://banland.xyz/asset/?id=97120937", --96551212'; + Image = "http://banland.xyz/asset/?id=97120937", --96551212'; Size = UDim2.new(1.3, 0, 1.64, 0), Position = UDim2.new(0, 0, 0, 0), BackgroundTransparency = 1, diff --git a/luau/host.luau b/luau/host.luau index f507404..31f649f 100644 --- a/luau/host.luau +++ b/luau/host.luau @@ -1,10 +1,8 @@ print "[Mercury]: Loaded Host corescript" -- Start Game Script Arguments -local placeId, sleeptime, access, url, killID, deathID, timeout, injectScriptAssetID, servicesUrl, libraryRegistrationScriptAssetID local InsertService = game:GetService "InsertService" local BadgeService = game:GetService "BadgeService" -local FriendService = game:GetService "FriendService" local ScriptContext = game:GetService "ScriptContext" local RunService = game:GetService "RunService" local ScriptInformationProvider = game:GetService "ScriptInformationProvider" @@ -17,9 +15,9 @@ local Visit = game:GetService "Visit" local NetworkServer = game:GetService "NetworkServer" -- StartGame -- -pcall(function() - ScriptContext:AddStarterScript(injectScriptAssetID) -end) +-- pcall(function() +-- ScriptContext:AddStarterScript(injectScriptAssetID) +-- end) RunService:Run() -- REQUIRES: StartGanmeSharedArgs.txt @@ -27,7 +25,7 @@ RunService:Run() ------------------- UTILITY FUNCTIONS -------------------------- -function waitForChild(parent, childName) +local function waitForChild(parent, childName) while true do local child = parent:findFirstChild(childName) if child then @@ -39,7 +37,7 @@ end -- returns the player object that killed this humanoid -- returns nil if the killer is no longer in the game -function getKillerOfHumanoidIfStillInGame(humanoid) +local function getKillerOfHumanoidIfStillInGame(humanoid) -- check for kill tag on humanoid - may be more than one - todo: deal with this local tag = humanoid:findFirstChild "creator" @@ -55,16 +53,16 @@ function getKillerOfHumanoidIfStillInGame(humanoid) end -- send kill and death stats when a player dies -function onDied(victim, humanoid) +local function onDied(victim, humanoid) local killer = getKillerOfHumanoidIfStillInGame(humanoid) local victorId = 0 if killer then victorId = killer.userId print(`STAT: kill by {victorId} of {victim.userId}`) - game:HttpGet(`{url}/Game/Knockouts.ashx?UserID={victorId}&{access}`) + game:HttpGet(`{url}/Game/Knockouts.ashx?UserID={victorId}`) end print(`STAT: death of {victim.userId} by {victorId}`) - game:HttpGet(`{url}/Game/Wipeouts.ashx?UserID={victim.userId}&{access}`) + game:HttpGet(`{url}/Game/Wipeouts.ashx?UserID={victim.userId}`) end -----------------------------------END UTILITY FUNCTIONS ------------------------- @@ -93,11 +91,11 @@ end) -----------------------------------START GAME SHARED SCRIPT------------------------------ -url = "_BASE_URL" +local url = "_BASE_URL" -pcall(function() - ScriptContext:AddStarterScript(libraryRegistrationScriptAssetID) -end) +-- pcall(function() +-- ScriptContext:AddStarterScript(libraryRegistrationScriptAssetID) +-- end) ScriptContext.ScriptsDisabled = true -- game:SetPlaceID(nil, false) @@ -120,27 +118,27 @@ if url ~= nil then -- end) -- BadgeService:SetPlaceId(placeId) - if access ~= nil then - BadgeService:SetAwardBadgeUrl( - `{url}/Game/Badge/AwardBadge.ashx?UserID=%d&BadgeID=%d&PlaceID=%d&{access}` - ) - BadgeService:SetHasBadgeUrl( - `{url}/Game/Badge/HasBadge.ashx?UserID=%d&BadgeID=%d&{access}` - ) - BadgeService:SetIsBadgeDisabledUrl( - `{url}/Game/Badge/IsBadgeDisabled.ashx?BadgeID=%d&PlaceID=%d&{access}` - ) + -- if access ~= nil then + -- BadgeService:SetAwardBadgeUrl( + -- `{url}/Game/Badge/AwardBadge.ashx?UserID=%d&BadgeID=%d&PlaceID=%d&{access}` + -- ) + -- BadgeService:SetHasBadgeUrl( + -- `{url}/Game/Badge/HasBadge.ashx?UserID=%d&BadgeID=%d&{access}` + -- ) + -- BadgeService:SetIsBadgeDisabledUrl( + -- `{url}/Game/Badge/IsBadgeDisabled.ashx?BadgeID=%d&PlaceID=%d&{access}` + -- ) - FriendService:SetMakeFriendUrl( - `{servicesUrl}/Friend/CreateFriend?firstUserId=%d&secondUserId=%d&{access}` - ) - FriendService:SetBreakFriendUrl( - `{servicesUrl}/Friend/BreakFriend?firstUserId=%d&secondUserId=%d&{access}` - ) - FriendService:SetGetFriendsUrl( - `{servicesUrl}/Friend/AreFriends?userId={access}` - ) - end + -- FriendService:SetMakeFriendUrl( + -- `{servicesUrl}/Friend/CreateFriend?firstUserId=%d&secondUserId=%d&{access}` + -- ) + -- FriendService:SetBreakFriendUrl( + -- `{servicesUrl}/Friend/BreakFriend?firstUserId=%d&secondUserId=%d&{access}` + -- ) + -- FriendService:SetGetFriendsUrl( + -- `{servicesUrl}/Friend/AreFriends?userId={access}` + -- ) + -- end BadgeService:SetIsBadgeLegalUrl "" InsertService:SetBaseSetsUrl( `{url}/Game/Tools/InsertAsset.ashx?nsets=10&type=base` @@ -152,17 +150,17 @@ if url ~= nil then InsertService:SetAssetUrl(`{url}/asset?id=%d`) InsertService:SetAssetVersionUrl(`{url}/Asset/?assetversionid=%d`) - pcall(function() - loadfile(`{url}/Game/LoadPlaceInfo.ashx?PlaceId={placeId}`)() - end) + -- pcall(function() + -- loadfile(`{url}/Game/LoadPlaceInfo.ashx?PlaceId={placeId}`)() + -- end) - pcall(function() - if access then - loadfile( - `{url}/Game/PlaceSpecificScript.ashx?PlaceId={placeId}&{access}` - )() - end - end) + -- pcall(function() + -- if access then + -- loadfile( + -- `{url}/Game/PlaceSpecificScript.ashx?PlaceId={placeId}&{access}` + -- )() + -- end + -- end) end pcall(function() @@ -196,33 +194,33 @@ end Players.PlayerAdded:connect(function(player) print(`Player {player.userId} added`) - if url and access and placeId and player and player.userId then - game:HttpGet( - `{url}/Game/ClientPresence.ashx?action=connect&{access}&PlaceID={placeId}&UserID={player.userId}` - ) - game:HttpGet( - `{url}/Game/PlaceVisit.ashx?UserID={player.userId}&AssociatedPlaceID={placeId}&{access}` - ) - end + -- if url and access and placeId and player and player.userId then + -- game:HttpGet( + -- `{url}/Game/ClientPresence.ashx?action=connect&{access}&PlaceID={placeId}&UserID={player.userId}` + -- ) + -- game:HttpGet( + -- `{url}/Game/PlaceVisit.ashx?UserID={player.userId}&AssociatedPlaceID={placeId}&{access}` + -- ) + -- end end) Players.PlayerRemoving:connect(function(player) print(`Player {player.userId} leaving`) - if url and access and placeId and player and player.userId then - game:HttpGet( - `{url}/Game/ClientPresence.ashx?action=disconnect&{access}&PlaceID={placeId}&UserID={player.userId}` - ) - end + -- if url and access and placeId and player and player.userId then + -- game:HttpGet( + -- `{url}/Game/ClientPresence.ashx?action=disconnect&{access}&PlaceID={placeId}&UserID={player.userId}` + -- ) + -- end end) -if placeId ~= nil and url ~= nil then - -- yield so that file load happens in the heartbeat thread - wait() +-- if placeId ~= nil and url ~= nil then +-- -- yield so that file load happens in the heartbeat thread +-- wait() - -- load the game - game:Load(`{url}/asset/?id={placeId}`) -end +-- -- load the game +-- game:Load(`{url}/asset/?id={placeId}`) +-- end if _MAP_LOCATION_EXISTS then -- yield so that file load happens in the heartbeat thread @@ -233,13 +231,13 @@ if _MAP_LOCATION_EXISTS then end -- Now start the connection -NetworkServer:Start(_SERVER_PORT, sleeptime) +NetworkServer:Start(_SERVER_PORT) Visit:SetPing("_SERVER_PRESENCE_URL", 30) -if timeout then - ScriptContext:SetTimeout(timeout) -end +-- if timeout then +-- ScriptContext:SetTimeout(timeout) +-- end ScriptContext.ScriptsDisabled = false -- delay(1, function() diff --git a/luau/join.luau b/luau/join.luau index 3079071..4385577 100644 --- a/luau/join.luau +++ b/luau/join.luau @@ -11,8 +11,6 @@ local Visit = game:GetService "Visit" local player, connectionFailed --- MultiplayerSharedScript.lua inserted here ------ Prepended to Join.lua -- - pcall(function() game:SetPlaceID(_PLACE_ID, false) end) @@ -38,47 +36,44 @@ pcall(function() end) -- arguments --------------------------------------- -local threadSleepTime = ... +-- (there aren't any) +local threadSleepTime = 15 -if threadSleepTime == nil then - threadSleepTime = 15 -end - -local test = _IS_STUDIO_JOIN +-- local test = _IS_STUDIO_JOIN -- unused print "! Joining game '_PLACE_ID' place _PLACE_ID at _SERVER_ADDRESS" ChangeHistoryService:SetEnabled(false) ContentProvider:SetThreadPool(16) -InsertService:SetBaseSetsUrl "https://banland.xyz/game/tools/insertasset?nsets=10&type=base" -InsertService:SetUserSetsUrl "https://banland.xyz/game/tools/insertasset?nsets=20&type=user&userid=%d" -InsertService:SetCollectionUrl "https://banland.xyz/game/tools/insertasset?sid=%d" -InsertService:SetAssetUrl "https://banland.xyz/asset?id=%d" -InsertService:SetAssetVersionUrl "https://banland.xyz/asset?assetversionid=%d" +InsertService:SetBaseSetsUrl "http://banland.xyz/game/tools/insertasset?nsets=10&type=base" +InsertService:SetUserSetsUrl "http://banland.xyz/game/tools/insertasset?nsets=20&type=user&userid=%d" +InsertService:SetCollectionUrl "http://banland.xyz/game/tools/insertasset?sid=%d" +InsertService:SetAssetUrl "http://banland.xyz/asset?id=%d" +InsertService:SetAssetVersionUrl "http://banland.xyz/asset?assetversionid=%d" pcall(function() - SocialService:SetFriendUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsFriendsWith&playerid=%d&userid=%d" + SocialService:SetFriendUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsFriendsWith&playerid=%d&userid=%d" end) pcall(function() - SocialService:SetBestFriendUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsBestFriendsWith&playerid=%d&userid=%d" + SocialService:SetBestFriendUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsBestFriendsWith&playerid=%d&userid=%d" end) pcall(function() - SocialService:SetGroupUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsInGroup&playerid=%d&groupid=%d" + SocialService:SetGroupUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsInGroup&playerid=%d&groupid=%d" end) pcall(function() - SocialService:SetGroupRankUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRank&playerid=%d&groupid=%d" + SocialService:SetGroupRankUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRank&playerid=%d&groupid=%d" end) pcall(function() - SocialService:SetGroupRoleUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRole&playerid=%d&groupid=%d" + SocialService:SetGroupRoleUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRole&playerid=%d&groupid=%d" end) pcall(function() - GamePassService:SetPlayerHasPassUrl "https://banland.xyz/Game/GamePass/GamePassHandler.ashx?Action=HasPass&UserID=%d&PassID=%d" + GamePassService:SetPlayerHasPassUrl "http://banland.xyz/Game/GamePass/GamePassHandler.ashx?Action=HasPass&UserID=%d&PassID=%d" end) pcall(function() - MarketplaceService:SetProductInfoUrl "https://banland.xyz/marketplace/productinfo?assetId=%d" + MarketplaceService:SetProductInfoUrl "http://banland.xyz/marketplace/productinfo?assetId=%d" end) pcall(function() - MarketplaceService:SetPlayerOwnsAssetUrl "https://banland.xyz/ownership/hasasset?userId=%d&assetId=%d" + MarketplaceService:SetPlayerOwnsAssetUrl "http://banland.xyz/ownership/hasasset?userId=%d&assetId=%d" end) pcall(function() game:SetCreatorID(_CREATOR_ID, Enum.CreatorType.User) @@ -89,7 +84,6 @@ pcall(function() Players:SetChatStyle(Enum.ChatStyle.ClassicAndBubble) end) -waitingForCharacter = false pcall(function() if settings().Network.MtuOverride == 0 then settings().Network.MtuOverride = 1400 @@ -97,74 +91,78 @@ pcall(function() end) -- functions --------------------------------------- -function setMessage(message: string) +local loadingState = 0 +local function setLoadingMessage(message: string) -- todo: animated "..." + local dots = "" + loadingState += 1 + local currentLoadingState = loadingState + Spawn(function() + while loadingState == currentLoadingState do + game:SetMessage(message .. dots) + wait(0.3) + dots ..= "." + if dots == "...." then + dots = "" + end + end + end) +end + +local function setMessage(message: string) + loadingState += 1 game:SetMessage(message) end -function showErrorWindow(message, _, _) - game:SetMessage(message) -end - -function reportError(err, message) +local function reportError(err) print("***ERROR*** " .. err) - if not test then - Visit:SetUploadUrl "" - end + Visit:SetUploadUrl "" Client:Disconnect() wait(4) - showErrorWindow("Error: " .. err, message, "Other") + setMessage("Error: " .. err) end -- called when the client connection closes -function onDisconnection(_, lostConnection) +local function onDisconnection(_, lostConnection) if lostConnection then - showErrorWindow( - "You have lost the connection to the game", - "LostConnection", - "LostConnection" - ) + setMessage "You have lost the connection to the game" else - showErrorWindow("This game has shut down", "Kick", "Kick") + setMessage "This game has shut down" end end -function requestCharacter(replicator) +local function requestCharacter(replicator) -- prepare code for when the Character appears local connection connection = player.Changed:connect(function(property) if property == "Character" then + loadingState += 1 game:ClearMessage() - waitingForCharacter = false connection:disconnect() end end) - setMessage "Requesting character" + setLoadingMessage "Requesting character" local success, err = pcall(function() replicator:RequestCharacter() - setMessage "Waiting for character" - waitingForCharacter = true + setLoadingMessage "Waiting for character" end) if not success then - reportError(err, "W4C") + reportError(err) return end end -- called when the client connection is established -function onConnectionAccepted(_, replicator) - connectResolved = true - +local function onConnectionAccepted(_, replicator) local waitingForMarker = true local success, err = pcall(function() - if not test then - Visit:SetPing("_PING_URL", 30) - end + Visit:SetPing("_PING_URL", 30) + loadingState += 1 game:SetMessageBrickCount() replicator.Disconnection:connect(onDisconnection) @@ -179,7 +177,7 @@ function onConnectionAccepted(_, replicator) end) if not success then - reportError(err, "ConnectionAccepted") + reportError(err) return end @@ -192,39 +190,25 @@ function onConnectionAccepted(_, replicator) end -- called when the client connection fails -function onConnectionFailed(_, err) - showErrorWindow( - `Failed to connect to the Game. (ID={err})`, - `ID{err}`, - "Other" - ) +local function onConnectionFailed(_, err) + setMessage(`Failed to connect to the place. (ID={err})`) end -- called when the client connection is rejected function onConnectionRejected() connectionFailed:disconnect() - showErrorWindow( - "This game is not available. Please try another", - "WrongVersion", - "WrongVersion" - ) + setMessage "This place is not available. Please try another" end -local idled = false -function onPlayerIdled(idleTime) +local function onPlayerIdled(idleTime) if idleTime > 20 * 60 then - showErrorWindow( + setMessage( string.format( "You were disconnected for being idle %d minutes", idleTime / 60 - ), - "Idle", - "Idle" + ) ) Client:disconnect() - if not idled then - idled = true - end end end @@ -236,7 +220,7 @@ end) local success, err = pcall(function() game:SetRemoteBuildMode(true) - setMessage "Connecting to Server" + setLoadingMessage "Connecting to server" Client.ConnectionAccepted:connect(onConnectionAccepted) Client.ConnectionRejected:connect(onConnectionRejected) connectionFailed = Client.ConnectionFailed:connect(onConnectionFailed) @@ -274,24 +258,20 @@ local success, err = pcall(function() player.Name = [========[_USER_NAME]========] end) player.CharacterAppearance = "_CHAR_APPEARANCE" - if not test then - Visit:SetUploadUrl "" - end + Visit:SetUploadUrl "" end) if not success then - reportError(err, "CreatePlayer") + reportError(err) end -if not test then - -- TODO: Async get? - loadfile ""("", -1, 0) -end +-- TODO: Async get? +loadfile ""("", -1, 0) pcall(function() game:SetScreenshotInfo "" end) pcall(function() - game:SetVideoInfo 'GamesMercury, video, free game, online virtual world' + game:SetVideoInfo 'GamesMercury, video, free game, online virtual world' end) -- use single quotes here because the video info string may have unescaped double quotes diff --git a/luau/studio.luau b/luau/studio.luau index eb3a791..b3290b1 100644 --- a/luau/studio.luau +++ b/luau/studio.luau @@ -7,46 +7,46 @@ local ScriptInformationProvider = game:GetService "ScriptInformationProvider" local ScriptContext = game:GetService "ScriptContext" -- Setup studio cmd bar & load core scripts pcall(function() - InsertService:SetFreeModelUrl "https://banland.xyz/game/tools/insertasset?type=fm&q=%s&pg=%d&rs=%d" + InsertService:SetFreeModelUrl "http://banland.xyz/game/tools/insertasset?type=fm&q=%s&pg=%d&rs=%d" end) pcall(function() - InsertService:SetFreeDecalUrl "https://banland.xyz/game/tools/insertasset?type=fd&q=%s&pg=%d&rs=%d" + InsertService:SetFreeDecalUrl "http://banland.xyz/game/tools/insertasset?type=fd&q=%s&pg=%d&rs=%d" end) -ScriptInformationProvider:SetAssetUrl "https://banland.xyz/asset/" -InsertService:SetBaseSetsUrl "https://banland.xyz/game/tools/insertasset?nsets=10&type=base" -InsertService:SetUserSetsUrl "https://banland.xyz/game/tools/insertasset?nsets=20&type=user&userid=%d" -InsertService:SetCollectionUrl "https://banland.xyz/game/tools/insertasset?sid=%d" -InsertService:SetAssetUrl "https://banland.xyz/asset/?id=%d" -InsertService:SetAssetVersionUrl "https://banland.xyz/asset/?assetversionid=%d" +ScriptInformationProvider:SetAssetUrl "http://banland.xyz/asset/" +InsertService:SetBaseSetsUrl "http://banland.xyz/game/tools/insertasset?nsets=10&type=base" +InsertService:SetUserSetsUrl "http://banland.xyz/game/tools/insertasset?nsets=20&type=user&userid=%d" +InsertService:SetCollectionUrl "http://banland.xyz/game/tools/insertasset?sid=%d" +InsertService:SetAssetUrl "http://banland.xyz/asset/?id=%d" +InsertService:SetAssetVersionUrl "http://banland.xyz/asset/?assetversionid=%d" InsertService:SetTrustLevel(0) pcall(function() - SocialService:SetFriendUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsFriendsWith&playerid=%d&userid=%d" + SocialService:SetFriendUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsFriendsWith&playerid=%d&userid=%d" end) pcall(function() - SocialService:SetBestFriendUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsBestFriendsWith&playerid=%d&userid=%d" + SocialService:SetBestFriendUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsBestFriendsWith&playerid=%d&userid=%d" end) pcall(function() - SocialService:SetGroupUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsInGroup&playerid=%d&groupid=%d" + SocialService:SetGroupUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsInGroup&playerid=%d&groupid=%d" end) pcall(function() - SocialService:SetGroupRankUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRank&playerid=%d&groupid=%d" + SocialService:SetGroupRankUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRank&playerid=%d&groupid=%d" end) pcall(function() - SocialService:SetGroupRoleUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRole&playerid=%d&groupid=%d" + SocialService:SetGroupRoleUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRole&playerid=%d&groupid=%d" end) pcall(function() - GamePassService:SetPlayerHasPassUrl "https://banland.xyz/Game/GamePass/GamePassHandler.ashx?Action=HasPass&UserID=%d&PassID=%d" + GamePassService:SetPlayerHasPassUrl "http://banland.xyz/Game/GamePass/GamePassHandler.ashx?Action=HasPass&UserID=%d&PassID=%d" end) pcall(function() - MarketplaceService:SetProductInfoUrl "https://banland.xyz/marketplace/productinfo?assetId=%d" + MarketplaceService:SetProductInfoUrl "http://banland.xyz/marketplace/productinfo?assetId=%d" end) pcall(function() - MarketplaceService:SetDevProductInfoUrl "https://banland.xyz/marketplace/productDetails?productId=%d" + MarketplaceService:SetDevProductInfoUrl "http://banland.xyz/marketplace/productDetails?productId=%d" end) pcall(function() - MarketplaceService:SetPlayerOwnsAssetUrl "https://banland.xyz/ownership/hasasset?userId=%d&assetId=%d" + MarketplaceService:SetPlayerOwnsAssetUrl "http://banland.xyz/ownership/hasasset?userId=%d&assetId=%d" end) local result, _ = pcall(function() diff --git a/luau/visit.luau b/luau/visit.luau index 8526528..8360b7c 100644 --- a/luau/visit.luau +++ b/luau/visit.luau @@ -24,40 +24,40 @@ local message = Instance.new "Message" message.Parent = workspace message.archivable = false -ScriptInformationProvider:SetAssetUrl "https://banland.xyz/Asset/" +ScriptInformationProvider:SetAssetUrl "http://banland.xyz/Asset/" ContentProvider:SetThreadPool(16) pcall(function() - InsertService:SetFreeModelUrl "https://banland.xyz/game/tools/insertasset?type=fm&q=%s&pg=%d&rs=%d" + InsertService:SetFreeModelUrl "http://banland.xyz/game/tools/insertasset?type=fm&q=%s&pg=%d&rs=%d" end) -- Used for free model search (insert tool) pcall(function() - InsertService:SetFreeDecalUrl "https://banland.xyz/game/tools/insertasset?type=fd&q=%s&pg=%d&rs=%d" + InsertService:SetFreeDecalUrl "http://banland.xyz/game/tools/insertasset?type=fd&q=%s&pg=%d&rs=%d" end) -- Used for free decal search (insert tool) settings().Diagnostics:LegacyScriptMode() -InsertService:SetBaseSetsUrl "https://banland.xyz/game/tools/insertasset?nsets=10&type=base" -InsertService:SetUserSetsUrl "https://banland.xyz/game/tools/insertasset?nsets=20&type=user&userid=%d" -InsertService:SetCollectionUrl "https://banland.xyz/game/tools/insertasset?sid=%d" -InsertService:SetAssetUrl "https://banland.xyz/Asset/?id=%d" -InsertService:SetAssetVersionUrl "https://banland.xyz/Asset/?assetversionid=%d" +InsertService:SetBaseSetsUrl "http://banland.xyz/game/tools/insertasset?nsets=10&type=base" +InsertService:SetUserSetsUrl "http://banland.xyz/game/tools/insertasset?nsets=20&type=user&userid=%d" +InsertService:SetCollectionUrl "http://banland.xyz/game/tools/insertasset?sid=%d" +InsertService:SetAssetUrl "http://banland.xyz/Asset/?id=%d" +InsertService:SetAssetVersionUrl "http://banland.xyz/Asset/?assetversionid=%d" pcall(function() - SocialService:SetFriendUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsFriendsWith&playerid=%d&userid=%d" + SocialService:SetFriendUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsFriendsWith&playerid=%d&userid=%d" end) pcall(function() - SocialService:SetBestFriendUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsBestFriendsWith&playerid=%d&userid=%d" + SocialService:SetBestFriendUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsBestFriendsWith&playerid=%d&userid=%d" end) pcall(function() - SocialService:SetGroupUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsInGroup&playerid=%d&groupid=%d" + SocialService:SetGroupUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsInGroup&playerid=%d&groupid=%d" end) pcall(function() - SocialService:SetGroupRankUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRank&playerid=%d&groupid=%d" + SocialService:SetGroupRankUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRank&playerid=%d&groupid=%d" end) pcall(function() - SocialService:SetGroupRoleUrl "https://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRole&playerid=%d&groupid=%d" + SocialService:SetGroupRoleUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRole&playerid=%d&groupid=%d" end) pcall(function() - GamePassService:SetPlayerHasPassUrl "https://banland.xyz/Game/GamePass/GamePassHandler.ashx?Action=HasPass&UserID=%d&PassID=%d" + GamePassService:SetPlayerHasPassUrl "http://banland.xyz/Game/GamePass/GamePassHandler.ashx?Action=HasPass&UserID=%d&PassID=%d" end) pcall(function() game:SetCreatorID(0, Enum.CreatorType.User) @@ -80,7 +80,7 @@ end) ChangeHistoryService:SetEnabled(false) pcall(function() - Players:SetBuildUserPermissionsUrl "https://banland.xyz/Game/BuildActionPermissionCheck.ashx?assetId=0&userId=%d&isSolo=true" + Players:SetBuildUserPermissionsUrl "http://banland.xyz/Game/BuildActionPermissionCheck.ashx?assetId=0&userId=%d&isSolo=true" end) workspace:SetPhysicsThrottleEnabled(true)