From 817d35cd0659f450c24d05464051d963643b7053 Mon Sep 17 00:00:00 2001 From: Bitl Date: Sun, 27 Oct 2019 14:59:24 -0700 Subject: [PATCH] more code cleaning + color presets --- NovetusLauncher/.vs/NovetusLauncher/v14/.suo | Bin 156160 -> 157696 bytes NovetusLauncher/NovetusCMD/Program.cs | 2 +- .../NovetusFuncs/CodeExtensions.cs | 25 ++ NovetusLauncher/NovetusFuncs/IconLoader.cs | 15 +- .../NovetusFuncs/ScriptGenerator.cs | 99 -------- .../CharacterCustomization.Designer.cs | 124 +++++++++- .../NovetusLauncher/CharacterCustomization.cs | 234 +++++++++++------- 7 files changed, 301 insertions(+), 198 deletions(-) diff --git a/NovetusLauncher/.vs/NovetusLauncher/v14/.suo b/NovetusLauncher/.vs/NovetusLauncher/v14/.suo index 35973164e7597bb71c4f26ac5ca0a335da91f3a7..af221228fc0bfcd06f893c61e694c5cf7907f5b5 100644 GIT binary patch delta 3043 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 + ///ColorArray[index, 0] = id (string) + ///ColorArray[index, 1] = button color (string) + /// + ColorArray = new string[32, 2] { { "1", button7.BackColor.ToString() }, { "208", button8.BackColor.ToString() }, { "194", button9.BackColor.ToString() }, @@ -752,229 +756,237 @@ namespace NovetusLauncher button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor); } } - - void Button7Click(object sender, EventArgs e) + + void ChangeColorOfPart(string part, int ColorID, Color ButtonColor) + { + if (part == "Head") + { + GlobalVars.HeadColorID = ColorID; + GlobalVars.ColorMenu_HeadColor = ButtonColor.ToString(); + button1.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_HeadColor); + } + else if (part == "Torso") + { + GlobalVars.TorsoColorID = ColorID; + GlobalVars.ColorMenu_TorsoColor = ButtonColor.ToString(); + button2.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_TorsoColor); + } + else if (part == "Right Arm") + { + GlobalVars.RightArmColorID = ColorID; + GlobalVars.ColorMenu_RightArmColor = ButtonColor.ToString(); + button3.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightArmColor); + } + else if (part == "Left Arm") + { + GlobalVars.LeftArmColorID = ColorID; + GlobalVars.ColorMenu_LeftArmColor = ButtonColor.ToString(); + button4.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftArmColor); + } + else if (part == "Right Leg") + { + GlobalVars.RightLegColorID = ColorID; + GlobalVars.ColorMenu_RightLegColor = ButtonColor.ToString(); + button5.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightLegColor); + } + else if (part == "Left Leg") + { + GlobalVars.LeftLegColorID = ColorID; + GlobalVars.ColorMenu_LeftLegColor = ButtonColor.ToString(); + button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor); + } + } + + void Button7Click(object sender, EventArgs e) { Color ButtonColor = button7.BackColor; - int colorID = 1; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(1, ButtonColor); } void Button8Click(object sender, EventArgs e) { Color ButtonColor = button8.BackColor; - int colorID = 208; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(208, ButtonColor); } void Button9Click(object sender, EventArgs e) { Color ButtonColor = button9.BackColor; - int colorID = 194; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(194, ButtonColor); } void Button10Click(object sender, EventArgs e) { Color ButtonColor = button10.BackColor; - int colorID = 199; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(199, ButtonColor); } void Button14Click(object sender, EventArgs e) { Color ButtonColor = button14.BackColor; - int colorID = 26; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(26, ButtonColor); } void Button13Click(object sender, EventArgs e) { Color ButtonColor = button13.BackColor; - int colorID = 21; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(21, ButtonColor); } void Button12Click(object sender, EventArgs e) { Color ButtonColor = button12.BackColor; - int colorID = 24; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(24, ButtonColor); } void Button11Click(object sender, EventArgs e) { Color ButtonColor = button11.BackColor; - int colorID = 226; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(226, ButtonColor); } void Button18Click(object sender, EventArgs e) { Color ButtonColor = button18.BackColor; - int colorID = 23; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(23, ButtonColor); } void Button17Click(object sender, EventArgs e) { Color ButtonColor = button17.BackColor; - int colorID = 107; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(107, ButtonColor); } void Button16Click(object sender, EventArgs e) { Color ButtonColor = button16.BackColor; - int colorID = 102; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(102, ButtonColor); } void Button15Click(object sender, EventArgs e) { Color ButtonColor = button15.BackColor; - int colorID = 11; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(11, ButtonColor); } void Button22Click(object sender, EventArgs e) { Color ButtonColor = button22.BackColor; - int colorID = 45; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(45, ButtonColor); } void Button21Click(object sender, EventArgs e) { Color ButtonColor = button21.BackColor; - int colorID = 135; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(135, ButtonColor); } void Button20Click(object sender, EventArgs e) { Color ButtonColor = button20.BackColor; - int colorID = 106; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(106, ButtonColor); } void Button19Click(object sender, EventArgs e) { Color ButtonColor = button19.BackColor; - int colorID = 105; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(105, ButtonColor); } void Button26Click(object sender, EventArgs e) { Color ButtonColor = button26.BackColor; - int colorID = 141; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(141, ButtonColor); } void Button25Click(object sender, EventArgs e) { Color ButtonColor = button25.BackColor; - int colorID = 28; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(28, ButtonColor); } void Button24Click(object sender, EventArgs e) { Color ButtonColor = button24.BackColor; - int colorID = 37; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(37, ButtonColor); } void Button23Click(object sender, EventArgs e) { Color ButtonColor = button23.BackColor; - int colorID = 119; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(119, ButtonColor); } void Button30Click(object sender, EventArgs e) { Color ButtonColor = button30.BackColor; - int colorID = 29; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(29, ButtonColor); } void Button29Click(object sender, EventArgs e) { Color ButtonColor = button29.BackColor; - int colorID = 151; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(151, ButtonColor); } void Button28Click(object sender, EventArgs e) { Color ButtonColor = button28.BackColor; - int colorID = 38; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(38, ButtonColor); } void Button27Click(object sender, EventArgs e) { Color ButtonColor = button27.BackColor; - int colorID = 192; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(192, ButtonColor); } void Button34Click(object sender, EventArgs e) { Color ButtonColor = button34.BackColor; - int colorID = 104; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(104, ButtonColor); } void Button33Click(object sender, EventArgs e) { Color ButtonColor = button33.BackColor; - int colorID = 9; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(9, ButtonColor); } void Button32Click(object sender, EventArgs e) { Color ButtonColor = button32.BackColor; - int colorID = 101; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(101, ButtonColor); } void Button31Click(object sender, EventArgs e) { Color ButtonColor = button31.BackColor; - int colorID = 5; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(5, ButtonColor); } void Button38Click(object sender, EventArgs e) { Color ButtonColor = button38.BackColor; - int colorID = 153; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(153, ButtonColor); } void Button37Click(object sender, EventArgs e) { Color ButtonColor = button37.BackColor; - int colorID = 217; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(217, ButtonColor); } void Button36Click(object sender, EventArgs e) { Color ButtonColor = button36.BackColor; - int colorID = 18; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(18, ButtonColor); } void Button35Click(object sender, EventArgs e) { Color ButtonColor = button35.BackColor; - int colorID = 125; - ChangeColorOfPart(colorID, ButtonColor); + ChangeColorOfPart(125, ButtonColor); } void Button39Click(object sender, EventArgs e) @@ -987,40 +999,28 @@ namespace NovetusLauncher RandomColor = rand.Next(ColorArray.GetLength(0)); if (i == 1) { - GlobalVars.HeadColorID = Convert.ToInt32(ColorArray[RandomColor, 0]); - GlobalVars.ColorMenu_HeadColor = ColorArray[RandomColor, 1]; - button1.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_HeadColor); + ChangeColorOfPart("Head", Convert.ToInt32(ColorArray[RandomColor, 0]), ConvertStringtoColor(ColorArray[RandomColor, 1])); } else if (i == 2) { - GlobalVars.TorsoColorID = Convert.ToInt32(ColorArray[RandomColor, 0]); - GlobalVars.ColorMenu_TorsoColor = ColorArray[RandomColor, 1]; - button2.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_TorsoColor); + ChangeColorOfPart("Torso", Convert.ToInt32(ColorArray[RandomColor, 0]), ConvertStringtoColor(ColorArray[RandomColor, 1])); } else if (i == 3) { - GlobalVars.RightArmColorID = Convert.ToInt32(ColorArray[RandomColor, 0]); - GlobalVars.ColorMenu_RightArmColor = ColorArray[RandomColor, 1]; - button3.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightArmColor); - } + ChangeColorOfPart("Left Arm", Convert.ToInt32(ColorArray[RandomColor, 0]), ConvertStringtoColor(ColorArray[RandomColor, 1])); + } else if (i == 4) { - GlobalVars.LeftArmColorID = Convert.ToInt32(ColorArray[RandomColor, 0]); - GlobalVars.ColorMenu_LeftArmColor = ColorArray[RandomColor, 1]; - button4.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftArmColor); - } + ChangeColorOfPart("Right Arm", Convert.ToInt32(ColorArray[RandomColor, 0]), ConvertStringtoColor(ColorArray[RandomColor, 1])); + } else if (i == 5) { - GlobalVars.RightLegColorID = Convert.ToInt32(ColorArray[RandomColor, 0]); - GlobalVars.ColorMenu_RightLegColor = ColorArray[RandomColor, 1]; - button5.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightLegColor); - } + ChangeColorOfPart("Left Leg", Convert.ToInt32(ColorArray[RandomColor, 0]), ConvertStringtoColor(ColorArray[RandomColor, 1])); + } else if (i == 6) { - GlobalVars.LeftLegColorID = Convert.ToInt32(ColorArray[RandomColor, 0]); - GlobalVars.ColorMenu_LeftLegColor = ColorArray[RandomColor, 1]; - button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor); - } + ChangeColorOfPart("Right Leg", Convert.ToInt32(ColorArray[RandomColor, 0]), ConvertStringtoColor(ColorArray[RandomColor, 1])); + } } } @@ -1256,9 +1256,9 @@ namespace NovetusLauncher { } - if (!string.IsNullOrWhiteSpace(icon.installOutcome)) + if (!string.IsNullOrWhiteSpace(icon.getInstallOutcome())) { - MessageBox.Show(icon.installOutcome); + MessageBox.Show(icon.getInstallOutcome()); } try @@ -1273,6 +1273,56 @@ namespace NovetusLauncher } } + public void ApplyPreset(int head, int torso, int larm, int rarm, int lleg, int rleg) + { + ChangeColorOfPart("Head", head, ConvertStringtoColor(ColorArray[Convert.ToInt32(ColorArray.FindInDimensions(Convert.ToString(head))), 1])); + ChangeColorOfPart("Torso", torso, ConvertStringtoColor(ColorArray[Convert.ToInt32(ColorArray.FindInDimensions(Convert.ToString(torso))), 1])); + ChangeColorOfPart("Left Arm", larm, ConvertStringtoColor(ColorArray[Convert.ToInt32(ColorArray.FindInDimensions(Convert.ToString(larm))), 1])); + ChangeColorOfPart("Right Arm", rarm, ConvertStringtoColor(ColorArray[Convert.ToInt32(ColorArray.FindInDimensions(Convert.ToString(rarm))), 1])); + ChangeColorOfPart("Left Leg", lleg, ConvertStringtoColor(ColorArray[Convert.ToInt32(ColorArray.FindInDimensions(Convert.ToString(lleg))), 1])); + ChangeColorOfPart("Right Leg", rleg, ConvertStringtoColor(ColorArray[Convert.ToInt32(ColorArray.FindInDimensions(Convert.ToString(rleg))), 1])); + } + + private void button61_Click(object sender, EventArgs e) + { + ApplyPreset(24, 194, 24, 24, 119, 119); + } + + private void button62_Click(object sender, EventArgs e) + { + ApplyPreset(24, 22, 24, 24, 9, 9); + } + + private void button63_Click(object sender, EventArgs e) + { + ApplyPreset(24, 23, 24, 24, 119, 119); + } + + private void button64_Click(object sender, EventArgs e) + { + ApplyPreset(24, 22, 24, 24, 119, 119); + } + + private void button68_Click(object sender, EventArgs e) + { + ApplyPreset(24, 11, 24, 24, 119, 119); + } + + private void button67_Click(object sender, EventArgs e) + { + ApplyPreset(38, 194, 38, 38, 119, 119); + } + + private void button66_Click(object sender, EventArgs e) + { + ApplyPreset(128, 119, 128, 128, 119, 119); + } + + private void button65_Click(object sender, EventArgs e) + { + ApplyPreset(9, 194, 9, 9, 119, 119); + } + /* private void button61_Click(object sender, EventArgs e) {