Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Singer localscript changes #1525

Merged
merged 2 commits into from
May 13, 2024
Merged

Singer localscript changes #1525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77184b3
Update Fun.lua
ocelot81 May 13, 2024
cea50bc
Update Singer.meta.json
ocelot81 May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions MainModule/Server/Commands/Fun.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5056,13 +5056,13 @@ return function(Vargs, env)
Function = function(plr, args)
local id = string.lower(assert(args[2], "Missing soundid!"))

for i, v in Variables.MusicList do
for _, v in Variables.MusicList do
if id == string.lower(v.Name) then
id = v.ID
end
end

for i, v in HTTP.Trello.Music do
for _, v in HTTP.Trello.Music do
if id == string.lower(v.Name) then
id = v.ID
end
Expand All @@ -5087,12 +5087,12 @@ return function(Vargs, env)
head.face:Destroy()
end

if head:IsA("MeshPart") and table.find(Variables.AnimatedFaces, tonumber(head.MeshId:match("%d%d%d+"))) then
if head:IsA("MeshPart") and table.find(Variables.AnimatedFaces, tonumber(string.match(head.MeshId, "%d%d%d+"))) then
head.TextureID = ""
if head:FindFirstChildOfClass("SurfaceAppearance") then
head:FindFirstChildOfClass("SurfaceAppearance"):Destroy()
end
elseif head:FindFirstChildOfClass("SpecialMesh") and table.find(Variables.AnimatedFaces, tonumber(head:FindFirstChildOfClass("SpecialMesh").MeshId:match("%d%d%d+"))) then
elseif head:FindFirstChildOfClass("SpecialMesh") and table.find(Variables.AnimatedFaces, tonumber(string.match(head:FindFirstChildOfClass("SpecialMesh").MeshId, "%d%d%d+"))) then
head:FindFirstChildOfClass("SpecialMesh").TextureId = ""
end

Expand Down Expand Up @@ -5152,7 +5152,9 @@ return function(Vargs, env)
sound.Parent = head

if not sound:FindFirstChild("Singer") then
Deps.Assets.Singer:Clone().Parent = sound
local Singer = Deps.Assets.Singer:Clone();
Singer.Parent = sound;
Singer.Enabled = true;
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion MainModule/Server/Dependencies/Assets/Singer.meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"properties": {
"RunContext": "Client",
"Enabled": false
"Disabled": true
}
}
Loading