Skip to content

Commit

Permalink
Misc fixes and improvements (#1769)
Browse files Browse the repository at this point in the history 
* Add clearnote alias

* Optimise textureid pooling

* Use script env for scriptbase

* Optimise material

* Better API checking

* Create ClientScriptBase.server.luau

* Create ClientScriptBase.meta.json

* Update AnimateAvatar.meta.json

* Update ClientScriptBase.meta.json

* Add clientscript support for scriptbuilder

* Use a clientscript for rainbowify

* Add clientscript support for newscript

* Delete MainModule/Server/Dependencies/Assets/Clipper.rbxmx

* Create init.client.luau

* Create Clip.model.json

* Fix multiple issues with effect

* Fix server mutex

* Update Quacker.server.luau

* Update Spinner.client.luau

* Fix sfling creating local craters

* Optimise terrain check

* Fix balance name

* Fix ClientScript not working

* Fix rainbowify

* Optimize and fix oldlogs conversion

* Add `:seize` alias

* Fix case

* Fix lint

---------

Co-authored-by: nichole <[email protected]>
  • Loading branch information
@ccuser44 @Dimenpsyonal
ccuser44 and Dimenpsyonal authored Nov 26, 2024
1 parent 34de1f4 commit 199be61
Show file tree
Hide file tree
Showing 19 changed files with 207 additions and 192 deletions.
23 changes: 2 additions & 21 deletions MainModule/Client/Plugins/Anti_Cheat.luau
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,29 +293,10 @@ return function(Vargs)
xpcall(function()
local function getCoreUrls()
local coreUrls = {"rbxassetid://0", "rbxassetid://10066921516", "rbxassetid://13262267483", "rbxassetid://13253401424"} -- Whitelist for Roblox Camera SFX and Quest Controls Scheme
local backpack = Player:FindFirstChildOfClass("Backpack")
local character = Player.Character
local starterPack = service.StarterPack
local screenshotHud = service.GuiService:FindFirstChildOfClass("ScreenshotHud")

if character then
for _, v in ipairs(character:GetChildren()) do
if v:IsA("BackpackItem") and service.Trim(v.TextureId) ~= "" then
table.insert(coreUrls, service.Trim(v.TextureId))
end
end
end

if backpack then
for _, v in ipairs(backpack:GetChildren()) do
if v:IsA("BackpackItem") and service.Trim(v.TextureId) ~= "" then
table.insert(coreUrls, service.Trim(v.TextureId))
end
end
end

if starterPack then
for _, v in ipairs(starterPack:GetChildren()) do
for _, container in {Player.Character, service.StarterPack, Player:FindFirstChildOfClass("Backpack")} do
for _, v in ipairs(container:GetChildren()) do
if v:IsA("BackpackItem") and service.Trim(v.TextureId) ~= "" then
table.insert(coreUrls, service.Trim(v.TextureId))
end
Expand Down
134 changes: 67 additions & 67 deletions MainModule/Client/UI/Default/Effect.luau
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ return function(data, env)
if env then
setfenv(1, env)
end

local gui = service.New("ScreenGui")
gui.IgnoreGuiInset = true
gui.ClipToDeviceSafeArea = true
local mode = data.Mode
local gTable = client.UI.Register(gui, {Name = "Effect"})
local BindEvent = gTable.BindEvent
Expand All @@ -26,12 +28,12 @@ return function(data, env)
local frame = Instance.new("Frame")
frame.Parent = gui
local camera = workspace.CurrentCamera
local pixels = {}

local resY = data.Resolution or 20
local resX = data.Resolution or 20
local depth = 0
local distance = data.Distance or 128
local pixels = table.create((gui.AbsoluteSize.Y / resY) * (gui.AbsoluteSize.X / resX))

local function renderScreen()
for _, pixel in pixels do
Expand All @@ -43,23 +45,21 @@ return function(data, env)
pixel.Pixel.BackgroundColor3 = if part and part.Transparency < 1
then part.BrickColor.Color
else Color3.fromRGB(105, 170, 255)

else
pixel.Pixel.BackgroundColor3 = Color3.fromRGB(105, 170, 255)
end
end
end

frame.Size = UDim2.new(1, 0, 1, 40)
frame.Position = UDim2.new(0, 0, 0, -35)
for y = 0, gui.AbsoluteSize.Y+50, resY do
for x = 0, gui.AbsoluteSize.X+30, resX do
local pixel = service.New("TextLabel", {
frame.Size = UDim2.new(1, 0, 1, 0)
frame.Position = UDim2.new(0, 0, 0, 0)
for y = 0, gui.AbsoluteSize.Y, resY do
for x = 0, gui.AbsoluteSize.X, resX do
local pixel = service.New("Frame", {
Parent = frame;
Text = "";
BorderSizePixel = 0;
Size = UDim2.fromOffset(resX, resY);
Position = UDim2.fromOffset(x-(resX/2), y-(resY/2));
Position = UDim2.fromOffset(x - (resX / 2), y - (resY / 2));
BackgroundColor3 = Color3.fromRGB(105, 170, 255);
})
table.insert(pixels, {Pixel = pixel, X = x, Y = y})
Expand Down Expand Up @@ -92,26 +92,21 @@ return function(data, env)
local bg = service.New("Frame", {
Parent = gui;
BackgroundTransparency = 1;
BackgroundColor3 = Color3.new(0,0,0);
Size = UDim2.new(2,0,2,0);
Position = UDim2.new(-0.5,0,-0.5,0);
BackgroundColor3 = Color3.new(0, 0, 0);
Size = UDim2.new(2, 0, 2, 0);
Position = UDim2.new(-1, 0, -1, 0);
})

for i = 1, 0, -0.01 do
bg.BackgroundTransparency = i
blur.Size = 56 * (1 - i);
task.wait(0.1)
end

bg.BackgroundTransparency = 0
service.TweenService:Create(bg, TweenInfo.new((1 / 0.01) * 0.1), { BackgroundTransparency = 0 }):Play()
service.TweenService:Create(blur, TweenInfo.new((1 / 0.01) * 0.1), { Size = (1 / 0.01) * 5.6 }):Play()
elseif mode == "Trippy" then
local v = service.Player
local bg = Instance.new("Frame")

bg.BackgroundColor3 = Color3.new(0,0,0)
bg.BackgroundColor3 = Color3.new(0, 0, 0)
bg.BackgroundTransparency = 0
bg.Size = UDim2.new(10,0,10,0)
bg.Position = UDim2.new(-5,0,-5,0)
bg.Size = UDim2.new(10, 0, 10, 0)
bg.Position = UDim2.new(-5, 0, -5, 0)
bg.ZIndex = 10
bg.Parent = gui

Expand All @@ -123,15 +118,15 @@ return function(data, env)
if gui then gui:Destroy() end
elseif mode == "Spooky" then
local frame = Instance.new("Frame")
frame.BackgroundColor3=Color3.new(0,0,0)
frame.Size=UDim2.new(1,0,1,50)
frame.Position=UDim2.new(0,0,0,-50)
frame.BackgroundColor3 = Color3.new(0, 0, 0)
frame.Size = UDim2.new(1, 0, 1, 0)
frame.Position = UDim2.new(0, 0, 0, 0)
frame.Parent = gui
local img = Instance.new("ImageLabel")
img.Position = UDim2.new(0,0,0,0)
img.Size = UDim2.new(1,0,1,0)
img.Position = UDim2.new(0, 0, 0, 0)
img.Size = UDim2.new(1, 0, 1, 0)
img.BorderSizePixel = 0
img.BackgroundColor3 = Color3.new(0,0,0)
img.BackgroundColor3 = Color3.new(0, 0, 0)
img.Parent = frame
local textures = {
299735022;
Expand All @@ -158,25 +153,28 @@ return function(data, env)
sound.Looped = true
sound.Parent = gui
sound:Play()
local lastImage

while gui and gui.Parent do
for i=1,#textures do
img.Image = `rbxassetid://{textures[i]}`
task.wait(0.1)
local image = `rbxassetid://{textures[math.floor(os.clock() / 0.1) % #textures + 1]}`
if image ~= lastImage then
img.Image, lastImage = image, image
end
task.wait()
end

sound:Stop()
elseif mode == "lifeoftheparty" then
local frame = Instance.new("Frame")
frame.BackgroundColor3 = Color3.new(0,0,0)
frame.Size = UDim2.new(1,0,1,50)
frame.Position = UDim2.new(0,0,0,-50)
frame.BackgroundColor3 = Color3.new(0, 0, 0)
frame.Size = UDim2.new(1, 0, 1, 0)
frame.Position = UDim2.new(0, 0, 0, 0)
frame.Parent = gui
local img = Instance.new("ImageLabel")
img.Position = UDim2.new(0,0,0,0)
img.Size = UDim2.new(1,0,1,0)
img.Position = UDim2.new(0, 0, 0, 0)
img.Size = UDim2.new(1, 0, 1, 0)
img.BorderSizePixel = 0
img.BackgroundColor3 = Color3.new(0,0,0)
img.BackgroundColor3 = Color3.new(0, 0, 0)
img.Parent = frame
local textures = {
299733203;
Expand Down Expand Up @@ -205,33 +203,34 @@ return function(data, env)
299733663;
299733674;
299733694;

}
local sound = Instance.new("Sound")
sound.SoundId = "rbxassetid://172906410"
sound.Looped = true
sound.Parent = gui
sound:Play()
local lastImage

while gui and gui.Parent do
for i=1,#textures do
img.Image = `rbxassetid://{textures[i]}`
task.wait(0.1)
local image = `rbxassetid://{textures[math.floor(os.clock() / 0.1) % #textures + 1]}`
if image ~= lastImage then
img.Image, lastImage = image, image
end
task.wait()
end

sound:Stop()
elseif mode == "trolling" then
local frame = Instance.new("Frame")
frame.BackgroundColor3 = Color3.new(0,0,0)
frame.Size = UDim2.new(1,0,1,50)
frame.Position = UDim2.new(0,0,0,-50)
frame.BackgroundColor3 = Color3.new(0, 0, 0)
frame.Size = UDim2.new(1, 0, 1, 0)
frame.Position = UDim2.new(0, 0, 0, 0)
frame.Parent = gui
local img = Instance.new("ImageLabel")
img.Position = UDim2.new(0,0,0,0)
img.Size = UDim2.new(1,0,1,0)
img.Position = UDim2.new(0, 0, 0, 0)
img.Size = UDim2.new(1, 0, 1, 0)
img.BorderSizePixel = 0
img.BackgroundColor3 = Color3.new(0,0,0)
img.BackgroundColor3 = Color3.new(0, 0, 0)
img.Parent = frame
local textures = {
"6172043688";
Expand Down Expand Up @@ -260,62 +259,63 @@ return function(data, env)
"6172045193";
"6172044478";
"6172043688";

}
local sound = Instance.new("Sound")
sound.SoundId = "rbxassetid://229681899"
sound.Looped = true
sound.Parent = gui
sound:Play()
local lastImage

while gui and gui.Parent do
for i=1,#textures do
img.Image = `rbxassetid://{textures[i]}`
task.wait(0.13)
local image = `rbxassetid://{textures[math.floor(os.clock() / 0.13) % #textures + 1]}`
if image ~= lastImage then
img.Image, lastImage = image, image
end
task.wait()
end

sound:Stop()
elseif mode == "Strobe" then
local bg = Instance.new("Frame")
bg.BackgroundColor3 = Color3.new(0,0,0)
bg.BackgroundColor3 = Color3.new(0, 0, 0)
bg.BackgroundTransparency = 0
bg.Size = UDim2.new(10,0,10,0)
bg.Position = UDim2.new(-5,0,-5,0)
bg.Size = UDim2.new(10, 0, 10, 0)
bg.Position = UDim2.new(-5, 0, -5, 0)
bg.ZIndex = 10
bg.Parent = gui

while gui and gui.Parent do
task.wait(1/44)
bg.BackgroundColor3 = Color3.new(1,1,1)
bg.BackgroundColor3 = Color3.new(1, 1, 1)
task.wait(1/44)
bg.BackgroundColor3 = Color3.new(0,0,0)
bg.BackgroundColor3 = Color3.new(0, 0, 0)
end
if gui then gui:Destroy() end
elseif mode == "Blind" then
local bg = Instance.new("Frame")
bg.BackgroundColor3 = Color3.new(0,0,0)
bg.BackgroundColor3 = Color3.new(0, 0, 0)
bg.BackgroundTransparency = 0
bg.Size = UDim2.new(10,0,10,0)
bg.Position = UDim2.new(-5,0,-5,0)
bg.Size = UDim2.new(10, 0, 10, 0)
bg.Position = UDim2.new(-5, 0, -5, 0)
bg.ZIndex = 10
bg.Parent = gui
elseif mode == "ScreenImage" then
local bg = Instance.new("ImageLabel")
bg.Image=`rbxassetid://{data.Image}`
bg.Image = `rbxassetid://{data.Image}`
bg.BackgroundColor3 = Color3.new(0,0,0)
bg.BackgroundTransparency = 0
bg.Size = UDim2.new(1,0,1,0)
bg.Position = UDim2.new(0,0,0,0)
bg.Size = UDim2.new(1, 0, 1, 0)
bg.Position = UDim2.new(0, 0, 0, 0)
bg.ZIndex = 10
bg.Parent = gui
elseif mode == "ScreenVideo" then
local bg = Instance.new("VideoFrame")
bg.Video=`rbxassetid://{data.Video}`
bg.BackgroundColor3 = Color3.new(0,0,0)
bg.Video = `rbxassetid://{data.Video}`
bg.BackgroundColor3 = Color3.new(0, 0, 0)
bg.BackgroundTransparency = 0
bg.Size = UDim2.new(1,0,1,0)
bg.Position = UDim2.new(0,0,0,0)
bg.Size = UDim2.new(1, 0, 1, 0)
bg.Position = UDim2.new(0, 0, 0, 0)
bg.ZIndex = 10
bg.Parent = gui
bg:Play()
Expand Down
4 changes: 3 additions & 1 deletion MainModule/Server/Commands/Admins.luau
View file
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,8 @@ return function(Vargs, env)

if string.lower(class) == "script" or string.lower(class) == "s" then
class = "Script"
elseif string.lower(class) == "clientscript" or string.lower(class) == "cs" then
class = "ClientScript"
--elseif string.lower(class) == "localscript" or string.lower(class) == "ls" then
-- class = "LocalScript"
else
Expand Down Expand Up @@ -1098,7 +1100,7 @@ return function(Vargs, env)

DeleteNote = {
Prefix = Settings.Prefix;
Commands = {"removenote", "remnote", "deletenote"};
Commands = {"removenote", "remnote", "deletenote", "clearnote"};
Args = {"player", "note (specify 'all' to delete all notes)"};
Description = "Removes a note on the target player(s)";
AdminLevel = "Admins";
Expand Down
11 changes: 6 additions & 5 deletions MainModule/Server/Commands/Fun.luau
View file
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ return function(Vargs, env)
Fun = true;
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
local scr = Core.NewScript("Script",[[
local scr = Core.NewScript("ClientScript", [[
local restore = {}
local tween = game:GetService("TweenService")
Expand All @@ -707,7 +707,7 @@ return function(Vargs, env)
end
script:Destroy()
end
]])
]], true)
scr.Name = "Rainbowify"

for i, v in service.GetPlayers(plr, args[1]) do
Expand Down Expand Up @@ -780,12 +780,13 @@ return function(Vargs, env)

Material = {
Prefix = Settings.Prefix;
Commands = {"mat", "material"};
Commands = {"material", "mat"};
Args = {"player", "material"};
Description = "Make the target the material you choose";
Fun = true;
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
--local chosenMat = if tonumber(args[2]) then Enum.Material:FromValue(tonumber(args[2])) elseif not args[2] then "Plastic" else Enum.Material:FromName(args[2])
local mats = {
Plastic = 256;
Wood = 512;
Expand Down Expand Up @@ -825,7 +826,7 @@ return function(Vargs, env)
for _, v in service.GetPlayers(plr, args[1]) do
if v.Character then
for _, p in v.Character:GetChildren() do
if p:IsA"BasePart" then
if p:IsA("BasePart") then
p.Material = chosenMat
end
end
Expand Down Expand Up @@ -3746,7 +3747,7 @@ return function(Vargs, env)

Seizure = {
Prefix = Settings.Prefix;
Commands = {"seizure"};
Commands = {"seizure", "seize"};
Args = {"player"};
Description = "Make the target player(s)'s character spazz out on the floor";
Fun = true;
Expand Down
Loading

0 comments on commit 199be61

Please sign in to comment.