diff --git a/NovetusLauncher/.vs/NovetusLauncher/v14/.suo b/NovetusLauncher/.vs/NovetusLauncher/v14/.suo index ae52f82..af75813 100644 Binary files a/NovetusLauncher/.vs/NovetusLauncher/v14/.suo and b/NovetusLauncher/.vs/NovetusLauncher/v14/.suo differ diff --git a/NovetusLauncher/NovetusCMD/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/NovetusLauncher/NovetusCMD/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100644 index e69de29..0000000 diff --git a/NovetusLauncher/NovetusCMD/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/NovetusLauncher/NovetusCMD/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100644 index e69de29..0000000 diff --git a/NovetusLauncher/NovetusCMD/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/NovetusLauncher/NovetusCMD/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100644 index e69de29..0000000 diff --git a/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems b/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems index a80f9e1..3dc8447 100644 --- a/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems +++ b/NovetusLauncher/NovetusFuncs/NovetusFuncs.projitems @@ -18,6 +18,7 @@ + diff --git a/NovetusLauncher/NovetusFuncs/PartColors.cs b/NovetusLauncher/NovetusFuncs/PartColors.cs new file mode 100644 index 0000000..abf2198 --- /dev/null +++ b/NovetusLauncher/NovetusFuncs/PartColors.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Text; + +namespace NovetusFuncs +{ + public class PartColors + { + public int ColorID { get; set; } + public Color ButtonColor { get; set; } + } +} diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs index 10e5659..54b30be 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization.Designer.cs @@ -39,7 +39,18 @@ namespace NovetusLauncher System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CharacterCustomization)); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.button61 = new System.Windows.Forms.Button(); + this.button65 = new System.Windows.Forms.Button(); + this.button62 = new System.Windows.Forms.Button(); + this.button66 = new System.Windows.Forms.Button(); + this.button63 = new System.Windows.Forms.Button(); + this.button67 = new System.Windows.Forms.Button(); + this.button64 = new System.Windows.Forms.Button(); + this.button68 = new System.Windows.Forms.Button(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.button70 = new System.Windows.Forms.Button(); + this.button69 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); @@ -142,17 +153,9 @@ namespace NovetusLauncher this.button54 = new System.Windows.Forms.Button(); this.button53 = new System.Windows.Forms.Button(); this.button52 = new System.Windows.Forms.Button(); - this.button61 = new System.Windows.Forms.Button(); - this.button62 = new System.Windows.Forms.Button(); - this.button63 = new System.Windows.Forms.Button(); - this.button64 = new System.Windows.Forms.Button(); - this.button65 = new System.Windows.Forms.Button(); - this.button66 = new System.Windows.Forms.Button(); - this.button67 = new System.Windows.Forms.Button(); - this.button68 = new System.Windows.Forms.Button(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); + this.groupBox3.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox1.SuspendLayout(); this.tabPage2.SuspendLayout(); @@ -177,7 +180,6 @@ namespace NovetusLauncher ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).BeginInit(); this.tabPage7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).BeginInit(); - this.groupBox3.SuspendLayout(); this.SuspendLayout(); // // tabControl1 @@ -216,6 +218,103 @@ namespace NovetusLauncher this.tabPage1.Text = "BODY"; this.tabPage1.UseVisualStyleBackColor = true; // + // groupBox3 + // + this.groupBox3.Controls.Add(this.button61); + this.groupBox3.Controls.Add(this.button65); + this.groupBox3.Controls.Add(this.button62); + this.groupBox3.Controls.Add(this.button66); + this.groupBox3.Controls.Add(this.button63); + this.groupBox3.Controls.Add(this.button67); + this.groupBox3.Controls.Add(this.button64); + this.groupBox3.Controls.Add(this.button68); + this.groupBox3.Location = new System.Drawing.Point(355, 163); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(109, 68); + this.groupBox3.TabIndex = 60; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "\'06 Color Presets"; + // + // button61 + // + this.button61.Location = new System.Drawing.Point(6, 16); + this.button61.Name = "button61"; + this.button61.Size = new System.Drawing.Size(24, 23); + this.button61.TabIndex = 51; + this.button61.Text = "1"; + this.button61.UseVisualStyleBackColor = true; + this.button61.Click += new System.EventHandler(this.button61_Click); + // + // button65 + // + this.button65.Location = new System.Drawing.Point(81, 42); + this.button65.Name = "button65"; + this.button65.Size = new System.Drawing.Size(24, 23); + this.button65.TabIndex = 58; + this.button65.Text = "8"; + this.button65.UseVisualStyleBackColor = true; + this.button65.Click += new System.EventHandler(this.button65_Click); + // + // button62 + // + this.button62.Location = new System.Drawing.Point(31, 16); + this.button62.Name = "button62"; + this.button62.Size = new System.Drawing.Size(24, 23); + this.button62.TabIndex = 52; + this.button62.Text = "2"; + this.button62.UseVisualStyleBackColor = true; + this.button62.Click += new System.EventHandler(this.button62_Click); + // + // button66 + // + this.button66.Location = new System.Drawing.Point(56, 42); + this.button66.Name = "button66"; + this.button66.Size = new System.Drawing.Size(24, 23); + this.button66.TabIndex = 57; + this.button66.Text = "7"; + this.button66.UseVisualStyleBackColor = true; + this.button66.Click += new System.EventHandler(this.button66_Click); + // + // button63 + // + this.button63.Location = new System.Drawing.Point(56, 16); + this.button63.Name = "button63"; + this.button63.Size = new System.Drawing.Size(24, 23); + this.button63.TabIndex = 53; + this.button63.Text = "3"; + this.button63.UseVisualStyleBackColor = true; + this.button63.Click += new System.EventHandler(this.button63_Click); + // + // button67 + // + this.button67.Location = new System.Drawing.Point(31, 42); + this.button67.Name = "button67"; + this.button67.Size = new System.Drawing.Size(24, 23); + this.button67.TabIndex = 56; + this.button67.Text = "6"; + this.button67.UseVisualStyleBackColor = true; + this.button67.Click += new System.EventHandler(this.button67_Click); + // + // button64 + // + this.button64.Location = new System.Drawing.Point(81, 16); + this.button64.Name = "button64"; + this.button64.Size = new System.Drawing.Size(24, 23); + this.button64.TabIndex = 54; + this.button64.Text = "4"; + this.button64.UseVisualStyleBackColor = true; + this.button64.Click += new System.EventHandler(this.button64_Click); + // + // button68 + // + this.button68.Location = new System.Drawing.Point(6, 42); + this.button68.Name = "button68"; + this.button68.Size = new System.Drawing.Size(24, 23); + this.button68.TabIndex = 55; + this.button68.Text = "5"; + this.button68.UseVisualStyleBackColor = true; + this.button68.Click += new System.EventHandler(this.button68_Click); + // // groupBox2 // this.groupBox2.Controls.Add(this.button2); @@ -231,6 +330,28 @@ namespace NovetusLauncher this.groupBox2.TabStop = false; this.groupBox2.Text = "Body Parts"; // + // button70 + // + this.button70.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(174)))), ((int)(((byte)(122)))), ((int)(((byte)(89))))); + this.button70.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.button70.Location = new System.Drawing.Point(244, 97); + this.button70.Name = "button70"; + this.button70.Size = new System.Drawing.Size(20, 20); + this.button70.TabIndex = 33; + this.button70.UseVisualStyleBackColor = false; + this.button70.Click += new System.EventHandler(this.button70_Click); + // + // button69 + // + this.button69.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(112)))), ((int)(((byte)(160))))); + this.button69.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.button69.Location = new System.Drawing.Point(58, 97); + this.button69.Name = "button69"; + this.button69.Size = new System.Drawing.Size(20, 20); + this.button69.TabIndex = 32; + this.button69.UseVisualStyleBackColor = false; + this.button69.Click += new System.EventHandler(this.button69_Click); + // // button2 // this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(105)))), ((int)(((byte)(172))))); @@ -299,7 +420,9 @@ namespace NovetusLauncher // // groupBox1 // + this.groupBox1.Controls.Add(this.button70); this.groupBox1.Controls.Add(this.button7); + this.groupBox1.Controls.Add(this.button69); this.groupBox1.Controls.Add(this.button8); this.groupBox1.Controls.Add(this.button9); this.groupBox1.Controls.Add(this.button10); @@ -333,18 +456,18 @@ namespace NovetusLauncher this.groupBox1.Controls.Add(this.button24); this.groupBox1.Location = new System.Drawing.Point(174, 6); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(281, 155); + this.groupBox1.Size = new System.Drawing.Size(286, 155); this.groupBox1.TabIndex = 49; this.groupBox1.TabStop = false; - this.groupBox1.Text = "Colors"; + this.groupBox1.Text = "Part Colors"; // // button7 // this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(243)))), ((int)(((byte)(243))))); this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button7.Location = new System.Drawing.Point(6, 19); + this.button7.Location = new System.Drawing.Point(27, 19); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(29, 26); + this.button7.Size = new System.Drawing.Size(20, 20); this.button7.TabIndex = 6; this.button7.UseVisualStyleBackColor = false; this.button7.Click += new System.EventHandler(this.Button7Click); @@ -353,9 +476,9 @@ namespace NovetusLauncher // this.button8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(229)))), ((int)(((byte)(224))))); this.button8.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button8.Location = new System.Drawing.Point(41, 19); + this.button8.Location = new System.Drawing.Point(58, 19); this.button8.Name = "button8"; - this.button8.Size = new System.Drawing.Size(28, 26); + this.button8.Size = new System.Drawing.Size(20, 20); this.button8.TabIndex = 7; this.button8.UseVisualStyleBackColor = false; this.button8.Click += new System.EventHandler(this.Button8Click); @@ -364,9 +487,9 @@ namespace NovetusLauncher // this.button9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(163)))), ((int)(((byte)(163)))), ((int)(((byte)(165))))); this.button9.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button9.Location = new System.Drawing.Point(75, 19); + this.button9.Location = new System.Drawing.Point(89, 19); this.button9.Name = "button9"; - this.button9.Size = new System.Drawing.Size(28, 26); + this.button9.Size = new System.Drawing.Size(20, 20); this.button9.TabIndex = 8; this.button9.UseVisualStyleBackColor = false; this.button9.Click += new System.EventHandler(this.Button9Click); @@ -375,9 +498,9 @@ namespace NovetusLauncher // this.button10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(99)))), ((int)(((byte)(95)))), ((int)(((byte)(96))))); this.button10.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button10.Location = new System.Drawing.Point(109, 19); + this.button10.Location = new System.Drawing.Point(120, 19); this.button10.Name = "button10"; - this.button10.Size = new System.Drawing.Size(28, 26); + this.button10.Size = new System.Drawing.Size(20, 20); this.button10.TabIndex = 9; this.button10.UseVisualStyleBackColor = false; this.button10.Click += new System.EventHandler(this.Button10Click); @@ -386,9 +509,9 @@ namespace NovetusLauncher // this.button14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(42)))), ((int)(((byte)(53))))); this.button14.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button14.Location = new System.Drawing.Point(140, 19); + this.button14.Location = new System.Drawing.Point(151, 19); this.button14.Name = "button14"; - this.button14.Size = new System.Drawing.Size(29, 26); + this.button14.Size = new System.Drawing.Size(20, 20); this.button14.TabIndex = 10; this.button14.UseVisualStyleBackColor = false; this.button14.Click += new System.EventHandler(this.Button14Click); @@ -397,9 +520,9 @@ namespace NovetusLauncher // this.button35.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(234)))), ((int)(((byte)(185)))), ((int)(((byte)(145))))); this.button35.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button35.Location = new System.Drawing.Point(243, 115); + this.button35.Location = new System.Drawing.Point(58, 123); this.button35.Name = "button35"; - this.button35.Size = new System.Drawing.Size(28, 26); + this.button35.Size = new System.Drawing.Size(20, 20); this.button35.TabIndex = 37; this.button35.UseVisualStyleBackColor = false; this.button35.Click += new System.EventHandler(this.Button35Click); @@ -408,9 +531,9 @@ namespace NovetusLauncher // this.button13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(40)))), ((int)(((byte)(27))))); this.button13.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button13.Location = new System.Drawing.Point(175, 19); + this.button13.Location = new System.Drawing.Point(182, 19); this.button13.Name = "button13"; - this.button13.Size = new System.Drawing.Size(28, 26); + this.button13.Size = new System.Drawing.Size(20, 20); this.button13.TabIndex = 11; this.button13.UseVisualStyleBackColor = false; this.button13.Click += new System.EventHandler(this.Button13Click); @@ -419,9 +542,9 @@ namespace NovetusLauncher // this.button36.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(142)))), ((int)(((byte)(105))))); this.button36.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button36.Location = new System.Drawing.Point(209, 115); + this.button36.Location = new System.Drawing.Point(27, 123); this.button36.Name = "button36"; - this.button36.Size = new System.Drawing.Size(28, 26); + this.button36.Size = new System.Drawing.Size(20, 20); this.button36.TabIndex = 36; this.button36.UseVisualStyleBackColor = false; this.button36.Click += new System.EventHandler(this.Button36Click); @@ -430,9 +553,9 @@ namespace NovetusLauncher // this.button12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(205)))), ((int)(((byte)(47))))); this.button12.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button12.Location = new System.Drawing.Point(209, 19); + this.button12.Location = new System.Drawing.Point(213, 19); this.button12.Name = "button12"; - this.button12.Size = new System.Drawing.Size(28, 26); + this.button12.Size = new System.Drawing.Size(20, 20); this.button12.TabIndex = 12; this.button12.UseVisualStyleBackColor = false; this.button12.Click += new System.EventHandler(this.Button12Click); @@ -441,9 +564,9 @@ namespace NovetusLauncher // this.button37.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(124)))), ((int)(((byte)(92)))), ((int)(((byte)(69))))); this.button37.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button37.Location = new System.Drawing.Point(175, 115); + this.button37.Location = new System.Drawing.Point(213, 97); this.button37.Name = "button37"; - this.button37.Size = new System.Drawing.Size(28, 26); + this.button37.Size = new System.Drawing.Size(20, 20); this.button37.TabIndex = 35; this.button37.UseVisualStyleBackColor = false; this.button37.Click += new System.EventHandler(this.Button37Click); @@ -452,9 +575,9 @@ namespace NovetusLauncher // this.button11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(234)))), ((int)(((byte)(142))))); this.button11.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button11.Location = new System.Drawing.Point(243, 19); + this.button11.Location = new System.Drawing.Point(244, 19); this.button11.Name = "button11"; - this.button11.Size = new System.Drawing.Size(28, 26); + this.button11.Size = new System.Drawing.Size(20, 20); this.button11.TabIndex = 13; this.button11.UseVisualStyleBackColor = false; this.button11.Click += new System.EventHandler(this.Button11Click); @@ -463,9 +586,9 @@ namespace NovetusLauncher // this.button38.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(147)))), ((int)(((byte)(122)))), ((int)(((byte)(118))))); this.button38.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button38.Location = new System.Drawing.Point(140, 115); + this.button38.Location = new System.Drawing.Point(182, 97); this.button38.Name = "button38"; - this.button38.Size = new System.Drawing.Size(29, 26); + this.button38.Size = new System.Drawing.Size(20, 20); this.button38.TabIndex = 34; this.button38.UseVisualStyleBackColor = false; this.button38.Click += new System.EventHandler(this.Button38Click); @@ -474,9 +597,9 @@ namespace NovetusLauncher // this.button18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(13)))), ((int)(((byte)(105)))), ((int)(((byte)(172))))); this.button18.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button18.Location = new System.Drawing.Point(6, 51); + this.button18.Location = new System.Drawing.Point(27, 45); this.button18.Name = "button18"; - this.button18.Size = new System.Drawing.Size(29, 26); + this.button18.Size = new System.Drawing.Size(20, 20); this.button18.TabIndex = 14; this.button18.UseVisualStyleBackColor = false; this.button18.Click += new System.EventHandler(this.Button18Click); @@ -485,9 +608,9 @@ namespace NovetusLauncher // this.button31.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(217)))), ((int)(((byte)(196)))), ((int)(((byte)(153))))); this.button31.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button31.Location = new System.Drawing.Point(109, 115); + this.button31.Location = new System.Drawing.Point(151, 97); this.button31.Name = "button31"; - this.button31.Size = new System.Drawing.Size(28, 26); + this.button31.Size = new System.Drawing.Size(20, 20); this.button31.TabIndex = 33; this.button31.UseVisualStyleBackColor = false; this.button31.Click += new System.EventHandler(this.Button31Click); @@ -496,9 +619,9 @@ namespace NovetusLauncher // this.button17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(143)))), ((int)(((byte)(155))))); this.button17.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button17.Location = new System.Drawing.Point(41, 51); + this.button17.Location = new System.Drawing.Point(58, 45); this.button17.Name = "button17"; - this.button17.Size = new System.Drawing.Size(28, 26); + this.button17.Size = new System.Drawing.Size(20, 20); this.button17.TabIndex = 15; this.button17.UseVisualStyleBackColor = false; this.button17.Click += new System.EventHandler(this.Button17Click); @@ -507,9 +630,9 @@ namespace NovetusLauncher // this.button32.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(135)))), ((int)(((byte)(121))))); this.button32.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button32.Location = new System.Drawing.Point(75, 115); + this.button32.Location = new System.Drawing.Point(120, 97); this.button32.Name = "button32"; - this.button32.Size = new System.Drawing.Size(28, 26); + this.button32.Size = new System.Drawing.Size(20, 20); this.button32.TabIndex = 32; this.button32.UseVisualStyleBackColor = false; this.button32.Click += new System.EventHandler(this.Button32Click); @@ -518,9 +641,9 @@ namespace NovetusLauncher // this.button16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(111)))), ((int)(((byte)(153)))), ((int)(((byte)(201))))); this.button16.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button16.Location = new System.Drawing.Point(75, 51); + this.button16.Location = new System.Drawing.Point(89, 45); this.button16.Name = "button16"; - this.button16.Size = new System.Drawing.Size(28, 26); + this.button16.Size = new System.Drawing.Size(20, 20); this.button16.TabIndex = 16; this.button16.UseVisualStyleBackColor = false; this.button16.Click += new System.EventHandler(this.Button16Click); @@ -529,9 +652,9 @@ namespace NovetusLauncher // this.button33.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(186)))), ((int)(((byte)(199))))); this.button33.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button33.Location = new System.Drawing.Point(41, 115); + this.button33.Location = new System.Drawing.Point(89, 97); this.button33.Name = "button33"; - this.button33.Size = new System.Drawing.Size(28, 26); + this.button33.Size = new System.Drawing.Size(20, 20); this.button33.TabIndex = 31; this.button33.UseVisualStyleBackColor = false; this.button33.Click += new System.EventHandler(this.Button33Click); @@ -540,9 +663,9 @@ namespace NovetusLauncher // this.button15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(186)))), ((int)(((byte)(219))))); this.button15.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button15.Location = new System.Drawing.Point(109, 51); + this.button15.Location = new System.Drawing.Point(120, 45); this.button15.Name = "button15"; - this.button15.Size = new System.Drawing.Size(28, 26); + this.button15.Size = new System.Drawing.Size(20, 20); this.button15.TabIndex = 17; this.button15.UseVisualStyleBackColor = false; this.button15.Click += new System.EventHandler(this.Button15Click); @@ -551,9 +674,9 @@ namespace NovetusLauncher // this.button34.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(50)))), ((int)(((byte)(123))))); this.button34.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button34.Location = new System.Drawing.Point(6, 115); + this.button34.Location = new System.Drawing.Point(27, 97); this.button34.Name = "button34"; - this.button34.Size = new System.Drawing.Size(29, 26); + this.button34.Size = new System.Drawing.Size(20, 20); this.button34.TabIndex = 30; this.button34.UseVisualStyleBackColor = false; this.button34.Click += new System.EventHandler(this.Button34Click); @@ -562,9 +685,9 @@ namespace NovetusLauncher // this.button22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(181)))), ((int)(((byte)(210)))), ((int)(((byte)(228))))); this.button22.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button22.Location = new System.Drawing.Point(140, 51); + this.button22.Location = new System.Drawing.Point(151, 45); this.button22.Name = "button22"; - this.button22.Size = new System.Drawing.Size(29, 26); + this.button22.Size = new System.Drawing.Size(20, 20); this.button22.TabIndex = 18; this.button22.UseVisualStyleBackColor = false; this.button22.Click += new System.EventHandler(this.Button22Click); @@ -573,9 +696,9 @@ namespace NovetusLauncher // this.button27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(105)))), ((int)(((byte)(63)))), ((int)(((byte)(39))))); this.button27.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button27.Location = new System.Drawing.Point(243, 83); + this.button27.Location = new System.Drawing.Point(244, 71); this.button27.Name = "button27"; - this.button27.Size = new System.Drawing.Size(28, 26); + this.button27.Size = new System.Drawing.Size(20, 20); this.button27.TabIndex = 29; this.button27.UseVisualStyleBackColor = false; this.button27.Click += new System.EventHandler(this.Button27Click); @@ -584,9 +707,9 @@ namespace NovetusLauncher // this.button21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(116)))), ((int)(((byte)(134)))), ((int)(((byte)(156))))); this.button21.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button21.Location = new System.Drawing.Point(175, 51); + this.button21.Location = new System.Drawing.Point(182, 45); this.button21.Name = "button21"; - this.button21.Size = new System.Drawing.Size(28, 26); + this.button21.Size = new System.Drawing.Size(20, 20); this.button21.TabIndex = 19; this.button21.UseVisualStyleBackColor = false; this.button21.Click += new System.EventHandler(this.Button21Click); @@ -595,9 +718,9 @@ namespace NovetusLauncher // this.button28.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(95)))), ((int)(((byte)(55))))); this.button28.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button28.Location = new System.Drawing.Point(209, 83); + this.button28.Location = new System.Drawing.Point(213, 71); this.button28.Name = "button28"; - this.button28.Size = new System.Drawing.Size(28, 26); + this.button28.Size = new System.Drawing.Size(20, 20); this.button28.TabIndex = 28; this.button28.UseVisualStyleBackColor = false; this.button28.Click += new System.EventHandler(this.Button28Click); @@ -606,9 +729,9 @@ namespace NovetusLauncher // this.button20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(134)))), ((int)(((byte)(64))))); this.button20.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button20.Location = new System.Drawing.Point(209, 51); + this.button20.Location = new System.Drawing.Point(213, 45); this.button20.Name = "button20"; - this.button20.Size = new System.Drawing.Size(28, 26); + this.button20.Size = new System.Drawing.Size(20, 20); this.button20.TabIndex = 20; this.button20.UseVisualStyleBackColor = false; this.button20.Click += new System.EventHandler(this.Button20Click); @@ -617,9 +740,9 @@ namespace NovetusLauncher // this.button29.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(120)))), ((int)(((byte)(144)))), ((int)(((byte)(130))))); this.button29.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button29.Location = new System.Drawing.Point(175, 83); + this.button29.Location = new System.Drawing.Point(182, 71); this.button29.Name = "button29"; - this.button29.Size = new System.Drawing.Size(28, 26); + this.button29.Size = new System.Drawing.Size(20, 20); this.button29.TabIndex = 27; this.button29.UseVisualStyleBackColor = false; this.button29.Click += new System.EventHandler(this.Button29Click); @@ -628,9 +751,9 @@ namespace NovetusLauncher // this.button19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(155)))), ((int)(((byte)(63))))); this.button19.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button19.Location = new System.Drawing.Point(243, 51); + this.button19.Location = new System.Drawing.Point(244, 45); this.button19.Name = "button19"; - this.button19.Size = new System.Drawing.Size(28, 26); + this.button19.Size = new System.Drawing.Size(20, 20); this.button19.TabIndex = 21; this.button19.UseVisualStyleBackColor = false; this.button19.Click += new System.EventHandler(this.Button19Click); @@ -639,9 +762,9 @@ namespace NovetusLauncher // this.button30.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(161)))), ((int)(((byte)(196)))), ((int)(((byte)(140))))); this.button30.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button30.Location = new System.Drawing.Point(140, 83); + this.button30.Location = new System.Drawing.Point(151, 71); this.button30.Name = "button30"; - this.button30.Size = new System.Drawing.Size(29, 26); + this.button30.Size = new System.Drawing.Size(20, 20); this.button30.TabIndex = 26; this.button30.UseVisualStyleBackColor = false; this.button30.Click += new System.EventHandler(this.Button30Click); @@ -650,9 +773,9 @@ namespace NovetusLauncher // this.button26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(70)))), ((int)(((byte)(43))))); this.button26.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button26.Location = new System.Drawing.Point(6, 83); + this.button26.Location = new System.Drawing.Point(27, 71); this.button26.Name = "button26"; - this.button26.Size = new System.Drawing.Size(29, 26); + this.button26.Size = new System.Drawing.Size(20, 20); this.button26.TabIndex = 22; this.button26.UseVisualStyleBackColor = false; this.button26.Click += new System.EventHandler(this.Button26Click); @@ -661,9 +784,9 @@ namespace NovetusLauncher // this.button23.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(164)))), ((int)(((byte)(189)))), ((int)(((byte)(71))))); this.button23.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button23.Location = new System.Drawing.Point(109, 83); + this.button23.Location = new System.Drawing.Point(120, 71); this.button23.Name = "button23"; - this.button23.Size = new System.Drawing.Size(28, 26); + this.button23.Size = new System.Drawing.Size(20, 20); this.button23.TabIndex = 25; this.button23.UseVisualStyleBackColor = false; this.button23.Click += new System.EventHandler(this.Button23Click); @@ -672,9 +795,9 @@ namespace NovetusLauncher // this.button25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(39)))), ((int)(((byte)(126)))), ((int)(((byte)(71))))); this.button25.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button25.Location = new System.Drawing.Point(41, 83); + this.button25.Location = new System.Drawing.Point(58, 71); this.button25.Name = "button25"; - this.button25.Size = new System.Drawing.Size(28, 26); + this.button25.Size = new System.Drawing.Size(20, 20); this.button25.TabIndex = 23; this.button25.UseVisualStyleBackColor = false; this.button25.Click += new System.EventHandler(this.Button25Click); @@ -683,9 +806,9 @@ namespace NovetusLauncher // this.button24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(150)))), ((int)(((byte)(73))))); this.button24.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button24.Location = new System.Drawing.Point(75, 83); + this.button24.Location = new System.Drawing.Point(89, 71); this.button24.Name = "button24"; - this.button24.Size = new System.Drawing.Size(28, 26); + this.button24.Size = new System.Drawing.Size(20, 20); this.button24.TabIndex = 24; this.button24.UseVisualStyleBackColor = false; this.button24.Click += new System.EventHandler(this.Button24Click); @@ -1343,103 +1466,6 @@ namespace NovetusLauncher this.button52.UseVisualStyleBackColor = true; this.button52.Click += new System.EventHandler(this.Button52Click); // - // button61 - // - this.button61.Location = new System.Drawing.Point(6, 16); - this.button61.Name = "button61"; - this.button61.Size = new System.Drawing.Size(24, 23); - this.button61.TabIndex = 51; - this.button61.Text = "1"; - this.button61.UseVisualStyleBackColor = true; - this.button61.Click += new System.EventHandler(this.button61_Click); - // - // button62 - // - this.button62.Location = new System.Drawing.Point(31, 16); - this.button62.Name = "button62"; - this.button62.Size = new System.Drawing.Size(24, 23); - this.button62.TabIndex = 52; - this.button62.Text = "2"; - this.button62.UseVisualStyleBackColor = true; - this.button62.Click += new System.EventHandler(this.button62_Click); - // - // button63 - // - this.button63.Location = new System.Drawing.Point(56, 16); - this.button63.Name = "button63"; - this.button63.Size = new System.Drawing.Size(24, 23); - this.button63.TabIndex = 53; - this.button63.Text = "3"; - this.button63.UseVisualStyleBackColor = true; - this.button63.Click += new System.EventHandler(this.button63_Click); - // - // button64 - // - this.button64.Location = new System.Drawing.Point(81, 16); - this.button64.Name = "button64"; - this.button64.Size = new System.Drawing.Size(24, 23); - this.button64.TabIndex = 54; - this.button64.Text = "4"; - this.button64.UseVisualStyleBackColor = true; - this.button64.Click += new System.EventHandler(this.button64_Click); - // - // button65 - // - this.button65.Location = new System.Drawing.Point(81, 42); - this.button65.Name = "button65"; - this.button65.Size = new System.Drawing.Size(24, 23); - this.button65.TabIndex = 58; - this.button65.Text = "8"; - this.button65.UseVisualStyleBackColor = true; - this.button65.Click += new System.EventHandler(this.button65_Click); - // - // button66 - // - this.button66.Location = new System.Drawing.Point(56, 42); - this.button66.Name = "button66"; - this.button66.Size = new System.Drawing.Size(24, 23); - this.button66.TabIndex = 57; - this.button66.Text = "7"; - this.button66.UseVisualStyleBackColor = true; - this.button66.Click += new System.EventHandler(this.button66_Click); - // - // button67 - // - this.button67.Location = new System.Drawing.Point(31, 42); - this.button67.Name = "button67"; - this.button67.Size = new System.Drawing.Size(24, 23); - this.button67.TabIndex = 56; - this.button67.Text = "6"; - this.button67.UseVisualStyleBackColor = true; - this.button67.Click += new System.EventHandler(this.button67_Click); - // - // button68 - // - this.button68.Location = new System.Drawing.Point(6, 42); - this.button68.Name = "button68"; - this.button68.Size = new System.Drawing.Size(24, 23); - this.button68.TabIndex = 55; - this.button68.Text = "5"; - this.button68.UseVisualStyleBackColor = true; - this.button68.Click += new System.EventHandler(this.button68_Click); - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.button61); - this.groupBox3.Controls.Add(this.button65); - this.groupBox3.Controls.Add(this.button62); - this.groupBox3.Controls.Add(this.button66); - this.groupBox3.Controls.Add(this.button63); - this.groupBox3.Controls.Add(this.button67); - this.groupBox3.Controls.Add(this.button64); - this.groupBox3.Controls.Add(this.button68); - this.groupBox3.Location = new System.Drawing.Point(355, 163); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(109, 68); - this.groupBox3.TabIndex = 60; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "\'06 Color Presets"; - // // CharacterCustomization // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1456,6 +1482,7 @@ namespace NovetusLauncher this.Load += new System.EventHandler(this.CharacterCustomizationLoad); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); + this.groupBox3.ResumeLayout(false); this.groupBox2.ResumeLayout(false); this.groupBox1.ResumeLayout(false); this.tabPage2.ResumeLayout(false); @@ -1481,7 +1508,6 @@ namespace NovetusLauncher this.tabPage7.ResumeLayout(false); this.tabPage7.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).EndInit(); - this.groupBox3.ResumeLayout(false); this.ResumeLayout(false); } @@ -1599,5 +1625,7 @@ namespace NovetusLauncher private System.Windows.Forms.Button button67; private System.Windows.Forms.Button button64; private System.Windows.Forms.Button button68; + private System.Windows.Forms.Button button70; + private System.Windows.Forms.Button button69; } } diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs index 6352150..85ecdd6 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs @@ -12,7 +12,8 @@ using System.Windows.Forms; using System.IO; using System.Diagnostics; using System.ComponentModel; -using System.Net; +using System.Collections.Generic; +using NovetusFuncs; namespace NovetusLauncher { @@ -22,61 +23,99 @@ namespace NovetusLauncher public partial class CharacterCustomization : Form { private string SelectedPart = "Head"; - private string[,] ColorArray; - - - public CharacterCustomization() + List PartColorList; + + public CharacterCustomization() { // // The InitializeComponent() call is required for Windows Forms designer support. // InitializeComponent(); - /// - ///ColorArray[index, 0] = id (string) - ///ColorArray[index, 1] = button color (string) - /// - ColorArray = new string[32, 2] { - { "1", button7.BackColor.ToString() }, - { "208", button8.BackColor.ToString() }, - { "194", button9.BackColor.ToString() }, - { "199", button10.BackColor.ToString() }, - { "26", button14.BackColor.ToString() }, - { "21", button13.BackColor.ToString() }, - { "24", button12.BackColor.ToString() }, - { "226", button11.BackColor.ToString() }, - { "23", button18.BackColor.ToString() }, - { "107", button17.BackColor.ToString() }, - { "102", button16.BackColor.ToString() }, - { "11", button15.BackColor.ToString() }, - { "45", button22.BackColor.ToString() }, - { "135", button21.BackColor.ToString() }, - { "106", button20.BackColor.ToString() }, - { "105", button19.BackColor.ToString() }, - { "141", button26.BackColor.ToString() }, - { "28", button25.BackColor.ToString() }, - { "37", button24.BackColor.ToString() }, - { "119", button23.BackColor.ToString() }, - { "29", button30.BackColor.ToString() }, - { "151", button29.BackColor.ToString() }, - { "38", button28.BackColor.ToString() }, - { "192", button27.BackColor.ToString() }, - { "104", button34.BackColor.ToString() }, - { "9", button33.BackColor.ToString() }, - { "101", button32.BackColor.ToString() }, - { "5", button31.BackColor.ToString() }, - { "153", button38.BackColor.ToString() }, - { "217", button37.BackColor.ToString() }, - { "18", button36.BackColor.ToString() }, - { "125", button35.BackColor.ToString() } - }; + InitColors(); // // TODO: Add constructor code after the InitializeComponent() call. // } - - void CharacterCustomizationLoad(object sender, EventArgs e) + + void InitColors() + { + PartColorList = new List() + { + //White + new PartColors(){ ColorID = 1, ButtonColor = button7.BackColor }, + //Light stone grey + new PartColors(){ ColorID = 208, ButtonColor = button8.BackColor }, + //Medium stone grey + new PartColors(){ ColorID = 194, ButtonColor = button9.BackColor }, + //Dark stone grey + new PartColors(){ ColorID = 199, ButtonColor = button10.BackColor }, + //Black + new PartColors(){ ColorID = 26, ButtonColor = button14.BackColor }, + //Bright red + new PartColors(){ ColorID = 21, ButtonColor = button13.BackColor }, + //Bright yellow + new PartColors(){ ColorID = 24, ButtonColor = button12.BackColor }, + //Cool yellow + new PartColors(){ ColorID = 226, ButtonColor = button11.BackColor }, + //Bright blue + new PartColors(){ ColorID = 23, ButtonColor = button18.BackColor }, + //Bright bluish green + new PartColors(){ ColorID = 107, ButtonColor = button17.BackColor }, + //Medium blue + new PartColors(){ ColorID = 102, ButtonColor = button16.BackColor }, + //Pastel Blue + new PartColors(){ ColorID = 11, ButtonColor = button15.BackColor }, + //Light blue + new PartColors(){ ColorID = 45, ButtonColor = button22.BackColor }, + //Sand blue + new PartColors(){ ColorID = 135, ButtonColor = button21.BackColor }, + //Bright orange + new PartColors(){ ColorID = 106, ButtonColor = button20.BackColor }, + //Br. yellowish orange + new PartColors(){ ColorID = 105, ButtonColor = button19.BackColor }, + //Earth green + new PartColors(){ ColorID = 141, ButtonColor = button26.BackColor }, + //Dark green + new PartColors(){ ColorID = 28, ButtonColor = button25.BackColor }, + //Bright green + new PartColors(){ ColorID = 37, ButtonColor = button24.BackColor }, + //Br. yellowish green + new PartColors(){ ColorID = 119, ButtonColor = button23.BackColor }, + //Medium green + new PartColors(){ ColorID = 29, ButtonColor = button30.BackColor }, + //Sand green + new PartColors(){ ColorID = 151, ButtonColor = button29.BackColor }, + //Dark orange + new PartColors(){ ColorID = 38, ButtonColor = button28.BackColor }, + //Reddish brown + new PartColors(){ ColorID = 192, ButtonColor = button27.BackColor }, + //Bright violet + new PartColors(){ ColorID = 104, ButtonColor = button34.BackColor }, + //Light reddish violet + new PartColors(){ ColorID = 9, ButtonColor = button33.BackColor }, + //Medium red + new PartColors(){ ColorID = 101, ButtonColor = button32.BackColor }, + //Brick yellow + new PartColors(){ ColorID = 5, ButtonColor = button31.BackColor }, + //Sand red + new PartColors(){ ColorID = 153, ButtonColor = button38.BackColor }, + //Brown + new PartColors(){ ColorID = 217, ButtonColor = button37.BackColor }, + //Nougat + new PartColors(){ ColorID = 18, ButtonColor = button36.BackColor }, + //Light orange + new PartColors(){ ColorID = 125, ButtonColor = button35.BackColor }, + // RARE 2006 COLORS!! + //Med. reddish violet + new PartColors(){ ColorID = 22, ButtonColor = button69.BackColor }, + //Dark nougat + new PartColors(){ ColorID = 128, ButtonColor = button70.BackColor } + }; + } + + void CharacterCustomizationLoad(object sender, EventArgs e) { //body label2.Text = SelectedPart; @@ -797,229 +836,212 @@ namespace NovetusLauncher } } + void ChangeColorOfPart(int ColorID) + { + ChangeColorOfPart(ColorID, PartColorList.Find(x => x.ColorID == ColorID).ButtonColor); + } + void Button7Click(object sender, EventArgs e) { - Color ButtonColor = button7.BackColor; - ChangeColorOfPart(1, ButtonColor); + ChangeColorOfPart(1); } void Button8Click(object sender, EventArgs e) { - Color ButtonColor = button8.BackColor; - ChangeColorOfPart(208, ButtonColor); + ChangeColorOfPart(208); } void Button9Click(object sender, EventArgs e) { - Color ButtonColor = button9.BackColor; - ChangeColorOfPart(194, ButtonColor); + ChangeColorOfPart(194); } void Button10Click(object sender, EventArgs e) { - Color ButtonColor = button10.BackColor; - ChangeColorOfPart(199, ButtonColor); + ChangeColorOfPart(199); } void Button14Click(object sender, EventArgs e) { - Color ButtonColor = button14.BackColor; - ChangeColorOfPart(26, ButtonColor); + ChangeColorOfPart(26); } void Button13Click(object sender, EventArgs e) { - Color ButtonColor = button13.BackColor; - ChangeColorOfPart(21, ButtonColor); + ChangeColorOfPart(21); } void Button12Click(object sender, EventArgs e) { - Color ButtonColor = button12.BackColor; - ChangeColorOfPart(24, ButtonColor); + ChangeColorOfPart(24); } void Button11Click(object sender, EventArgs e) { - Color ButtonColor = button11.BackColor; - ChangeColorOfPart(226, ButtonColor); + ChangeColorOfPart(226); } void Button18Click(object sender, EventArgs e) { - Color ButtonColor = button18.BackColor; - ChangeColorOfPart(23, ButtonColor); + ChangeColorOfPart(23); } void Button17Click(object sender, EventArgs e) { - Color ButtonColor = button17.BackColor; - ChangeColorOfPart(107, ButtonColor); + ChangeColorOfPart(107); } void Button16Click(object sender, EventArgs e) { - Color ButtonColor = button16.BackColor; - ChangeColorOfPart(102, ButtonColor); + ChangeColorOfPart(102); } void Button15Click(object sender, EventArgs e) { - Color ButtonColor = button15.BackColor; - ChangeColorOfPart(11, ButtonColor); + ChangeColorOfPart(11); } void Button22Click(object sender, EventArgs e) { - Color ButtonColor = button22.BackColor; - ChangeColorOfPart(45, ButtonColor); + ChangeColorOfPart(45); } void Button21Click(object sender, EventArgs e) { - Color ButtonColor = button21.BackColor; - ChangeColorOfPart(135, ButtonColor); + ChangeColorOfPart(135); } void Button20Click(object sender, EventArgs e) { - Color ButtonColor = button20.BackColor; - ChangeColorOfPart(106, ButtonColor); + ChangeColorOfPart(106); } void Button19Click(object sender, EventArgs e) { - Color ButtonColor = button19.BackColor; - ChangeColorOfPart(105, ButtonColor); + ChangeColorOfPart(105); } void Button26Click(object sender, EventArgs e) { - Color ButtonColor = button26.BackColor; - ChangeColorOfPart(141, ButtonColor); + ChangeColorOfPart(141); } void Button25Click(object sender, EventArgs e) { - Color ButtonColor = button25.BackColor; - ChangeColorOfPart(28, ButtonColor); + ChangeColorOfPart(28); } void Button24Click(object sender, EventArgs e) { - Color ButtonColor = button24.BackColor; - ChangeColorOfPart(37, ButtonColor); + ChangeColorOfPart(37); } void Button23Click(object sender, EventArgs e) { - Color ButtonColor = button23.BackColor; - ChangeColorOfPart(119, ButtonColor); + ChangeColorOfPart(119); } void Button30Click(object sender, EventArgs e) { - Color ButtonColor = button30.BackColor; - ChangeColorOfPart(29, ButtonColor); + ChangeColorOfPart(29); } void Button29Click(object sender, EventArgs e) { - Color ButtonColor = button29.BackColor; - ChangeColorOfPart(151, ButtonColor); + ChangeColorOfPart(151); } void Button28Click(object sender, EventArgs e) { - Color ButtonColor = button28.BackColor; - ChangeColorOfPart(38, ButtonColor); + ChangeColorOfPart(38); } void Button27Click(object sender, EventArgs e) { - Color ButtonColor = button27.BackColor; - ChangeColorOfPart(192, ButtonColor); + ChangeColorOfPart(192); } void Button34Click(object sender, EventArgs e) { - Color ButtonColor = button34.BackColor; - ChangeColorOfPart(104, ButtonColor); + ChangeColorOfPart(104); } void Button33Click(object sender, EventArgs e) { - Color ButtonColor = button33.BackColor; - ChangeColorOfPart(9, ButtonColor); + ChangeColorOfPart(9); } void Button32Click(object sender, EventArgs e) { - Color ButtonColor = button32.BackColor; - ChangeColorOfPart(101, ButtonColor); + ChangeColorOfPart(101); } void Button31Click(object sender, EventArgs e) { - Color ButtonColor = button31.BackColor; - ChangeColorOfPart(5, ButtonColor); + ChangeColorOfPart(5); } void Button38Click(object sender, EventArgs e) { - Color ButtonColor = button38.BackColor; - ChangeColorOfPart(153, ButtonColor); + ChangeColorOfPart(153); } void Button37Click(object sender, EventArgs e) { - Color ButtonColor = button37.BackColor; - ChangeColorOfPart(217, ButtonColor); + ChangeColorOfPart(217); } void Button36Click(object sender, EventArgs e) { - Color ButtonColor = button36.BackColor; - ChangeColorOfPart(18, ButtonColor); + ChangeColorOfPart(18); } void Button35Click(object sender, EventArgs e) { - Color ButtonColor = button35.BackColor; - ChangeColorOfPart(125, ButtonColor); + ChangeColorOfPart(125); } - - void Button39Click(object sender, EventArgs e) + + private void button69_Click(object sender, EventArgs e) + { + ChangeColorOfPart(22); + } + + private void button70_Click(object sender, EventArgs e) + { + ChangeColorOfPart(128); + } + + void Button39Click(object sender, EventArgs e) { Random rand = new Random(); - int RandomColor; - + for (int i=1; i <= 6; i++) { - RandomColor = rand.Next(ColorArray.GetLength(0)); + int RandomColor = rand.Next(PartColorList.Count); + if (i == 1) { - ChangeColorOfPart("Head", Convert.ToInt32(ColorArray[RandomColor, 0]), ConvertStringtoColor(ColorArray[RandomColor, 1])); + ChangeColorOfPart("Head", PartColorList[RandomColor].ColorID, PartColorList[RandomColor].ButtonColor); } else if (i == 2) { - ChangeColorOfPart("Torso", Convert.ToInt32(ColorArray[RandomColor, 0]), ConvertStringtoColor(ColorArray[RandomColor, 1])); + ChangeColorOfPart("Torso", PartColorList[RandomColor].ColorID, PartColorList[RandomColor].ButtonColor); } else if (i == 3) { - ChangeColorOfPart("Left Arm", Convert.ToInt32(ColorArray[RandomColor, 0]), ConvertStringtoColor(ColorArray[RandomColor, 1])); + ChangeColorOfPart("Left Arm", PartColorList[RandomColor].ColorID, PartColorList[RandomColor].ButtonColor); } else if (i == 4) { - ChangeColorOfPart("Right Arm", Convert.ToInt32(ColorArray[RandomColor, 0]), ConvertStringtoColor(ColorArray[RandomColor, 1])); + ChangeColorOfPart("Right Arm", PartColorList[RandomColor].ColorID, PartColorList[RandomColor].ButtonColor); } else if (i == 5) { - ChangeColorOfPart("Left Leg", Convert.ToInt32(ColorArray[RandomColor, 0]), ConvertStringtoColor(ColorArray[RandomColor, 1])); + ChangeColorOfPart("Left Leg", PartColorList[RandomColor].ColorID, PartColorList[RandomColor].ButtonColor); } else if (i == 6) { - ChangeColorOfPart("Right Leg", Convert.ToInt32(ColorArray[RandomColor, 0]), ConvertStringtoColor(ColorArray[RandomColor, 1])); + ChangeColorOfPart("Right Leg", PartColorList[RandomColor].ColorID, PartColorList[RandomColor].ButtonColor); } } } @@ -1275,12 +1297,12 @@ namespace NovetusLauncher public void ApplyPreset(int head, int torso, int larm, int rarm, int lleg, int rleg) { - ChangeColorOfPart("Head", head, ConvertStringtoColor(ColorArray[Convert.ToInt32(ColorArray.FindInDimensions(Convert.ToString(head))), 1])); - ChangeColorOfPart("Torso", torso, ConvertStringtoColor(ColorArray[Convert.ToInt32(ColorArray.FindInDimensions(Convert.ToString(torso))), 1])); - ChangeColorOfPart("Left Arm", larm, ConvertStringtoColor(ColorArray[Convert.ToInt32(ColorArray.FindInDimensions(Convert.ToString(larm))), 1])); - ChangeColorOfPart("Right Arm", rarm, ConvertStringtoColor(ColorArray[Convert.ToInt32(ColorArray.FindInDimensions(Convert.ToString(rarm))), 1])); - ChangeColorOfPart("Left Leg", lleg, ConvertStringtoColor(ColorArray[Convert.ToInt32(ColorArray.FindInDimensions(Convert.ToString(lleg))), 1])); - ChangeColorOfPart("Right Leg", rleg, ConvertStringtoColor(ColorArray[Convert.ToInt32(ColorArray.FindInDimensions(Convert.ToString(rleg))), 1])); + ChangeColorOfPart("Head", head, PartColorList.Find(x => x.ColorID == head).ButtonColor); + ChangeColorOfPart("Torso", torso, PartColorList.Find(x => x.ColorID == torso).ButtonColor); + ChangeColorOfPart("Left Arm", larm, PartColorList.Find(x => x.ColorID == larm).ButtonColor); + ChangeColorOfPart("Right Arm", rarm, PartColorList.Find(x => x.ColorID == rarm).ButtonColor); + ChangeColorOfPart("Left Leg", lleg, PartColorList.Find(x => x.ColorID == lleg).ButtonColor); + ChangeColorOfPart("Right Leg", rleg, PartColorList.Find(x => x.ColorID == rleg).ButtonColor); } private void button61_Click(object sender, EventArgs e) @@ -1310,7 +1332,7 @@ namespace NovetusLauncher private void button67_Click(object sender, EventArgs e) { - ApplyPreset(38, 194, 38, 38, 119, 119); + ApplyPreset(128, 194, 128, 128, 119, 119); } private void button66_Click(object sender, EventArgs e) diff --git a/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs b/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs index 451d037..a128753 100644 --- a/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs +++ b/NovetusLauncher/NovetusLauncher/ClientinfoCreator.cs @@ -109,14 +109,14 @@ namespace NovetusLauncher void TextBox2TextChanged(object sender, EventArgs e) { - textBox2.Text = textBox2.Text.ToUpper(CultureInfo.InvariantCulture); - SelectedClientMD5 = textBox2.Text.ToUpper(CultureInfo.InvariantCulture); + textBox2.Text = textBox2.Text.ToUpper(CultureInfo.InstalledUICulture); + SelectedClientMD5 = textBox2.Text.ToUpper(CultureInfo.InstalledUICulture); } void TextBox3TextChanged(object sender, EventArgs e) { - textBox3.Text = textBox3.Text.ToUpper(CultureInfo.InvariantCulture); - SelectedClientScriptMD5 = textBox3.Text.ToUpper(CultureInfo.InvariantCulture); + textBox3.Text = textBox3.Text.ToUpper(CultureInfo.InstalledUICulture); + SelectedClientScriptMD5 = textBox3.Text.ToUpper(CultureInfo.InstalledUICulture); } void Button4Click(object sender, EventArgs e) @@ -145,8 +145,8 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(ClientMD5)) { - textBox2.Text = ClientMD5.ToUpper(CultureInfo.InvariantCulture); - SelectedClientMD5 = textBox2.Text.ToUpper(CultureInfo.InvariantCulture); + textBox2.Text = ClientMD5.ToUpper(CultureInfo.InstalledUICulture); + SelectedClientMD5 = textBox2.Text.ToUpper(CultureInfo.InstalledUICulture); } else { @@ -157,8 +157,8 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(ClientScriptMD5)) { - textBox3.Text = ClientScriptMD5.ToUpper(CultureInfo.InvariantCulture); - SelectedClientScriptMD5 = textBox3.Text.ToUpper(CultureInfo.InvariantCulture); + textBox3.Text = ClientScriptMD5.ToUpper(CultureInfo.InstalledUICulture); + SelectedClientScriptMD5 = textBox3.Text.ToUpper(CultureInfo.InstalledUICulture); } else { @@ -224,8 +224,8 @@ namespace NovetusLauncher checkBox4.Checked = Locked; checkBox6.Checked = FixScriptMapMode; checkBox7.Checked = AlreadyHasSecurity; - textBox3.Text = SelectedClientScriptMD5.ToUpper(CultureInfo.InvariantCulture); - textBox2.Text = SelectedClientMD5.ToUpper(CultureInfo.InvariantCulture); + textBox3.Text = SelectedClientScriptMD5.ToUpper(CultureInfo.InstalledUICulture); + textBox2.Text = SelectedClientMD5.ToUpper(CultureInfo.InstalledUICulture); textBox1.Text = SelectedClientDesc; textBox4.Text = CustomArgs; textBox5.Text = Warning; @@ -315,8 +315,8 @@ namespace NovetusLauncher checkBox3.Checked = LegacyMode; checkBox6.Checked = FixScriptMapMode; checkBox7.Checked = AlreadyHasSecurity; - textBox3.Text = SelectedClientScriptMD5.ToUpper(CultureInfo.InvariantCulture); - textBox2.Text = SelectedClientMD5.ToUpper(CultureInfo.InvariantCulture); + textBox3.Text = SelectedClientScriptMD5.ToUpper(CultureInfo.InstalledUICulture); + textBox2.Text = SelectedClientMD5.ToUpper(CultureInfo.InstalledUICulture); textBox1.Text = SelectedClientDesc; textBox4.Text = CustomArgs; textBox5.Text = Warning; diff --git a/NovetusLauncher/NovetusLauncher/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm.cs index cfce7ca..52e15fd 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.cs @@ -1078,109 +1078,109 @@ namespace NovetusLauncher void ConsoleProcessCommands(string command) { - if (string.Compare(command,"server",true, CultureInfo.InvariantCulture) == 0) + if (string.Compare(command,"server",true, CultureInfo.InstalledUICulture) == 0) { StartServer(false); } - else if (string.Compare(command,"server no3d",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"server no3d",true, CultureInfo.InstalledUICulture) == 0) { StartServer(true); } - else if (string.Compare(command,"no3d",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"no3d",true, CultureInfo.InstalledUICulture) == 0) { StartServer(true); } - else if (string.Compare(command,"client",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"client",true, CultureInfo.InstalledUICulture) == 0) { StartClient(); } - else if (string.Compare(command,"client solo",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"client solo",true, CultureInfo.InstalledUICulture) == 0) { StartSolo(); } - else if (string.Compare(command,"solo",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"solo",true, CultureInfo.InstalledUICulture) == 0) { StartSolo(); } - else if (string.Compare(command,"studio",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"studio",true, CultureInfo.InstalledUICulture) == 0) { StartStudio(); } - else if (string.Compare(command,"config save",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"config save",true, CultureInfo.InstalledUICulture) == 0) { WriteConfigValues(); } - else if (string.Compare(command,"config load",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"config load",true, CultureInfo.InstalledUICulture) == 0) { ReadConfigValues(); } - else if (string.Compare(command,"config reset",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"config reset",true, CultureInfo.InstalledUICulture) == 0) { ResetConfigValues(); } - else if (string.Compare(command,"help",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"help",true, CultureInfo.InstalledUICulture) == 0) { ConsoleHelp(0); } - else if (string.Compare(command,"help config",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"help config",true, CultureInfo.InstalledUICulture) == 0) { ConsoleHelp(1); } - else if (string.Compare(command,"config",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"config",true, CultureInfo.InstalledUICulture) == 0) { ConsoleHelp(1); } - else if (string.Compare(command,"help sdk",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"help sdk",true, CultureInfo.InstalledUICulture) == 0) { ConsoleHelp(2); } - else if (string.Compare(command,"sdk",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"sdk",true, CultureInfo.InstalledUICulture) == 0) { ConsoleHelp(2); } - else if (string.Compare(command,"sdk clientinfo",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"sdk clientinfo",true, CultureInfo.InstalledUICulture) == 0) { LoadClientSDK(); } - else if (string.Compare(command,"sdk itemmaker",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"sdk itemmaker",true, CultureInfo.InstalledUICulture) == 0) { LoadItemSDK(); } - else if (string.Compare(command,"clientinfo",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"clientinfo",true, CultureInfo.InstalledUICulture) == 0) { LoadClientSDK(); } - else if (string.Compare(command,"itemmaker",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"itemmaker",true, CultureInfo.InstalledUICulture) == 0) { LoadItemSDK(); } - else if (string.Compare(command,"sdk clientsdk",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"sdk clientsdk",true, CultureInfo.InstalledUICulture) == 0) { LoadClientSDK(); } - else if (string.Compare(command,"sdk itemsdk",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"sdk itemsdk",true, CultureInfo.InstalledUICulture) == 0) { LoadItemSDK(); } - else if (string.Compare(command,"clientsdk",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"clientsdk",true, CultureInfo.InstalledUICulture) == 0) { LoadClientSDK(); } - else if (string.Compare(command,"itemsdk",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"itemsdk",true, CultureInfo.InstalledUICulture) == 0) { LoadItemSDK(); } - else if (string.Compare(command,"charcustom",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"charcustom",true, CultureInfo.InstalledUICulture) == 0) { CharacterCustomization cc = new CharacterCustomization(); cc.Show(); ConsolePrint("Avatar Customization Loaded.", 4); } - else if (string.Compare(command,"webserver",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"webserver",true, CultureInfo.InstalledUICulture) == 0) { ConsoleHelp(3); } - else if (string.Compare(command,"webserver start",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"webserver start",true, CultureInfo.InstalledUICulture) == 0) { if (GlobalVars.IsWebServerOn == false) { @@ -1191,7 +1191,7 @@ namespace NovetusLauncher ConsolePrint("WebServer: There is already a web server open.", 2); } } - else if (string.Compare(command,"webserver stop",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"webserver stop",true, CultureInfo.InstalledUICulture) == 0) { if (GlobalVars.IsWebServerOn == true) { @@ -1202,7 +1202,7 @@ namespace NovetusLauncher ConsolePrint("WebServer: There is no web server open.", 2); } } - else if (string.Compare(command,"webserver restart",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"webserver restart",true, CultureInfo.InstalledUICulture) == 0) { try { @@ -1215,7 +1215,7 @@ namespace NovetusLauncher ConsolePrint("WebServer: Cannot restart web server. (" + ex.Message + ")", 2); } } - else if (string.Compare(command,"start",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"start",true, CultureInfo.InstalledUICulture) == 0) { if (GlobalVars.IsWebServerOn == false) { @@ -1226,7 +1226,7 @@ namespace NovetusLauncher ConsolePrint("WebServer: There is already a web server open.", 2); } } - else if (string.Compare(command,"stop",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"stop",true, CultureInfo.InstalledUICulture) == 0) { if (GlobalVars.IsWebServerOn == true) { @@ -1237,7 +1237,7 @@ namespace NovetusLauncher ConsolePrint("WebServer: There is no web server open.", 2); } } - else if (string.Compare(command,"restart",true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,"restart",true, CultureInfo.InstalledUICulture) == 0) { try { @@ -1250,7 +1250,7 @@ namespace NovetusLauncher ConsolePrint("WebServer: Cannot restart web server. (" + ex.Message + ")", 2); } } - else if (string.Compare(command,GlobalVars.important,true, CultureInfo.InvariantCulture) == 0) + else if (string.Compare(command,GlobalVars.important,true, CultureInfo.InstalledUICulture) == 0) { GlobalVars.AdminMode = true; ConsolePrint("ADMIN MODE ENABLED.", 4); diff --git a/NovetusLauncher/NovetusLauncher/bin/Release/Novetus.vshost.exe.manifest b/NovetusLauncher/NovetusLauncher/bin/Release/Novetus.vshost.exe.manifest deleted file mode 100644 index 061c9ca..0000000 --- a/NovetusLauncher/NovetusLauncher/bin/Release/Novetus.vshost.exe.manifest +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100644 index e69de29..0000000 diff --git a/NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100644 index e69de29..0000000 diff --git a/NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/NovetusLauncher/NovetusLauncher/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100644 index e69de29..0000000