diff --git a/.gitignore b/.gitignore index cd2946a..dbf32b4 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,15 @@ $RECYCLE.BIN/ Network Trash Folder Temporary Items .apdisk + +# Debug/Release shit +bin/* +obj/* +Release/* +Debug/* +*.cache +*.resources +*.exe +*.pdb +*.csproj.FileListAbsolute.txt +*.exe.config \ No newline at end of file diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs index 1162bd8..1bacf2a 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs @@ -96,27 +96,27 @@ namespace NovetusLauncher this.listBox2 = new System.Windows.Forms.ListBox(); this.listBox1 = new System.Windows.Forms.ListBox(); this.tabPage3 = new System.Windows.Forms.TabPage(); - this.tabPage4 = new System.Windows.Forms.TabPage(); - this.tabPage5 = new System.Windows.Forms.TabPage(); - this.tabPage6 = new System.Windows.Forms.TabPage(); - this.tabPage7 = new System.Windows.Forms.TabPage(); - this.button43 = new System.Windows.Forms.Button(); this.button44 = new System.Windows.Forms.Button(); this.button45 = new System.Windows.Forms.Button(); this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.listBox4 = new System.Windows.Forms.ListBox(); + this.tabPage4 = new System.Windows.Forms.TabPage(); this.button46 = new System.Windows.Forms.Button(); this.button47 = new System.Windows.Forms.Button(); this.pictureBox5 = new System.Windows.Forms.PictureBox(); this.listBox5 = new System.Windows.Forms.ListBox(); + this.tabPage5 = new System.Windows.Forms.TabPage(); this.button48 = new System.Windows.Forms.Button(); this.button49 = new System.Windows.Forms.Button(); this.pictureBox6 = new System.Windows.Forms.PictureBox(); this.listBox6 = new System.Windows.Forms.ListBox(); + this.tabPage6 = new System.Windows.Forms.TabPage(); this.button50 = new System.Windows.Forms.Button(); this.button51 = new System.Windows.Forms.Button(); this.pictureBox7 = new System.Windows.Forms.PictureBox(); this.listBox7 = new System.Windows.Forms.ListBox(); + this.tabPage7 = new System.Windows.Forms.TabPage(); + this.button43 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -126,12 +126,12 @@ namespace NovetusLauncher ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tabPage3.SuspendLayout(); - this.tabPage4.SuspendLayout(); - this.tabPage5.SuspendLayout(); - this.tabPage6.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); + this.tabPage4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); + this.tabPage5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit(); + this.tabPage6.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); this.SuspendLayout(); // @@ -808,6 +808,41 @@ namespace NovetusLauncher this.tabPage3.Text = "FACES"; this.tabPage3.UseVisualStyleBackColor = true; // + // button44 + // + this.button44.Location = new System.Drawing.Point(242, 193); + this.button44.Name = "button44"; + this.button44.Size = new System.Drawing.Size(219, 42); + this.button44.TabIndex = 61; + this.button44.Text = "Reset"; + this.button44.UseVisualStyleBackColor = true; + // + // button45 + // + this.button45.Location = new System.Drawing.Point(6, 193); + this.button45.Name = "button45"; + this.button45.Size = new System.Drawing.Size(219, 42); + this.button45.TabIndex = 60; + this.button45.Text = "Randomize"; + this.button45.UseVisualStyleBackColor = true; + // + // pictureBox4 + // + this.pictureBox4.Location = new System.Drawing.Point(182, 13); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(95, 86); + this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox4.TabIndex = 59; + this.pictureBox4.TabStop = false; + // + // listBox4 + // + this.listBox4.FormattingEnabled = true; + this.listBox4.Location = new System.Drawing.Point(6, 105); + this.listBox4.Name = "listBox4"; + this.listBox4.Size = new System.Drawing.Size(455, 82); + this.listBox4.TabIndex = 57; + // // tabPage4 // this.tabPage4.Controls.Add(this.button46); @@ -821,6 +856,41 @@ namespace NovetusLauncher this.tabPage4.Text = "T-SHIRTS"; this.tabPage4.UseVisualStyleBackColor = true; // + // button46 + // + this.button46.Location = new System.Drawing.Point(242, 193); + this.button46.Name = "button46"; + this.button46.Size = new System.Drawing.Size(219, 42); + this.button46.TabIndex = 65; + this.button46.Text = "Reset"; + this.button46.UseVisualStyleBackColor = true; + // + // button47 + // + this.button47.Location = new System.Drawing.Point(6, 193); + this.button47.Name = "button47"; + this.button47.Size = new System.Drawing.Size(219, 42); + this.button47.TabIndex = 64; + this.button47.Text = "Randomize"; + this.button47.UseVisualStyleBackColor = true; + // + // pictureBox5 + // + this.pictureBox5.Location = new System.Drawing.Point(182, 13); + this.pictureBox5.Name = "pictureBox5"; + this.pictureBox5.Size = new System.Drawing.Size(95, 86); + this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox5.TabIndex = 63; + this.pictureBox5.TabStop = false; + // + // listBox5 + // + this.listBox5.FormattingEnabled = true; + this.listBox5.Location = new System.Drawing.Point(6, 105); + this.listBox5.Name = "listBox5"; + this.listBox5.Size = new System.Drawing.Size(455, 82); + this.listBox5.TabIndex = 62; + // // tabPage5 // this.tabPage5.Controls.Add(this.button48); @@ -834,6 +904,41 @@ namespace NovetusLauncher this.tabPage5.Text = "SHIRTS"; this.tabPage5.UseVisualStyleBackColor = true; // + // button48 + // + this.button48.Location = new System.Drawing.Point(242, 193); + this.button48.Name = "button48"; + this.button48.Size = new System.Drawing.Size(219, 42); + this.button48.TabIndex = 65; + this.button48.Text = "Reset"; + this.button48.UseVisualStyleBackColor = true; + // + // button49 + // + this.button49.Location = new System.Drawing.Point(6, 193); + this.button49.Name = "button49"; + this.button49.Size = new System.Drawing.Size(219, 42); + this.button49.TabIndex = 64; + this.button49.Text = "Randomize"; + this.button49.UseVisualStyleBackColor = true; + // + // pictureBox6 + // + this.pictureBox6.Location = new System.Drawing.Point(182, 13); + this.pictureBox6.Name = "pictureBox6"; + this.pictureBox6.Size = new System.Drawing.Size(95, 86); + this.pictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox6.TabIndex = 63; + this.pictureBox6.TabStop = false; + // + // listBox6 + // + this.listBox6.FormattingEnabled = true; + this.listBox6.Location = new System.Drawing.Point(6, 105); + this.listBox6.Name = "listBox6"; + this.listBox6.Size = new System.Drawing.Size(455, 82); + this.listBox6.TabIndex = 62; + // // tabPage6 // this.tabPage6.Controls.Add(this.button50); @@ -847,6 +952,41 @@ namespace NovetusLauncher this.tabPage6.Text = "PANTS"; this.tabPage6.UseVisualStyleBackColor = true; // + // button50 + // + this.button50.Location = new System.Drawing.Point(242, 193); + this.button50.Name = "button50"; + this.button50.Size = new System.Drawing.Size(219, 42); + this.button50.TabIndex = 65; + this.button50.Text = "Reset"; + this.button50.UseVisualStyleBackColor = true; + // + // button51 + // + this.button51.Location = new System.Drawing.Point(6, 193); + this.button51.Name = "button51"; + this.button51.Size = new System.Drawing.Size(219, 42); + this.button51.TabIndex = 64; + this.button51.Text = "Randomize"; + this.button51.UseVisualStyleBackColor = true; + // + // pictureBox7 + // + this.pictureBox7.Location = new System.Drawing.Point(182, 13); + this.pictureBox7.Name = "pictureBox7"; + this.pictureBox7.Size = new System.Drawing.Size(95, 86); + this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox7.TabIndex = 63; + this.pictureBox7.TabStop = false; + // + // listBox7 + // + this.listBox7.FormattingEnabled = true; + this.listBox7.Location = new System.Drawing.Point(6, 105); + this.listBox7.Name = "listBox7"; + this.listBox7.Size = new System.Drawing.Size(455, 82); + this.listBox7.TabIndex = 62; + // // tabPage7 // this.tabPage7.Location = new System.Drawing.Point(4, 22); @@ -866,146 +1006,6 @@ namespace NovetusLauncher this.button43.UseVisualStyleBackColor = true; this.button43.Click += new System.EventHandler(this.Button43Click); // - // button44 - // - this.button44.Location = new System.Drawing.Point(242, 189); - this.button44.Name = "button44"; - this.button44.Size = new System.Drawing.Size(219, 42); - this.button44.TabIndex = 61; - this.button44.Text = "Reset"; - this.button44.UseVisualStyleBackColor = true; - // - // button45 - // - this.button45.Location = new System.Drawing.Point(6, 189); - this.button45.Name = "button45"; - this.button45.Size = new System.Drawing.Size(219, 42); - this.button45.TabIndex = 60; - this.button45.Text = "Randomize"; - this.button45.UseVisualStyleBackColor = true; - // - // pictureBox4 - // - this.pictureBox4.Location = new System.Drawing.Point(182, 9); - this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.Size = new System.Drawing.Size(95, 86); - this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox4.TabIndex = 59; - this.pictureBox4.TabStop = false; - // - // listBox4 - // - this.listBox4.FormattingEnabled = true; - this.listBox4.Location = new System.Drawing.Point(6, 101); - this.listBox4.Name = "listBox4"; - this.listBox4.Size = new System.Drawing.Size(455, 82); - this.listBox4.TabIndex = 57; - // - // button46 - // - this.button46.Location = new System.Drawing.Point(242, 189); - this.button46.Name = "button46"; - this.button46.Size = new System.Drawing.Size(219, 42); - this.button46.TabIndex = 65; - this.button46.Text = "Reset"; - this.button46.UseVisualStyleBackColor = true; - // - // button47 - // - this.button47.Location = new System.Drawing.Point(6, 189); - this.button47.Name = "button47"; - this.button47.Size = new System.Drawing.Size(219, 42); - this.button47.TabIndex = 64; - this.button47.Text = "Randomize"; - this.button47.UseVisualStyleBackColor = true; - // - // pictureBox5 - // - this.pictureBox5.Location = new System.Drawing.Point(182, 9); - this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(95, 86); - this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox5.TabIndex = 63; - this.pictureBox5.TabStop = false; - // - // listBox5 - // - this.listBox5.FormattingEnabled = true; - this.listBox5.Location = new System.Drawing.Point(6, 101); - this.listBox5.Name = "listBox5"; - this.listBox5.Size = new System.Drawing.Size(455, 82); - this.listBox5.TabIndex = 62; - // - // button48 - // - this.button48.Location = new System.Drawing.Point(242, 189); - this.button48.Name = "button48"; - this.button48.Size = new System.Drawing.Size(219, 42); - this.button48.TabIndex = 65; - this.button48.Text = "Reset"; - this.button48.UseVisualStyleBackColor = true; - // - // button49 - // - this.button49.Location = new System.Drawing.Point(6, 189); - this.button49.Name = "button49"; - this.button49.Size = new System.Drawing.Size(219, 42); - this.button49.TabIndex = 64; - this.button49.Text = "Randomize"; - this.button49.UseVisualStyleBackColor = true; - // - // pictureBox6 - // - this.pictureBox6.Location = new System.Drawing.Point(182, 9); - this.pictureBox6.Name = "pictureBox6"; - this.pictureBox6.Size = new System.Drawing.Size(95, 86); - this.pictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox6.TabIndex = 63; - this.pictureBox6.TabStop = false; - // - // listBox6 - // - this.listBox6.FormattingEnabled = true; - this.listBox6.Location = new System.Drawing.Point(6, 101); - this.listBox6.Name = "listBox6"; - this.listBox6.Size = new System.Drawing.Size(455, 82); - this.listBox6.TabIndex = 62; - // - // button50 - // - this.button50.Location = new System.Drawing.Point(242, 189); - this.button50.Name = "button50"; - this.button50.Size = new System.Drawing.Size(219, 42); - this.button50.TabIndex = 65; - this.button50.Text = "Reset"; - this.button50.UseVisualStyleBackColor = true; - // - // button51 - // - this.button51.Location = new System.Drawing.Point(6, 189); - this.button51.Name = "button51"; - this.button51.Size = new System.Drawing.Size(219, 42); - this.button51.TabIndex = 64; - this.button51.Text = "Randomize"; - this.button51.UseVisualStyleBackColor = true; - // - // pictureBox7 - // - this.pictureBox7.Location = new System.Drawing.Point(182, 9); - this.pictureBox7.Name = "pictureBox7"; - this.pictureBox7.Size = new System.Drawing.Size(95, 86); - this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox7.TabIndex = 63; - this.pictureBox7.TabStop = false; - // - // listBox7 - // - this.listBox7.FormattingEnabled = true; - this.listBox7.Location = new System.Drawing.Point(6, 101); - this.listBox7.Name = "listBox7"; - this.listBox7.Size = new System.Drawing.Size(455, 82); - this.listBox7.TabIndex = 62; - // // CharacterCustomization // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1030,12 +1030,12 @@ namespace NovetusLauncher ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tabPage3.ResumeLayout(false); - this.tabPage4.ResumeLayout(false); - this.tabPage5.ResumeLayout(false); - this.tabPage6.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); + this.tabPage4.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); + this.tabPage5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit(); + this.tabPage6.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); this.ResumeLayout(false); } diff --git a/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs b/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs index 928fa4d..573f945 100644 --- a/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs +++ b/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs @@ -279,7 +279,7 @@ namespace NovetusLauncher MessageBox.Show("Cannot load '" + ClientName.Trim('/') + "'. Please make sure you selected the directory","Novetus Launcher - Error while generating MD5 for client", MessageBoxButtons.OK, MessageBoxIcon.Error); } - string ClientScriptMD5 = File.Exists(SelectedClientInfoPath + "\\content\\scripts\\CSMPFunctions.lua") ? SecurityFuncs.CalculateMD5(SelectedClientInfoPath + "\\content\\scripts\\CSMPFunctions.lua") : ""; + string ClientScriptMD5 = File.Exists(SelectedClientInfoPath + "\\content\\scripts\\" + GlobalVars.ScriptName + ".lua") ? SecurityFuncs.CalculateMD5(SelectedClientInfoPath + "\\content\\scripts\\" + GlobalVars.ScriptName + ".lua") : ""; if (!string.IsNullOrWhiteSpace(ClientScriptMD5)) { @@ -288,7 +288,7 @@ namespace NovetusLauncher } else { - MessageBox.Show("Cannot load 'CSMPFunctions.lua'. Please make sure you selected the directory","Novetus Launcher - Error while generating MD5 for script", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Cannot load '" + GlobalVars.ScriptName + ".lua'. Please make sure you selected the directory","Novetus Launcher - Error while generating MD5 for script", MessageBoxButtons.OK, MessageBoxIcon.Error); } MessageBox.Show("MD5s generated.","Novetus Launcher - Novetus Client SDK", MessageBoxButtons.OK, MessageBoxIcon.Information); diff --git a/NovetusLauncher/NovetusLauncher/ItemMaker.Designer.cs b/NovetusLauncher/NovetusLauncher/ItemMaker.Designer.cs index 79cb203..e2ea660 100644 --- a/NovetusLauncher/NovetusLauncher/ItemMaker.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/ItemMaker.Designer.cs @@ -120,6 +120,7 @@ namespace NovetusLauncher this.Controls.Add(this.textBox2); this.Controls.Add(this.button1); this.Controls.Add(this.textBox1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.Name = "ItemMaker"; diff --git a/NovetusLauncher/NovetusLauncher/LauncherFuncs.cs b/NovetusLauncher/NovetusLauncher/LauncherFuncs.cs index 71f2ae4..f96d636 100644 --- a/NovetusLauncher/NovetusLauncher/LauncherFuncs.cs +++ b/NovetusLauncher/NovetusLauncher/LauncherFuncs.cs @@ -598,7 +598,7 @@ namespace NovetusLauncher { if (GlobalVars.AdminMode != true) { - string rbxscript = GlobalVars.BasePath + "\\clients\\" + client + "\\content\\scripts\\CSMPFunctions.lua"; + string rbxscript = GlobalVars.BasePath + "\\clients\\" + client + "\\content\\scripts\\" + GlobalVars.ScriptName + ".lua"; using (var md5 = MD5.Create()) { using (var stream = File.OpenRead(rbxscript)) @@ -699,6 +699,482 @@ namespace NovetusLauncher } } + + /* + public class ScriptGenerator + { + public ScriptGenerator() + { + } + + public static void GenerateScriptForClient() + { + //next, generate the header functions. + + SecurityFuncs.ReadConfigValues(); + + int aasamples = GlobalVars.AASamples.Equals(0) ? 1 : GlobalVars.AASamples.Equals(1) ? 4 : GlobalVars.AASamples.Equals(2) ? 8 : 1; + + string header = MultiLine( + "--Header", + "function newWaitForChild(newParent,name)", + "local returnable = nil", + "if newParent:FindFirstChild(name) then", + "returnable = newParent:FindFirstChild(name)", + "else", + "repeat wait() returnable = newParent:FindFirstChild(name) until returnable ~= nil", + "end", + "return returnable", + "end", + "settings().Rendering.Shadows = " + GlobalVars.Shadows.ToString().ToLower(), + "settings().Rendering.AASamples = " + aasamples, + "AnimatedCharacter = " + GlobalVars.AnimatedCharacter.ToString().ToLower() + ); + + string playersettings = MultiLine( + "--Player Settings", + "UserID = " + GlobalVars.UserID, + "PlayerName = '" + GlobalVars.Name + "'" + ); + + string customizationsettings = ""; + + if (GlobalVars.AnimatedCharacter == false) + { + customizationsettings = MultiLine( + "--Customization Settings", + "Hat1ID = 'NoHat.rbxm'" + ); + } + else + { + customizationsettings = MultiLine( + "--Customization Settings", + "Hat1ID = '" + GlobalVars.HatName + "'" + ); + } + + string colorsettings = ""; + + if (GlobalVars.AnimatedCharacter == false) + { + if (GlobalVars.UseRandomColors) + { + colorsettings = GeneratePlayerColorString(); + } + else + { + colorsettings = GeneratePlayerColorPresetString(GlobalVars.PlayerColorPreset); + } + } + else + { + colorsettings = MultiLine( + "--Color Settings", + "HeadColorID = " + GlobalVars.HeadColor, + "TorsoColorID = " + GlobalVars.TorsoColor, + "LeftArmColorID = " + GlobalVars.LeftArmColor, + "RightArmColorID = " + GlobalVars.RightArmColor, + "LeftLegColorID = " + GlobalVars.LeftLegColor, + "RightLegColorID = " + GlobalVars.RightLegColor + ); + } + + //add customization funcs + string customizationgen = MultiLine( + "--Customization Code", + "function InitalizeClientAppearance(Player,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,HatID)", + "local newCharApp = Instance.new('IntValue',Player)", + "newCharApp.Name = 'Appearance'", + "for i=1,6,1 do", + "local BodyColor = Instance.new('BrickColorValue',newCharApp)", + "if (i == 1) then", + "if (HeadColorID ~= nil) then", + "BodyColor.Value = BrickColor.new(HeadColorID)", + "BodyColor.Name = 'HeadColor (ID: '..HeadColorID..')'", + "else", + "BodyColor.Value = BrickColor.new(1)", + "BodyColor.Name = 'HeadColor (ID: 1)'", + "end", + "elseif (i == 2) then", + "if (TorsoColorID ~= nil) then", + "BodyColor.Value = BrickColor.new(TorsoColorID)", + "BodyColor.Name = 'TorsoColor (ID: '..TorsoColorID..')'", + "else", + "BodyColor.Value = BrickColor.new(1)", + "BodyColor.Name = 'TorsoColor (ID: 1)'", + "end", + "elseif (i == 3) then", + "if (LeftArmColorID ~= nil) then", + "BodyColor.Value = BrickColor.new(LeftArmColorID)", + "BodyColor.Name = 'LeftArmColor (ID: '..LeftArmColorID..')'", + "else", + "BodyColor.Value = BrickColor.new(1)", + "BodyColor.Name = 'LeftArmColor (ID: 1)'", + "end", + "elseif (i == 4) then", + "if (RightArmColorID ~= nil) then", + "BodyColor.Value = BrickColor.new(RightArmColorID)", + "BodyColor.Name = 'RightArmColor (ID: '..RightArmColorID..')'", + "else", + "BodyColor.Value = BrickColor.new(1)", + "BodyColor.Name = 'RightArmColor (ID: 1)'", + "end", + "elseif (i == 5) then", + "if (LeftLegColorID ~= nil) then", + "BodyColor.Value = BrickColor.new(LeftLegColorID)", + "BodyColor.Name = 'LeftLegColor (ID: '..LeftLegColorID..')'", + "else", + "BodyColor.Value = BrickColor.new(1)", + "BodyColor.Name = 'LeftLegColor (ID: 1)'", + "end", + "elseif (i == 6) then", + "if (RightLegColorID ~= nil) then", + "BodyColor.Value = BrickColor.new(RightLegColorID)", + "BodyColor.Name = 'RightLegColor (ID: '..RightLegColorID..')'", + "else", + "BodyColor.Value = BrickColor.new(1)", + "BodyColor.Name = 'RightLegColor (ID: 1)'", + "end", + "end", + "local typeValue = Instance.new('NumberValue')", + "typeValue.Name = 'CustomizationType'", + "typeValue.Parent = BodyColor", + "typeValue.Value = 1", + "local indexValue = Instance.new('NumberValue')", + "indexValue.Name = 'ColorIndex'", + "indexValue.Parent = BodyColor", + "indexValue.Value = i", + "end", + "local newHat = Instance.new('StringValue',newCharApp)", + "if (HatID ~= nil) then", + "newHat.Value = HatID", + "newHat.Name = HatID", + "else", + "newHat.Value = 'NoHat.rbxm'", + "newHat.Name = 'NoHat.rbxm'", + "end", + "local typeValue = Instance.new('NumberValue')", + "typeValue.Name = 'CustomizationType'", + "typeValue.Parent = newHat", + "typeValue.Value = 2", + "end", + "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", + "newWaitForChild(newVal,'CustomizationType')", + "local customtype = newVal:FindFirstChild('CustomizationType')", + "if (customtype.Value == 1) then ", + "pcall(function()", + "newWaitForChild(newVal,'ColorIndex')", + "local colorindex = newVal:FindFirstChild('ColorIndex')", + "charparts[colorindex.Value].BrickColor = newVal.Value ", + "end)", + "elseif (customtype.Value == 2) then", + "pcall(function()", + "local newHat = game.Workspace:InsertContent('rbxasset://hats/'..newVal.Value)", + "if newHat[1] then ", + "if newHat[1].className == 'Hat' then", + "newHat[1].Parent = newChar", + "else", + "newHat[1]:remove()", + "end", + "end", + "end)", + "end", + "end", + "end" + ); + + //finally, we generate the actual script code. + + string code = MultiLine( + "--Game Code", + "game:GetService('RunService'):run()", + "local plr = game.Players:CreateLocalPlayer(UserID)", + "plr.Name = PlayerName", + "plr:LoadCharacter()", + "pcall(function() plr:SetUnder13(false) end)", + "pcall(function() plr:SetAccountAge(365) end)", + "if (AnimatedCharacter == false) then", + "if plr.Character:FindFirstChild('Animate') then", + "plr.Character.Animate:Remove()", + "end", + "end", + "InitalizeClientAppearance(plr,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,Hat1ID)", + "LoadCharacterNew(newWaitForChild(plr,'Appearance'),plr.Character)", + "game:GetService('Visit')", + "while true do", + "wait(0.001)", + "if (plr.Character ~= nil) then", + "if (plr.Character.Humanoid.Health == 0) then", + "wait(5)", + "plr:LoadCharacter()", + "LoadCharacterNew(newWaitForChild(plr,'Appearance'),plr.Character,plr.Backpack)", + "if (AnimatedCharacter == false) then", + "if plr.Character:FindFirstChild('Animate') then", + "plr.Character.Animate:Remove()", + "end", + "end", + "elseif (plr.Character.Parent == nil) then", + "wait(5)", + "plr:LoadCharacter()", + "LoadCharacterNew(newWaitForChild(plr,'Appearance'),plr.Character,plr.Backpack)", + "if (AnimatedCharacter == false) then", + "if plr.Character:FindFirstChild('Animate') then", + "plr.Character.Animate:Remove()", + "end", + "end", + "end", + "end", + "end" + ); + + string scriptfile = MultiLine( + header, + playersettings, + customizationsettings, + colorsettings, + customizationgen, + code + ); + + List list = new List(Regex.Split(scriptfile, Environment.NewLine)); + string[] convertedList = list.ToArray(); + File.WriteAllLines(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + GlobalVars.ScriptLuaFile, convertedList); + } + + public static string GeneratePlayerColorString() + { + CryptoRandom random = new CryptoRandom(); + int SkinPattern = random.Next(1,7); + int LegsPattern = random.Next(1,5); + int TorsoPattern = random.Next(1,8); + + int HeadColor = 0; + int TorsoColor= 0; + int LArmColor = 0; + int RArmColor = 0; + int LLegColor = 0; + int RLegColor = 0; + + if (SkinPattern == 1) + { + HeadColor = 24; + LArmColor = 24; + RArmColor = 24; + } + else if (SkinPattern == 2) + { + HeadColor = 226; + LArmColor = 226; + RArmColor = 226; + } + else if (SkinPattern == 3) + { + HeadColor = 101; + LArmColor = 101; + RArmColor = 101; + } + else if (SkinPattern == 4) + { + HeadColor = 9; + LArmColor = 9; + RArmColor = 9; + } + else if (SkinPattern == 5) + { + HeadColor = 38; + LArmColor = 38; + RArmColor = 38; + } + else if (SkinPattern == 6) + { + HeadColor = 18; + LArmColor = 18; + RArmColor = 18; + } + else if (SkinPattern == 7) + { + HeadColor = 128; + LArmColor = 128; + RArmColor = 128; + } + + if (LegsPattern == 1) + { + RLegColor = 119; + LLegColor = 119; + } + else if (LegsPattern == 2) + { + LLegColor = 11; + RLegColor = 11; + } + else if (LegsPattern == 3) + { + LLegColor = 23; + RLegColor = 23; + } + else if (LegsPattern == 4) + { + LLegColor = 1; + RLegColor = 1; + } + else if (LegsPattern == 5) + { + LLegColor = 45; + RLegColor = 45; + } + + if (TorsoPattern == 1) + { + TorsoColor = 194; + } + else if (TorsoPattern == 2) + { + TorsoColor = 199; + } + else if (TorsoPattern == 3) + { + TorsoColor = 1; + } + else if (TorsoPattern == 4) + { + TorsoColor = 21; + } + else if (TorsoPattern == 5) + { + TorsoColor = 37; + } + else if (TorsoPattern == 6) + { + TorsoColor = 23; + } + else if (TorsoPattern == 7) + { + TorsoColor = 45; + } + else if (TorsoPattern == 8) + { + TorsoColor = 11; + } + + string output = MultiLine( + "--Color Settings", + "HeadColorID = " + HeadColor, + "TorsoColorID = " + TorsoColor, + "LeftArmColorID = " + LArmColor, + "RightArmColorID = " + RArmColor, + "LeftLegColorID = " + LLegColor, + "RightLegColorID = " + RLegColor + ); + + return output; + } + + public static string GeneratePlayerColorPresetString(int preset) + { + int HeadColor = 0; + int TorsoColor = 0; + int LArmColor = 0; + int RArmColor = 0; + int LLegColor = 0; + int RLegColor = 0; + + if (preset == 1) + { + HeadColor = 24; + TorsoColor = 194; + LArmColor = 24; + RArmColor = 24; + LLegColor = 119; + RLegColor = 119; + } + else if (preset == 2) + { + HeadColor = 24; + TorsoColor = 22; + LArmColor = 24; + RArmColor = 24; + LLegColor = 9; + RLegColor = 9; + } + else if (preset == 3) + { + HeadColor = 24; + TorsoColor = 23; + LArmColor = 24; + RArmColor = 24; + LLegColor = 119; + RLegColor = 119; + } + else if (preset == 4) + { + HeadColor = 24; + TorsoColor = 22; + LArmColor = 24; + RArmColor = 24; + LLegColor = 119; + RLegColor = 119; + } + else if (preset == 5) + { + HeadColor = 24; + TorsoColor = 11; + LArmColor = 24; + RArmColor = 24; + LLegColor = 119; + RLegColor = 119; + } + else if (preset == 6) + { + HeadColor = 38; + TorsoColor = 194; + LArmColor = 38; + RArmColor = 38; + LLegColor = 119; + RLegColor = 119; + } + else if (preset == 7) + { + HeadColor = 128; + TorsoColor = 119; + LArmColor = 128; + RArmColor = 128; + LLegColor = 119; + RLegColor = 119; + } + else if (preset == 8) + { + HeadColor = 9; + TorsoColor = 194; + LArmColor = 9; + RArmColor = 9; + LLegColor = 119; + RLegColor = 119; + } + + string output = MultiLine( + "--Color Settings", + "HeadColorID = " + HeadColor, + "TorsoColorID = " + TorsoColor, + "LeftArmColorID = " + LArmColor, + "RightArmColorID = " + RArmColor, + "LeftLegColorID = " + LLegColor, + "RightLegColorID = " + RLegColor + ); + + return output; + } + + public static string MultiLine(params string[] args) + { + return string.Join(Environment.NewLine, args); + } + } + */ + public static class GlobalVars { public static string BasePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); @@ -709,6 +1185,8 @@ namespace NovetusLauncher public static string IP = "localhost"; public static string Version = ""; public static string SharedArgs = ""; + public static string ScriptName = "CSMPFunctions"; + public static string ScriptGenName = "CSMPBoot"; //vars for loader public static bool ReadyToLaunch = false; //server settings. diff --git a/NovetusLauncher/NovetusLauncher/LoaderForm.cs b/NovetusLauncher/NovetusLauncher/LoaderForm.cs index d3bb856..adfc37a 100644 --- a/NovetusLauncher/NovetusLauncher/LoaderForm.cs +++ b/NovetusLauncher/NovetusLauncher/LoaderForm.cs @@ -55,7 +55,7 @@ namespace NovetusLauncher string port = SecurityFuncs.Base64Decode(SplitArg[1]); string client = SecurityFuncs.Base64Decode(SplitArg[2]); ReadClientValues(client); - string luafile = "rbxasset://scripts\\\\CSMPFunctions.lua"; + string luafile = "rbxasset://scripts\\\\" + GlobalVars.ScriptName + ".lua"; string rbxexe = ""; if (GlobalVars.LegacyMode == true) { diff --git a/NovetusLauncher/NovetusLauncher/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm.cs index ac96770..188a845 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.cs @@ -604,7 +604,7 @@ namespace NovetusLauncher void StartClient() { - string luafile = "rbxasset://scripts\\\\CSMPFunctions.lua"; + string luafile = "rbxasset://scripts\\\\" + GlobalVars.ScriptName + ".lua"; string rbxexe = ""; if (GlobalVars.LegacyMode == true) { @@ -675,7 +675,7 @@ namespace NovetusLauncher void StartSolo() { - string luafile = "rbxasset://scripts\\\\CSMPFunctions.lua"; + string luafile = "rbxasset://scripts\\\\" + GlobalVars.ScriptName + ".lua"; string mapfile = GlobalVars.MapsDir + @"\\" + GlobalVars.Map; string rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; string quote = "\""; @@ -722,7 +722,7 @@ namespace NovetusLauncher void StartServer() { - string luafile = "rbxasset://scripts\\\\CSMPFunctions.lua"; + string luafile = "rbxasset://scripts\\\\" + GlobalVars.ScriptName + ".lua"; string mapfile = GlobalVars.MapsDir + @"\\" + GlobalVars.Map; string rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; string quote = "\""; @@ -743,7 +743,7 @@ namespace NovetusLauncher void StartServerNo3D() { - string luafile = "rbxasset://scripts\\\\CSMPFunctions.lua"; + string luafile = "rbxasset://scripts\\\\" + GlobalVars.ScriptName + ".lua"; string mapfile = GlobalVars.MapsDir + @"\\" + GlobalVars.Map; string rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; string quote = "\""; @@ -766,7 +766,7 @@ namespace NovetusLauncher void StartStudio() { - string luafile = "rbxasset://scripts\\\\CSMPFunctions.lua"; + string luafile = "rbxasset://scripts\\\\" + GlobalVars.ScriptName + ".lua"; string mapfile = GlobalVars.MapsDir + @"\\" + GlobalVars.Map; string rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; string quote = "\"";