Further corescript formatting improvements

This commit is contained in:
Lewin Kelly 2024-04-11 00:21:50 +01:00
parent 98561c76e0
commit 37f3892695
19 changed files with 1117 additions and 2480 deletions

View File

@ -968,11 +968,6 @@ declare class EnumFontSize_INTERNAL extends Enum
Size24: EnumFontSize
Size36: EnumFontSize
Size48: EnumFontSize
Size28: EnumFontSize
Size32: EnumFontSize
Size42: EnumFontSize
Size60: EnumFontSize
Size96: EnumFontSize
end
declare class EnumFontStyle extends EnumItem end
declare class EnumFontStyle_INTERNAL extends Enum
@ -2615,8 +2610,6 @@ declare class EnumPriorityMethod_INTERNAL extends Enum
AccumulatedError: EnumPriorityMethod
end
type ENUM_LIST = {
AccessModifierType: EnumAccessModifierType_INTERNAL,
ActionType: EnumActionType_INTERNAL,
@ -3741,7 +3734,8 @@ declare class CoreGui extends BasePlayerGui
SelectionImageObject: GuiObject
UserGuiRenderingChanged: RBXScriptSignal<boolean, Instance, EnumNormalId, number>
Version: number
RobloxGui: any
RobloxGui: ScreenGui
MercuryGui: ScreenGui -- lmfaooo
function SetUserGuiRendering(self, enabled: boolean, guiAdornee: Instance, faceId: EnumNormalId, horizontalCurvature: number?): nil
function TakeScreenshot(self): nil
function ToggleRecording(self): nil
@ -5022,6 +5016,8 @@ declare class TextLabel extends GuiLabel
TextWrapped: boolean
TextXAlignment: EnumTextXAlignment
TextYAlignment: EnumTextYAlignment
FontSize: EnumFontSize
function SetTextFromInput(self, text: string): nil
end
@ -5544,6 +5540,9 @@ declare class InsertService extends Instance
function SetBaseSetsUrl(self, baseSetsUrl: string): nil
function SetCollectionUrl(self, collectionUrl: string): nil
function SetUserSetsUrl(self, userSetsUrl: string): nil
function SetTrustLevel(self, trustLevel: number): nil
function SetFreeModelUrl(self, freeModelUrl: string): nil
function SetFreeDecalUrl(self, freeDecalUrl: string): nil
end
declare class JointInstance extends Instance
@ -6205,6 +6204,7 @@ declare class Terrain extends BasePart
function AutoWedgeCell(self, x: number, y: number, z: number): boolean
function SetWaterCell(self, x: number, y: number, z: number, waterForce: EnumWaterForce, waterDirection: EnumWaterDirection): nil
function SetCell(self, x: number, y: number, z: number, material: EnumCellMaterial, orientation: EnumCellOrientation): nil
function GetCell(self, x: number, y: number, z: number): any -- "tuple" bruh
end
declare class TriangleMeshPart extends BasePart
@ -6263,6 +6263,8 @@ declare class Model extends PVInstance
function RemovePersistentPlayer(self, playerInstance: Player?): nil
function ScaleTo(self, newScaleFactor: number): nil
function TranslateBy(self, delta: Vector3): nil
function GetModelCFrame(self): CFrame
end
declare class BackpackItem extends Model
@ -7033,20 +7035,13 @@ end
declare class ScriptContext extends Instance
Error: RBXScriptSignal<string, string, Instance>
ErrorDetailed: RBXScriptSignal<string, string, Instance, string, number>
ScriptsDisabled: boolean
function AddCoreScriptLocal(self, name: string, parent: Instance): nil
function ClearScriptProfilingData(self): nil
function DeserializeScriptProfilerString(self, jsonString: string): { [any]: any }
function GetCoverageStats(self): { any }
function SaveScriptProfilingData(self, filename: string): nil
function SetTimeout(self, seconds: number): nil
function StartScriptProfiling(self, frequency: number?): nil
function StopScriptProfiling(self): string
-- player or instance
function AddCoreScript(self, id: number, instance: Instance, name: string): nil
function RegisterLibrary(self, name: string, id: string): nil
function AddCoreScript(self, assetId: number, parent: Instance, name: string): nil
function AddStarterScript(self, assetId: number): nil
function RegisterLibrary(self, libraryName: string, assetId: string): nil
function LibraryRegistrationComplete(self): nil
end

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
--!strict
-- CoreGui.MercuryGui.CoreScripts/ToolTip
-- CoreGui.RobloxGui.CoreScripts/ToolTip
print "[Mercury]: Loaded corescript 36868950"
local News = require "../Modules/New"
@ -31,31 +31,39 @@ local frameTip = New "TextLabel" {
BackgroundColor3 = Color3.new(0, 0, 0),
BackgroundTransparency = 1,
TextTransparency = 1,
TextWrap = true,
TextWrapped = true,
New "BoolValue" {
Name = "inside",
Value = false,
},
}
local function setUpListeners(frameToListen)
local function setUpListeners(
labelToListen: TextLabel & {
inside: BoolValue,
Parent: Frame, -- but has mousebutton1click? hmm... todo: investigate - Heliodex
}
)
local fadeSpeed = 0.1
frameToListen.Parent.MouseEnter:connect(function()
if frameToListen:FindFirstChild "inside" then
frameToListen.inside.Value = true
wait(1.2)
if frameToListen.inside.Value then
while
frameToListen.inside.Value
and frameToListen.BackgroundTransparency > 0
do
frameToListen.BackgroundTransparency = frameToListen.BackgroundTransparency
- fadeSpeed
frameToListen.TextTransparency = frameToListen.TextTransparency
- fadeSpeed
RunService.Heartbeat:wait()
end
end
labelToListen.Parent.MouseEnter:connect(function()
if not labelToListen:FindFirstChild "inside" then
return
end
labelToListen.inside.Value = true
wait(1.2)
if not labelToListen.inside.Value then
return
end
while
labelToListen.inside.Value
and labelToListen.BackgroundTransparency > 0
do
labelToListen.BackgroundTransparency = labelToListen.BackgroundTransparency
- fadeSpeed
labelToListen.TextTransparency = labelToListen.TextTransparency
- fadeSpeed
RunService.Heartbeat:wait()
end
end)
@ -65,11 +73,11 @@ local function setUpListeners(frameToListen)
killFrame.TextTransparency = 1
end
frameToListen.Parent.MouseLeave:connect(function()
killTip(frameToListen)
labelToListen.Parent.MouseLeave:connect(function()
killTip(labelToListen)
end)
frameToListen.Parent.MouseButton1Click:connect(function()
killTip(frameToListen)
labelToListen.Parent.MouseButton1Click:connect(function()
killTip(labelToListen)
end)
end

View File

@ -36,7 +36,8 @@ local screenGui = CoreGui:FindFirstChild "RobloxGui" :: ScreenGui & {
Backpack: Frame,
CurrentLoadout: Frame,
}
screenGui.Name = "MercuryGui" -- lmao lel lol lmfao
-- screenGui.Name = "MercuryGui" -- "it wasn't meant to be" - Heliodex
-- renaming the RobloxGui seems to break the camera
local scripts = {
[36868950] = "CoreScripts/ToolTip", -- ToolTipper (creates tool tips for gui)
@ -45,7 +46,6 @@ local scripts = {
[48488451] = "CoreScripts/PopupScript", -- Popup Script
[48488398] = "CoreScripts/NotificationScript", -- Friend Notification Script (probably can use this script to expand out to other notifications)
[97188756] = "CoreScripts/ChatScript", -- Chat script
[107893730] = "CoreScripts/PurchasePromptScript", -- Purchase Prompt Script
}
for id, path in pairs(scripts) do

View File

@ -1,5 +1,5 @@
--!strict
-- CoreGui.MercuryGui.CoreScripts/MainBotChatScript
-- CoreGui.RobloxGui.CoreScripts/MainBotChatScript
print "[Mercury]: Loaded corescript 39250920"
local News = require "../Modules/New"
@ -9,16 +9,18 @@ local Hydrate = News.Hydrate
local InsertService = game:GetService "InsertService"
local RunService = game:GetService "RunService"
local function waitForProperty(instance, name)
local function waitForProperty(instance, name: string)
while not instance[name] do
instance.Changed:wait()
end
end
local function waitForChild(instance, name)
local function waitForChild(instance: Instance, name: string)
while not instance:FindFirstChild(name) do
instance.ChildAdded:wait()
return instance:FindFirstChild(name)
end
return nil
end
local mainFrame: Frame & {
@ -42,11 +44,11 @@ local dialogConnections = {}
local gui
waitForChild(game, "CoreGui")
waitForChild(game.CoreGui, "MercuryGui")
if game.CoreGui.MercuryGui:FindFirstChild "ControlFrame" then
gui = game.CoreGui.MercuryGui.ControlFrame
waitForChild(game.CoreGui, "RobloxGui")
if game.CoreGui.RobloxGui:FindFirstChild "ControlFrame" then
gui = game.CoreGui.RobloxGui.ControlFrame
else
gui = game.CoreGui.MercuryGui
gui = game.CoreGui.RobloxGui
end
local function currentTone()
@ -393,7 +395,7 @@ local function newChoice(numberText)
Size = UDim2.new(1, -32, 1, -4),
TextXAlignment = Enum.TextXAlignment.Left,
TextYAlignment = Enum.TextYAlignment.Top,
TextWrap = true,
TextWrapped = true,
RobloxLocked = true,
},
}

View File

@ -30,13 +30,11 @@ local function ScopedConnect(
if syncFunc then
syncFunc()
end
else
elseif eventConnection then
--Probably leaving the world, so disconnect for now
if eventConnection then
eventConnection:disconnect()
if removeFunc then
removeFunc()
end
eventConnection:disconnect()
if removeFunc then
removeFunc()
end
end
end
@ -177,7 +175,7 @@ function RbxGui.CreateMessageDialog(title, message, buttons)
BackgroundTransparency = 1,
Font = Enum.Font.Arial,
FontSize = Enum.FontSize.Size18,
TextWrap = true,
TextWrapped = true,
TextXAlignment = Enum.TextXAlignment.Left,
TextYAlignment = Enum.TextYAlignment.Top,
},
@ -218,7 +216,7 @@ function RbxGui.CreateStyledMessageDialog(title, message, style, buttons)
BackgroundTransparency = 1,
Font = Enum.Font.Arial,
FontSize = Enum.FontSize.Size18,
TextWrap = true,
TextWrapped = true,
TextXAlignment = Enum.TextXAlignment.Left,
TextYAlignment = Enum.TextYAlignment.Top,
},
@ -266,7 +264,7 @@ function RbxGui.CreateDropDownMenu(
local dropDownMenu = New "TextButton" {
Name = "DropDownMenuButton",
TextWrap = true,
TextWrapped = true,
TextColor3 = Color3.new(1, 1, 1),
Text = "Choose One",
Font = Enum.Font.ArialBold,
@ -323,7 +321,7 @@ function RbxGui.CreateDropDownMenu(
BackgroundColor3 = Color3.new(1, 1, 1),
Font = Enum.Font.Arial,
FontSize = Enum.FontSize.Size18,
TextWrap = true,
TextWrapped = true,
ZIndex = 2,
}
@ -361,13 +359,15 @@ function RbxGui.CreateDropDownMenu(
end
local children = droppedDownMenu:GetChildren()
if children then
for _, child in ipairs(children) do
if child.Name == "ChoiceButton" then
child.ZIndex = baseZIndex + 2
elseif child.Name == "ClickCaptureButton" then
child.ZIndex = baseZIndex
end
if not children then
return
end
for _, child in ipairs(children) do
if child.Name == "ChoiceButton" then
child.ZIndex = baseZIndex + 2
elseif child.Name == "ClickCaptureButton" then
child.ZIndex = baseZIndex
end
end
end
@ -418,11 +418,7 @@ function RbxGui.CreateDropDownMenu(
areaSoak.Visible = not areaSoak.Visible
dropDownMenu.Visible = not dropDownSelected
droppedDownMenu.Visible = dropDownSelected
if dropDownSelected then
setZIndex(4)
else
setZIndex(2)
end
setZIndex(dropDownSelected and 4 or 2)
if useScrollButtons then
updateScroll()
end
@ -2479,7 +2475,7 @@ local function CreateBasicTutorialPage(
Font = Enum.Font.ArialBold,
TextColor3 = Color3.new(1, 1, 1),
TextXAlignment = Enum.TextXAlignment.Center,
TextWrap = true,
TextWrapped = true,
Size = UDim2.new(1, -55, 0, 22),
Position = UDim2.new(0, 0, 0, 0),
},
@ -2607,7 +2603,7 @@ function RbxGui.CreateTextTutorialPage(name, text, skipTutorial)
BackgroundTransparency = 1,
TextColor3 = Color3.new(1, 1, 1),
Text = text,
TextWrap = true,
TextWrapped = true,
TextXAlignment = Enum.TextXAlignment.Left,
TextYAlignment = Enum.TextYAlignment.Center,
Font = Enum.Font.Arial,
@ -2959,7 +2955,7 @@ function RbxGui.CreateSetPanel(
FontSize = Enum.FontSize.Size24,
Text = "",
TextColor3 = Color3.new(1, 1, 1),
TextWrap = true,
TextWrapped = true,
TextXAlignment = Enum.TextXAlignment.Left,
TextYAlignment = Enum.TextYAlignment.Top,
},

View File

@ -1,5 +1,5 @@
--!strict
-- CoreGui.MercuryGui.CoreScripts/Settings
-- CoreGui.RobloxGui.CoreScripts/Settings
print "[Mercury]: Loaded corescript 46295863"
local News = require "../Modules/New"
@ -23,10 +23,9 @@ local function waitForProperty(instance, property)
end
-- A Few Script Globals
local gui = script.Parent
if gui:FindFirstChild "ControlFrame" then
gui = gui.ControlFrame
end
local mercuryGui = script.Parent :: ScreenGui & { ControlFrame: Frame }
local gui = mercuryGui:FindFirstChild "ControlFrame" and mercuryGui.ControlFrame
or mercuryGui
local RbxGui
local helpButton, updateCameraDropDownSelection, updateVideoCaptureDropDownSelection
@ -56,7 +55,7 @@ local ok, isMac = pcall(function()
end)
macClient = ok and isMac
local function Color3I(r, g, b)
local function Colour3(r: number, g: number, b: number)
return Color3.new(r / 255, g / 255, b / 255)
end
@ -343,8 +342,8 @@ local function createHelpDialog(baseZIndex)
Active = true,
Visible = false,
Size = UDim2.new(1, 0, 1, 0),
BackgroundColor3 = Color3I(51, 51, 51),
BorderColor3 = Color3I(27, 42, 53),
BackgroundColor3 = Colour3(51, 51, 51),
BorderColor3 = Colour3(27, 42, 53),
BackgroundTransparency = 0.4,
ZIndex = baseZIndex + 1,
}
@ -500,7 +499,7 @@ local function createLeaveConfirmationMenu(baseZIndex, shield)
Name = "LeaveText",
Text = "Leave this game?",
Size = UDim2.new(1, 0, 0.8, 0),
TextWrap = true,
TextWrapped = true,
TextColor3 = Color3.new(1, 1, 1),
Font = Enum.Font.ArialBold,
FontSize = Enum.FontSize.Size36,
@ -559,7 +558,7 @@ local function createResetConfirmationMenu(baseZIndex, shield)
local function resetCharacterText()
return New "TextLabel" {
Size = UDim2.new(1, 0, 0.8, 0),
TextWrap = true,
TextWrapped = true,
TextColor3 = Color3.new(1, 1, 1),
Font = Enum.Font.ArialBold,
BackgroundTransparency = 1,
@ -999,7 +998,7 @@ local function createGameSettingsMenu(baseZIndex, _)
local betterQualityText = Hydrate(qualityTextC()) {
Name = "BetterQualityText",
Text = "Better Quality",
TextWrap = true,
TextWrapped = true,
Size = UDim2.new(0, 41, 0, 28),
Position = UDim2.new(0, 390, 0, 269),
TextColor3 = Color3.new(95, 95, 95),
@ -1049,7 +1048,7 @@ local function createGameSettingsMenu(baseZIndex, _)
FontSize = Enum.FontSize.Size18,
Text = "Auto",
ZIndex = 1,
TextWrap = true,
TextWrapped = true,
Parent = gameSettingsMenuFrame,
Visible = not inStudioMode,
}
@ -1471,7 +1470,7 @@ local function createGameSettingsMenu(baseZIndex, _)
Position = UDim2.new(0, 32, 0, 100),
Size = UDim2.new(0, 164, 0, 18),
BackgroundTransparency = 1,
TextColor3 = Color3I(255, 255, 255),
TextColor3 = Colour3(255, 255, 255),
TextXAlignment = Enum.TextXAlignment.Left,
ZIndex = baseZIndex + 4,
Parent = gameSettingsMenuFrame,
@ -1529,14 +1528,14 @@ local function createGameSettingsMenu(baseZIndex, _)
FontSize = Enum.FontSize.Size18,
Position = UDim2.new(0, 31, 0, 58),
Size = UDim2.new(0, 224, 0, 18),
TextColor3 = Color3I(255, 255, 255),
TextColor3 = Colour3(255, 255, 255),
TextXAlignment = Enum.TextXAlignment.Left,
BackgroundTransparency = 1,
ZIndex = baseZIndex + 4,
Parent = gameSettingsMenuFrame,
}
mouseLockLabel = CoreGui.MercuryGui:FindFirstChild("MouseLockLabel", true)
mouseLockLabel = CoreGui.RobloxGui:FindFirstChild("MouseLockLabel", true)
local enumItems = Enum.ControlMode:GetEnumItems()
local enumNames = {}
@ -1607,8 +1606,8 @@ if UserSettings then
AutoButtonColor = false,
Visible = false,
Size = UDim2.new(1, 0, 1, 0),
BackgroundColor3 = Color3I(51, 51, 51),
BorderColor3 = Color3I(27, 42, 53),
BackgroundColor3 = Colour3(51, 51, 51),
BorderColor3 = Colour3(27, 42, 53),
BackgroundTransparency = 0.4,
ZIndex = baseZIndex + 2,
}
@ -1663,7 +1662,7 @@ if UserSettings then
end)
end
CoreGui.MercuryGui.Changed:connect(
CoreGui.RobloxGui.Changed:connect(
function(prop) -- We have stopped recording when we resize
if prop == "AbsoluteSize" and recordingVideo then
recordVideoClick(
@ -1976,8 +1975,8 @@ local function createSaveDialogs()
Active = true,
Visible = false,
Size = UDim2.new(1, 0, 1, 0),
BackgroundColor3 = Color3I(51, 51, 51),
BorderColor3 = Color3I(27, 42, 53),
BackgroundColor3 = Colour3(51, 51, 51),
BorderColor3 = Colour3(27, 42, 53),
BackgroundTransparency = 0.4,
ZIndex = baseZIndex + 1,
}
@ -2207,8 +2206,8 @@ local function createReportAbuseDialog()
Active = true,
Visible = false,
Size = UDim2.new(1, 0, 1, 0),
BackgroundColor3 = Color3I(51, 51, 51),
BorderColor3 = Color3I(27, 42, 53),
BackgroundColor3 = Colour3(51, 51, 51),
BorderColor3 = Colour3(27, 42, 53),
BackgroundTransparency = 0.4,
ZIndex = baseZIndex + 1,
}
@ -2303,7 +2302,7 @@ local function createReportAbuseDialog()
New "TextLabel" {
Name = "Title",
Text = "Report Abuse",
TextColor3 = Color3I(221, 221, 221),
TextColor3 = Colour3(221, 221, 221),
Position = UDim2.new(0.5, 0, 0, 30),
Font = Enum.Font.ArialBold,
FontSize = Enum.FontSize.Size36,
@ -2312,13 +2311,13 @@ local function createReportAbuseDialog()
New "TextLabel" {
Name = "Description",
Text = "This will send a complete report to a moderator. The moderator will review the chat log and take appropriate action.",
TextColor3 = Color3I(221, 221, 221),
TextColor3 = Colour3(221, 221, 221),
Position = UDim2.new(0, 0, 0, 55),
Size = UDim2.new(1, 0, 0, 40),
BackgroundTransparency = 1,
Font = Enum.Font.Arial,
FontSize = Enum.FontSize.Size18,
TextWrap = true,
TextWrapped = true,
ZIndex = baseZIndex + 2,
TextXAlignment = Enum.TextXAlignment.Left,
TextYAlignment = Enum.TextYAlignment.Top,
@ -2331,7 +2330,7 @@ local function createReportAbuseDialog()
FontSize = Enum.FontSize.Size18,
Position = UDim2.new(0.025, 0, 0, 100),
Size = UDim2.new(0.4, 0, 0, 36),
TextColor3 = Color3I(255, 255, 255),
TextColor3 = Colour3(255, 255, 255),
TextXAlignment = Enum.TextXAlignment.Left,
ZIndex = baseZIndex + 2,
},
@ -2343,7 +2342,7 @@ local function createReportAbuseDialog()
FontSize = Enum.FontSize.Size18,
Position = UDim2.new(0.025, 0, 0, 140),
Size = UDim2.new(0.4, 0, 0, 36),
TextColor3 = Color3I(255, 255, 255),
TextColor3 = Colour3(255, 255, 255),
TextXAlignment = Enum.TextXAlignment.Left,
ZIndex = baseZIndex + 2,
},
@ -2360,7 +2359,7 @@ local function createReportAbuseDialog()
FontSize = Enum.FontSize.Size18,
Position = UDim2.new(0.025, 0, 0, 180),
Size = UDim2.new(0.95, 0, 0, 36),
TextColor3 = Color3I(255, 255, 255),
TextColor3 = Colour3(255, 255, 255),
TextXAlignment = Enum.TextXAlignment.Left,
BackgroundTransparency = 1,
ZIndex = baseZIndex + 2,
@ -2405,7 +2404,7 @@ local function createReportAbuseDialog()
Name = "ShortDescriptionWrapper",
Position = UDim2.new(0.025, 0, 0, 220),
Size = UDim2.new(0.95, 0, 1, -310),
BackgroundColor3 = Color3I(0, 0, 0),
BackgroundColor3 = Colour3(0, 0, 0),
BorderSizePixel = 0,
ZIndex = baseZIndex + 2,
Parent = reportAbuseFrame,
@ -2419,11 +2418,11 @@ local function createReportAbuseDialog()
FontSize = Enum.FontSize.Size18,
Position = UDim2.new(0, 3, 0, 3),
Size = UDim2.new(1, -6, 1, -6),
TextColor3 = Color3I(255, 255, 255),
TextColor3 = Colour3(255, 255, 255),
TextXAlignment = Enum.TextXAlignment.Left,
TextYAlignment = Enum.TextYAlignment.Top,
TextWrap = true,
BackgroundColor3 = Color3I(0, 0, 0),
TextWrapped = true,
BackgroundColor3 = Colour3(0, 0, 0),
BorderSizePixel = 0,
ZIndex = baseZIndex + 2,
Parent = shortDescriptionWrapper,
@ -2440,7 +2439,7 @@ local function createReportAbuseDialog()
AutoButtonColor = true,
Style = Enum.ButtonStyle.RobloxButtonDefault,
Text = "Submit Report",
TextColor3 = Color3I(255, 255, 255),
TextColor3 = Colour3(255, 255, 255),
ZIndex = baseZIndex + 2,
Parent = reportAbuseFrame,
}
@ -2476,7 +2475,7 @@ local function createReportAbuseDialog()
AutoButtonColor = true,
Style = Enum.ButtonStyle.RobloxButtonDefault,
Text = "Cancel",
TextColor3 = Color3I(255, 255, 255),
TextColor3 = Colour3(255, 255, 255),
ZIndex = baseZIndex + 2,
Parent = reportAbuseFrame,
}

View File

@ -1,5 +1,5 @@
--!strict
-- CoreGui.MercuryGui.CoreScripts/PlayerListScript
-- CoreGui.RobloxGui.CoreScripts/PlayerListScript
print "[Mercury]: Loaded corescript 48488235"
local RunService = game:GetService "RunService"
@ -435,7 +435,7 @@ local AbuseSettingsFrame = New "Frame" {
BackgroundTransparency = 1,
Font = Enum.Font.Arial,
FontSize = Enum.FontSize.Size18,
TextWrap = true,
TextWrapped = true,
TextXAlignment = Enum.TextXAlignment.Left,
TextYAlignment = Enum.TextYAlignment.Top,
},
@ -532,7 +532,7 @@ local OriginalAbuseDescriptionBox = New "TextBox" {
TextColor3 = Colour3(255, 255, 255),
TextXAlignment = Enum.TextXAlignment.Left,
TextYAlignment = Enum.TextYAlignment.Top,
TextWrap = true,
TextWrapped = true,
BackgroundColor3 = Colour3(0, 0, 0),
BorderSizePixel = 0,
}
@ -761,9 +761,9 @@ local PrivilegeLevel = {
Banned = 0,
}
-- local IsPersonalServer = not not game.Workspace:FindFirstChild "PSVariable"
-- local IsPersonalServer = workspace:FindFirstChild "PSVariable"
-- game.Workspace.ChildAdded:connect(function(nchild)
-- workspace.ChildAdded:connect(function(nchild)
-- if nchild.Name == "PSVariable" and nchild:IsA "BoolValue" then
-- IsPersonalServer = true
-- end
@ -3395,4 +3395,4 @@ BaseUpdate()
-- UGGGLY, find a better way later
-- wait(2)
-- IsPersonalServer = not not game.Workspace:FindFirstChild "PSVariable"
-- IsPersonalServer = workspace:FindFirstChild "PSVariable"

View File

@ -1,4 +1,4 @@
-- CoreGui.MercuryGui.CoreScripts/NotificationScript
-- CoreGui.RobloxGui.CoreScripts/NotificationScript
print "[Mercury]: Loaded corescript 48488398"
local GuiService = game:GetService "GuiService"

View File

@ -1,4 +1,4 @@
-- CoreGui.MercuryGui.CoreScripts/PopupScript
-- CoreGui.RobloxGui.CoreScripts/PopupScript
print "[Mercury]: Loaded corescript 48488451"
local News = require "../Modules/New"
@ -37,7 +37,7 @@ local popupFrame = New "Frame" {
BackgroundTransparency = 1,
Text = "Hello I'm a popup",
TextColor3 = Color3.new(248 / 255, 248 / 255, 248 / 255),
TextWrap = true,
TextWrapped = true,
ZIndex = 5,
},
}

View File

@ -1,4 +1,4 @@
-- CoreGui.MercuryGui.CoreScripts/BackpackScripts/BackpackBuild
-- CoreGui.RobloxGui.CoreScripts/BackpackScripts/BackpackBuild
print "[Mercury]: Loaded corescript 53878047"
local News = require "../Modules/New"
@ -127,7 +127,7 @@ local CurrentLoadout = New "Frame" {
TextStrokeTransparency = 0,
Font = Enum.Font.ArialBold,
FontSize = Enum.FontSize.Size14,
-- TextWrap = true,
-- TextWrapped = true,
Size = UDim2.new(1, 60, 0, 20),
Position = UDim2.new(0, -30, 0, -30),
},
@ -153,7 +153,7 @@ local CurrentLoadout = New "Frame" {
Size = UDim2.new(1, 16, 1, 16),
Text = "",
TextColor3 = Color3.new(1, 1, 1),
TextWrap = true,
TextWrapped = true,
ZIndex = 5.0,
},
Hydrate(SlotNumber()) {
@ -311,7 +311,7 @@ New "Frame" {
TextColor3 = Color3.new(1, 1, 1),
TextXAlignment = Enum.TextXAlignment.Left,
ZIndex = 2,
TextWrap = true,
TextWrapped = true,
Text = "Search...",
},
},
@ -418,7 +418,7 @@ New "Frame" {
Size = UDim2.new(1, 6, 1, 5),
Text = "",
TextColor3 = Color3.new(1, 1, 1),
TextWrap = true,
TextWrapped = true,
ZIndex = 9,
},
},
@ -501,7 +501,7 @@ New "Frame" {
Text = "",
ZIndex = 2,
TextColor3 = Color3.new(1, 1, 1),
TextWrap = true,
TextWrapped = true,
},
},
},

View File

@ -1,4 +1,4 @@
-- CoreGui.MercuryGui.CurrentLoadout.CoreScripts/BackpackScript
-- CoreGui.RobloxGui.CurrentLoadout.CoreScripts/BackpackScript
print "[Mercury]: Loaded corescript 53878057"
local CoreGui = game:GetService "CoreGui"
@ -23,7 +23,7 @@ local currentLoadout = script.Parent
local StaticTabName = "gear"
local backpackEnabled = true
local mercuryGui = CoreGui:FindFirstChild "MercuryGui"
local mercuryGui = CoreGui:FindFirstChild "RobloxGui"
assert(mercuryGui)
local controlFrame = waitForChild(mercuryGui, "ControlFrame")

View File

@ -39,7 +39,7 @@ function RbxUtility.SelectTerrainRegion(
selectEmptyCells: boolean,
selectionParent: Instance
)
local terrain = game.Workspace:FindFirstChild "Terrain" :: Terrain
local terrain = workspace:FindFirstChild "Terrain" :: Terrain
if not terrain then
return
end
@ -73,7 +73,7 @@ function RbxUtility.SelectTerrainRegion(
local selectionContainer = New "Model" {
Name = "SelectionContainer",
Archivable = false,
Parent = selectionParent or game.Workspace,
Parent = selectionParent or workspace,
}
local updateSelection -- function we return to allow user to update selection
@ -386,7 +386,7 @@ Some example usages:
A simple example which uses the Create function to create a model object and assign two of it's properties.
local model = Create'Model'{
Name = 'A New model',
Parent = game.Workspace,
Parent = workspace,
}

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
-- CoreGui.MercuryGui.Backpack.CoreScripts/BackpackScripts/Back (1?)
-- CoreGui.RobloxGui.Backpack.CoreScripts/BackpackScripts/Back (1?)
print "[Mercury]: Loaded corescript 89449008"
local UserInputService = game:GetService "UserInputService"

View File

@ -1,4 +1,4 @@
-- CoreGui.MercuryGui.Backpack.CoreScripts/BackpackScripts/Back (2?)
-- CoreGui.RobloxGui.Backpack.CoreScripts/BackpackScripts/Back (2?)
print "[Mercury]: Loaded corescript 89449093"
local News = require "../Modules/New"
@ -53,7 +53,7 @@ local searchBox = waitForChild(backpack.SearchFrame.SearchBoxFrame, "SearchBox")
local searchButton = waitForChild(backpack.SearchFrame, "SearchButton")
local resetButton = waitForChild(backpack.SearchFrame, "ResetButton")
local mercuryGui = waitForChild(game.CoreGui, "MercuryGui")
local mercuryGui = waitForChild(game.CoreGui, "RobloxGui")
local currentLoadout = waitForChild(mercuryGui, "CurrentLoadout")
local loadoutBackground = waitForChild(currentLoadout, "Background")

View File

@ -1,5 +1,5 @@
--!strict
-- CoreGui.MercuryGui.CoreScripts/ChatScript
-- CoreGui.RobloxGui.CoreScripts/ChatScript
print "[Mercury]: Loaded corescript 97188756"
local RunService = game:GetService "RunService"
@ -25,7 +25,7 @@ local Player = game.Players.LocalPlayer
while not Player.Character do
RunService.Heartbeat:wait()
end
local Camera = game.Workspace.CurrentCamera
local Camera = workspace.CurrentCamera
-- Services
local CoreGui = game:GetService "CoreGui"
@ -653,7 +653,7 @@ end
-- Create the initial Chat stuff
-- Done only once
function Chat:CreateGui()
self.Gui = WaitForChild(CoreGui, "MercuryGui")
self.Gui = WaitForChild(CoreGui, "RobloxGui")
self.Frame = New "Frame" {
Name = "ChatFrame",
--Size = self.Configuration.Size;
@ -706,35 +706,37 @@ function Chat:CreateGui()
end)
end
if forceChatGUI or Player.ChatMode == Enum.ChatMode.TextAndMenu then
Chat:CreateChatBar()
if self.ChatBar then
self.ChatBar.FocusLost:connect(function(enterPressed)
Chat.GotFocus = false
if enterPressed and self.ChatBar.Text ~= "" then
local cText = self.ChatBar.Text
if string.sub(self.ChatBar.Text, 1, 1) == "%" then
cText = "(TEAM) " .. string.sub(cText, 2, #cText)
pcall(Players.TeamChat, Players, cText)
else
pcall(Players.Chat, Players, cText)
end
if self.ClickToChatButton then
self.ClickToChatButton.Visible = true
end
self.ChatBar.Text = ""
end
Spawn(function()
wait(5)
if not Chat.GotFocus then
Chat.Frame.Background.Visible = false
end
end)
end)
end
if not (forceChatGUI or Player.ChatMode == Enum.ChatMode.TextAndMenu) then
return
end
Chat:CreateChatBar()
if not self.ChatBar then
return
end
self.ChatBar.FocusLost:connect(function(enterPressed)
Chat.GotFocus = false
if enterPressed and self.ChatBar.Text ~= "" then
local cText = self.ChatBar.Text
if string.sub(self.ChatBar.Text, 1, 1) == "%" then
cText = "(TEAM) " .. string.sub(cText, 2, #cText)
pcall(Players.TeamChat, Players, cText)
else
pcall(Players.Chat, Players, cText)
end
if self.ClickToChatButton then
self.ClickToChatButton.Visible = true
end
self.ChatBar.Text = ""
end
Spawn(function()
wait(5)
if not Chat.GotFocus then
Chat.Frame.Background.Visible = false
end
end)
end)
end
-- Scrolling function
@ -754,7 +756,7 @@ function Input:OnMouseScroll()
wait(0.25)
end
end
wait()
wait(0.03)
end
end)
if Chat:CheckIfInBounds(Input.Speed) then

View File

@ -4,9 +4,6 @@ print "[Mercury]: Loaded Join corescript"
local InsertService = game:GetService "InsertService"
local ChangeHistoryService = game:GetService "ChangeHistoryService"
local ContentProvider = game:GetService "ContentProvider"
local SocialService = game:GetService "SocialService"
local GamePassService = game:GetService "GamePassService"
local MarketplaceService = game:GetService "MarketplaceService"
local Players = game:GetService "Players"
local Client = game:GetService "NetworkClient"
local Visit = game:GetService "Visit"
@ -53,30 +50,6 @@ 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 "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsFriendsWith&playerid=%d&userid=%d"
end)
pcall(function()
SocialService:SetBestFriendUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsBestFriendsWith&playerid=%d&userid=%d"
end)
pcall(function()
SocialService:SetGroupUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsInGroup&playerid=%d&groupid=%d"
end)
pcall(function()
SocialService:SetGroupRankUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRank&playerid=%d&groupid=%d"
end)
pcall(function()
SocialService:SetGroupRoleUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRole&playerid=%d&groupid=%d"
end)
pcall(function()
GamePassService:SetPlayerHasPassUrl "http://banland.xyz/Game/GamePass/GamePassHandler.ashx?Action=HasPass&UserID=%d&PassID=%d"
end)
pcall(function()
MarketplaceService:SetProductInfoUrl "http://banland.xyz/marketplace/productinfo?assetId=%d"
end)
pcall(function()
MarketplaceService:SetPlayerOwnsAssetUrl "http://banland.xyz/ownership/hasasset?userId=%d&assetId=%d"
end)
pcall(function()
game:SetCreatorID(_CREATOR_ID, Enum.CreatorType.User)
end)

View File

@ -1,13 +1,10 @@
--!strict
print "[Mercury]: Loaded Studio corescript"
-- local MarketplaceService = game:GetService "MarketplaceService"
local InsertService = game:GetService "InsertService"
-- local SocialService = game:GetService "SocialService"
-- local GamePassService = game:GetService "GamePassService"
local ScriptInformationProvider = game:GetService "ScriptInformationProvider"
local ScriptContext = game:GetService "ScriptContext"
-- Setup studio cmd bar & load core scripts
pcall(function()
InsertService:SetFreeModelUrl "http://banland.xyz/game/tools/insertasset?type=fm&q=%s&pg=%d&rs=%d"
end)
@ -23,38 +20,9 @@ InsertService:SetAssetUrl "http://banland.xyz/asset?id=%d"
InsertService:SetAssetVersionUrl "http://banland.xyz/asset/?assetversionid=%d"
InsertService:SetTrustLevel(0)
-- pcall(function()
-- SocialService:SetFriendUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsFriendsWith&playerid=%d&userid=%d"
-- end)
-- pcall(function()
-- SocialService:SetBestFriendUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsBestFriendsWith&playerid=%d&userid=%d"
-- end)
-- pcall(function()
-- SocialService:SetGroupUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=IsInGroup&playerid=%d&groupid=%d"
-- end)
-- pcall(function()
-- SocialService:SetGroupRankUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRank&playerid=%d&groupid=%d"
-- end)
-- pcall(function()
-- SocialService:SetGroupRoleUrl "http://banland.xyz/Game/LuaWebService/HandleSocialRequest.ashx?method=GetGroupRole&playerid=%d&groupid=%d"
-- end)
-- pcall(function()
-- GamePassService:SetPlayerHasPassUrl "http://banland.xyz/Game/GamePass/GamePassHandler.ashx?Action=HasPass&UserID=%d&PassID=%d"
-- end)
-- pcall(function()
-- MarketplaceService:SetProductInfoUrl "http://banland.xyz/marketplace/productinfo?assetId=%d"
-- end)
-- pcall(function()
-- MarketplaceService:SetDevProductInfoUrl "http://banland.xyz/marketplace/productDetails?productId=%d"
-- end)
-- pcall(function()
-- MarketplaceService:SetPlayerOwnsAssetUrl "http://banland.xyz/ownership/hasasset?userId=%d&assetId=%d"
-- end)
local result, _ = pcall(function()
if not pcall(function()
ScriptContext:AddStarterScript(37801172)
end)
if not result then
end) then
pcall(function()
ScriptContext:AddCoreScript(37801172, ScriptContext, "StarterScript")
end)