From 7ce67d32190b1d2c9fb856240b9a0b5b057f5d1b Mon Sep 17 00:00:00 2001 From: Bitl Date: Sun, 21 Nov 2021 15:30:09 -0700 Subject: [PATCH] small changes --- .../StorageAndFunctions/GlobalFuncs.cs | 12 ++----- .../Forms/LauncherForm/LauncherFormShared.cs | 8 +---- changelog.txt | 13 ++++++++ documentation.txt | 1 + scripts/game/2006S-Shaders/CSMPFunctions.lua | 13 ++++++-- scripts/game/2006S/CSMPFunctions.lua | 13 ++++++-- scripts/game/2007E-Shaders/CSMPFunctions.lua | 23 +++++++++---- scripts/game/2007E/CSMPFunctions.lua | 23 +++++++++---- scripts/game/2007M-Shaders/CSMPFunctions.lua | 32 ++++++++++++++----- scripts/game/2007M/CSMPFunctions.lua | 32 ++++++++++++++----- scripts/game/2008M/CSMPFunctions.lua | 4 +++ scripts/game/2009E-HD/CSMPFunctions.lua | 4 +++ scripts/game/2009E/CSMPFunctions.lua | 4 +++ scripts/game/2010L/CSMPFunctions.lua | 4 +++ scripts/game/2011E/CSMPFunctions.lua | 4 +++ scripts/game/2011M/CSMPFunctions.lua | 4 +++ 16 files changed, 145 insertions(+), 49 deletions(-) diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs index 72d1539..dc5bef0 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs @@ -1997,11 +1997,7 @@ public class GlobalFuncs break; case ScriptType.Solo: ReloadLoadoutValue(true); - if (GlobalVars.GameOpened != ScriptType.Studio) - { - goto default; - } - break; + goto default; default: if (GlobalVars.GameOpened != ScriptType.None) { @@ -2200,11 +2196,7 @@ public class GlobalFuncs goto default; } break; - case ScriptType.Solo: - if (GlobalVars.GameOpened != ScriptType.Studio) - { - goto default; - } + case ScriptType.Studio: break; case ScriptType.Server: #if LAUNCHER diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs index c13e198..2a9db34 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs @@ -527,7 +527,7 @@ namespace NovetusLauncher GlobalFuncs.LaunchRBXClient(ScriptType.Solo, false, false, new EventHandler(SoloExited), ConsoleBox); break; case ScriptType.Studio: - GlobalFuncs.LaunchRBXClient(ScriptType.Studio, false, nomap, new EventHandler(StudioExited), ConsoleBox); + GlobalFuncs.LaunchRBXClient(ScriptType.Studio, false, nomap, new EventHandler(ClientExitedBase), ConsoleBox); break; case ScriptType.EasterEgg: GlobalFuncs.LaunchRBXClient(ScriptType.EasterEgg, false, false, new EventHandler(EasterEggExited), ConsoleBox); @@ -591,12 +591,6 @@ namespace NovetusLauncher ClientExitedBase(sender, e); } - void StudioExited(object sender, EventArgs e) - { - GlobalVars.GameOpened = ScriptType.None; - ClientExitedBase(sender, e); - } - void ServerExited(object sender, EventArgs e) { GlobalVars.GameOpened = ScriptType.None; diff --git a/changelog.txt b/changelog.txt index 6bcbe94..48ae7a1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -10,8 +10,11 @@ New Features: - %tshirttexid%, %shirttexid%, %pantstexid%, %facetexid% - Returns the texture URL for the respective online clothing type. Returns nothing if the URL is invalid, the item isn't using Online Clothing, or %localizeonlineclothing% is not defined in the script. - %tshirttexidlocal%, %shirttexidlocal%, %pantstexidlocal%, %facetexlocal%" - Returns the texture rbxasset URL for the respective online clothing type. Returns nothing if the URL is invalid, the item isn't using Online Clothing, or %localizeonlineclothing% is not defined in the script. Only the client who downloads the clothing would be able to see it. - %localizeonlineclothing% - Grabs texture IDS for the %texid% variables and localizes the texture for the %texidlocal% variables. This WILL increase load times of your client depending on how many items are being downloaded. + - %newgui% - Returns if the 2011L interface is enabled on 2011M clients. Can be used as a toggle switch for other client-side CoreScript features. - Users may now use a image URL to load custom icons. - Icons loaded from a URL will show up for all players. +- Added the ability to assign a custom client EXE name in the Client SDK. +- Server hosters and map authors may now insert a "DisableCustomization" object into Lighting that will disable player customizations. DisableCustomization may also be removed to re-enable player customizations. Enhancements: - The Bootstrapper now creates error logs of its own. @@ -24,6 +27,13 @@ Enhancements: - Novetus now bases your tripcode off of your computer's hardware information. (Powered by https://github.com/davcs86/csharp-uhwid) - 2011M's GUI is now more accurate to when it released (Mid June 2011). - You can re-enable the previous GUI by going into Novetus' settings. +- The Client SDK now has specific version numbers for each clientinfo version. +- Made the Client Description and Warning fields larger in the Client SDK. +- The Client Description field now resizes with the rest of the Client SDK window. +- 2006S and 2006S-Shaders now use "PlayerHopper" instead of "Backpack" for compatibility with 2006 levels. +- All customization items are now named properly in 2006S-2007M. +- Studio can now be launched alongside other game types and clients. +- Universal clients are caegoriozed based on client optimizations. Fixes: - Fixed the URL Override box in the Asset SDK not being functional. @@ -36,6 +46,9 @@ Fixes: - Fixed some clients not functioning properly with Wine (Credits to man-of-eel in pull request #27). - Fixed small issues with tripcodes. - Fixed a bug where Novetus would switch the style to Stylish even after saving. +- Fixed compatibility with 1.2.3 clientinfo.nov files in the Client SDK. +- Fixed Santa's Winter Stronghold. +- Fixed missing assets in some Universal maps. Lite version changes: - Removed the following clients: diff --git a/documentation.txt b/documentation.txt index 00000dc..f37332b 100644 --- a/documentation.txt +++ b/documentation.txt @@ -25,6 +25,7 @@ General: %joinport% - Returns the port when joining a server. %validatedfiles% - Returns the total number of files that have been validated. %validatedextrafiles% - Returns the total number of files that have been validated with . +%newgui% - Returns if the 2011L interface is enabled on 2011M clients. Can be used as a toggle switch for other client-side CoreScript features. Server: %limit% - Max Player limit. diff --git a/scripts/game/2006S-Shaders/CSMPFunctions.lua b/scripts/game/2006S-Shaders/CSMPFunctions.lua index 573ca6c..377114b 100644 --- a/scripts/game/2006S-Shaders/CSMPFunctions.lua +++ b/scripts/game/2006S-Shaders/CSMPFunctions.lua @@ -51,6 +51,10 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) + if (game.Lighting:findFirstChild("DisableCustomization") ~= nil) then + do return end + end + PlayerService = game:service("Players") Player = PlayerService:playerFromCharacter(newChar) @@ -74,7 +78,7 @@ function LoadCharacterNew(playerApp,newChar) local charparts = {[1] = newWaitForChild(newChar,"Head"),[2] = newWaitForChild(newChar,"Torso"),[3] = newWaitForChild(newChar,"Left Arm"),[4] = newWaitForChild(newChar,"Right Arm"),[5] = newWaitForChild(newChar,"Left Leg"),[6] = newWaitForChild(newChar,"Right Leg")} for _,newVal in pairs(playerApp:children()) do - if (newVal.Name == "Body Color") then + if (string.match(newVal.Name, "Color") == "Color") then pcall(function() charparts[newVal.ColorIndex.Value].BrickColor = newVal.Value end) @@ -94,38 +98,43 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Head Color" elseif (i == 2) then if (TorsoColorID ~= nil) then BodyColor.Value = BrickColor.new(TorsoColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Torso Color" elseif (i == 3) then if (LeftArmColorID ~= nil) then BodyColor.Value = BrickColor.new(LeftArmColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Left Arm Color" elseif (i == 4) then if (RightArmColorID ~= nil) then BodyColor.Value = BrickColor.new(RightArmColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Right Arm Color" elseif (i == 5) then if (LeftLegColorID ~= nil) then BodyColor.Value = BrickColor.new(LeftLegColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Left Leg Color" elseif (i == 6) then if (RightLegColorID ~= nil) then BodyColor.Value = BrickColor.new(RightLegColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Right Leg Color" end - BodyColor.Name = "Body Color" local indexValue = Instance.new("NumberValue") indexValue.Name = "ColorIndex" indexValue.Parent = BodyColor diff --git a/scripts/game/2006S/CSMPFunctions.lua b/scripts/game/2006S/CSMPFunctions.lua index f0ee828..acf3183 100644 --- a/scripts/game/2006S/CSMPFunctions.lua +++ b/scripts/game/2006S/CSMPFunctions.lua @@ -51,6 +51,10 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) + if (game.Lighting:findFirstChild("DisableCustomization") ~= nil) then + do return end + end + PlayerService = game:service("Players") Player = PlayerService:playerFromCharacter(newChar) @@ -74,7 +78,7 @@ function LoadCharacterNew(playerApp,newChar) local charparts = {[1] = newWaitForChild(newChar,"Head"),[2] = newWaitForChild(newChar,"Torso"),[3] = newWaitForChild(newChar,"Left Arm"),[4] = newWaitForChild(newChar,"Right Arm"),[5] = newWaitForChild(newChar,"Left Leg"),[6] = newWaitForChild(newChar,"Right Leg")} for _,newVal in pairs(playerApp:children()) do - if (newVal.Name == "Body Color") then + if (string.match(newVal.Name, "Color") == "Color") then pcall(function() charparts[newVal.ColorIndex.Value].BrickColor = newVal.Value end) @@ -94,38 +98,43 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Head Color" elseif (i == 2) then if (TorsoColorID ~= nil) then BodyColor.Value = BrickColor.new(TorsoColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Torso Color" elseif (i == 3) then if (LeftArmColorID ~= nil) then BodyColor.Value = BrickColor.new(LeftArmColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Left Arm Color" elseif (i == 4) then if (RightArmColorID ~= nil) then BodyColor.Value = BrickColor.new(RightArmColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Right Arm Color" elseif (i == 5) then if (LeftLegColorID ~= nil) then BodyColor.Value = BrickColor.new(LeftLegColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Left Leg Color" elseif (i == 6) then if (RightLegColorID ~= nil) then BodyColor.Value = BrickColor.new(RightLegColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Right Leg Color" end - BodyColor.Name = "Body Color" local indexValue = Instance.new("NumberValue") indexValue.Name = "ColorIndex" indexValue.Parent = BodyColor diff --git a/scripts/game/2007E-Shaders/CSMPFunctions.lua b/scripts/game/2007E-Shaders/CSMPFunctions.lua index 6cc27e6..b698746 100644 --- a/scripts/game/2007E-Shaders/CSMPFunctions.lua +++ b/scripts/game/2007E-Shaders/CSMPFunctions.lua @@ -51,6 +51,10 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) + if (game.Lighting:findFirstChild("DisableCustomization") ~= nil) then + do return end + end + PlayerService = game:service("Players") Player = PlayerService:playerFromCharacter(newChar) @@ -74,11 +78,11 @@ function LoadCharacterNew(playerApp,newChar) local charparts = {[1] = newWaitForChild(newChar,"Head"),[2] = newWaitForChild(newChar,"Torso"),[3] = newWaitForChild(newChar,"Left Arm"),[4] = newWaitForChild(newChar,"Right Arm"),[5] = newWaitForChild(newChar,"Left Leg"),[6] = newWaitForChild(newChar,"Right Leg")} for _,newVal in pairs(playerApp:children()) do - if (newVal.Name == "Body Color") then + if (string.match(newVal.Name, "Color") == "Color") then pcall(function() charparts[newVal.ColorIndex.Value].BrickColor = newVal.Value end) - elseif (newVal.Name == "T-Shirt") then + elseif (string.match(newVal.Name, "Shirt") == "Shirt") then pcall(function() local newTShirt = ""; if (string.match(newVal.Value, "http") == "http") then @@ -106,7 +110,7 @@ function LoadCharacterNew(playerApp,newChar) end end end) - elseif (newVal.Name == "Extra") then + elseif (string.match(newVal.Name, "Extra") == "Extra") then pcall(function() local newItem = game.Workspace:insertContent(path.."custom/"..newVal.Value) if newItem[1] then @@ -138,38 +142,43 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Head Color" elseif (i == 2) then if (TorsoColorID ~= nil) then BodyColor.Value = BrickColor.new(TorsoColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Torso Color" elseif (i == 3) then if (LeftArmColorID ~= nil) then BodyColor.Value = BrickColor.new(LeftArmColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Left Arm Color" elseif (i == 4) then if (RightArmColorID ~= nil) then BodyColor.Value = BrickColor.new(RightArmColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Right Arm Color" elseif (i == 5) then if (LeftLegColorID ~= nil) then BodyColor.Value = BrickColor.new(LeftLegColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Left Leg Color" elseif (i == 6) then if (RightLegColorID ~= nil) then BodyColor.Value = BrickColor.new(RightLegColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Right Leg Color" end - BodyColor.Name = "Body Color" local indexValue = Instance.new("NumberValue") indexValue.Name = "ColorIndex" indexValue.Parent = BodyColor @@ -179,18 +188,20 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso local newTShirt = Instance.new("StringValue",newCharApp) if (TShirtID ~= nil) then newTShirt.Value = TShirtID + newTShirt.Name = "T-Shirt - "..TShirtID else newTShirt.Value = "NoTShirt.rbxm" + newTShirt.Name = "T-Shirt - NoTShirt.rbxm" end - newTShirt.Name = "T-Shirt" --EXTRA local newItem = Instance.new("StringValue",newCharApp) if (ItemID ~= nil) then newItem.Value = ItemID + newItem.Name = "Extra - "..ItemID else newItem.Value = "NoExtra.rbxm" + newItem.Name = "Extra - NoExtra.rbxm" end - newItem.Name = "Extra" end function LoadSecurity(playerApp,Player,ServerSecurityLocation) diff --git a/scripts/game/2007E/CSMPFunctions.lua b/scripts/game/2007E/CSMPFunctions.lua index 6cc27e6..b698746 100644 --- a/scripts/game/2007E/CSMPFunctions.lua +++ b/scripts/game/2007E/CSMPFunctions.lua @@ -51,6 +51,10 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) + if (game.Lighting:findFirstChild("DisableCustomization") ~= nil) then + do return end + end + PlayerService = game:service("Players") Player = PlayerService:playerFromCharacter(newChar) @@ -74,11 +78,11 @@ function LoadCharacterNew(playerApp,newChar) local charparts = {[1] = newWaitForChild(newChar,"Head"),[2] = newWaitForChild(newChar,"Torso"),[3] = newWaitForChild(newChar,"Left Arm"),[4] = newWaitForChild(newChar,"Right Arm"),[5] = newWaitForChild(newChar,"Left Leg"),[6] = newWaitForChild(newChar,"Right Leg")} for _,newVal in pairs(playerApp:children()) do - if (newVal.Name == "Body Color") then + if (string.match(newVal.Name, "Color") == "Color") then pcall(function() charparts[newVal.ColorIndex.Value].BrickColor = newVal.Value end) - elseif (newVal.Name == "T-Shirt") then + elseif (string.match(newVal.Name, "Shirt") == "Shirt") then pcall(function() local newTShirt = ""; if (string.match(newVal.Value, "http") == "http") then @@ -106,7 +110,7 @@ function LoadCharacterNew(playerApp,newChar) end end end) - elseif (newVal.Name == "Extra") then + elseif (string.match(newVal.Name, "Extra") == "Extra") then pcall(function() local newItem = game.Workspace:insertContent(path.."custom/"..newVal.Value) if newItem[1] then @@ -138,38 +142,43 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Head Color" elseif (i == 2) then if (TorsoColorID ~= nil) then BodyColor.Value = BrickColor.new(TorsoColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Torso Color" elseif (i == 3) then if (LeftArmColorID ~= nil) then BodyColor.Value = BrickColor.new(LeftArmColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Left Arm Color" elseif (i == 4) then if (RightArmColorID ~= nil) then BodyColor.Value = BrickColor.new(RightArmColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Right Arm Color" elseif (i == 5) then if (LeftLegColorID ~= nil) then BodyColor.Value = BrickColor.new(LeftLegColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Left Leg Color" elseif (i == 6) then if (RightLegColorID ~= nil) then BodyColor.Value = BrickColor.new(RightLegColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Right Leg Color" end - BodyColor.Name = "Body Color" local indexValue = Instance.new("NumberValue") indexValue.Name = "ColorIndex" indexValue.Parent = BodyColor @@ -179,18 +188,20 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso local newTShirt = Instance.new("StringValue",newCharApp) if (TShirtID ~= nil) then newTShirt.Value = TShirtID + newTShirt.Name = "T-Shirt - "..TShirtID else newTShirt.Value = "NoTShirt.rbxm" + newTShirt.Name = "T-Shirt - NoTShirt.rbxm" end - newTShirt.Name = "T-Shirt" --EXTRA local newItem = Instance.new("StringValue",newCharApp) if (ItemID ~= nil) then newItem.Value = ItemID + newItem.Name = "Extra - "..ItemID else newItem.Value = "NoExtra.rbxm" + newItem.Name = "Extra - NoExtra.rbxm" end - newItem.Name = "Extra" end function LoadSecurity(playerApp,Player,ServerSecurityLocation) diff --git a/scripts/game/2007M-Shaders/CSMPFunctions.lua b/scripts/game/2007M-Shaders/CSMPFunctions.lua index fe342b5..931cad9 100644 --- a/scripts/game/2007M-Shaders/CSMPFunctions.lua +++ b/scripts/game/2007M-Shaders/CSMPFunctions.lua @@ -51,6 +51,10 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) + if (game.Lighting:findFirstChild("DisableCustomization") ~= nil) then + do return end + end + PlayerService = game:GetService("Players") Player = PlayerService:GetPlayerFromCharacter(newChar) @@ -74,11 +78,11 @@ function LoadCharacterNew(playerApp,newChar) local charparts = {[1] = newWaitForChild(newChar,"Head"),[2] = newWaitForChild(newChar,"Torso"),[3] = newWaitForChild(newChar,"Left Arm"),[4] = newWaitForChild(newChar,"Right Arm"),[5] = newWaitForChild(newChar,"Left Leg"),[6] = newWaitForChild(newChar,"Right Leg")} for _,newVal in pairs(playerApp:GetChildren()) do - if (newVal.Name == "Body Color") then + if (string.match(newVal.Name, "Color") == "Color") then pcall(function() charparts[newVal.ColorIndex.Value].BrickColor = newVal.Value end) - elseif (newVal.Name == "Hat") then + elseif (string.match(newVal.Name, "Hat") == "Hat") then pcall(function() local newHat = game.Workspace:InsertContent(path.."hats/"..newVal.Value) if newHat[1] then @@ -89,7 +93,7 @@ function LoadCharacterNew(playerApp,newChar) end end end) - elseif (newVal.Name == "T-Shirt") then + elseif (string.match(newVal.Name, "Shirt") == "Shirt") then pcall(function() local newTShirt = ""; if (string.match(newVal.Value, "http") == "http") then @@ -126,7 +130,7 @@ function LoadCharacterNew(playerApp,newChar) end end end) - elseif (newVal.Name == "Extra") then + elseif (string.match(newVal.Name, "Extra") == "Extra") then pcall(function() local newHat = game.Workspace:InsertContent(path.."hats/"..newVal.Value) if newHat[1] then @@ -169,38 +173,43 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Head Color" elseif (i == 2) then if (TorsoColorID ~= nil) then BodyColor.Value = BrickColor.new(TorsoColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Torso Color" elseif (i == 3) then if (LeftArmColorID ~= nil) then BodyColor.Value = BrickColor.new(LeftArmColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Left Arm Color" elseif (i == 4) then if (RightArmColorID ~= nil) then BodyColor.Value = BrickColor.new(RightArmColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Right Arm Color" elseif (i == 5) then if (LeftLegColorID ~= nil) then BodyColor.Value = BrickColor.new(LeftLegColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Left Leg Color" elseif (i == 6) then if (RightLegColorID ~= nil) then BodyColor.Value = BrickColor.new(RightLegColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Right Leg Color" end - BodyColor.Name = "Body Color" local indexValue = Instance.new("NumberValue") indexValue.Name = "ColorIndex" indexValue.Parent = BodyColor @@ -212,40 +221,47 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso if (i == 1) then if (Hat1ID ~= nil) then newHat.Value = Hat1ID + newHat.Name = "Hat 1 - "..Hat1ID else newHat.Value = "NoHat.rbxm" + newHat.Name = "Hat 1 - NoHat.rbxm" end elseif (i == 2) then if (Hat2ID ~= nil) then newHat.Value = Hat2ID + newHat.Name = "Hat 2 - "..Hat2ID else newHat.Value = "NoHat.rbxm" + newHat.Name = "Hat 2 - NoHat.rbxm" end elseif (i == 3) then if (Hat3ID ~= nil) then newHat.Value = Hat3ID + newHat.Name = "Hat 3 - "..Hat3ID else newHat.Value = "NoHat.rbxm" + newHat.Name = "Hat 3 - NoHat.rbxm" end end - newHat.Name = "Hat" end --T-SHIRT local newTShirt = Instance.new("StringValue",newCharApp) if (TShirtID ~= nil) then newTShirt.Value = TShirtID + newTShirt.Name = "T-Shirt - "..TShirtID else newTShirt.Value = "NoTShirt.rbxm" + newTShirt.Name = "T-Shirt - NoTShirt.rbxm" end - newTShirt.Name = "T-Shirt" --EXTRA local newItem = Instance.new("StringValue",newCharApp) if (ItemID ~= nil) then newItem.Value = ItemID + newItem.Name = "Extra - "..ItemID else newItem.Value = "NoExtra.rbxm" + newItem.Name = "Extra - NoExtra.rbxm" end - newItem.Name = "Extra" end function LoadSecurity(playerApp,Player,ServerSecurityLocation) diff --git a/scripts/game/2007M/CSMPFunctions.lua b/scripts/game/2007M/CSMPFunctions.lua index 718b7e3..526aa68 100644 --- a/scripts/game/2007M/CSMPFunctions.lua +++ b/scripts/game/2007M/CSMPFunctions.lua @@ -51,6 +51,10 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) + if (game.Lighting:findFirstChild("DisableCustomization") ~= nil) then + do return end + end + PlayerService = game:GetService("Players") Player = PlayerService:GetPlayerFromCharacter(newChar) @@ -74,11 +78,11 @@ function LoadCharacterNew(playerApp,newChar) local charparts = {[1] = newWaitForChild(newChar,"Head"),[2] = newWaitForChild(newChar,"Torso"),[3] = newWaitForChild(newChar,"Left Arm"),[4] = newWaitForChild(newChar,"Right Arm"),[5] = newWaitForChild(newChar,"Left Leg"),[6] = newWaitForChild(newChar,"Right Leg")} for _,newVal in pairs(playerApp:GetChildren()) do - if (newVal.Name == "Body Color") then + if (string.match(newVal.Name, "Color") == "Color") then pcall(function() charparts[newVal.ColorIndex.Value].BrickColor = newVal.Value end) - elseif (newVal.Name == "Hat") then + elseif (string.match(newVal.Name, "Hat") == "Hat") then pcall(function() local newHat = game.Workspace:InsertContent(path.."hats/"..newVal.Value) if newHat[1] then @@ -89,7 +93,7 @@ function LoadCharacterNew(playerApp,newChar) end end end) - elseif (newVal.Name == "T-Shirt") then + elseif (string.match(newVal.Name, "Shirt") == "Shirt") then pcall(function() local newTShirt = ""; if (string.match(newVal.Value, "http") == "http") then @@ -126,7 +130,7 @@ function LoadCharacterNew(playerApp,newChar) end end end) - elseif (newVal.Name == "Extra") then + elseif (string.match(newVal.Name, "Extra") == "Extra") then pcall(function() local newHat = game.Workspace:InsertContent(path.."hats/"..newVal.Value) if newHat[1] then @@ -169,38 +173,43 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Head Color" elseif (i == 2) then if (TorsoColorID ~= nil) then BodyColor.Value = BrickColor.new(TorsoColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Torso Color" elseif (i == 3) then if (LeftArmColorID ~= nil) then BodyColor.Value = BrickColor.new(LeftArmColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Left Arm Color" elseif (i == 4) then if (RightArmColorID ~= nil) then BodyColor.Value = BrickColor.new(RightArmColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Right Arm Color" elseif (i == 5) then if (LeftLegColorID ~= nil) then BodyColor.Value = BrickColor.new(LeftLegColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Left Leg Color" elseif (i == 6) then if (RightLegColorID ~= nil) then BodyColor.Value = BrickColor.new(RightLegColorID) else BodyColor.Value = BrickColor.new(1) end + BodyColor.Name = "Right Leg Color" end - BodyColor.Name = "Body Color" local indexValue = Instance.new("NumberValue") indexValue.Name = "ColorIndex" indexValue.Parent = BodyColor @@ -212,40 +221,47 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso if (i == 1) then if (Hat1ID ~= nil) then newHat.Value = Hat1ID + newHat.Name = "Hat 1 - "..Hat1ID else newHat.Value = "NoHat.rbxm" + newHat.Name = "Hat 1 - NoHat.rbxm" end elseif (i == 2) then if (Hat2ID ~= nil) then newHat.Value = Hat2ID + newHat.Name = "Hat 2 - "..Hat2ID else newHat.Value = "NoHat.rbxm" + newHat.Name = "Hat 2 - NoHat.rbxm" end elseif (i == 3) then if (Hat3ID ~= nil) then newHat.Value = Hat3ID + newHat.Name = "Hat 3 - "..Hat3ID else newHat.Value = "NoHat.rbxm" + newHat.Name = "Hat 3 - NoHat.rbxm" end end - newHat.Name = "Hat" end --T-SHIRT local newTShirt = Instance.new("StringValue",newCharApp) if (TShirtID ~= nil) then newTShirt.Value = TShirtID + newTShirt.Name = "T-Shirt - "..TShirtID else newTShirt.Value = "NoTShirt.rbxm" + newTShirt.Name = "T-Shirt - NoTShirt.rbxm" end - newTShirt.Name = "T-Shirt" --EXTRA local newItem = Instance.new("StringValue",newCharApp) if (ItemID ~= nil) then newItem.Value = ItemID + newItem.Name = "Extra - "..ItemID else newItem.Value = "NoExtra.rbxm" + newItem.Name = "Extra - NoExtra.rbxm" end - newItem.Name = "Extra" end function LoadSecurity(playerApp,Player,ServerSecurityLocation) diff --git a/scripts/game/2008M/CSMPFunctions.lua b/scripts/game/2008M/CSMPFunctions.lua index 319632d..db83651 100644 --- a/scripts/game/2008M/CSMPFunctions.lua +++ b/scripts/game/2008M/CSMPFunctions.lua @@ -51,6 +51,10 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) + if (game.Lighting:findFirstChild("DisableCustomization") ~= nil) then + do return end + end + PlayerService = game:GetService("Players") Player = PlayerService:GetPlayerFromCharacter(newChar) diff --git a/scripts/game/2009E-HD/CSMPFunctions.lua b/scripts/game/2009E-HD/CSMPFunctions.lua index 4bec753..9232994 100644 --- a/scripts/game/2009E-HD/CSMPFunctions.lua +++ b/scripts/game/2009E-HD/CSMPFunctions.lua @@ -51,6 +51,10 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) + if (game.Lighting:findFirstChild("DisableCustomization") ~= nil) then + do return end + end + PlayerService = game:GetService("Players") Player = PlayerService:GetPlayerFromCharacter(newChar) diff --git a/scripts/game/2009E/CSMPFunctions.lua b/scripts/game/2009E/CSMPFunctions.lua index 4bec753..9232994 100644 --- a/scripts/game/2009E/CSMPFunctions.lua +++ b/scripts/game/2009E/CSMPFunctions.lua @@ -51,6 +51,10 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) + if (game.Lighting:findFirstChild("DisableCustomization") ~= nil) then + do return end + end + PlayerService = game:GetService("Players") Player = PlayerService:GetPlayerFromCharacter(newChar) diff --git a/scripts/game/2010L/CSMPFunctions.lua b/scripts/game/2010L/CSMPFunctions.lua index c9f21a8..6b4d24a 100644 --- a/scripts/game/2010L/CSMPFunctions.lua +++ b/scripts/game/2010L/CSMPFunctions.lua @@ -54,6 +54,10 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) + if (game.Lighting:findFirstChild("DisableCustomization") ~= nil) then + do return end + end + PlayerService = game:GetService("Players") Player = PlayerService:GetPlayerFromCharacter(newChar) diff --git a/scripts/game/2011E/CSMPFunctions.lua b/scripts/game/2011E/CSMPFunctions.lua index ff9653b..6247202 100644 --- a/scripts/game/2011E/CSMPFunctions.lua +++ b/scripts/game/2011E/CSMPFunctions.lua @@ -57,6 +57,10 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) + if (game.Lighting:findFirstChild("DisableCustomization") ~= nil) then + do return end + end + PlayerService = game:GetService("Players") Player = PlayerService:GetPlayerFromCharacter(newChar) diff --git a/scripts/game/2011M/CSMPFunctions.lua b/scripts/game/2011M/CSMPFunctions.lua index f5f1aa1..2a14a44 100644 --- a/scripts/game/2011M/CSMPFunctions.lua +++ b/scripts/game/2011M/CSMPFunctions.lua @@ -55,6 +55,10 @@ function newWaitForChildSecurity(newParent,name) end function LoadCharacterNew(playerApp,newChar) + if (game.Lighting:findFirstChild("DisableCustomization") ~= nil) then + do return end + end + PlayerService = game:GetService("Players") Player = PlayerService:GetPlayerFromCharacter(newChar)