diff --git a/CSMPFunctions.lua b/CSMPFunctions.lua index bb75d80..703e25a 100644 --- a/CSMPFunctions.lua +++ b/CSMPFunctions.lua @@ -246,104 +246,6 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,OutfitID,ColorHash,Pant end end -function GetHatID(Hat1ID,Hat2ID,Hat3ID) - if (Hat1ID == 1) then - Hat1 = "rbxasset://charcustom/hats/BlueBaseballCap.rbxm" - elseif (Hat1ID == 2) then - Hat1 = "rbxasset://charcustom/hats/DominoCrown.rbxm" - elseif (Hat1ID == 3) then - Hat1 = "rbxasset://charcustom/hats/fedora.rbxm" - elseif (Hat1ID == 4) then - Hat1 = "rbxasset://charcustom/hats/GreenTopHat.rbxm" - elseif (Hat1ID == 5) then - Hat1 = "rbxasset://charcustom/hats/headphones.rbxm" - elseif (Hat1ID == 6) then - Hat1 = "rbxasset://charcustom/hats/NoHat.rbxm" - elseif (Hat1ID == 7) then - Hat1 = "rbxasset://charcustom/hats/PirateHat.rbxm" - elseif (Hat1ID == 8) then - Hat1 = "rbxasset://charcustom/hats/PoliceCap.rbxm" - elseif (Hat1ID == 9) then - Hat1 = "rbxasset://charcustom/hats/PurpleTopHat.rbxm" - elseif (Hat1ID == 10) then - Hat1 = "rbxasset://charcustom/hats/RedBaseballCap.rbxm" - elseif (Hat1ID == 11) then - Hat1 = "rbxasset://charcustom/hats/RedTopHat.rbxm" - elseif (Hat1ID == 12) then - Hat1 = "rbxasset://charcustom/hats/shades.rbxm" - elseif (Hat1ID == 13) then - Hat1 = "rbxasset://charcustom/hats/ShadowNinjaMask.rbxm" - elseif (Hat1ID == 14) then - Hat1 = "rbxasset://charcustom/hats/sombrero.rbxm" - elseif (Hat1ID == 15) then - Hat1 = "rbxasset://charcustom/hats/VikingHelm.rbxm" - end - - if (Hat2ID == 1) then - Hat2 = "rbxasset://charcustom/hats/BlueBaseballCap.rbxm" - elseif (Hat2ID == 2) then - Hat2 = "rbxasset://charcustom/hats/DominoCrown.rbxm" - elseif (Hat2ID == 3) then - Hat2 = "rbxasset://charcustom/hats/fedora.rbxm" - elseif (Hat2ID == 4) then - Hat2 = "rbxasset://charcustom/hats/GreenTopHat.rbxm" - elseif (Hat2ID == 5) then - Hat2 = "rbxasset://charcustom/hats/headphones.rbxm" - elseif (Hat2ID == 6) then - Hat2 = "rbxasset://charcustom/hats/NoHat.rbxm" - elseif (Hat2ID == 7) then - Hat2 = "rbxasset://charcustom/hats/PirateHat.rbxm" - elseif (Hat2ID == 8) then - Hat2 = "rbxasset://charcustom/hats/PoliceCap.rbxm" - elseif (Hat2ID == 9) then - Hat2 = "rbxasset://charcustom/hats/PurpleTopHat.rbxm" - elseif (Hat2ID == 10) then - Hat2 = "rbxasset://charcustom/hats/RedBaseballCap.rbxm" - elseif (Hat2ID == 11) then - Hat2 = "rbxasset://charcustom/hats/RedTopHat.rbxm" - elseif (Hat2ID == 12) then - Hat2 = "rbxasset://charcustom/hats/shades.rbxm" - elseif (Hat2ID == 13) then - Hat2 = "rbxasset://charcustom/hats/ShadowNinjaMask.rbxm" - elseif (Hat2ID == 14) then - Hat2 = "rbxasset://charcustom/hats/sombrero.rbxm" - elseif (Hat2ID == 15) then - Hat2 = "rbxasset://charcustom/hats/VikingHelm.rbxm" - end - - if (Hat3ID == 1) then - Hat3 = "rbxasset://charcustom/hats/BlueBaseballCap.rbxm" - elseif (Hat3ID == 2) then - Hat3 = "rbxasset://charcustom/hats/DominoCrown.rbxm" - elseif (Hat3ID == 3) then - Hat3 = "rbxasset://charcustom/hats/fedora.rbxm" - elseif (Hat3ID == 4) then - Hat3 = "rbxasset://charcustom/hats/GreenTopHat.rbxm" - elseif (Hat3ID == 5) then - Hat3 = "rbxasset://charcustom/hats/headphones.rbxm" - elseif (Hat3ID == 6) then - Hat3 = "rbxasset://charcustom/hats/NoHat.rbxm" - elseif (Hat3ID == 7) then - Hat3 = "rbxasset://charcustom/hats/PirateHat.rbxm" - elseif (Hat3ID == 8) then - Hat3 = "rbxasset://charcustom/hats/PoliceCap.rbxm" - elseif (Hat3ID == 9) then - Hat3 = "rbxasset://charcustom/hats/PurpleTopHat.rbxm" - elseif (Hat3ID == 10) then - Hat3 = "rbxasset://charcustom/hats/RedBaseballCap.rbxm" - elseif (Hat3ID == 11) then - Hat3 = "rbxasset://charcustom/hats/RedTopHat.rbxm" - elseif (Hat3ID == 12) then - Hat3 = "rbxasset://charcustom/hats/shades.rbxm" - elseif (Hat3ID == 13) then - Hat3 = "rbxasset://charcustom/hats/ShadowNinjaMask.rbxm" - elseif (Hat3ID == 14) then - Hat3 = "rbxasset://charcustom/hats/sombrero.rbxm" - elseif (Hat3ID == 15) then - Hat3 = "rbxasset://charcustom/hats/VikingHelm.rbxm" - end -end - --same function but with our new localized customization system! function CSConnect2(UserID,ServerIP,ServerPort,PlayerName,OutfitID,Hat1ID,Hat2ID,Hat3ID,Ticket) pcall(function() game:SetPlaceID(-1, false) end); @@ -369,7 +271,9 @@ function CSConnect2(UserID,ServerIP,ServerPort,PlayerName,OutfitID,Hat1ID,Hat2ID if (OutfitID and OutfitID ~= 0) then player.CharacterAppearance="http://www.roblox.com/Asset/CharacterFetch.ashx?userId="..OutfitID; elseif (Hat1ID and Hat1ID ~= 0) then - GetHatID(Hat1ID,Hat2ID,Hat3ID) + Hat1 = "rbxasset://charcustom/hats/"..Hat1ID + Hat2 = "rbxasset://charcustom/hats/"..Hat2ID + Hat3 = "rbxasset://charcustom/hats/"..Hat3ID local charapp = "rbxasset://charcustom/CharacterColors.rbxm;"..Hat1..";"..Hat2..";"..Hat3 player.CharacterAppearance = charapp else diff --git a/CSMPFunctions_Modern.lua b/CSMPFunctions_Modern.lua index 8833f47..30a76e1 100644 --- a/CSMPFunctions_Modern.lua +++ b/CSMPFunctions_Modern.lua @@ -260,104 +260,6 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,OutfitID,ColorHash,Pant pcall(function() Visit:SetUploadUrl(""); end); end -function GetHatID(Hat1ID,Hat2ID,Hat3ID) - if (Hat1ID == 1) then - Hat1 = "rbxasset://charcustom/hats/BlueBaseballCap.rbxm" - elseif (Hat1ID == 2) then - Hat1 = "rbxasset://charcustom/hats/DominoCrown.rbxm" - elseif (Hat1ID == 3) then - Hat1 = "rbxasset://charcustom/hats/fedora.rbxm" - elseif (Hat1ID == 4) then - Hat1 = "rbxasset://charcustom/hats/GreenTopHat.rbxm" - elseif (Hat1ID == 5) then - Hat1 = "rbxasset://charcustom/hats/headphones.rbxm" - elseif (Hat1ID == 6) then - Hat1 = "rbxasset://charcustom/hats/NoHat.rbxm" - elseif (Hat1ID == 7) then - Hat1 = "rbxasset://charcustom/hats/PirateHat.rbxm" - elseif (Hat1ID == 8) then - Hat1 = "rbxasset://charcustom/hats/PoliceCap.rbxm" - elseif (Hat1ID == 9) then - Hat1 = "rbxasset://charcustom/hats/PurpleTopHat.rbxm" - elseif (Hat1ID == 10) then - Hat1 = "rbxasset://charcustom/hats/RedBaseballCap.rbxm" - elseif (Hat1ID == 11) then - Hat1 = "rbxasset://charcustom/hats/RedTopHat.rbxm" - elseif (Hat1ID == 12) then - Hat1 = "rbxasset://charcustom/hats/shades.rbxm" - elseif (Hat1ID == 13) then - Hat1 = "rbxasset://charcustom/hats/ShadowNinjaMask.rbxm" - elseif (Hat1ID == 14) then - Hat1 = "rbxasset://charcustom/hats/sombrero.rbxm" - elseif (Hat1ID == 15) then - Hat1 = "rbxasset://charcustom/hats/VikingHelm.rbxm" - end - - if (Hat2ID == 1) then - Hat2 = "rbxasset://charcustom/hats/BlueBaseballCap.rbxm" - elseif (Hat2ID == 2) then - Hat2 = "rbxasset://charcustom/hats/DominoCrown.rbxm" - elseif (Hat2ID == 3) then - Hat2 = "rbxasset://charcustom/hats/fedora.rbxm" - elseif (Hat2ID == 4) then - Hat2 = "rbxasset://charcustom/hats/GreenTopHat.rbxm" - elseif (Hat2ID == 5) then - Hat2 = "rbxasset://charcustom/hats/headphones.rbxm" - elseif (Hat2ID == 6) then - Hat2 = "rbxasset://charcustom/hats/NoHat.rbxm" - elseif (Hat2ID == 7) then - Hat2 = "rbxasset://charcustom/hats/PirateHat.rbxm" - elseif (Hat2ID == 8) then - Hat2 = "rbxasset://charcustom/hats/PoliceCap.rbxm" - elseif (Hat2ID == 9) then - Hat2 = "rbxasset://charcustom/hats/PurpleTopHat.rbxm" - elseif (Hat2ID == 10) then - Hat2 = "rbxasset://charcustom/hats/RedBaseballCap.rbxm" - elseif (Hat2ID == 11) then - Hat2 = "rbxasset://charcustom/hats/RedTopHat.rbxm" - elseif (Hat2ID == 12) then - Hat2 = "rbxasset://charcustom/hats/shades.rbxm" - elseif (Hat2ID == 13) then - Hat2 = "rbxasset://charcustom/hats/ShadowNinjaMask.rbxm" - elseif (Hat2ID == 14) then - Hat2 = "rbxasset://charcustom/hats/sombrero.rbxm" - elseif (Hat2ID == 15) then - Hat2 = "rbxasset://charcustom/hats/VikingHelm.rbxm" - end - - if (Hat3ID == 1) then - Hat3 = "rbxasset://charcustom/hats/BlueBaseballCap.rbxm" - elseif (Hat3ID == 2) then - Hat3 = "rbxasset://charcustom/hats/DominoCrown.rbxm" - elseif (Hat3ID == 3) then - Hat3 = "rbxasset://charcustom/hats/fedora.rbxm" - elseif (Hat3ID == 4) then - Hat3 = "rbxasset://charcustom/hats/GreenTopHat.rbxm" - elseif (Hat3ID == 5) then - Hat3 = "rbxasset://charcustom/hats/headphones.rbxm" - elseif (Hat3ID == 6) then - Hat3 = "rbxasset://charcustom/hats/NoHat.rbxm" - elseif (Hat3ID == 7) then - Hat3 = "rbxasset://charcustom/hats/PirateHat.rbxm" - elseif (Hat3ID == 8) then - Hat3 = "rbxasset://charcustom/hats/PoliceCap.rbxm" - elseif (Hat3ID == 9) then - Hat3 = "rbxasset://charcustom/hats/PurpleTopHat.rbxm" - elseif (Hat3ID == 10) then - Hat3 = "rbxasset://charcustom/hats/RedBaseballCap.rbxm" - elseif (Hat3ID == 11) then - Hat3 = "rbxasset://charcustom/hats/RedTopHat.rbxm" - elseif (Hat3ID == 12) then - Hat3 = "rbxasset://charcustom/hats/shades.rbxm" - elseif (Hat3ID == 13) then - Hat3 = "rbxasset://charcustom/hats/ShadowNinjaMask.rbxm" - elseif (Hat3ID == 14) then - Hat3 = "rbxasset://charcustom/hats/sombrero.rbxm" - elseif (Hat3ID == 15) then - Hat3 = "rbxasset://charcustom/hats/VikingHelm.rbxm" - end -end - --same function but with our new localized customization system! function CSConnect2(UserID,ServerIP,ServerPort,PlayerName,OutfitID,Hat1ID,Hat2ID,Hat3ID,Ticket) pcall(function() game:SetPlaceID(-1, false) end); @@ -458,7 +360,9 @@ function CSConnect2(UserID,ServerIP,ServerPort,PlayerName,OutfitID,Hat1ID,Hat2ID if (OutfitID and OutfitID ~= 0) then Player.CharacterAppearance="http://www.roblox.com/Asset/CharacterFetch.ashx?userId="..OutfitID; elseif (Hat1ID and Hat1ID ~= 0) then - GetHatID(Hat1ID,Hat2ID,Hat3ID) + Hat1 = "rbxasset://charcustom/hats/"..Hat1ID + Hat2 = "rbxasset://charcustom/hats/"..Hat2ID + Hat3 = "rbxasset://charcustom/hats/"..Hat3ID local charapp = "rbxasset://charcustom/CharacterColors.rbxm;"..Hat1..";"..Hat2..";"..Hat3 player.CharacterAppearance = charapp else diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.Designer.cs index 2091490..0e6a9cd 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.Designer.cs @@ -78,6 +78,7 @@ namespace RBXLegacyLauncher this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.button39 = new System.Windows.Forms.Button(); + this.button40 = new System.Windows.Forms.Button(); this.SuspendLayout(); // // button1 @@ -477,19 +478,30 @@ namespace RBXLegacyLauncher // // button39 // - this.button39.Location = new System.Drawing.Point(170, 160); + this.button39.Location = new System.Drawing.Point(170, 186); this.button39.Name = "button39"; - this.button39.Size = new System.Drawing.Size(255, 50); + this.button39.Size = new System.Drawing.Size(255, 24); this.button39.TabIndex = 40; this.button39.Text = "Save Colors"; this.button39.UseVisualStyleBackColor = true; this.button39.Click += new System.EventHandler(this.Button39Click); // + // button40 + // + this.button40.Location = new System.Drawing.Point(170, 156); + this.button40.Name = "button40"; + this.button40.Size = new System.Drawing.Size(255, 24); + this.button40.TabIndex = 41; + this.button40.Text = "Reset Colors"; + this.button40.UseVisualStyleBackColor = true; + this.button40.Click += new System.EventHandler(this.Button40Click); + // // CharacterColors // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(437, 222); + this.Controls.Add(this.button40); this.Controls.Add(this.button39); this.Controls.Add(this.label2); this.Controls.Add(this.label1); @@ -539,6 +551,7 @@ namespace RBXLegacyLauncher this.Load += new System.EventHandler(this.CharacterColorsLoad); this.ResumeLayout(false); } + private System.Windows.Forms.Button button40; private System.Windows.Forms.Button button39; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.cs index d9f5f49..8932618 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.cs @@ -10,6 +10,9 @@ using System; using System.Drawing; using System.Windows.Forms; using System.Xml; +using System.IO; +using System.Diagnostics; +using System.Threading; namespace RBXLegacyLauncher { @@ -18,13 +21,13 @@ namespace RBXLegacyLauncher /// public partial class CharacterColors : Form { - public static int HeadColor = 0; - public static int TorsoColor = 0; - public static int LArmColor = 0; - public static int RArmColor = 0; - public static int LLegColor = 0; - public static int RLegColor = 0; - public static string SelectedPart = ""; + public static int HeadColor = 24; + public static int TorsoColor = 23; + public static int LArmColor = 24; + public static int RArmColor = 24; + public static int LLegColor = 119; + public static int RLegColor = 119; + public static string SelectedPart = "Head"; public CharacterColors() { @@ -76,14 +79,99 @@ namespace RBXLegacyLauncher void CharacterColorsLoad(object sender, EventArgs e) { - HeadColor = 24; - TorsoColor = 23; - LArmColor = 24; - RArmColor = 24; - LLegColor = 119; - RLegColor = 119; - SelectedPart = "Head"; + if (!File.Exists("playercolors.txt")) + { + WriteColorConfigValues(); + } + if (!File.Exists(GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\content\\charcustom\\CharacterColors.rbxm")) + { + WriteColorModel(); + } label2.Text = SelectedPart; + button1.BackColor = ConvertStringtoColor("Color [A=255, R=245, G=205, B=47]"); + button2.BackColor = ConvertStringtoColor("Color [A=255, R=13, G=105, B=172]"); + button3.BackColor = ConvertStringtoColor("Color [A=255, R=245, G=205, B=47]"); + button4.BackColor = ConvertStringtoColor("Color [A=255, R=245, G=205, B=47]"); + button5.BackColor = ConvertStringtoColor("Color [A=255, R=164, G=189, B=71]"); + button6.BackColor = ConvertStringtoColor("Color [A=255, R=164, G=189, B=71]"); + ReadColorConfigValues(); + } + + void ReadColorConfigValues() + { + string line1, line2, line3, line4, line5, line6, line7, line8, line9, line10, line11, line12; + + using(StreamReader reader = new StreamReader("playercolors.txt")) + { + line1 = reader.ReadLine(); + line2 = reader.ReadLine(); + line3 = reader.ReadLine(); + line4 = reader.ReadLine(); + line5 = reader.ReadLine(); + line6 = reader.ReadLine(); + line7 = reader.ReadLine(); + line8 = reader.ReadLine(); + line9 = reader.ReadLine(); + line10 = reader.ReadLine(); + line11 = reader.ReadLine(); + line12 = reader.ReadLine(); + } + + int iline1 = Convert.ToInt32(line1); + HeadColor = iline1; + + int iline2 = Convert.ToInt32(line2); + TorsoColor = iline2; + + int iline3 = Convert.ToInt32(line3); + LArmColor = iline3; + + int iline4 = Convert.ToInt32(line4); + RArmColor = iline4; + + int iline5 = Convert.ToInt32(line5); + LLegColor = iline5; + + int iline6 = Convert.ToInt32(line6); + RLegColor = iline6; + + button1.BackColor = ConvertStringtoColor(line7); + button2.BackColor = ConvertStringtoColor(line8); + button3.BackColor = ConvertStringtoColor(line9); + button4.BackColor = ConvertStringtoColor(line10); + button5.BackColor = ConvertStringtoColor(line11); + button6.BackColor = ConvertStringtoColor(line12); + } + + void WriteColorConfigValues() + { + string[] lines = { + HeadColor.ToString(), + TorsoColor.ToString(), + LArmColor.ToString(), + RArmColor.ToString(), + LLegColor.ToString(), + RLegColor.ToString(), + button1.BackColor.ToString(), + button2.BackColor.ToString(), + button3.BackColor.ToString(), + button4.BackColor.ToString(), + button5.BackColor.ToString(), + button6.BackColor.ToString(), + }; + File.WriteAllLines("playercolors.txt", lines); + } + + Color ConvertStringtoColor(string CString) + { + var p = CString.Split(new char[]{',',']'}); + + int A = Convert.ToInt32(p[0].Substring(p[0].IndexOf('=') + 1)); + int R = Convert.ToInt32(p[1].Substring(p[1].IndexOf('=') + 1)); + int G = Convert.ToInt32(p[2].Substring(p[2].IndexOf('=') + 1)); + int B = Convert.ToInt32(p[3].Substring(p[3].IndexOf('=') + 1)); + + return Color.FromArgb(A,R,G,B); } void ChangeColorOfPart(int ColorID, Color ButtonColor) @@ -346,7 +434,14 @@ namespace RBXLegacyLauncher void Button39Click(object sender, EventArgs e) { - string filename = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\content\\charcustom\\CharacterColors.rbxm"; + WriteColorModel(); + WriteColorConfigValues(); + MessageBox.Show("Colors Saved!"); + } + + void WriteColorModel() + { + string filename = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\content\\charcustom\\CharacterColors.rbxm"; XmlTextWriter writer = new XmlTextWriter(filename, System.Text.Encoding.UTF8); writer.Formatting = Formatting.Indented; writer.Indentation = 3; @@ -362,15 +457,6 @@ namespace RBXLegacyLauncher writer.WriteStartElement("External"); writer.WriteString("nil"); writer.WriteEndElement(); - WriteColorModel(writer); - writer.WriteEndElement(); - writer.WriteEndDocument(); - writer.Close(); - MessageBox.Show("Colors Saved!"); - } - - void WriteColorModel(XmlTextWriter writer) - { writer.WriteStartElement("Item"); writer.WriteAttributeString("class", "BodyColors"); writer.WriteStartElement("Properties"); @@ -408,6 +494,28 @@ namespace RBXLegacyLauncher writer.WriteEndElement(); writer.WriteEndElement(); writer.WriteEndElement(); + writer.WriteEndElement(); + writer.WriteEndDocument(); + writer.Close(); } + + void Button40Click(object sender, EventArgs e) + { + HeadColor = 24; + TorsoColor = 23; + LArmColor = 24; + RArmColor = 24; + LLegColor = 119; + RLegColor = 119; + button1.BackColor = ConvertStringtoColor("Color [A=255, R=245, G=205, B=47]"); + button2.BackColor = ConvertStringtoColor("Color [A=255, R=13, G=105, B=172]"); + button3.BackColor = ConvertStringtoColor("Color [A=255, R=245, G=205, B=47]"); + button4.BackColor = ConvertStringtoColor("Color [A=255, R=245, G=205, B=47]"); + button5.BackColor = ConvertStringtoColor("Color [A=255, R=164, G=189, B=71]"); + button6.BackColor = ConvertStringtoColor("Color [A=255, R=164, G=189, B=71]"); + WriteColorModel(); + WriteColorConfigValues(); + MessageBox.Show("Colors Reset!"); + } } } diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.Designer.cs index 7b1ebea..898962a 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.Designer.cs @@ -63,15 +63,15 @@ namespace RBXLegacyLauncher this.tabPage1 = new System.Windows.Forms.TabPage(); this.label7 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.button1 = new System.Windows.Forms.Button(); - this.listBox1 = new System.Windows.Forms.ListBox(); - this.listBox2 = new System.Windows.Forms.ListBox(); - this.listBox3 = new System.Windows.Forms.ListBox(); - this.label12 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.label18 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.listBox3 = new System.Windows.Forms.ListBox(); + this.listBox2 = new System.Windows.Forms.ListBox(); + this.listBox1 = new System.Windows.Forms.ListBox(); + this.button1 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); @@ -322,7 +322,7 @@ namespace RBXLegacyLauncher this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Size = new System.Drawing.Size(255, 341); this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "Online Editor"; + this.tabPage1.Text = "Custom Outfit (Online)"; this.tabPage1.ToolTipText = "Requires Internet Connection"; this.tabPage1.UseVisualStyleBackColor = true; // @@ -342,75 +342,6 @@ namespace RBXLegacyLauncher this.label2.Size = new System.Drawing.Size(228, 2); this.label2.TabIndex = 28; // - // button1 - // - this.button1.Location = new System.Drawing.Point(6, 6); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(243, 40); - this.button1.TabIndex = 0; - this.button1.Text = "Edit Character Colors"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.Button1Click); - // - // listBox1 - // - this.listBox1.FormattingEnabled = true; - this.listBox1.Location = new System.Drawing.Point(6, 85); - this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(243, 69); - this.listBox1.TabIndex = 1; - this.listBox1.SelectedIndexChanged += new System.EventHandler(this.ListBox1SelectedIndexChanged); - // - // listBox2 - // - this.listBox2.FormattingEnabled = true; - this.listBox2.Location = new System.Drawing.Point(6, 173); - this.listBox2.Name = "listBox2"; - this.listBox2.Size = new System.Drawing.Size(243, 69); - this.listBox2.TabIndex = 2; - this.listBox2.SelectedIndexChanged += new System.EventHandler(this.ListBox2SelectedIndexChanged); - // - // listBox3 - // - this.listBox3.FormattingEnabled = true; - this.listBox3.Location = new System.Drawing.Point(6, 266); - this.listBox3.Name = "listBox3"; - this.listBox3.Size = new System.Drawing.Size(243, 69); - this.listBox3.TabIndex = 3; - this.listBox3.SelectedIndexChanged += new System.EventHandler(this.ListBox3SelectedIndexChanged); - // - // label12 - // - this.label12.Location = new System.Drawing.Point(108, 69); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(35, 13); - this.label12.TabIndex = 4; - this.label12.Text = "Hat 1"; - // - // label16 - // - this.label16.Location = new System.Drawing.Point(108, 157); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(35, 13); - this.label16.TabIndex = 5; - this.label16.Text = "Hat 2"; - // - // label17 - // - this.label17.Location = new System.Drawing.Point(108, 245); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(35, 18); - this.label17.TabIndex = 6; - this.label17.Text = "Hat 3"; - // - // label18 - // - this.label18.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.label18.Location = new System.Drawing.Point(6, 58); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(243, 2); - this.label18.TabIndex = 7; - // // tabPage2 // this.tabPage2.Controls.Add(this.label18); @@ -426,9 +357,78 @@ namespace RBXLegacyLauncher this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.tabPage2.Size = new System.Drawing.Size(255, 341); this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Offline Editor"; + this.tabPage2.Text = "Custom Outfit (Local)"; this.tabPage2.UseVisualStyleBackColor = true; // + // label18 + // + this.label18.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.label18.Location = new System.Drawing.Point(6, 58); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(243, 2); + this.label18.TabIndex = 7; + // + // label17 + // + this.label17.Location = new System.Drawing.Point(108, 245); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(35, 18); + this.label17.TabIndex = 6; + this.label17.Text = "Hat 3"; + // + // label16 + // + this.label16.Location = new System.Drawing.Point(108, 157); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(35, 13); + this.label16.TabIndex = 5; + this.label16.Text = "Hat 2"; + // + // label12 + // + this.label12.Location = new System.Drawing.Point(108, 69); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(35, 13); + this.label12.TabIndex = 4; + this.label12.Text = "Hat 1"; + // + // listBox3 + // + this.listBox3.FormattingEnabled = true; + this.listBox3.Location = new System.Drawing.Point(6, 266); + this.listBox3.Name = "listBox3"; + this.listBox3.Size = new System.Drawing.Size(243, 69); + this.listBox3.TabIndex = 3; + this.listBox3.SelectedIndexChanged += new System.EventHandler(this.ListBox3SelectedIndexChanged); + // + // listBox2 + // + this.listBox2.FormattingEnabled = true; + this.listBox2.Location = new System.Drawing.Point(6, 173); + this.listBox2.Name = "listBox2"; + this.listBox2.Size = new System.Drawing.Size(243, 69); + this.listBox2.TabIndex = 2; + this.listBox2.SelectedIndexChanged += new System.EventHandler(this.ListBox2SelectedIndexChanged); + // + // listBox1 + // + this.listBox1.FormattingEnabled = true; + this.listBox1.Location = new System.Drawing.Point(6, 85); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(243, 69); + this.listBox1.TabIndex = 1; + this.listBox1.SelectedIndexChanged += new System.EventHandler(this.ListBox1SelectedIndexChanged); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(6, 6); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(243, 40); + this.button1.TabIndex = 0; + this.button1.Text = "Edit Character Colors"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.Button1Click); + // // CharacterCustomization // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.cs index 61905ff..7ac7524 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization.cs @@ -259,9 +259,9 @@ namespace RBXLegacyLauncher listBox2.Items.Add(file.Name); listBox3.Items.Add(file.Name); } - listBox1.SelectedIndex = GlobalVars.Custom_Hat1ID_Offline-1; - listBox2.SelectedIndex = GlobalVars.Custom_Hat2ID_Offline-1; - listBox3.SelectedIndex = GlobalVars.Custom_Hat3ID_Offline-1; + listBox1.SelectedItem = GlobalVars.Custom_Hat1ID_Offline; + listBox2.SelectedItem = GlobalVars.Custom_Hat2ID_Offline; + listBox3.SelectedItem = GlobalVars.Custom_Hat3ID_Offline; GlobalVars.CustomMode = 1; } else @@ -286,7 +286,7 @@ namespace RBXLegacyLauncher string hatdir = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\content\\charcustom\\hats"; if (Directory.Exists(hatdir)) { - GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedIndex+1; + GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString();; } } @@ -295,7 +295,7 @@ namespace RBXLegacyLauncher string hatdir = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\content\\charcustom\\hats"; if (Directory.Exists(hatdir)) { - GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedIndex+1; + GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString();; } } @@ -304,7 +304,7 @@ namespace RBXLegacyLauncher string hatdir = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\content\\charcustom\\hats"; if (Directory.Exists(hatdir)) { - GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedIndex+1; + GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString();; } } } diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.cs b/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.cs index 0680427..ba4069e 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.cs @@ -155,7 +155,16 @@ namespace RBXLegacyLauncher if (sfd.ShowDialog() == DialogResult.OK) { - string[] lines = { GlobalVars.ClientCreator_UsesPlayerName.ToString(), GlobalVars.ClientCreator_UsesID.ToString(), GlobalVars.ClientCreator_SupportsLocalPlay.ToString(), GlobalVars.ClientCreator_SupportsAppearanceID.ToString(), GlobalVars.ClientCreator_LoadsAssetsOnline.ToString(), GlobalVars.ClientCreator_ModernClient.ToString(), GlobalVars.ClientCreator_SupportsCharacterCustomization.ToString() ,GlobalVars.ClientCreator_SelectedClientDesc.ToString() }; + string[] lines = { + GlobalVars.ClientCreator_UsesPlayerName.ToString(), + GlobalVars.ClientCreator_UsesID.ToString(), + GlobalVars.ClientCreator_SupportsLocalPlay.ToString(), + GlobalVars.ClientCreator_SupportsAppearanceID.ToString(), + GlobalVars.ClientCreator_LoadsAssetsOnline.ToString(), + GlobalVars.ClientCreator_ModernClient.ToString(), + GlobalVars.ClientCreator_SupportsCharacterCustomization.ToString(), + GlobalVars.ClientCreator_SelectedClientDesc.ToString() + }; File.WriteAllLines(sfd.FileName, lines); } } diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs b/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs index 6b059f9..8f4b81e 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs @@ -50,7 +50,7 @@ public static int Custom_Hat3Version = 1; //charcustom offline public static int CustomMode = 0; - public static int Custom_Hat1ID_Offline = 6; - public static int Custom_Hat2ID_Offline = 6; - public static int Custom_Hat3ID_Offline = 6; + public static string Custom_Hat1ID_Offline = "NoHat.rbxm"; + public static string Custom_Hat2ID_Offline = "NoHat.rbxm"; + public static string Custom_Hat3ID_Offline = "NoHat.rbxm"; } \ No newline at end of file diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs index e2fb8e4..38303b8 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs @@ -127,24 +127,24 @@ namespace RBXLegacyLauncher { args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "',0,'" + GlobalVars.Custom_ColorHash + "'," + GlobalVars.Custom_PantsID + "," + GlobalVars.Custom_ShirtsID + "," + GlobalVars.Custom_TShirtsID + "," + GlobalVars.Custom_Hat1ID + "," + GlobalVars.Custom_Hat2ID + "," + GlobalVars.Custom_Hat3ID + "," + GlobalVars.Custom_Hat1Version + "," + GlobalVars.Custom_Hat2Version + "," + GlobalVars.Custom_Hat3Version + ");" + quote; } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits() && !IsInOfflineMode()) + else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits() && IsInOfflineMode()) { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player',0," + GlobalVars.Custom_Hat1ID_Offline + "," + GlobalVars.Custom_Hat2ID_Offline + "," + GlobalVars.Custom_Hat3ID_Offline + ");" + quote; + args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player',0,'" + GlobalVars.Custom_Hat1ID_Offline + "','" + GlobalVars.Custom_Hat2ID_Offline + "','" + GlobalVars.Custom_Hat3ID_Offline + "');" + quote; } else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits() && IsInOfflineMode()) { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect2(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "',0," + GlobalVars.Custom_Hat1ID_Offline + "," + GlobalVars.Custom_Hat2ID_Offline + "," + GlobalVars.Custom_Hat3ID_Offline + ");" + quote; + args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect2(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "',0,'" + GlobalVars.Custom_Hat1ID_Offline + "','" + GlobalVars.Custom_Hat2ID_Offline + "','" + GlobalVars.Custom_Hat3ID_Offline + "');" + quote; } else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits() && IsInOfflineMode()) { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect2(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player',0," + GlobalVars.Custom_Hat1ID_Offline + "," + GlobalVars.Custom_Hat2ID_Offline + "," + GlobalVars.Custom_Hat3ID_Offline + ");" + quote; + args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect2(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player',0,'" + GlobalVars.Custom_Hat1ID_Offline + "','" + GlobalVars.Custom_Hat2ID_Offline + "','" + GlobalVars.Custom_Hat3ID_Offline + "');" + quote; } //how the fuck does this even happen? oh well. else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits() && IsInOfflineMode()) { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect2(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "',0," + GlobalVars.Custom_Hat1ID_Offline + "," + GlobalVars.Custom_Hat2ID_Offline + "," + GlobalVars.Custom_Hat3ID_Offline + ");" + quote; + args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect2(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "',0,'" + GlobalVars.Custom_Hat1ID_Offline + "','" + GlobalVars.Custom_Hat2ID_Offline + "','" + GlobalVars.Custom_Hat3ID_Offline + "');" + quote; } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits() && IsInOfflineMode()) + else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits() && !IsInOfflineMode()) { args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect2(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player',0,'" + GlobalVars.Custom_ColorHash + "'," + GlobalVars.Custom_PantsID + "," + GlobalVars.Custom_ShirtsID + "," + GlobalVars.Custom_TShirtsID + "," + GlobalVars.Custom_Hat1ID + "," + GlobalVars.Custom_Hat2ID + "," + GlobalVars.Custom_Hat3ID + "," + GlobalVars.Custom_Hat1Version + "," + GlobalVars.Custom_Hat2Version + "," + GlobalVars.Custom_Hat3Version + ");" + quote; } @@ -378,14 +378,9 @@ namespace RBXLegacyLauncher int iline21 = Convert.ToInt32(line21); GlobalVars.CustomMode = iline21; - int iline22 = Convert.ToInt32(line22); - GlobalVars.Custom_Hat1ID_Offline = iline22; - - int iline23 = Convert.ToInt32(line23); - GlobalVars.Custom_Hat2ID_Offline = iline23; - - int iline24 = Convert.ToInt32(line24); - GlobalVars.Custom_Hat3ID_Offline = iline24; + GlobalVars.Custom_Hat1ID_Offline = line22; + GlobalVars.Custom_Hat2ID_Offline = line23; + GlobalVars.Custom_Hat3ID_Offline = line24; if (GlobalVars.CloseOnLaunch == true) { @@ -491,7 +486,7 @@ namespace RBXLegacyLauncher GlobalVars.BodyColors = true; GlobalVars.UserID = 0; GlobalVars.PlayerName = "Player"; - GlobalVars.SelectedClient = "2008"; + GlobalVars.SelectedClient = "Mid-2008"; GlobalVars.CharacterAppearanceID = 0; GlobalVars.UseAppearanceID = false; GlobalVars.Map = "Baseplate.rbxl"; @@ -505,9 +500,9 @@ namespace RBXLegacyLauncher GlobalVars.Custom_Hat2ID = 0; GlobalVars.Custom_Hat3ID = 0; GlobalVars.CustomMode = 0; - GlobalVars.Custom_Hat1ID_Offline = 1; - GlobalVars.Custom_Hat2ID_Offline = 1; - GlobalVars.Custom_Hat3ID_Offline = 1; + GlobalVars.Custom_Hat1ID_Offline = "NoHat.rbxm"; + GlobalVars.Custom_Hat2ID_Offline = "NoHat.rbxm"; + GlobalVars.Custom_Hat3ID_Offline = "NoHat.rbxm"; WriteConfigValues(); ReadConfigValues(); } @@ -645,6 +640,7 @@ namespace RBXLegacyLauncher checkBox5.Checked = false; button8.Enabled = false; GlobalVars.UseCustomAppearanceID = false; + GlobalVars.CustomMode = 0; } textBox6.Text = GlobalVars.SelectedClientDesc; @@ -738,6 +734,7 @@ namespace RBXLegacyLauncher void Button5Click(object sender, EventArgs e) { WriteConfigValues(); + MessageBox.Show("Config Saved!"); } void TextBox2TextChanged(object sender, EventArgs e) @@ -857,6 +854,7 @@ namespace RBXLegacyLauncher void Button7Click(object sender, EventArgs e) { WriteConfigValues(); + MessageBox.Show("Config Saved!"); } void TextBox4TextChanged(object sender, EventArgs e) @@ -938,6 +936,7 @@ namespace RBXLegacyLauncher void Button9Click(object sender, EventArgs e) { ResetConfigValues(); + MessageBox.Show("Config Reset!"); } void ListBox3SelectedIndexChanged(object sender, EventArgs e) diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csproj.GenerateResource.Cache b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csproj.GenerateResource.Cache index 00602e9..2dad578 100644 Binary files a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csproj.GenerateResource.Cache and b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csproj.GenerateResource.Cache differ diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.exe b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.exe index 550a6c4..fd4dec7 100644 Binary files a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.exe and b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.exe differ diff --git a/RBXLegacySetup.iss b/RBXLegacySetup.iss index 295e257..89a3689 100644 --- a/RBXLegacySetup.iss +++ b/RBXLegacySetup.iss @@ -1,7 +1,7 @@ ; Script generated by the Inno Script Studio Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#define AppVer "1.8.4" +#define AppVer "1.9" [Setup] ; NOTE: The value of AppId uniquely identifies this application.