From 680a1ecb0e5d0d8dd1fc5a19307d838e527638b7 Mon Sep 17 00:00:00 2001 From: Bitl Date: Sun, 29 Aug 2021 17:55:17 -0700 Subject: [PATCH] added support for more colors, added a color list xml feature --- .../CharacterCustomizationShared.cs | 175 +++--- .../CharCustom/ContentProviders.cs | 1 + .../CharacterCustomizationCompact.Designer.cs | 567 ++--------------- .../Compact/CharacterCustomizationCompact.cs | 193 +----- ...CharacterCustomizationExtended.Designer.cs | 568 ++---------------- .../CharacterCustomizationExtended.cs | 193 +----- .../CharacterCustomizationExtended.resx | 2 +- Novetus/NovetusCore/CharCustom/PartColors.cs | 69 +++ Novetus/NovetusCore/NovetusCore.projitems | 1 + .../StorageAndFunctions/GlobalFuncs.cs | 8 +- .../StorageAndFunctions/GlobalPaths.cs | 1 + .../StorageAndFunctions/VarStorage.cs | 9 - .../Compact/LauncherFormCompact.Designer.cs | 97 ++- .../Compact/LauncherFormCompact.resx | 2 +- .../Extended/LauncherFormExtended.Designer.cs | 79 ++- .../Extended/LauncherFormExtended.resx | 36 +- .../NovetusLauncher/Forms/SDK/NovetusSDK.cs | 1 - changelog.txt | 17 +- scripts/batch/github_sync.bat | 1 + scripts/launcher/PartColors.xml | 331 ++++++++++ scripts/launcher/splashes.txt | 4 +- 21 files changed, 713 insertions(+), 1642 deletions(-) create mode 100644 Novetus/NovetusCore/CharCustom/PartColors.cs create mode 100644 scripts/launcher/PartColors.xml diff --git a/Novetus/NovetusCore/CharCustom/CharacterCustomizationShared.cs b/Novetus/NovetusCore/CharCustom/CharacterCustomizationShared.cs index 95b2c6f..2c102c5 100644 --- a/Novetus/NovetusCore/CharCustom/CharacterCustomizationShared.cs +++ b/Novetus/NovetusCore/CharCustom/CharacterCustomizationShared.cs @@ -2,7 +2,9 @@ using System; using System.Collections.Generic; using System.Drawing; +using System.Drawing.Imaging; using System.IO; +using System.Linq; using System.Windows.Forms; #endregion @@ -15,16 +17,12 @@ class CharacterCustomizationShared public string Custom_Shirt_URL = ""; public string Custom_Pants_URL = ""; public string Custom_Face_URL = ""; - public List PartColorList; + public PartColor[] PartColorList; + public List PartColorListConv; public Provider[] contentProviders; public Form Parent; public Settings.UIOptions.Style FormStyle; - public Button WhiteButton, LightStoneGreyButton, MediumStoneGreyButton, DarkStoneGreyButton, BlackButton, - BrightRedButton, BrightYellowButton, CoolYellowButton, BrightBlueButton, BrightBluishGreenButton, MediumBlueButton, - PastelBlueButton, LightBlueButton, SandBlueButton, BrightOrangeButton, BrightYellowishOrangeButton, EarthGreenButton, DarkGreenButton, - BrightGreenButton, BrightYellowishGreenButton, MediumGreenButton, SandGreenButton, DarkOrangeButton, ReddishBrownButton, BrightVioletButton, - LightReddishVioletButton, MediumRedButton, BrickYellowButton, SandRedButton, BrownButton, NougatButton, LightOrangeButton, MediumReddishViolet, - DarkNougatButton, HeadButton, TorsoButton, LeftArmButton, RightArmButton, LeftLegButton, RightLegButton; + public Button HeadButton, TorsoButton, LeftArmButton, RightArmButton, LeftLegButton, RightLegButton; public ComboBox FaceTypeBox, TShirtsTypeBox, ShirtsTypeBox, PantsTypeBox; public TextBox FaceIDBox, TShirtsIDBox, ShirtsIDBox, PantsIDBox, CharacterIDBox, Hat1Desc, Hat2Desc, Hat3Desc, HeadDesc, TShirtDesc, ShirtDesc, PantsDesc, FaceDesc, ExtraItemDesc; public CheckBox ShowHatsInExtraBox; @@ -33,6 +31,8 @@ class CharacterCustomizationShared public Panel OrganizationPanel; public ListBox Hat1List, Hat2List, Hat3List, HeadList, TShirtList, ShirtList, PantsList, FaceList, ExtraItemList; public PictureBox Hat1Image, Hat2Image, Hat3Image, HeadImage, TShirtImage, ShirtImage, PantsImage, FaceImage, ExtraItemImage, IconImage; + public ListView ColorView; + private ImageList ColorImageList; #endregion #region Constructor @@ -43,78 +43,16 @@ class CharacterCustomizationShared public void InitColors() { - PartColorList = new List() + PartColorList = PartColorLoader.GetPartColors(); + + for (int i = 0; i < PartColorList.Length; i++) { - //White - new VarStorage.PartColors{ ColorID = 1, ButtonColor = WhiteButton.BackColor }, - //Light stone grey - new VarStorage.PartColors{ ColorID = 208, ButtonColor = LightStoneGreyButton.BackColor }, - //Medium stone grey - new VarStorage.PartColors{ ColorID = 194, ButtonColor = MediumStoneGreyButton.BackColor }, - //Dark stone grey - new VarStorage.PartColors{ ColorID = 199, ButtonColor = DarkStoneGreyButton.BackColor }, - //Black - new VarStorage.PartColors{ ColorID = 26, ButtonColor = BlackButton.BackColor }, - //Bright red - new VarStorage.PartColors{ ColorID = 21, ButtonColor = BrightRedButton.BackColor }, - //Bright yellow - new VarStorage.PartColors{ ColorID = 24, ButtonColor = BrightYellowButton.BackColor }, - //Cool yellow - new VarStorage.PartColors{ ColorID = 226, ButtonColor = CoolYellowButton.BackColor }, - //Bright blue - new VarStorage.PartColors{ ColorID = 23, ButtonColor = BrightBlueButton.BackColor }, - //Bright bluish green - new VarStorage.PartColors{ ColorID = 107, ButtonColor = BrightBluishGreenButton.BackColor }, - //Medium blue - new VarStorage.PartColors{ ColorID = 102, ButtonColor = MediumBlueButton.BackColor }, - //Pastel Blue - new VarStorage.PartColors{ ColorID = 11, ButtonColor = PastelBlueButton.BackColor }, - //Light blue - new VarStorage.PartColors{ ColorID = 45, ButtonColor = LightBlueButton.BackColor }, - //Sand blue - new VarStorage.PartColors{ ColorID = 135, ButtonColor = SandBlueButton.BackColor }, - //Bright orange - new VarStorage.PartColors{ ColorID = 106, ButtonColor = BrightOrangeButton.BackColor }, - //Br. yellowish orange - new VarStorage.PartColors{ ColorID = 105, ButtonColor = BrightYellowishOrangeButton.BackColor }, - //Earth green - new VarStorage.PartColors{ ColorID = 141, ButtonColor = EarthGreenButton.BackColor }, - //Dark green - new VarStorage.PartColors{ ColorID = 28, ButtonColor = DarkGreenButton.BackColor }, - //Bright green - new VarStorage.PartColors{ ColorID = 37, ButtonColor = BrightGreenButton.BackColor }, - //Br. yellowish green - new VarStorage.PartColors{ ColorID = 119, ButtonColor = BrightYellowishGreenButton.BackColor }, - //Medium green - new VarStorage.PartColors{ ColorID = 29, ButtonColor = MediumGreenButton.BackColor }, - //Sand green - new VarStorage.PartColors{ ColorID = 151, ButtonColor = SandGreenButton.BackColor }, - //Dark orange - new VarStorage.PartColors{ ColorID = 38, ButtonColor = DarkOrangeButton.BackColor }, - //Reddish brown - new VarStorage.PartColors{ ColorID = 192, ButtonColor = ReddishBrownButton.BackColor }, - //Bright violet - new VarStorage.PartColors{ ColorID = 104, ButtonColor = BrightVioletButton.BackColor }, - //Light reddish violet - new VarStorage.PartColors{ ColorID = 9, ButtonColor = LightReddishVioletButton.BackColor }, - //Medium red - new VarStorage.PartColors{ ColorID = 101, ButtonColor = MediumRedButton.BackColor }, - //Brick yellow - new VarStorage.PartColors{ ColorID = 5, ButtonColor = BrickYellowButton.BackColor }, - //Sand red - new VarStorage.PartColors{ ColorID = 153, ButtonColor = SandRedButton.BackColor }, - //Brown - new VarStorage.PartColors{ ColorID = 217, ButtonColor = BrownButton.BackColor }, - //Nougat - new VarStorage.PartColors{ ColorID = 18, ButtonColor = NougatButton.BackColor }, - //Light orange - new VarStorage.PartColors{ ColorID = 125, ButtonColor = LightOrangeButton.BackColor }, - // RARE 2006 COLORS!! - //Med. reddish violet - new VarStorage.PartColors{ ColorID = 22, ButtonColor = MediumReddishViolet.BackColor }, - //Dark nougat - new VarStorage.PartColors{ ColorID = 128, ButtonColor = DarkNougatButton.BackColor } - }; + string[] rgbValues = PartColorList[i].ColorRGB.Replace(" ", "").Split(','); + PartColorList[i].ColorObject = Color.FromArgb(Convert.ToInt32(rgbValues[0]), Convert.ToInt32(rgbValues[1]), Convert.ToInt32(rgbValues[2])); + } + + PartColorListConv = new List(); + PartColorListConv.AddRange(PartColorList); } #endregion @@ -175,6 +113,30 @@ class CharacterCustomizationShared PantsIDBox.Enabled = false; } + int imgsize = 32; + ColorImageList = new ImageList(); + ColorImageList.ImageSize = new Size(imgsize, imgsize); + ColorImageList.ColorDepth = ColorDepth.Depth32Bit; + ColorView.LargeImageList = ColorImageList; + ColorView.SmallImageList = ColorImageList; + + foreach (var item in PartColorList) + { + var lvi = new ListViewItem(item.ColorName); + lvi.Tag = item.ColorID; + + Bitmap Bmp = new Bitmap(imgsize, imgsize, PixelFormat.Format32bppArgb); + using (Graphics gfx = Graphics.FromImage(Bmp)) + using (SolidBrush brush = new SolidBrush(item.ColorObject)) + { + gfx.FillRectangle(brush, 0, 0, imgsize, imgsize); + } + + ColorImageList.Images.Add(item.ColorName, Bmp); + lvi.ImageIndex = ColorImageList.Images.IndexOfKey(item.ColorName); + ColorView.Items.Add(lvi); + } + //body SelectedPartLabel.Text = SelectedPart; HeadButton.BackColor = ConvertStringtoColor(GlobalVars.UserCustomization.HeadColorString); @@ -200,6 +162,7 @@ class CharacterCustomizationShared public void ChangeTabs() { + ColorView.SelectedIndices.Clear(); switch (CharacterTabControl.SelectedTab) { case TabPage pg1 when pg1 == CharacterTabControl.TabPages["tabPage1"]: @@ -473,7 +436,23 @@ class CharacterCustomizationShared } #endregion - #region Color Funcs + #region Part/Color Funcs + public void ColorButton() + { + int selectedIndex = 0; + + if (ColorView.SelectedIndices.Count > 0) + { + selectedIndex = ColorView.SelectedIndices[0]; + } + else + { + return; + } + + ChangeColorOfPart(Convert.ToInt32(ColorView.Items[selectedIndex].Tag)); + } + Color ConvertStringtoColor(string CString) { var p = CString.Split(new char[] { ',', ']' }); @@ -488,7 +467,7 @@ class CharacterCustomizationShared public void ChangeColorOfPart(int ColorID) { - ChangeColorOfPart(ColorID, PartColorList.Find(x => x.ColorID == ColorID).ButtonColor); + ChangeColorOfPart(ColorID, PartColorListConv.Find(x => x.ColorID == ColorID).ColorObject); } public void ChangeColorOfPart(int ColorID, Color ButtonColor) @@ -535,18 +514,27 @@ class CharacterCustomizationShared } } + public void SelectPart(string part) + { + ColorView.SelectedIndices.Clear(); + SelectedPart = part; + SelectedPartLabel.Text = SelectedPart; + } + public void ApplyPreset(int head, int torso, int larm, int rarm, int lleg, int rleg) { - 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); + ColorView.SelectedIndices.Clear(); + ChangeColorOfPart("Head", head, PartColorListConv.Find(x => x.ColorID == head).ColorObject); + ChangeColorOfPart("Torso", torso, PartColorListConv.Find(x => x.ColorID == torso).ColorObject); + ChangeColorOfPart("Left Arm", larm, PartColorListConv.Find(x => x.ColorID == larm).ColorObject); + ChangeColorOfPart("Right Arm", rarm, PartColorListConv.Find(x => x.ColorID == rarm).ColorObject); + ChangeColorOfPart("Left Leg", lleg, PartColorListConv.Find(x => x.ColorID == lleg).ColorObject); + ChangeColorOfPart("Right Leg", rleg, PartColorListConv.Find(x => x.ColorID == rleg).ColorObject); } public void ResetColors() { + ColorView.SelectedIndices.Clear(); GlobalVars.UserCustomization.HeadColorID = 24; GlobalVars.UserCustomization.TorsoColorID = 23; GlobalVars.UserCustomization.LeftArmColorID = 24; @@ -570,31 +558,32 @@ class CharacterCustomizationShared public void RandomizeColors() { + ColorView.SelectedIndices.Clear(); Random rand = new Random(); for (int i = 1; i <= 6; i++) { - int RandomColor = rand.Next(PartColorList.Count); + int RandomColor = rand.Next(PartColorListConv.Count); switch (i) { case 1: - ChangeColorOfPart("Head", PartColorList[RandomColor].ColorID, PartColorList[RandomColor].ButtonColor); + ChangeColorOfPart("Head", PartColorListConv[RandomColor].ColorID, PartColorListConv[RandomColor].ColorObject); break; case 2: - ChangeColorOfPart("Torso", PartColorList[RandomColor].ColorID, PartColorList[RandomColor].ButtonColor); + ChangeColorOfPart("Torso", PartColorListConv[RandomColor].ColorID, PartColorListConv[RandomColor].ColorObject); break; case 3: - ChangeColorOfPart("Left Arm", PartColorList[RandomColor].ColorID, PartColorList[RandomColor].ButtonColor); + ChangeColorOfPart("Left Arm", PartColorListConv[RandomColor].ColorID, PartColorListConv[RandomColor].ColorObject); break; case 4: - ChangeColorOfPart("Right Arm", PartColorList[RandomColor].ColorID, PartColorList[RandomColor].ButtonColor); + ChangeColorOfPart("Right Arm", PartColorListConv[RandomColor].ColorID, PartColorListConv[RandomColor].ColorObject); break; case 5: - ChangeColorOfPart("Left Leg", PartColorList[RandomColor].ColorID, PartColorList[RandomColor].ButtonColor); + ChangeColorOfPart("Left Leg", PartColorListConv[RandomColor].ColorID, PartColorListConv[RandomColor].ColorObject); break; case 6: - ChangeColorOfPart("Right Leg", PartColorList[RandomColor].ColorID, PartColorList[RandomColor].ButtonColor); + ChangeColorOfPart("Right Leg", PartColorListConv[RandomColor].ColorID, PartColorListConv[RandomColor].ColorObject); break; default: break; diff --git a/Novetus/NovetusCore/CharCustom/ContentProviders.cs b/Novetus/NovetusCore/CharCustom/ContentProviders.cs index 209107b..9f7b4c3 100644 --- a/Novetus/NovetusCore/CharCustom/ContentProviders.cs +++ b/Novetus/NovetusCore/CharCustom/ContentProviders.cs @@ -30,6 +30,7 @@ public class OnlineClothing FileStream fs = new FileStream(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ContentProviderXMLName, FileMode.Open); ContentProviders providers; providers = (ContentProviders)serializer.Deserialize(fs); + fs.Close(); return providers.Providers; } diff --git a/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.Designer.cs b/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.Designer.cs index 4f2cf96..9bd5497 100644 --- a/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.Designer.cs +++ b/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.Designer.cs @@ -42,6 +42,9 @@ partial class CharacterCustomizationCompact this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label30 = new System.Windows.Forms.Label(); + this.listView1 = new System.Windows.Forms.ListView(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.button61 = new System.Windows.Forms.Button(); this.button65 = new System.Windows.Forms.Button(); @@ -58,41 +61,6 @@ partial class CharacterCustomizationCompact this.button4 = new System.Windows.Forms.Button(); this.button5 = new System.Windows.Forms.Button(); this.button6 = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.button70 = new System.Windows.Forms.Button(); - this.button7 = new System.Windows.Forms.Button(); - this.button69 = new System.Windows.Forms.Button(); - this.button8 = new System.Windows.Forms.Button(); - this.button9 = new System.Windows.Forms.Button(); - this.button10 = new System.Windows.Forms.Button(); - this.button14 = new System.Windows.Forms.Button(); - this.button35 = new System.Windows.Forms.Button(); - this.button13 = new System.Windows.Forms.Button(); - this.button36 = new System.Windows.Forms.Button(); - this.button12 = new System.Windows.Forms.Button(); - this.button37 = new System.Windows.Forms.Button(); - this.button11 = new System.Windows.Forms.Button(); - this.button38 = new System.Windows.Forms.Button(); - this.button18 = new System.Windows.Forms.Button(); - this.button31 = new System.Windows.Forms.Button(); - this.button17 = new System.Windows.Forms.Button(); - this.button32 = new System.Windows.Forms.Button(); - this.button16 = new System.Windows.Forms.Button(); - this.button33 = new System.Windows.Forms.Button(); - this.button15 = new System.Windows.Forms.Button(); - this.button34 = new System.Windows.Forms.Button(); - this.button22 = new System.Windows.Forms.Button(); - this.button27 = new System.Windows.Forms.Button(); - this.button21 = new System.Windows.Forms.Button(); - this.button28 = new System.Windows.Forms.Button(); - this.button20 = new System.Windows.Forms.Button(); - this.button29 = new System.Windows.Forms.Button(); - this.button19 = new System.Windows.Forms.Button(); - this.button30 = new System.Windows.Forms.Button(); - this.button26 = new System.Windows.Forms.Button(); - this.button23 = new System.Windows.Forms.Button(); - this.button25 = new System.Windows.Forms.Button(); - this.button24 = new System.Windows.Forms.Button(); this.button39 = new System.Windows.Forms.Button(); this.button40 = new System.Windows.Forms.Button(); this.label2 = new System.Windows.Forms.Label(); @@ -180,9 +148,9 @@ partial class CharacterCustomizationCompact this.button52 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.groupBox3.SuspendLayout(); this.groupBox2.SuspendLayout(); - this.groupBox1.SuspendLayout(); this.tabPage2.SuspendLayout(); this.tabControl2.SuspendLayout(); this.tabPage10.SuspendLayout(); @@ -234,9 +202,9 @@ partial class CharacterCustomizationCompact // // tabPage1 // + this.tabPage1.Controls.Add(this.groupBox1); this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox2); - this.tabPage1.Controls.Add(this.groupBox1); this.tabPage1.Controls.Add(this.button39); this.tabPage1.Controls.Add(this.button40); this.tabPage1.Controls.Add(this.label2); @@ -249,6 +217,39 @@ partial class CharacterCustomizationCompact this.tabPage1.Text = "BODY"; this.tabPage1.UseVisualStyleBackColor = true; // + // groupBox1 + // + this.groupBox1.Controls.Add(this.label30); + this.groupBox1.Controls.Add(this.listView1); + this.groupBox1.Location = new System.Drawing.Point(177, 6); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(283, 151); + this.groupBox1.TabIndex = 61; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Body Colors"; + // + // label30 + // + this.label30.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label30.ForeColor = System.Drawing.Color.Red; + this.label30.Location = new System.Drawing.Point(6, 108); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(271, 40); + this.label30.TabIndex = 4; + this.label30.Text = "Some colors may be incompatible with earlier clients. Incompatible colors will sh" + + "ow up as grey in-game. "; + this.label30.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // listView1 + // + this.listView1.HideSelection = false; + this.listView1.Location = new System.Drawing.Point(6, 15); + this.listView1.Name = "listView1"; + this.listView1.Size = new System.Drawing.Size(271, 90); + this.listView1.TabIndex = 0; + this.listView1.UseCompatibleStateImageBehavior = false; + this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged); + // // groupBox3 // this.groupBox3.Controls.Add(this.button61); @@ -427,423 +428,6 @@ partial class CharacterCustomizationCompact this.button6.UseVisualStyleBackColor = false; this.button6.Click += new System.EventHandler(this.Button6Click); // - // 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); - this.groupBox1.Controls.Add(this.button14); - this.groupBox1.Controls.Add(this.button35); - this.groupBox1.Controls.Add(this.button13); - this.groupBox1.Controls.Add(this.button36); - this.groupBox1.Controls.Add(this.button12); - this.groupBox1.Controls.Add(this.button37); - this.groupBox1.Controls.Add(this.button11); - this.groupBox1.Controls.Add(this.button38); - this.groupBox1.Controls.Add(this.button18); - this.groupBox1.Controls.Add(this.button31); - this.groupBox1.Controls.Add(this.button17); - this.groupBox1.Controls.Add(this.button32); - this.groupBox1.Controls.Add(this.button16); - this.groupBox1.Controls.Add(this.button33); - this.groupBox1.Controls.Add(this.button15); - this.groupBox1.Controls.Add(this.button34); - this.groupBox1.Controls.Add(this.button22); - this.groupBox1.Controls.Add(this.button27); - this.groupBox1.Controls.Add(this.button21); - this.groupBox1.Controls.Add(this.button28); - this.groupBox1.Controls.Add(this.button20); - this.groupBox1.Controls.Add(this.button29); - this.groupBox1.Controls.Add(this.button19); - this.groupBox1.Controls.Add(this.button30); - this.groupBox1.Controls.Add(this.button26); - this.groupBox1.Controls.Add(this.button23); - this.groupBox1.Controls.Add(this.button25); - 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(286, 155); - this.groupBox1.TabIndex = 49; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Part Colors"; - // - // 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); - // - // 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(27, 19); - this.button7.Name = "button7"; - 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); - // - // 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); - // - // button8 - // - 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(58, 19); - this.button8.Name = "button8"; - 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); - // - // button9 - // - 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(89, 19); - this.button9.Name = "button9"; - 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); - // - // button10 - // - 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(120, 19); - this.button10.Name = "button10"; - 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); - // - // button14 - // - 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(151, 19); - this.button14.Name = "button14"; - 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); - // - // button35 - // - 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(58, 123); - this.button35.Name = "button35"; - 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); - // - // button13 - // - 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(182, 19); - this.button13.Name = "button13"; - 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); - // - // button36 - // - 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(27, 123); - this.button36.Name = "button36"; - 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); - // - // button12 - // - 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(213, 19); - this.button12.Name = "button12"; - 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); - // - // button37 - // - 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(213, 97); - this.button37.Name = "button37"; - 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); - // - // button11 - // - 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(244, 19); - this.button11.Name = "button11"; - 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); - // - // button38 - // - 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(182, 97); - this.button38.Name = "button38"; - 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); - // - // button18 - // - 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(27, 45); - this.button18.Name = "button18"; - 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); - // - // button31 - // - 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(151, 97); - this.button31.Name = "button31"; - 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); - // - // button17 - // - 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(58, 45); - this.button17.Name = "button17"; - 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); - // - // button32 - // - 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(120, 97); - this.button32.Name = "button32"; - 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); - // - // button16 - // - 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(89, 45); - this.button16.Name = "button16"; - 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); - // - // button33 - // - 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(89, 97); - this.button33.Name = "button33"; - 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); - // - // button15 - // - 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(120, 45); - this.button15.Name = "button15"; - 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); - // - // button34 - // - 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(27, 97); - this.button34.Name = "button34"; - 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); - // - // button22 - // - 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(151, 45); - this.button22.Name = "button22"; - 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); - // - // button27 - // - 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(244, 71); - this.button27.Name = "button27"; - 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); - // - // button21 - // - 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(182, 45); - this.button21.Name = "button21"; - 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); - // - // button28 - // - 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(213, 71); - this.button28.Name = "button28"; - 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); - // - // button20 - // - 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(213, 45); - this.button20.Name = "button20"; - 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); - // - // button29 - // - 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(182, 71); - this.button29.Name = "button29"; - 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); - // - // button19 - // - 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(244, 45); - this.button19.Name = "button19"; - 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); - // - // button30 - // - 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(151, 71); - this.button30.Name = "button30"; - 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); - // - // button26 - // - 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(27, 71); - this.button26.Name = "button26"; - 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); - // - // button23 - // - 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(120, 71); - this.button23.Name = "button23"; - 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); - // - // button25 - // - 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(58, 71); - this.button25.Name = "button25"; - 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); - // - // button24 - // - 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(89, 71); - this.button24.Name = "button24"; - 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); - // // button39 // this.button39.Location = new System.Drawing.Point(174, 182); @@ -1753,9 +1337,9 @@ partial class CharacterCustomizationCompact this.Load += new System.EventHandler(this.CharacterCustomizationLoad); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); this.groupBox3.ResumeLayout(false); this.groupBox2.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); this.tabPage2.ResumeLayout(false); this.tabControl2.ResumeLayout(false); this.tabPage10.ResumeLayout(false); @@ -1798,40 +1382,7 @@ partial class CharacterCustomizationCompact characterCustomizationForm = new CharacterCustomizationShared(); characterCustomizationForm.Parent = this; characterCustomizationForm.FormStyle = Settings.UIOptions.Style.Compact; - characterCustomizationForm.WhiteButton = button7; - characterCustomizationForm.LightStoneGreyButton = button8; - characterCustomizationForm.MediumStoneGreyButton = button9; - characterCustomizationForm.DarkStoneGreyButton = button10; - characterCustomizationForm.BlackButton = button14; - characterCustomizationForm.BrightRedButton = button13; - characterCustomizationForm.BrightYellowButton = button12; - characterCustomizationForm.CoolYellowButton = button11; - characterCustomizationForm.BrightBlueButton = button18; - characterCustomizationForm.BrightBluishGreenButton = button17; - characterCustomizationForm.MediumBlueButton = button16; - characterCustomizationForm.PastelBlueButton = button15; - characterCustomizationForm.LightBlueButton = button22; - characterCustomizationForm.SandBlueButton = button21; - characterCustomizationForm.BrightOrangeButton = button20; - characterCustomizationForm.BrightYellowishOrangeButton = button19; - characterCustomizationForm.EarthGreenButton = button26; - characterCustomizationForm.DarkGreenButton = button25; - characterCustomizationForm.BrightGreenButton = button24; - characterCustomizationForm.BrightYellowishGreenButton = button23; - characterCustomizationForm.MediumGreenButton = button30; - characterCustomizationForm.SandGreenButton = button29; - characterCustomizationForm.DarkOrangeButton = button28; - characterCustomizationForm.ReddishBrownButton = button27; - characterCustomizationForm.BrightVioletButton = button34; - characterCustomizationForm.LightReddishVioletButton = button33; - characterCustomizationForm.MediumRedButton = button32; - characterCustomizationForm.BrickYellowButton = button31; - characterCustomizationForm.SandRedButton = button38; - characterCustomizationForm.BrownButton = button37; - characterCustomizationForm.NougatButton = button36; - characterCustomizationForm.LightOrangeButton = button35; - characterCustomizationForm.MediumReddishViolet = button69; - characterCustomizationForm.DarkNougatButton = button70; + characterCustomizationForm.ColorView = listView1; characterCustomizationForm.FaceTypeBox = FaceTypeBox; characterCustomizationForm.TShirtsTypeBox = TShirtsTypeBox; characterCustomizationForm.ShirtsTypeBox = ShirtsTypeBox; @@ -1934,39 +1485,6 @@ partial class CharacterCustomizationCompact private System.Windows.Forms.Label label2; private System.Windows.Forms.Button button40; private System.Windows.Forms.Button button39; - private System.Windows.Forms.Button button24; - private System.Windows.Forms.Button button25; - private System.Windows.Forms.Button button23; - private System.Windows.Forms.Button button26; - private System.Windows.Forms.Button button30; - private System.Windows.Forms.Button button19; - private System.Windows.Forms.Button button29; - private System.Windows.Forms.Button button20; - private System.Windows.Forms.Button button28; - private System.Windows.Forms.Button button21; - private System.Windows.Forms.Button button27; - private System.Windows.Forms.Button button22; - private System.Windows.Forms.Button button34; - private System.Windows.Forms.Button button15; - private System.Windows.Forms.Button button33; - private System.Windows.Forms.Button button16; - private System.Windows.Forms.Button button32; - private System.Windows.Forms.Button button17; - private System.Windows.Forms.Button button31; - private System.Windows.Forms.Button button18; - private System.Windows.Forms.Button button38; - private System.Windows.Forms.Button button11; - private System.Windows.Forms.Button button37; - private System.Windows.Forms.Button button12; - private System.Windows.Forms.Button button36; - private System.Windows.Forms.Button button13; - private System.Windows.Forms.Button button35; - private System.Windows.Forms.Button button14; - private System.Windows.Forms.Button button10; - private System.Windows.Forms.Button button9; - private System.Windows.Forms.Button button8; - private System.Windows.Forms.Button button7; - private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Button button6; private System.Windows.Forms.Button button5; private System.Windows.Forms.Button button4; @@ -1997,8 +1515,6 @@ partial class CharacterCustomizationCompact 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; private System.Windows.Forms.Button button71; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.TextBox textBox3; @@ -2023,4 +1539,7 @@ partial class CharacterCustomizationCompact private System.Windows.Forms.Label label12; private System.Windows.Forms.TextBox FaceIDBox; private CharacterCustomizationShared characterCustomizationForm; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.ListView listView1; + private System.Windows.Forms.Label label30; } \ No newline at end of file diff --git a/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs b/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs index 6f883ef..19f06d1 100644 --- a/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs +++ b/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs @@ -701,208 +701,32 @@ public partial class CharacterCustomizationCompact : Form void Button1Click(object sender, EventArgs e) { - characterCustomizationForm.SelectedPart = "Head"; - label2.Text = characterCustomizationForm.SelectedPart; + characterCustomizationForm.SelectPart("Head"); } void Button2Click(object sender, EventArgs e) { - characterCustomizationForm.SelectedPart = "Torso"; - label2.Text = characterCustomizationForm.SelectedPart; + characterCustomizationForm.SelectPart("Torso"); } void Button3Click(object sender, EventArgs e) { - characterCustomizationForm.SelectedPart = "Right Arm"; - label2.Text = characterCustomizationForm.SelectedPart; + characterCustomizationForm.SelectPart("Right Arm"); } void Button4Click(object sender, EventArgs e) { - characterCustomizationForm.SelectedPart = "Left Arm"; - label2.Text = characterCustomizationForm.SelectedPart; + characterCustomizationForm.SelectPart("Left Arm"); } void Button5Click(object sender, EventArgs e) { - characterCustomizationForm.SelectedPart = "Right Leg"; - label2.Text = characterCustomizationForm.SelectedPart; + characterCustomizationForm.SelectPart("Right Leg"); } void Button6Click(object sender, EventArgs e) { - characterCustomizationForm.SelectedPart = "Left Leg"; - label2.Text = characterCustomizationForm.SelectedPart; - } - - void Button7Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(1); - } - - void Button8Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(208); - } - - void Button9Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(194); - } - - void Button10Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(199); - } - - void Button14Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(26); - } - - void Button13Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(21); - } - - void Button12Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(24); - } - - void Button11Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(226); - } - - void Button18Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(23); - } - - void Button17Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(107); - } - - void Button16Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(102); - } - - void Button15Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(11); - } - - void Button22Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(45); - } - - void Button21Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(135); - } - - void Button20Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(106); - } - - void Button19Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(105); - } - - void Button26Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(141); - } - - void Button25Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(28); - } - - void Button24Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(37); - } - - void Button23Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(119); - } - - void Button30Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(29); - } - - void Button29Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(151); - } - - void Button28Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(38); - } - - void Button27Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(192); - } - - void Button34Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(104); - } - - void Button33Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(9); - } - - void Button32Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(101); - } - - void Button31Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(5); - } - - void Button38Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(153); - } - - void Button37Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(217); - } - - void Button36Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(18); - } - - void Button35Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(125); - } - - private void button69_Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(22); - } - - private void button70_Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(128); + characterCustomizationForm.SelectPart("Left Leg"); } void Button39Click(object sender, EventArgs e) @@ -1017,6 +841,11 @@ public partial class CharacterCustomizationCompact : Form { GlobalVars.UserCustomization.CharacterID = textBox1.Text; } + + private void listView1_SelectedIndexChanged(object sender, EventArgs e) + { + characterCustomizationForm.ColorButton(); + } #endregion } #endregion diff --git a/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.Designer.cs b/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.Designer.cs index 3b16d94..c14cf88 100644 --- a/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.Designer.cs +++ b/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.Designer.cs @@ -55,6 +55,8 @@ partial class CharacterCustomizationExtended this.panel2 = new System.Windows.Forms.Panel(); this.tabControl1 = new TabControlWithoutHeader(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.listView1 = new System.Windows.Forms.ListView(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.button61 = new System.Windows.Forms.Button(); this.button65 = new System.Windows.Forms.Button(); @@ -71,41 +73,6 @@ partial class CharacterCustomizationExtended this.button4 = new System.Windows.Forms.Button(); this.button5 = new System.Windows.Forms.Button(); this.button6 = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.button70 = new System.Windows.Forms.Button(); - this.button7 = new System.Windows.Forms.Button(); - this.button69 = new System.Windows.Forms.Button(); - this.button8 = new System.Windows.Forms.Button(); - this.button9 = new System.Windows.Forms.Button(); - this.button10 = new System.Windows.Forms.Button(); - this.button14 = new System.Windows.Forms.Button(); - this.button35 = new System.Windows.Forms.Button(); - this.button13 = new System.Windows.Forms.Button(); - this.button36 = new System.Windows.Forms.Button(); - this.button12 = new System.Windows.Forms.Button(); - this.button37 = new System.Windows.Forms.Button(); - this.button11 = new System.Windows.Forms.Button(); - this.button38 = new System.Windows.Forms.Button(); - this.button18 = new System.Windows.Forms.Button(); - this.button31 = new System.Windows.Forms.Button(); - this.button17 = new System.Windows.Forms.Button(); - this.button32 = new System.Windows.Forms.Button(); - this.button16 = new System.Windows.Forms.Button(); - this.button33 = new System.Windows.Forms.Button(); - this.button15 = new System.Windows.Forms.Button(); - this.button34 = new System.Windows.Forms.Button(); - this.button22 = new System.Windows.Forms.Button(); - this.button27 = new System.Windows.Forms.Button(); - this.button21 = new System.Windows.Forms.Button(); - this.button28 = new System.Windows.Forms.Button(); - this.button20 = new System.Windows.Forms.Button(); - this.button29 = new System.Windows.Forms.Button(); - this.button19 = new System.Windows.Forms.Button(); - this.button30 = new System.Windows.Forms.Button(); - this.button26 = new System.Windows.Forms.Button(); - this.button23 = new System.Windows.Forms.Button(); - this.button25 = new System.Windows.Forms.Button(); - this.button24 = new System.Windows.Forms.Button(); this.button39 = new System.Windows.Forms.Button(); this.button40 = new System.Windows.Forms.Button(); this.label2 = new System.Windows.Forms.Label(); @@ -196,13 +163,14 @@ partial class CharacterCustomizationExtended this.button82 = new System.Windows.Forms.Button(); this.button42 = new System.Windows.Forms.Button(); this.button81 = new System.Windows.Forms.Button(); + this.label30 = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.groupBox3.SuspendLayout(); this.groupBox2.SuspendLayout(); - this.groupBox1.SuspendLayout(); this.tabPage2.SuspendLayout(); this.tabControl2.SuspendLayout(); this.tabPage10.SuspendLayout(); @@ -405,9 +373,9 @@ partial class CharacterCustomizationExtended // // tabPage1 // + this.tabPage1.Controls.Add(this.groupBox1); this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox2); - this.tabPage1.Controls.Add(this.groupBox1); this.tabPage1.Controls.Add(this.button39); this.tabPage1.Controls.Add(this.button40); this.tabPage1.Controls.Add(this.label2); @@ -420,6 +388,27 @@ partial class CharacterCustomizationExtended this.tabPage1.Text = "BODY"; this.tabPage1.UseVisualStyleBackColor = true; // + // groupBox1 + // + this.groupBox1.Controls.Add(this.label30); + this.groupBox1.Controls.Add(this.listView1); + this.groupBox1.Location = new System.Drawing.Point(199, 6); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(341, 195); + this.groupBox1.TabIndex = 61; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Body Colors"; + // + // listView1 + // + this.listView1.HideSelection = false; + this.listView1.Location = new System.Drawing.Point(6, 16); + this.listView1.Name = "listView1"; + this.listView1.Size = new System.Drawing.Size(329, 137); + this.listView1.TabIndex = 0; + this.listView1.UseCompatibleStateImageBehavior = false; + this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged); + // // groupBox3 // this.groupBox3.Controls.Add(this.button61); @@ -598,423 +587,6 @@ partial class CharacterCustomizationExtended this.button6.UseVisualStyleBackColor = false; this.button6.Click += new System.EventHandler(this.Button6Click); // - // 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); - this.groupBox1.Controls.Add(this.button14); - this.groupBox1.Controls.Add(this.button35); - this.groupBox1.Controls.Add(this.button13); - this.groupBox1.Controls.Add(this.button36); - this.groupBox1.Controls.Add(this.button12); - this.groupBox1.Controls.Add(this.button37); - this.groupBox1.Controls.Add(this.button11); - this.groupBox1.Controls.Add(this.button38); - this.groupBox1.Controls.Add(this.button18); - this.groupBox1.Controls.Add(this.button31); - this.groupBox1.Controls.Add(this.button17); - this.groupBox1.Controls.Add(this.button32); - this.groupBox1.Controls.Add(this.button16); - this.groupBox1.Controls.Add(this.button33); - this.groupBox1.Controls.Add(this.button15); - this.groupBox1.Controls.Add(this.button34); - this.groupBox1.Controls.Add(this.button22); - this.groupBox1.Controls.Add(this.button27); - this.groupBox1.Controls.Add(this.button21); - this.groupBox1.Controls.Add(this.button28); - this.groupBox1.Controls.Add(this.button20); - this.groupBox1.Controls.Add(this.button29); - this.groupBox1.Controls.Add(this.button19); - this.groupBox1.Controls.Add(this.button30); - this.groupBox1.Controls.Add(this.button26); - this.groupBox1.Controls.Add(this.button23); - this.groupBox1.Controls.Add(this.button25); - this.groupBox1.Controls.Add(this.button24); - this.groupBox1.Location = new System.Drawing.Point(204, 6); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(332, 201); - this.groupBox1.TabIndex = 49; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Part Colors"; - // - // 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(293, 124); - this.button70.Name = "button70"; - this.button70.Size = new System.Drawing.Size(30, 30); - this.button70.TabIndex = 33; - this.button70.UseVisualStyleBackColor = false; - this.button70.Click += new System.EventHandler(this.button70_Click); - // - // 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, 16); - this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(30, 30); - this.button7.TabIndex = 6; - this.button7.UseVisualStyleBackColor = false; - this.button7.Click += new System.EventHandler(this.Button7Click); - // - // 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(47, 124); - this.button69.Name = "button69"; - this.button69.Size = new System.Drawing.Size(30, 30); - this.button69.TabIndex = 32; - this.button69.UseVisualStyleBackColor = false; - this.button69.Click += new System.EventHandler(this.button69_Click); - // - // button8 - // - 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(47, 16); - this.button8.Name = "button8"; - this.button8.Size = new System.Drawing.Size(30, 30); - this.button8.TabIndex = 7; - this.button8.UseVisualStyleBackColor = false; - this.button8.Click += new System.EventHandler(this.Button8Click); - // - // button9 - // - 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(88, 16); - this.button9.Name = "button9"; - this.button9.Size = new System.Drawing.Size(30, 30); - this.button9.TabIndex = 8; - this.button9.UseVisualStyleBackColor = false; - this.button9.Click += new System.EventHandler(this.Button9Click); - // - // button10 - // - 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(129, 16); - this.button10.Name = "button10"; - this.button10.Size = new System.Drawing.Size(30, 30); - this.button10.TabIndex = 9; - this.button10.UseVisualStyleBackColor = false; - this.button10.Click += new System.EventHandler(this.Button10Click); - // - // button14 - // - 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(170, 16); - this.button14.Name = "button14"; - this.button14.Size = new System.Drawing.Size(30, 30); - this.button14.TabIndex = 10; - this.button14.UseVisualStyleBackColor = false; - this.button14.Click += new System.EventHandler(this.Button14Click); - // - // button35 - // - 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(47, 160); - this.button35.Name = "button35"; - this.button35.Size = new System.Drawing.Size(30, 30); - this.button35.TabIndex = 37; - this.button35.UseVisualStyleBackColor = false; - this.button35.Click += new System.EventHandler(this.Button35Click); - // - // button13 - // - 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(211, 16); - this.button13.Name = "button13"; - this.button13.Size = new System.Drawing.Size(30, 30); - this.button13.TabIndex = 11; - this.button13.UseVisualStyleBackColor = false; - this.button13.Click += new System.EventHandler(this.Button13Click); - // - // button36 - // - 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(6, 160); - this.button36.Name = "button36"; - this.button36.Size = new System.Drawing.Size(30, 30); - this.button36.TabIndex = 36; - this.button36.UseVisualStyleBackColor = false; - this.button36.Click += new System.EventHandler(this.Button36Click); - // - // button12 - // - 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(252, 16); - this.button12.Name = "button12"; - this.button12.Size = new System.Drawing.Size(30, 30); - this.button12.TabIndex = 12; - this.button12.UseVisualStyleBackColor = false; - this.button12.Click += new System.EventHandler(this.Button12Click); - // - // button37 - // - 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(252, 124); - this.button37.Name = "button37"; - this.button37.Size = new System.Drawing.Size(30, 30); - this.button37.TabIndex = 35; - this.button37.UseVisualStyleBackColor = false; - this.button37.Click += new System.EventHandler(this.Button37Click); - // - // button11 - // - 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(293, 16); - this.button11.Name = "button11"; - this.button11.Size = new System.Drawing.Size(30, 30); - this.button11.TabIndex = 13; - this.button11.UseVisualStyleBackColor = false; - this.button11.Click += new System.EventHandler(this.Button11Click); - // - // button38 - // - 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(211, 124); - this.button38.Name = "button38"; - this.button38.Size = new System.Drawing.Size(30, 30); - this.button38.TabIndex = 34; - this.button38.UseVisualStyleBackColor = false; - this.button38.Click += new System.EventHandler(this.Button38Click); - // - // button18 - // - 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, 52); - this.button18.Name = "button18"; - this.button18.Size = new System.Drawing.Size(30, 30); - this.button18.TabIndex = 14; - this.button18.UseVisualStyleBackColor = false; - this.button18.Click += new System.EventHandler(this.Button18Click); - // - // button31 - // - 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(170, 124); - this.button31.Name = "button31"; - this.button31.Size = new System.Drawing.Size(30, 30); - this.button31.TabIndex = 33; - this.button31.UseVisualStyleBackColor = false; - this.button31.Click += new System.EventHandler(this.Button31Click); - // - // button17 - // - 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(47, 52); - this.button17.Name = "button17"; - this.button17.Size = new System.Drawing.Size(30, 30); - this.button17.TabIndex = 15; - this.button17.UseVisualStyleBackColor = false; - this.button17.Click += new System.EventHandler(this.Button17Click); - // - // button32 - // - 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(129, 124); - this.button32.Name = "button32"; - this.button32.Size = new System.Drawing.Size(30, 30); - this.button32.TabIndex = 32; - this.button32.UseVisualStyleBackColor = false; - this.button32.Click += new System.EventHandler(this.Button32Click); - // - // button16 - // - 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(88, 52); - this.button16.Name = "button16"; - this.button16.Size = new System.Drawing.Size(30, 30); - this.button16.TabIndex = 16; - this.button16.UseVisualStyleBackColor = false; - this.button16.Click += new System.EventHandler(this.Button16Click); - // - // button33 - // - 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(88, 124); - this.button33.Name = "button33"; - this.button33.Size = new System.Drawing.Size(30, 30); - this.button33.TabIndex = 31; - this.button33.UseVisualStyleBackColor = false; - this.button33.Click += new System.EventHandler(this.Button33Click); - // - // button15 - // - 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(129, 52); - this.button15.Name = "button15"; - this.button15.Size = new System.Drawing.Size(30, 30); - this.button15.TabIndex = 17; - this.button15.UseVisualStyleBackColor = false; - this.button15.Click += new System.EventHandler(this.Button15Click); - // - // button34 - // - 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, 124); - this.button34.Name = "button34"; - this.button34.Size = new System.Drawing.Size(30, 30); - this.button34.TabIndex = 30; - this.button34.UseVisualStyleBackColor = false; - this.button34.Click += new System.EventHandler(this.Button34Click); - // - // button22 - // - 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(170, 52); - this.button22.Name = "button22"; - this.button22.Size = new System.Drawing.Size(30, 30); - this.button22.TabIndex = 18; - this.button22.UseVisualStyleBackColor = false; - this.button22.Click += new System.EventHandler(this.Button22Click); - // - // button27 - // - 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(293, 88); - this.button27.Name = "button27"; - this.button27.Size = new System.Drawing.Size(30, 30); - this.button27.TabIndex = 29; - this.button27.UseVisualStyleBackColor = false; - this.button27.Click += new System.EventHandler(this.Button27Click); - // - // button21 - // - 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(211, 52); - this.button21.Name = "button21"; - this.button21.Size = new System.Drawing.Size(30, 30); - this.button21.TabIndex = 19; - this.button21.UseVisualStyleBackColor = false; - this.button21.Click += new System.EventHandler(this.Button21Click); - // - // button28 - // - 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(252, 88); - this.button28.Name = "button28"; - this.button28.Size = new System.Drawing.Size(30, 30); - this.button28.TabIndex = 28; - this.button28.UseVisualStyleBackColor = false; - this.button28.Click += new System.EventHandler(this.Button28Click); - // - // button20 - // - 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(252, 52); - this.button20.Name = "button20"; - this.button20.Size = new System.Drawing.Size(30, 30); - this.button20.TabIndex = 20; - this.button20.UseVisualStyleBackColor = false; - this.button20.Click += new System.EventHandler(this.Button20Click); - // - // button29 - // - 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(211, 88); - this.button29.Name = "button29"; - this.button29.Size = new System.Drawing.Size(30, 30); - this.button29.TabIndex = 27; - this.button29.UseVisualStyleBackColor = false; - this.button29.Click += new System.EventHandler(this.Button29Click); - // - // button19 - // - 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(293, 52); - this.button19.Name = "button19"; - this.button19.Size = new System.Drawing.Size(30, 30); - this.button19.TabIndex = 21; - this.button19.UseVisualStyleBackColor = false; - this.button19.Click += new System.EventHandler(this.Button19Click); - // - // button30 - // - 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(170, 88); - this.button30.Name = "button30"; - this.button30.Size = new System.Drawing.Size(30, 30); - this.button30.TabIndex = 26; - this.button30.UseVisualStyleBackColor = false; - this.button30.Click += new System.EventHandler(this.Button30Click); - // - // button26 - // - 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, 88); - this.button26.Name = "button26"; - this.button26.Size = new System.Drawing.Size(30, 30); - this.button26.TabIndex = 22; - this.button26.UseVisualStyleBackColor = false; - this.button26.Click += new System.EventHandler(this.Button26Click); - // - // button23 - // - 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(129, 88); - this.button23.Name = "button23"; - this.button23.Size = new System.Drawing.Size(30, 30); - this.button23.TabIndex = 25; - this.button23.UseVisualStyleBackColor = false; - this.button23.Click += new System.EventHandler(this.Button23Click); - // - // button25 - // - 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(47, 88); - this.button25.Name = "button25"; - this.button25.Size = new System.Drawing.Size(30, 30); - this.button25.TabIndex = 23; - this.button25.UseVisualStyleBackColor = false; - this.button25.Click += new System.EventHandler(this.Button25Click); - // - // button24 - // - 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(88, 88); - this.button24.Name = "button24"; - this.button24.Size = new System.Drawing.Size(30, 30); - this.button24.TabIndex = 24; - this.button24.UseVisualStyleBackColor = false; - this.button24.Click += new System.EventHandler(this.Button24Click); - // // button39 // this.button39.Location = new System.Drawing.Point(230, 229); @@ -1961,6 +1533,19 @@ partial class CharacterCustomizationExtended this.button81.UseVisualStyleBackColor = true; this.button81.Click += new System.EventHandler(this.button81_Click); // + // label30 + // + this.label30.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label30.ForeColor = System.Drawing.Color.Red; + this.label30.Location = new System.Drawing.Point(6, 156); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(329, 36); + this.label30.TabIndex = 5; + this.label30.Text = "Some colors may be incompatible with earlier clients. Incompatible colors will sh" + + "ow up as grey in-game. "; + this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label30.Visible = true; + // // CharacterCustomizationExtended // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1981,9 +1566,9 @@ partial class CharacterCustomizationExtended this.panel2.ResumeLayout(false); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); this.groupBox3.ResumeLayout(false); this.groupBox2.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); this.tabPage2.ResumeLayout(false); this.tabControl2.ResumeLayout(false); this.tabPage10.ResumeLayout(false); @@ -2027,40 +1612,7 @@ partial class CharacterCustomizationExtended characterCustomizationForm = new CharacterCustomizationShared(); characterCustomizationForm.Parent = this; characterCustomizationForm.FormStyle = Settings.UIOptions.Style.Extended; - characterCustomizationForm.WhiteButton = button7; - characterCustomizationForm.LightStoneGreyButton = button8; - characterCustomizationForm.MediumStoneGreyButton = button9; - characterCustomizationForm.DarkStoneGreyButton = button10; - characterCustomizationForm.BlackButton = button14; - characterCustomizationForm.BrightRedButton = button13; - characterCustomizationForm.BrightYellowButton = button12; - characterCustomizationForm.CoolYellowButton = button11; - characterCustomizationForm.BrightBlueButton = button18; - characterCustomizationForm.BrightBluishGreenButton = button17; - characterCustomizationForm.MediumBlueButton = button16; - characterCustomizationForm.PastelBlueButton = button15; - characterCustomizationForm.LightBlueButton = button22; - characterCustomizationForm.SandBlueButton = button21; - characterCustomizationForm.BrightOrangeButton = button20; - characterCustomizationForm.BrightYellowishOrangeButton = button19; - characterCustomizationForm.EarthGreenButton = button26; - characterCustomizationForm.DarkGreenButton = button25; - characterCustomizationForm.BrightGreenButton = button24; - characterCustomizationForm.BrightYellowishGreenButton = button23; - characterCustomizationForm.MediumGreenButton = button30; - characterCustomizationForm.SandGreenButton = button29; - characterCustomizationForm.DarkOrangeButton = button28; - characterCustomizationForm.ReddishBrownButton = button27; - characterCustomizationForm.BrightVioletButton = button34; - characterCustomizationForm.LightReddishVioletButton = button33; - characterCustomizationForm.MediumRedButton = button32; - characterCustomizationForm.BrickYellowButton = button31; - characterCustomizationForm.SandRedButton = button38; - characterCustomizationForm.BrownButton = button37; - characterCustomizationForm.NougatButton = button36; - characterCustomizationForm.LightOrangeButton = button35; - characterCustomizationForm.MediumReddishViolet = button69; - characterCustomizationForm.DarkNougatButton = button70; + characterCustomizationForm.ColorView = listView1; characterCustomizationForm.FaceTypeBox = FaceTypeBox; characterCustomizationForm.TShirtsTypeBox = TShirtsTypeBox; characterCustomizationForm.ShirtsTypeBox = ShirtsTypeBox; @@ -2163,39 +1715,6 @@ partial class CharacterCustomizationExtended private System.Windows.Forms.Label label2; private System.Windows.Forms.Button button40; private System.Windows.Forms.Button button39; - private System.Windows.Forms.Button button24; - private System.Windows.Forms.Button button25; - private System.Windows.Forms.Button button23; - private System.Windows.Forms.Button button26; - private System.Windows.Forms.Button button30; - private System.Windows.Forms.Button button19; - private System.Windows.Forms.Button button29; - private System.Windows.Forms.Button button20; - private System.Windows.Forms.Button button28; - private System.Windows.Forms.Button button21; - private System.Windows.Forms.Button button27; - private System.Windows.Forms.Button button22; - private System.Windows.Forms.Button button34; - private System.Windows.Forms.Button button15; - private System.Windows.Forms.Button button33; - private System.Windows.Forms.Button button16; - private System.Windows.Forms.Button button32; - private System.Windows.Forms.Button button17; - private System.Windows.Forms.Button button31; - private System.Windows.Forms.Button button18; - private System.Windows.Forms.Button button38; - private System.Windows.Forms.Button button11; - private System.Windows.Forms.Button button37; - private System.Windows.Forms.Button button12; - private System.Windows.Forms.Button button36; - private System.Windows.Forms.Button button13; - private System.Windows.Forms.Button button35; - private System.Windows.Forms.Button button14; - private System.Windows.Forms.Button button10; - private System.Windows.Forms.Button button9; - private System.Windows.Forms.Button button8; - private System.Windows.Forms.Button button7; - private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Button button6; private System.Windows.Forms.Button button5; private System.Windows.Forms.Button button4; @@ -2226,8 +1745,6 @@ partial class CharacterCustomizationExtended 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; private System.Windows.Forms.Button button71; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.TextBox textBox3; @@ -2271,4 +1788,7 @@ partial class CharacterCustomizationExtended private System.Windows.Forms.Label label16; private System.Windows.Forms.TextBox FaceIDBox; private CharacterCustomizationShared characterCustomizationForm; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.ListView listView1; + private System.Windows.Forms.Label label30; } diff --git a/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs b/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs index 60dd898..5f6a253 100644 --- a/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs +++ b/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs @@ -704,208 +704,32 @@ public partial class CharacterCustomizationExtended : Form void Button1Click(object sender, EventArgs e) { - characterCustomizationForm.SelectedPart = "Head"; - label2.Text = characterCustomizationForm.SelectedPart; + characterCustomizationForm.SelectPart("Head"); } void Button2Click(object sender, EventArgs e) { - characterCustomizationForm.SelectedPart = "Torso"; - label2.Text = characterCustomizationForm.SelectedPart; + characterCustomizationForm.SelectPart("Torso"); } void Button3Click(object sender, EventArgs e) { - characterCustomizationForm.SelectedPart = "Right Arm"; - label2.Text = characterCustomizationForm.SelectedPart; + characterCustomizationForm.SelectPart("Right Arm"); } void Button4Click(object sender, EventArgs e) { - characterCustomizationForm.SelectedPart = "Left Arm"; - label2.Text = characterCustomizationForm.SelectedPart; + characterCustomizationForm.SelectPart("Left Arm"); } void Button5Click(object sender, EventArgs e) { - characterCustomizationForm.SelectedPart = "Right Leg"; - label2.Text = characterCustomizationForm.SelectedPart; + characterCustomizationForm.SelectPart("Right Leg"); } void Button6Click(object sender, EventArgs e) { - characterCustomizationForm.SelectedPart = "Left Leg"; - label2.Text = characterCustomizationForm.SelectedPart; - } - - void Button7Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(1); - } - - void Button8Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(208); - } - - void Button9Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(194); - } - - void Button10Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(199); - } - - void Button14Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(26); - } - - void Button13Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(21); - } - - void Button12Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(24); - } - - void Button11Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(226); - } - - void Button18Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(23); - } - - void Button17Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(107); - } - - void Button16Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(102); - } - - void Button15Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(11); - } - - void Button22Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(45); - } - - void Button21Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(135); - } - - void Button20Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(106); - } - - void Button19Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(105); - } - - void Button26Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(141); - } - - void Button25Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(28); - } - - void Button24Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(37); - } - - void Button23Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(119); - } - - void Button30Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(29); - } - - void Button29Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(151); - } - - void Button28Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(38); - } - - void Button27Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(192); - } - - void Button34Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(104); - } - - void Button33Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(9); - } - - void Button32Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(101); - } - - void Button31Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(5); - } - - void Button38Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(153); - } - - void Button37Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(217); - } - - void Button36Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(18); - } - - void Button35Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(125); - } - - private void button69_Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(22); - } - - private void button70_Click(object sender, EventArgs e) - { - characterCustomizationForm.ChangeColorOfPart(128); + characterCustomizationForm.SelectPart("Left Leg"); } void Button39Click(object sender, EventArgs e) @@ -1082,6 +906,11 @@ public partial class CharacterCustomizationExtended : Form { GlobalVars.UserCustomization.CharacterID = textBox1.Text; } + + private void listView1_SelectedIndexChanged(object sender, EventArgs e) + { + characterCustomizationForm.ColorButton(); + } #endregion } #endregion diff --git a/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.resx b/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.resx index 2e230b6..31cfcf9 100644 --- a/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.resx +++ b/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACe - OAAAAk1TRnQBSQFMAgEBAwEAAaQBAAGkAQABQAEAAUABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + OAAAAk1TRnQBSQFMAgEBAwEAAbwBAAG8AQABQAEAAUABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo BAABAQIAAUADAAEBAQABCAYAAUAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Novetus/NovetusCore/CharCustom/PartColors.cs b/Novetus/NovetusCore/CharCustom/PartColors.cs new file mode 100644 index 0000000..2f37a08 --- /dev/null +++ b/Novetus/NovetusCore/CharCustom/PartColors.cs @@ -0,0 +1,69 @@ +#region Usings +using System.Drawing; +using System.IO; +using System.Linq; +using System.Xml.Serialization; +#endregion + +#region Part Color Options +public class PartColor +{ + public string ColorName; + public int ColorID; + public string ColorRGB; + public Color ColorObject; +} + +[XmlRoot("PartColors")] +public class PartColors +{ + [XmlArray("ColorList")] + public PartColor[] ColorList; +} + +public class PartColorLoader +{ + public static PartColor[] GetPartColors() + { + if (File.Exists(GlobalPaths.ConfigDir + "\\" + GlobalPaths.PartColorXMLName)) + { + XmlSerializer serializer = new XmlSerializer(typeof(PartColors)); + + FileStream fs = new FileStream(GlobalPaths.ConfigDir + "\\" + GlobalPaths.PartColorXMLName, FileMode.Open); + PartColors colors; + colors = (PartColors)serializer.Deserialize(fs); + fs.Close(); + + return colors.ColorList; + } + else + { + return null; + } + } + + public static PartColor FindPartColorByName(PartColor[] colors, string query) + { + if (File.Exists(GlobalPaths.ConfigDir + "\\" + GlobalPaths.PartColorXMLName)) + { + return colors.SingleOrDefault(item => query.Contains(item.ColorName)); + } + else + { + return null; + } + } + + public static PartColor FindPartColorByID(PartColor[] colors, string query) + { + if (File.Exists(GlobalPaths.ConfigDir + "\\" + GlobalPaths.PartColorXMLName)) + { + return colors.SingleOrDefault(item => query.Contains(item.ColorID.ToString())); + } + else + { + return null; + } + } +} +#endregion diff --git a/Novetus/NovetusCore/NovetusCore.projitems b/Novetus/NovetusCore/NovetusCore.projitems index f14907a..95d0670 100644 --- a/Novetus/NovetusCore/NovetusCore.projitems +++ b/Novetus/NovetusCore/NovetusCore.projitems @@ -9,6 +9,7 @@ NovetusCore + diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs index ee456b3..fa4076e 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs @@ -50,13 +50,11 @@ public class GlobalFuncs { if (!string.IsNullOrWhiteSpace(exepath)) { - string dateformat = GetLinkerTimestampUtc(exepath).ToString("MM.yyyy"); var versionInfo = FileVersionInfo.GetVersionInfo(exepath); GlobalVars.ProgramInformation.Version = extendedversiontemplate.Replace("%version%", versionbranch) .Replace("%build%", versionInfo.ProductBuildPart.ToString()) .Replace("%revision%", versionInfo.FilePrivatePart.ToString()) - .Replace("%extended-revision%", (!extendedversionrevision.Equals("-1") ? extendedversionrevision : "")) - .Replace("%compile-date%", dateformat); + .Replace("%extended-revision%", (!extendedversionrevision.Equals("-1") ? extendedversionrevision : "")); } else { @@ -65,12 +63,10 @@ public class GlobalFuncs } else { - string dateformat = GetLinkerTimestampUtc(Assembly.GetExecutingAssembly()).ToString("MM.yyyy"); GlobalVars.ProgramInformation.Version = extendedversiontemplate.Replace("%version%", versionbranch) .Replace("%build%", Assembly.GetExecutingAssembly().GetName().Version.Build.ToString()) .Replace("%revision%", Assembly.GetExecutingAssembly().GetName().Version.Revision.ToString()) - .Replace("%extended-revision%", (!extendedversionrevision.Equals("-1") ? extendedversionrevision : "")) - .Replace("%compile-date%", dateformat); + .Replace("%extended-revision%", (!extendedversionrevision.Equals("-1") ? extendedversionrevision : "")); } bool changelogedit = Convert.ToBoolean(extendedversioneditchangelog); diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs index 624d9dc..7df4270 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs @@ -114,6 +114,7 @@ public class GlobalPaths public static readonly string ScriptName = "CSMPFunctions"; public static readonly string ScriptGenName = "CSMPBoot"; public static readonly string ContentProviderXMLName = "ContentProviders.xml"; + public static readonly string PartColorXMLName = "PartColors.xml"; #endregion #region Empty Paths (automatically changed) diff --git a/Novetus/NovetusCore/StorageAndFunctions/VarStorage.cs b/Novetus/NovetusCore/StorageAndFunctions/VarStorage.cs index 567e54b..282aa8e 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/VarStorage.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/VarStorage.cs @@ -27,15 +27,6 @@ public class VarStorage } #endregion - #region Part Colors - public class PartColors - { - public int ColorID { get; set; } - public Color ButtonColor { get; set; } - } - - #endregion - #region Game Server Definition public class GameServer { diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs index ad9b2b2..346cd2f 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs @@ -46,7 +46,6 @@ namespace NovetusLauncher this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.button36 = new System.Windows.Forms.Button(); - this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.button7 = new System.Windows.Forms.Button(); this.label31 = new System.Windows.Forms.Label(); @@ -81,8 +80,12 @@ namespace NovetusLauncher this.label30 = new System.Windows.Forms.Label(); this.listBox2 = new System.Windows.Forms.ListBox(); this.tabPage4 = new System.Windows.Forms.TabPage(); + this.button23 = new System.Windows.Forms.Button(); + this.SearchButton = new System.Windows.Forms.Button(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.SearchBar = new System.Windows.Forms.TextBox(); this.textBox4 = new System.Windows.Forms.TextBox(); + this.button24 = new System.Windows.Forms.Button(); this.treeView1 = new System.Windows.Forms.TreeView(); this.button6 = new System.Windows.Forms.Button(); this.tabPage6 = new System.Windows.Forms.TabPage(); @@ -159,11 +162,7 @@ namespace NovetusLauncher this.panel3 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); this.button35 = new System.Windows.Forms.Button(); - this.imageList1 = new System.Windows.Forms.ImageList(this.components); - this.button23 = new System.Windows.Forms.Button(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.SearchButton = new System.Windows.Forms.Button(); - this.button24 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); @@ -202,7 +201,6 @@ namespace NovetusLauncher // tabPage1 // this.tabPage1.Controls.Add(this.button36); - this.tabPage1.Controls.Add(this.label2); this.tabPage1.Controls.Add(this.label1); this.tabPage1.Controls.Add(this.button7); this.tabPage1.Controls.Add(this.label31); @@ -234,14 +232,6 @@ namespace NovetusLauncher this.button36.UseVisualStyleBackColor = true; this.button36.Click += new System.EventHandler(this.button36_Click); // - // label2 - // - this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.label2.Location = new System.Drawing.Point(6, 253); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(393, 2); - this.label2.TabIndex = 50; - // // label1 // this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; @@ -647,6 +637,34 @@ namespace NovetusLauncher this.tabPage4.Text = "MAPS"; this.tabPage4.UseVisualStyleBackColor = true; // + // button23 + // + this.button23.Location = new System.Drawing.Point(219, 3); + this.button23.Name = "button23"; + this.button23.Size = new System.Drawing.Size(75, 23); + this.button23.TabIndex = 70; + this.button23.Text = "Add Map..."; + this.button23.UseVisualStyleBackColor = true; + this.button23.Click += new System.EventHandler(this.button23_Click); + // + // SearchButton + // + this.SearchButton.ImageKey = "search.png"; + this.SearchButton.ImageList = this.imageList1; + this.SearchButton.Location = new System.Drawing.Point(141, 3); + this.SearchButton.Name = "SearchButton"; + this.SearchButton.Size = new System.Drawing.Size(26, 23); + this.SearchButton.TabIndex = 69; + this.SearchButton.UseVisualStyleBackColor = true; + this.SearchButton.Click += new System.EventHandler(this.SearchButton_Click); + // + // imageList1 + // + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "search.png"); + this.imageList1.Images.SetKeyName(1, "refresh.png"); + // // SearchBar // this.SearchBar.Location = new System.Drawing.Point(7, 5); @@ -665,6 +683,17 @@ namespace NovetusLauncher this.textBox4.Size = new System.Drawing.Size(392, 110); this.textBox4.TabIndex = 67; // + // button24 + // + this.button24.ImageKey = "refresh.png"; + this.button24.ImageList = this.imageList1; + this.button24.Location = new System.Drawing.Point(173, 3); + this.button24.Name = "button24"; + this.button24.Size = new System.Drawing.Size(24, 23); + this.button24.TabIndex = 59; + this.button24.UseVisualStyleBackColor = true; + this.button24.Click += new System.EventHandler(this.Button24Click); + // // treeView1 // this.treeView1.HideSelection = false; @@ -1384,23 +1413,6 @@ namespace NovetusLauncher this.button35.Size = new System.Drawing.Size(75, 23); this.button35.TabIndex = 0; // - // imageList1 - // - this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); - this.imageList1.TransparentColor = System.Drawing.Color.Transparent; - this.imageList1.Images.SetKeyName(0, "search.png"); - this.imageList1.Images.SetKeyName(1, "refresh.png"); - // - // button23 - // - this.button23.Location = new System.Drawing.Point(219, 3); - this.button23.Name = "button23"; - this.button23.Size = new System.Drawing.Size(75, 23); - this.button23.TabIndex = 70; - this.button23.Text = "Add Map..."; - this.button23.UseVisualStyleBackColor = true; - this.button23.Click += new System.EventHandler(this.button23_Click); - // // pictureBox2 // this.pictureBox2.BackgroundImage = global::NovetusLauncher.Properties.Resources.N; @@ -1411,28 +1423,6 @@ namespace NovetusLauncher this.pictureBox2.TabIndex = 7; this.pictureBox2.TabStop = false; // - // SearchButton - // - this.SearchButton.ImageKey = "search.png"; - this.SearchButton.ImageList = this.imageList1; - this.SearchButton.Location = new System.Drawing.Point(141, 3); - this.SearchButton.Name = "SearchButton"; - this.SearchButton.Size = new System.Drawing.Size(26, 23); - this.SearchButton.TabIndex = 69; - this.SearchButton.UseVisualStyleBackColor = true; - this.SearchButton.Click += new System.EventHandler(this.SearchButton_Click); - // - // button24 - // - this.button24.ImageKey = "refresh.png"; - this.button24.ImageList = this.imageList1; - this.button24.Location = new System.Drawing.Point(173, 3); - this.button24.Name = "button24"; - this.button24.Size = new System.Drawing.Size(24, 23); - this.button24.TabIndex = 59; - this.button24.UseVisualStyleBackColor = true; - this.button24.Click += new System.EventHandler(this.Button24Click); - // // LauncherFormCompact // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1545,7 +1535,6 @@ namespace NovetusLauncher private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label2; private System.Windows.Forms.TabPage tabPage5; private System.Windows.Forms.Button button22; private System.Windows.Forms.Button button7; diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.resx b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.resx index 8bc94cc..1114b20 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.resx +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.resx @@ -136,7 +136,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0 - CQAAAk1TRnQBSQFMAgEBAgEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAARgBAAEYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs index 1ae5904..cbaa659 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs @@ -75,7 +75,6 @@ namespace NovetusLauncher this.button37 = new System.Windows.Forms.Button(); this.label24 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.button7 = new System.Windows.Forms.Button(); this.button11 = new System.Windows.Forms.Button(); @@ -108,7 +107,9 @@ namespace NovetusLauncher this.label30 = new System.Windows.Forms.Label(); this.listBox2 = new System.Windows.Forms.ListBox(); this.tabPage4 = new System.Windows.Forms.TabPage(); + this.button23 = new System.Windows.Forms.Button(); this.SearchButton = new System.Windows.Forms.Button(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.SearchBar = new System.Windows.Forms.TextBox(); this.textBox4 = new System.Windows.Forms.TextBox(); this.button24 = new System.Windows.Forms.Button(); @@ -158,12 +159,10 @@ namespace NovetusLauncher this.label7 = new System.Windows.Forms.Label(); this.SettingsButton = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.panel4 = new System.Windows.Forms.Panel(); this.button35 = new System.Windows.Forms.Button(); this.UAButton = new System.Windows.Forms.Button(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.imageList1 = new System.Windows.Forms.ImageList(this.components); - this.button23 = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.tabControl1.SuspendLayout(); @@ -180,8 +179,8 @@ namespace NovetusLauncher this.tabPage5.SuspendLayout(); this.panel5.SuspendLayout(); this.panel3.SuspendLayout(); - this.panel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + this.panel4.SuspendLayout(); this.SuspendLayout(); // // button25 @@ -488,7 +487,6 @@ namespace NovetusLauncher this.tabPage1.Controls.Add(this.button37); this.tabPage1.Controls.Add(this.label24); this.tabPage1.Controls.Add(this.label23); - this.tabPage1.Controls.Add(this.label2); this.tabPage1.Controls.Add(this.label1); this.tabPage1.Controls.Add(this.button7); this.tabPage1.Controls.Add(this.button11); @@ -536,14 +534,6 @@ namespace NovetusLauncher this.label23.TabIndex = 51; this.label23.Text = "Server IP Address"; // - // label2 - // - this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.label2.Location = new System.Drawing.Point(6, 251); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(612, 2); - this.label2.TabIndex = 50; - // // label1 // this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; @@ -619,9 +609,9 @@ namespace NovetusLauncher // this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.ForeColor = System.Drawing.Color.Red; - this.label4.Location = new System.Drawing.Point(6, 127); + this.label4.Location = new System.Drawing.Point(6, 134); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(613, 126); + this.label4.Size = new System.Drawing.Size(613, 112); this.label4.TabIndex = 4; this.label4.Text = resources.GetString("label4.Text"); this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -923,6 +913,16 @@ namespace NovetusLauncher this.tabPage4.Text = "MAPS"; this.tabPage4.UseVisualStyleBackColor = true; // + // button23 + // + this.button23.Location = new System.Drawing.Point(435, 3); + this.button23.Name = "button23"; + this.button23.Size = new System.Drawing.Size(75, 23); + this.button23.TabIndex = 71; + this.button23.Text = "Add Map..."; + this.button23.UseVisualStyleBackColor = true; + this.button23.Click += new System.EventHandler(this.button23_Click); + // // SearchButton // this.SearchButton.ImageKey = "search.png"; @@ -934,6 +934,13 @@ namespace NovetusLauncher this.SearchButton.UseVisualStyleBackColor = true; this.SearchButton.Click += new System.EventHandler(this.SearchButton_Click); // + // imageList1 + // + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "search.png"); + this.imageList1.Images.SetKeyName(1, "refresh.png"); + // // SearchBar // this.SearchBar.Location = new System.Drawing.Point(7, 5); @@ -1478,6 +1485,16 @@ namespace NovetusLauncher this.panel3.Size = new System.Drawing.Size(229, 69); this.panel3.TabIndex = 62; // + // pictureBox2 + // + this.pictureBox2.BackgroundImage = global::NovetusLauncher.Properties.Resources.N; + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox2.Location = new System.Drawing.Point(3, 3); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(43, 41); + this.pictureBox2.TabIndex = 7; + this.pictureBox2.TabStop = false; + // // panel4 // this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; @@ -1510,33 +1527,6 @@ namespace NovetusLauncher this.UAButton.Size = new System.Drawing.Size(75, 23); this.UAButton.TabIndex = 0; // - // pictureBox2 - // - this.pictureBox2.BackgroundImage = global::NovetusLauncher.Properties.Resources.N; - this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBox2.Location = new System.Drawing.Point(3, 3); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(43, 41); - this.pictureBox2.TabIndex = 7; - this.pictureBox2.TabStop = false; - // - // imageList1 - // - this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); - this.imageList1.TransparentColor = System.Drawing.Color.Transparent; - this.imageList1.Images.SetKeyName(0, "search.png"); - this.imageList1.Images.SetKeyName(1, "refresh.png"); - // - // button23 - // - this.button23.Location = new System.Drawing.Point(435, 3); - this.button23.Name = "button23"; - this.button23.Size = new System.Drawing.Size(75, 23); - this.button23.TabIndex = 71; - this.button23.Text = "Add Map..."; - this.button23.UseVisualStyleBackColor = true; - this.button23.Click += new System.EventHandler(this.button23_Click); - // // LauncherFormExtended // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1582,8 +1572,8 @@ namespace NovetusLauncher this.panel5.PerformLayout(); this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); - this.panel4.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + this.panel4.ResumeLayout(false); this.ResumeLayout(false); } @@ -1649,7 +1639,6 @@ namespace NovetusLauncher private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label2; private System.Windows.Forms.TabPage tabPage5; private System.Windows.Forms.Button button22; private System.Windows.Forms.Button button7; diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.resx b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.resx index 5bdaf39..058456e 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.resx +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.resx @@ -117,6 +117,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NOTE: +- If you have a problem where you can't see your character, REGENERATE YOUR PLAYER ID THEN REJOIN THE SERVER. +- If you tried to connect to the server and you get an error, REJOIN THE SERVER. +- To reset your character, type !!!reset into chat. +- Your tripcode will only be seen by you and the server host of any server you join. It is used to verify that you are a unique player. + + + + + 17, 17 @@ -125,7 +136,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0 - CQAAAk1TRnQBSQFMAgEBAgEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -154,29 +165,18 @@ AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/xgAA/86AAH0Ae0BEQMA - AeoB8AH/LQAB/wHwAfMFAAH/Ae8BDgGSAfIC/wH0AbwBFQFtAf8rAAH/AewB6wEAAfUEAAGSARUB9AEA - Af8B8wH0Af8BAAH/Am0B/ykAAf8B7AHyAe8BFQH1AwAB8gEPAfQBAAHwAQ4BEQEOARQC8gEPAfcB/yYA - AfQB8QHzAe0B8gHvAfgB8QQAAesB7wEAAfIBDgHyAQAB/wEHAg4B8CYAAf8B9wEPAW0BQwEOAesB+AHx + AeoB8AH/LQAB/wHwAfMFAAH/Ae8BDgGSAfIC/wH0AbwBFQFtAf8rAAH/AewB6wEAAf8EAAGSARUB9AEA + Af8B8wH0Af8BAAH/Am0B/ykAAf8B7AHyAe8BFQH/AwAB8gEPAfQBAAHwAQ4BEQEOARQC8gEPAfcB/yYA + AfQB8QHzAe0B8gHvAewB8QQAAesB7wEAAfIBDgHyAQAB/wEHAg4B8CYAAf8B9wEPAW0BQwEOAesB7AHx BQABDgHzAQABbQEHBAAC8ycAAQcBbQH/AQAB/wGSARAB8gUAAf8BAAH/AQABDgH0AQAB8wbxAfIkAAEU AfMDAAH/AQ8B/wUAAf8BAAH0AQABDwHzAQAB8wEOAQ8DEgEUAREkAAEQAf8EAAEVAfQGAAEVAfIBAAHr - Ae8CAAHyAQ4B8gIAAfMBESQAAfgBvAMAAfQBEQH/BgAB7AH3AQAB8wEOAQcB/wH0AW0BEQH/AQAB8wER - JAAB9AEQAQcB8wHwAUMB8AcAAfMBDwH/AQAB8gETAgAB6wH0Av8B8wERJQAB9AHsARIB+AHyCQAB7AHq - Af8CAAL/AQAB9AFtAREBvAERMwAB/wH4AREB7wHyAfMB8AH4AQ4BkgH3AQ4BETUAAfEB+AEVAREB6gHv + Ae8CAAHyAQ4B8gIAAfMBESQAAewBvAMAAfQBEQH/BgAB7AH3AQAB8wEOAQcB/wH0AW0BEQH/AQAB8wER + JAAB9AEQAQcB8wHwAUMB8AcAAfMBDwH/AQAB8gETAgAB6wH0Av8B8wERJQAB9AHsARIB7AHyCQAB7AHq + Af8CAAL/AQAB9AFtAREBvAERMwAB/wHsAREB7wHyAfMB8AHsAQ4BkgH3AQ4BETUAAfEB7AEVAREB6gHv AfQCAAH3ARE+AAH/AQchAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAC/wH+ AT8EAAL/AfABBwQAAf8BxwHAAQMEAAH/AYMBxAEhBAAB/wEDAYgBAQQAAfgBBwGRAQcEAAHgAQ8BkwHP BAAB4gEfARIBAQQAAecBHwESAQEEAAHnAZ8BkwEZBAAB5wEfAZABCQQAAeABPwGIAQEEAAHwAX8BxgFB BAAC/wHAAQEEAAL/AfABGQQAA/8B+QQACw== - - - - NOTE: -- If you have a problem where you can't see your character, REGENERATE YOUR PLAYER ID THEN REJOIN THE SERVER. -- If you tried to connect to the server and you get an error, REJOIN THE SERVER. -- To reset your character, type !!!reset into chat. -- Your tripcode will only be seen by you and the server host of any server you join. It is used to verify that you are a unique player. - - - diff --git a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs index e3ca8f7..bb70e40 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs @@ -36,7 +36,6 @@ public partial class NovetusSDK : Form private void listView1_SelectedIndexChanged(object sender, EventArgs e) { - List selectedIndices = listView1.SelectedIndices.Cast().ToList(); int selectedIndex = 0; if (listView1.SelectedIndices.Count > 0) diff --git a/changelog.txt b/changelog.txt index 7491d04..b4ee960 100644 --- a/changelog.txt +++ b/changelog.txt @@ -10,8 +10,23 @@ - Improved compatibility with ReShade 4.9.1. - Added a new official Novetus redirect for items. - Fixed a bug where players couldn't respawn in 2009E and 2009E-HD when joining a game. -- Lowered the minimum frame rate for 2009E/2009E-HD from 60 to 30, allowing lower-end PCS to run the client better. +- Lowered the minimum frame rate for 2009E/2009E-HD from 60 to 30, allowing lower-end PCs to run the client better. - The maximum is still set to 120. +- Redesigned the body colors field in the Character Customization window. +- Added more body colors. + - You can add more body colors by editing the config/PartColors.xml file! +- Fixed an error that occured when loading multiple instances of the Character Customization window. +Added the following T-Shirts: +Blue Ring of Fire +Ring of Fire +Bot Gear +Added the following Shirts: +Armor +Blue DC Hoodie +Bombastic Suit +Crystal Shirt +Darkseed Suit +Novetus Guest Shirt ---------------------------------------------------------------------------- 1.3 Pre-Release 2 1.3: diff --git a/scripts/batch/github_sync.bat b/scripts/batch/github_sync.bat index 0431b14..bc60b7a 100644 --- a/scripts/batch/github_sync.bat +++ b/scripts/batch/github_sync.bat @@ -86,6 +86,7 @@ if not exist "%launcherscriptdir%" mkdir "%launcherscriptdir%" if not exist "%launcherscriptdir%/3DView" mkdir "%launcherscriptdir%/3DView" XCOPY "%cd%\Novetus\bin\preview\content\scripts\CSView.lua" "%launcherscriptdir%/3DView" XCOPY "%cd%\Novetus\config\ContentProviders.xml" "%launcherscriptdir%" +XCOPY "%cd%\Novetus\config\PartColors.xml" "%launcherscriptdir%" XCOPY "%cd%\Novetus\config\splashes.txt" "%launcherscriptdir%" XCOPY "%cd%\Novetus\config\splashes-special.txt" "%launcherscriptdir%" XCOPY "%cd%\Novetus\config\names-special.txt" "%launcherscriptdir%" diff --git a/scripts/launcher/PartColors.xml b/scripts/launcher/PartColors.xml new file mode 100644 index 0000000..bee3f4b --- /dev/null +++ b/scripts/launcher/PartColors.xml @@ -0,0 +1,331 @@ + + + + + + White + 1 + 242,243,243 + + + Light stone grey + 208 + 229,228,223 + + + Medium stone grey + 194 + 163,162,165 + + + Dark stone grey + 199 + 99,95,98 + + + Black + 26 + 27,42,53 + + + Bright red + 21 + 196,40,28 + + + Bright yellow + 24 + 245,205,48 + + + Cool yellow + 226 + 253,234,141 + + + Bright blue + 23 + 13,105,172 + + + Bright bluish green + 107 + 0,143,156 + + + Medium blue + 102 + 110,153,202 + + + Pastel Blue + 11 + 128,187,219 + + + Light blue + 45 + 180,210,228 + + + Sand blue + 135 + 116,134,157 + + + Bright orange + 106 + 206,125,63 + + + Br. yellowish orange + 105 + 225,154,66 + + + Earth green + 141 + 36,65,43 + + + Dark green + 28 + 40,127,71 + + + Bright green + 37 + 75,151,75 + + + Br. yellowish green + 119 + 164,189,71 + + + Medium green + 29 + 161,196,140 + + + Sand green + 151 + 120,144,130 + + + Dark orange + 38 + 160,95,53 + + + Reddish brown + 192 + 105,64,40 + + + Bright violet + 104 + 107,50,124 + + + Light reddish violet + 9 + 232,186,200 + + + Medium red + 101 + 218,134,122 + + + Brick yellow + 5 + 215,197,154 + + + Sand red + 153 + 149,121,119 + + + Brown + 217 + 124,92,70 + + + Nougat + 18 + 204,142,105 + + + Light orange + 125 + 234,184,146 + + + Med. reddish violet + 22 + 196,112,160 + + + Dark nougat + 128 + 174,122,89 + + + Institutional white + 1001 + 248,248,248 + + + Mid gray + 1002 + 205,205,205 + + + Really black + 1003 + 17,17,17 + + + Grime + 1022 + 127,142,100 + + + Lavender + 1023 + 140,91,159 + + + Neon orange + 1005 + 216,148,13 + + + Teal + 1018 + 18,238,212 + + + Pastel brown + 1030 + 255,204,153 + + + Pastel yellow + 1029 + 255,255,204 + + + Pastel orange + 1025 + 255,201,201 + + + Pink + 1016 + 255,102,204 + + + Pastel violet + 1026 + 177,167,255 + + + Pastel light blue + 1024 + 175,221,255 + + + Pastel blue-green + 1027 + 159,243,233 + + + Pastel green + 1028 + 204,255,204 + + + Olive + 1008 + 193,190,66 + + + New Yeller + 1009 + 255,255,0 + + + Really red + 1004 + 255,0,0 + + + Hot pink + 1032 + 255,0,191 + + + Really blue + 1010 + 0,0,255 + + + Toothpaste + 1019 + 0,255,255 + + + Lime green + 1020 + 0,255,0 + + + Royal purple + 1031 + 98,37,209 + + + Alder + 1006 + 180,128,255 + + + Cyan + 1013 + 4,175,236 + + + Camo + 1021 + 58,125,21 + + + CGA brown + 1014 + 170,85,0 + + + Dusty Rose + 1007 + 163,75,75 + + + Magenta + 1015 + 170,0,170 + + + Deep blue + 1012 + 33,84,185 + + + Navy blue + 1011 + 0,32,96 + + + \ No newline at end of file diff --git a/scripts/launcher/splashes.txt b/scripts/launcher/splashes.txt index fbde3f7..e2bdf6e 100644 --- a/scripts/launcher/splashes.txt +++ b/scripts/launcher/splashes.txt @@ -129,4 +129,6 @@ splashes.txt has not been found. Play on Wine or Proton! Come try Novetus on your Not Phone! LOAD"*",8 RUN -Previously 1.2.5! \ No newline at end of file +Previously 1.2.5! +You are now breathing manually. +Check out MAYHEM! \ No newline at end of file