From 53f512c42fcb04839415f0d2144b2b2672cdbf29 Mon Sep 17 00:00:00 2001 From: Bitl Date: Sat, 29 Jul 2017 20:22:56 -0700 Subject: [PATCH] Converted client loading from strings to ints --- CSMPFunctions.lua | 289 +++++++++--------- .../RBXLegacyLauncher/DocForm.resx | 49 ++- .../RBXLegacyLauncher/GlobalVars.cs | 4 +- .../RBXLegacyLauncher/LauncherFuncs.cs | 3 +- .../RBXLegacyLauncher/LoaderForm.cs | 8 +- .../RBXLegacyLauncher/MainForm.cs | 22 +- .../RBXLegacyLauncher/SDKForm.Designer.cs | 2 +- .../RBXLegacyLauncher/SDKForm.cs | 26 +- 8 files changed, 208 insertions(+), 195 deletions(-) diff --git a/CSMPFunctions.lua b/CSMPFunctions.lua index 8d51434..98eaae1 100644 --- a/CSMPFunctions.lua +++ b/CSMPFunctions.lua @@ -164,7 +164,6 @@ end function LoadCharacterNew(playerApp,newChar) --authentic roblox style loading - wait(1.5) 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.CustomizationType.Value == 1) then @@ -328,152 +327,162 @@ function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,Torso typeValue.Value = 1 end --HATS - for i=1,3,1 do - local newHat = Instance.new("StringValue",newCharApp) - if (i == 1) then - if (Hat1ID ~= nil) then - newHat.Value = Hat1ID - newHat.Name = Hat1ID - else - newHat.Value = "NoHat.rbxm" - newHat.Name = "NoHat.rbxm" - end - elseif (i == 2) then - if (Hat2ID ~= nil) then - newHat.Value = Hat2ID - newHat.Name = Hat2ID - else - newHat.Value = "NoHat.rbxm" - newHat.Name = "NoHat.rbxm" - end - elseif (i == 3) then - if (Hat3ID ~= nil) then - newHat.Value = Hat3ID - newHat.Name = Hat3ID - else - newHat.Value = "NoHat.rbxm" - newHat.Name = "NoHat.rbxm" + if (rbxlegacyversion ~= "pre-alpha") then + for i=1,3,1 do + local newHat = Instance.new("StringValue",newCharApp) + if (i == 1) then + if (Hat1ID ~= nil) then + newHat.Value = Hat1ID + newHat.Name = Hat1ID + else + newHat.Value = "NoHat.rbxm" + newHat.Name = "NoHat.rbxm" + end + elseif (i == 2) then + if (Hat2ID ~= nil) then + newHat.Value = Hat2ID + newHat.Name = Hat2ID + else + newHat.Value = "NoHat.rbxm" + newHat.Name = "NoHat.rbxm" + end + elseif (i == 3) then + if (Hat3ID ~= nil) then + newHat.Value = Hat3ID + newHat.Name = Hat3ID + else + newHat.Value = "NoHat.rbxm" + newHat.Name = "NoHat.rbxm" + end end + local typeValue = Instance.new("NumberValue") + typeValue.Name = "CustomizationType" + typeValue.Parent = newHat + typeValue.Value = 2 end - local typeValue = Instance.new("NumberValue") - typeValue.Name = "CustomizationType" - typeValue.Parent = newHat - typeValue.Value = 2 end --T-SHIRT - local newTShirt = Instance.new("StringValue",newCharApp) - if (TShirtID ~= nil or TShirtID ~= "0") then - newTShirt.Value = TShirtID - else - newTShirt.Value = "0" - end - newTShirt.Name = "T-Shirt" - local typeValue = Instance.new("NumberValue") - typeValue.Name = "CustomizationType" - typeValue.Parent = newTShirt - typeValue.Value = 3 - --SHIRT - local newShirt = Instance.new("StringValue",newCharApp) - if (ShirtID ~= nil or ShirtID ~= "0") then - newShirt.Value = ShirtID - else - newShirt.Value = "0" - end - newShirt.Name = "Shirt" - local typeValue = Instance.new("NumberValue") - typeValue.Name = "CustomizationType" - typeValue.Parent = newShirt - typeValue.Value = 4 - --PANTS - local newPants = Instance.new("StringValue",newCharApp) - if (PantsID ~= nil or PantsID ~= "0") then - newPants.Value = PantsID - else - newPants.Value = "0" - end - newPants.Name = "Pants" - local typeValue = Instance.new("NumberValue") - typeValue.Name = "CustomizationType" - typeValue.Parent = newPants - typeValue.Value = 5 - --FACE - local newFace = Instance.new("StringValue",newCharApp) - if (FaceID ~= nil) then - newFace.Value = FaceID - newFace.Name = FaceID - else - newFace.Value = "DefaultFace.rbxm" - newFace.Name = "DefaultFace.rbxm" - end - local typeValue = Instance.new("NumberValue") - typeValue.Name = "CustomizationType" - typeValue.Parent = newFace - typeValue.Value = 6 - --HEADS - local newHead = Instance.new("StringValue",newCharApp) - if (HeadID ~= nil) then - newHead.Value = HeadID - newHead.Name = HeadID - else - newHead.Value = "DefaultHead.rbxm" - newHead.Name = "DefaultHead.rbxm" - end - local typeValue = Instance.new("NumberValue") - typeValue.Name = "CustomizationType" - typeValue.Parent = newHead - typeValue.Value = 7 - --PACKAGES - for i=2,5,1 do - local BodyMesh = Instance.new("StringValue",newCharApp) - if (i == 2) then - if (TorsoID ~= nil) then - BodyMesh.Value = TorsoID - BodyMesh.Name = TorsoID - else - BodyMesh.Value = "DefaultTorso.rbxm" - BodyMesh.Name = "DefaultTorso.rbxm" - end - elseif (i == 3) then - if (LArmID ~= nil) then - BodyMesh.Value = LArmID - BodyMesh.Name = LArmID - else - BodyMesh.Value = "DefaultLArm.rbxm" - BodyMesh.Name = "DefaultLArm.rbxm" - end - elseif (i == 4) then - if (RArmID ~= nil) then - BodyMesh.Value = RArmID - BodyMesh.Name = RArmID - else - BodyMesh.Value = "DefaultRArm.rbxm" - BodyMesh.Name = "DefaultRArm.rbxm" - end - elseif (i == 5) then - if (LLegID ~= nil) then - BodyMesh.Value = LLegID - BodyMesh.Name = LLegID - else - BodyMesh.Value = "DefaultLLeg.rbxm" - BodyMesh.Name = "DefaultLLeg.rbxm" - end - elseif (i == 6) then - if (RLegID ~= nil) then - BodyMesh.Value = RLegID - BodyMesh.Name = RLegID - else - BodyMesh.Value = "DefaultRLeg.rbxm" - BodyMesh.Name = "DefaultRLeg.rbxm" - end + if (rbxlegacyversion ~= "pre-alpha") then + local newTShirt = Instance.new("StringValue",newCharApp) + if (TShirtID ~= nil or TShirtID ~= "0") then + newTShirt.Value = TShirtID + else + newTShirt.Value = "0" end - local indexValue = Instance.new("NumberValue") - indexValue.Name = "MeshIndex" - indexValue.Parent = BodyColor - indexValue.Value = i + newTShirt.Name = "T-Shirt" local typeValue = Instance.new("NumberValue") typeValue.Name = "CustomizationType" - typeValue.Parent = BodyColor - typeValue.Value = 8 + typeValue.Parent = newTShirt + typeValue.Value = 3 + end + --SHIRTS AND PANTS + if (rbxlegacyversion ~= "pre-alpha" or rbxlegacyversion ~= "pre-alpha-ext") then + local newShirt = Instance.new("StringValue",newCharApp) + if (ShirtID ~= nil or ShirtID ~= "0") then + newShirt.Value = ShirtID + else + newShirt.Value = "0" + end + newShirt.Name = "Shirt" + local typeValue = Instance.new("NumberValue") + typeValue.Name = "CustomizationType" + typeValue.Parent = newShirt + typeValue.Value = 4 + + local newPants = Instance.new("StringValue",newCharApp) + if (PantsID ~= nil or PantsID ~= "0") then + newPants.Value = PantsID + else + newPants.Value = "0" + end + newPants.Name = "Pants" + local typeValue = Instance.new("NumberValue") + typeValue.Name = "CustomizationType" + typeValue.Parent = newPants + typeValue.Value = 5 + end + --FACE AND HEADS + if (rbxlegacyversion ~= "pre-alpha" or rbxlegacyversion ~= "pre-alpha-ext" or rbxlegacyversion ~= "alpha" or rbxlegacyversion ~= "beta" or rbxlegacyversion ~= "delta-beta" or rbxlegacyversion ~= "pre-gamma-beta" or rbxlegacyversion ~= "delta-pre-gamma-beta") then + local newFace = Instance.new("StringValue",newCharApp) + if (FaceID ~= nil) then + newFace.Value = FaceID + newFace.Name = FaceID + else + newFace.Value = "DefaultFace.rbxm" + newFace.Name = "DefaultFace.rbxm" + end + local typeValue = Instance.new("NumberValue") + typeValue.Name = "CustomizationType" + typeValue.Parent = newFace + typeValue.Value = 6 + + local newHead = Instance.new("StringValue",newCharApp) + if (HeadID ~= nil) then + newHead.Value = HeadID + newHead.Name = HeadID + else + newHead.Value = "DefaultHead.rbxm" + newHead.Name = "DefaultHead.rbxm" + end + local typeValue = Instance.new("NumberValue") + typeValue.Name = "CustomizationType" + typeValue.Parent = newHead + typeValue.Value = 7 + end + --PACKAGES + if (rbxlegacyversion ~= "pre-alpha" or rbxlegacyversion ~= "pre-alpha-ext" or rbxlegacyversion ~= "alpha" or rbxlegacyversion ~= "beta" or rbxlegacyversion ~= "delta-beta" or rbxlegacyversion ~= "pre-gamma" or rbxlegacyversion ~= "delta-pre-gamma" or rbxlegacyversion ~= "pre-gamma-beta" or rbxlegacyversion ~= "delta-pre-gamma-beta") then + for i=2,5,1 do + local BodyMesh = Instance.new("StringValue",newCharApp) + if (i == 2) then + if (TorsoID ~= nil) then + BodyMesh.Value = TorsoID + BodyMesh.Name = TorsoID + else + BodyMesh.Value = "DefaultTorso.rbxm" + BodyMesh.Name = "DefaultTorso.rbxm" + end + elseif (i == 3) then + if (LArmID ~= nil) then + BodyMesh.Value = LArmID + BodyMesh.Name = LArmID + else + BodyMesh.Value = "DefaultLArm.rbxm" + BodyMesh.Name = "DefaultLArm.rbxm" + end + elseif (i == 4) then + if (RArmID ~= nil) then + BodyMesh.Value = RArmID + BodyMesh.Name = RArmID + else + BodyMesh.Value = "DefaultRArm.rbxm" + BodyMesh.Name = "DefaultRArm.rbxm" + end + elseif (i == 5) then + if (LLegID ~= nil) then + BodyMesh.Value = LLegID + BodyMesh.Name = LLegID + else + BodyMesh.Value = "DefaultLLeg.rbxm" + BodyMesh.Name = "DefaultLLeg.rbxm" + end + elseif (i == 6) then + if (RLegID ~= nil) then + BodyMesh.Value = RLegID + BodyMesh.Name = RLegID + else + BodyMesh.Value = "DefaultRLeg.rbxm" + BodyMesh.Name = "DefaultRLeg.rbxm" + end + end + local indexValue = Instance.new("NumberValue") + indexValue.Name = "MeshIndex" + indexValue.Parent = BodyColor + indexValue.Value = i + local typeValue = Instance.new("NumberValue") + typeValue.Name = "CustomizationType" + typeValue.Parent = BodyColor + typeValue.Value = 8 + end end end diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/DocForm.resx b/RBXLegacyLauncher/RBXLegacyLauncher/DocForm.resx index 6560ff8..ccecbe0 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/DocForm.resx +++ b/RBXLegacyLauncher/RBXLegacyLauncher/DocForm.resx @@ -119,81 +119,68 @@ VERSION CODENAME DOCUMENTATION +USE NUMBERS PROVIDED AS VALUES ------------------------------------------------------------- -pre-alpha +1 - Pre-Alpha - Mid-2008 or lower. - Support for "fake" 2006/2007 clients, or the real things. - Uses Legacy joinscript. - Does not support hats or any other form of customization besides body colors. ------------------------------------------------------------- -pre-alpha-ext +2 - Pre-Alpha (Ext.) - Mid-2008 or lower. - Support for "fake" 2006/2007 clients, or the real things. - Uses Legacy joinscript. - Supports only hats, body colors, and T-Shirts. ------------------------------------------------------------- -alpha +3 - Alpha - Mid-2008 or lower. - Uses Legacy joinscript. - Supports only hats, body colors, T-Shirts, shirts, and pants. ------------------------------------------------------------- -beta +4 - Beta - Late-2008-Early 2009. - Uses Legacy joinscript. - Supports only hats, body colors, T-Shirts, shirts, and pants. ------------------------------------------------------------- -delta-beta -- Late-2008-Early 2009. -- Uses RBXPri joinscript. -- Supports only hats, body colors, T-Shirts, shirts, and pants. -------------------------------------------------------------- -pre-gamma-beta +5 - Pre-Gamma Beta - Early-2009-Early 2010. - Uses Legacy joinscript. - Supports most kinds of customization except faces and body meshes. ------------------------------------------------------------- -delta-pre-gamma-beta -- Early-2009-Early 2010. -- Uses RBXPri joinscript. -- Supports most kinds of customization except faces and body meshes. -------------------------------------------------------------- -pre-gamma +6 - Pre-Gamma - Early-2009-Early 2010. - Uses Legacy joinscript. -- Supports most kinds of customization except body meshes. +- Supports most kinds of customization except most body meshes. ------------------------------------------------------------- -delta-pre-gamma -- Early-2009-Early 2010. -- Uses RBXPri joinscript. -- Supports most kinds of customization except body meshes. -------------------------------------------------------------- -gamma +7 - Gamma - Mid-2010-November 2010. - Uses Legacy joinscript. - Supports all kinds of customization. ------------------------------------------------------------- -delta-gamma -- Mid-2010-November 2010. -- Uses RBXPri joinscript. -- Supports all kinds of customization. -------------------------------------------------------------- -delta +8 - Delta - December-2010-Early 2011. - Uses RBXPri joinscript. - Supports the more modern 2011 user interface. - Supports all kinds of customization. ------------------------------------------------------------- -delta-omega +9 - Delta Omega - Mid-2011-Early-2012. - Uses RBXPri joinscript. - Supports the more modern 2011 user interface. - Supports all kinds of customization. ------------------------------------------------------------- -omega +10 - Omega - Mid-2011-Early-2012. - Uses RBXPri joinscript. - Meant for more modern clients which don't use early 2011's UI. - Supports all kinds of customization. +------------------------------------------------------------- +11 - Ultra +- ???-???. +- Uses RBXPri joinscript. +- Meant for more modern clients over ones supported with Ultra. +- Supports all kinds of customization. ------------------------------------------------------------- diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs b/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs index efcf5bc..a912102 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs @@ -32,7 +32,7 @@ public static bool LoadsAssetsOnline = false; public static bool LegacyMode = false; public static string SelectedClientMD5 = ""; - public static string SelectedClientVersion = ""; + public static int SelectedClientVersion = 0; public static bool HasRocky = false; // clientinfo creator public static bool ClientCreator_UsesPlayerName = false; @@ -41,7 +41,7 @@ public static string ClientCreator_SelectedClientDesc = ""; public static bool ClientCreator_LegacyMode = false; public static string ClientCreator_SelectedClientMD5 = ""; - public static string ClientCreator_SelectedClientVersion = ""; + public static int ClientCreator_SelectedClientVersion = 0; public static bool ClientCreator_HasRocky = false; // info editor public static string InfoEditor_Version = ""; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/LauncherFuncs.cs b/RBXLegacyLauncher/RBXLegacyLauncher/LauncherFuncs.cs index a8094a2..1b17135 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/LauncherFuncs.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/LauncherFuncs.cs @@ -266,7 +266,8 @@ namespace RBXLegacyLauncher GlobalVars.SelectedClientMD5 = Decryptline6; - GlobalVars.SelectedClientVersion = Decryptline7; + int iline7 = Convert.ToInt32(Decryptline7); + GlobalVars.SelectedClientVersion = iline7; GlobalVars.SelectedClientDesc = Decryptline8; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/LoaderForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/LoaderForm.cs index 604841b..3e7014d 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/LoaderForm.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/LoaderForm.cs @@ -85,19 +85,19 @@ namespace RBXLegacyLauncher string HatIDOffline3 = GlobalVars.Custom_Hat3ID_Offline; if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true) { - args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; } else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true) { - args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" +GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" +GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; } else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false) { - args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; } else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false) { - args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; } try { diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs index 95ffd6b..90f55ea 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs @@ -680,19 +680,19 @@ namespace RBXLegacyLauncher string HatIDOffline3 = GlobalVars.Custom_Hat3ID_Offline; if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true) { - args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSConnect(" + GlobalVars.UserID + ",'localhost'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSConnect(" + GlobalVars.UserID + ",'localhost'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; } else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true) { - args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSConnect(" + GlobalVars.UserID + ",'localhost'," + GlobalVars.RobloxPort + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSConnect(" + GlobalVars.UserID + ",'localhost'," + GlobalVars.RobloxPort + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; } else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false) { - args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSConnect(0,'localhost'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSConnect(0,'localhost'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; } else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false) { - args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSConnect(0,'localhost'," + GlobalVars.RobloxPort + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + args = "-script " + quote + "dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSConnect(0,'localhost'," + GlobalVars.RobloxPort + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; } try { @@ -748,19 +748,19 @@ namespace RBXLegacyLauncher string HatIDOffline3 = GlobalVars.Custom_Hat3ID_Offline; if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true) { - args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; } else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true) { - args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSSolo(" + GlobalVars.UserID + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSSolo(" + GlobalVars.UserID + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; } else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false) { - args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSSolo(0,'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSSolo(0,'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; } else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false ) { - args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSSolo(0,'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; + args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSSolo(0,'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ",'" + GlobalVars.Custom_TShirt + "','" + GlobalVars.Custom_Shirt + "','" + GlobalVars.Custom_Pants + "','" + GlobalVars.FaceID + "','" + GlobalVars.HeadID + "','" + GlobalVars.TorsoID + "','" + GlobalVars.RightArmID + "','" + GlobalVars.LeftArmID + "','" + GlobalVars.RightLegID + "','" + GlobalVars.LeftLegID + "','" + GlobalVars.Custom_IconType + "');" + quote; } try { @@ -780,7 +780,7 @@ namespace RBXLegacyLauncher string rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; string quote = "\""; string args = ""; - args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSServer(" + GlobalVars.ServerPort + "," + GlobalVars.PlayerLimit + "); " + quote; + args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSServer(" + GlobalVars.ServerPort + "," + GlobalVars.PlayerLimit + "); " + quote; try { ConsolePrint("Server Loaded.", 4); @@ -799,7 +799,7 @@ namespace RBXLegacyLauncher string rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; string quote = "\""; string args = ""; - args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "'); _G.CSServer(" + GlobalVars.ServerPort + "," + GlobalVars.PlayerLimit + "); " + quote + " -no3d"; + args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + "); _G.CSServer(" + GlobalVars.ServerPort + "," + GlobalVars.PlayerLimit + "); " + quote + " -no3d"; try { ConsolePrint("Server Loaded in No3d.", 4); @@ -818,7 +818,7 @@ namespace RBXLegacyLauncher string rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; string quote = "\""; string args = ""; - args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion('" + GlobalVars.SelectedClientVersion + "');" + quote; + args = quote + mapfile + "\" -script \"dofile('" + GlobalVars.DefaultScript + "'); _G.SetRBXLegacyVersion(" + GlobalVars.SelectedClientVersion + ");" + quote; try { ConsolePrint("Studio Loaded.", 4); diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.Designer.cs index 4dc75e8..2d5ce99 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.Designer.cs @@ -76,7 +76,7 @@ namespace RBXLegacyLauncher // this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Location = new System.Drawing.Point(12, 12); + this.tabControl1.Location = new System.Drawing.Point(8, 7); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; this.tabControl1.Size = new System.Drawing.Size(336, 357); diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.cs index c853be6..8c83803 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/SDKForm.cs @@ -112,7 +112,8 @@ namespace RBXLegacyLauncher GlobalVars.ClientCreator_SelectedClientMD5 = Decryptline6; - GlobalVars.ClientCreator_SelectedClientVersion = Decryptline7; + int iline7 = Convert.ToInt32(Decryptline7); + GlobalVars.ClientCreator_SelectedClientVersion = iline7; GlobalVars.ClientCreator_SelectedClientDesc = Decryptline8; @@ -123,7 +124,7 @@ namespace RBXLegacyLauncher checkBox4.Checked = GlobalVars.ClientCreator_HasRocky; textBox2.Text = GlobalVars.ClientCreator_SelectedClientMD5.ToUpper(); textBox1.Text = GlobalVars.ClientCreator_SelectedClientDesc; - textBox3.Text = GlobalVars.ClientCreator_SelectedClientVersion; + textBox3.Text = GlobalVars.ClientCreator_SelectedClientVersion.ToString(); } } } @@ -174,7 +175,7 @@ namespace RBXLegacyLauncher GlobalVars.ClientCreator_LegacyMode = false; GlobalVars.ClientCreator_SelectedClientDesc = ""; GlobalVars.ClientCreator_SelectedClientMD5 = ""; - GlobalVars.ClientCreator_SelectedClientVersion = ""; + GlobalVars.ClientCreator_SelectedClientVersion = 0; GlobalVars.ClientCreator_HasRocky = false; checkBox1.Checked = GlobalVars.ClientCreator_UsesPlayerName; checkBox2.Checked = GlobalVars.ClientCreator_UsesID; @@ -183,7 +184,7 @@ namespace RBXLegacyLauncher checkBox4.Checked = GlobalVars.ClientCreator_HasRocky; textBox2.Text = GlobalVars.ClientCreator_SelectedClientMD5.ToUpper(); textBox1.Text = GlobalVars.ClientCreator_SelectedClientDesc; - textBox3.Text = GlobalVars.ClientCreator_SelectedClientVersion; + textBox3.Text = GlobalVars.ClientCreator_SelectedClientVersion.ToString(); } void CheckBox3CheckedChanged(object sender, EventArgs e) @@ -206,7 +207,22 @@ namespace RBXLegacyLauncher void TextBox3TextChanged(object sender, EventArgs e) { - GlobalVars.ClientCreator_SelectedClientVersion = textBox3.Text; + int parsedValue; + if (int.TryParse(textBox3.Text, out parsedValue)) + { + if (textBox3.Text.Equals("")) + { + GlobalVars.ClientCreator_SelectedClientVersion = 0; + } + else + { + GlobalVars.ClientCreator_SelectedClientVersion = Convert.ToInt32(textBox3.Text); + } + } + else + { + GlobalVars.ClientCreator_SelectedClientVersion = 0; + } } void CheckBox4CheckedChanged(object sender, EventArgs e)