diff --git a/pk3DS/Main.Designer.cs b/pk3DS/Main.Designer.cs index 911b508..ebe4f0c 100644 --- a/pk3DS/Main.Designer.cs +++ b/pk3DS/Main.Designer.cs @@ -86,6 +86,7 @@ private void InitializeComponent() this.B_Static = new System.Windows.Forms.Button(); this.Tab_Output = new System.Windows.Forms.TabPage(); this.L_Status = new System.Windows.Forms.Label(); + this.B_OWSE = new System.Windows.Forms.Button(); this.menuStrip1.SuspendLayout(); this.TC_RomFS.SuspendLayout(); this.Tab_RomFS.SuspendLayout(); @@ -359,7 +360,7 @@ private void InitializeComponent() this.Menu_Language.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.CB_Lang}); this.Menu_Language.Name = "Menu_Language"; - this.Menu_Language.Size = new System.Drawing.Size(152, 22); + this.Menu_Language.Size = new System.Drawing.Size(146, 22); this.Menu_Language.Text = "Language"; // // CB_Lang @@ -385,14 +386,14 @@ private void InitializeComponent() this.Menu_About.Name = "Menu_About"; this.Menu_About.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B))); this.Menu_About.ShowShortcutKeys = false; - this.Menu_About.Size = new System.Drawing.Size(152, 22); + this.Menu_About.Size = new System.Drawing.Size(146, 22); this.Menu_About.Text = "A&bout pk3DS"; this.Menu_About.Click += new System.EventHandler(this.L_About_Click); // // Menu_GARCs // this.Menu_GARCs.Name = "Menu_GARCs"; - this.Menu_GARCs.Size = new System.Drawing.Size(152, 22); + this.Menu_GARCs.Size = new System.Drawing.Size(146, 22); this.Menu_GARCs.Text = "About GARCs"; this.Menu_GARCs.Click += new System.EventHandler(this.L_GARCInfo_Click); // @@ -438,6 +439,7 @@ private void InitializeComponent() this.FLP_RomFS.Controls.Add(this.B_Item); this.FLP_RomFS.Controls.Add(this.B_Move); this.FLP_RomFS.Controls.Add(this.B_TitleScreen); + this.FLP_RomFS.Controls.Add(this.B_OWSE); this.FLP_RomFS.Dock = System.Windows.Forms.DockStyle.Fill; this.FLP_RomFS.Location = new System.Drawing.Point(3, 3); this.FLP_RomFS.Name = "FLP_RomFS"; @@ -680,6 +682,16 @@ private void InitializeComponent() this.L_Status.TabIndex = 14; this.L_Status.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // B_OWSE + // + this.B_OWSE.Location = new System.Drawing.Point(109, 119); + this.B_OWSE.Name = "B_OWSE"; + this.B_OWSE.Size = new System.Drawing.Size(100, 23); + this.B_OWSE.TabIndex = 13; + this.B_OWSE.Text = "Title Screen"; + this.B_OWSE.UseVisualStyleBackColor = true; + this.B_OWSE.Click += new System.EventHandler(this.B_OWSE_Click); + // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -772,5 +784,6 @@ private void InitializeComponent() private System.Windows.Forms.Button B_GameText; private System.Windows.Forms.FlowLayoutPanel FLP_RomFS; private System.Windows.Forms.Label L_Status; + private System.Windows.Forms.Button B_OWSE; } } \ No newline at end of file diff --git a/pk3DS/Main.cs b/pk3DS/Main.cs index 9bf5891..65a0fb0 100644 --- a/pk3DS/Main.cs +++ b/pk3DS/Main.cs @@ -291,7 +291,7 @@ private void toggleSubEditors() switch (Config.Generation) { case 6: - romfs = new Control[] {B_GameText, B_StoryText, B_Personal, B_Evolution, B_LevelUp, B_Wild, B_MegaEvo, B_EggMove, B_Trainer, B_Item, B_Move, B_Maison, B_TitleScreen}; + romfs = new Control[] {B_GameText, B_StoryText, B_Personal, B_Evolution, B_LevelUp, B_Wild, B_MegaEvo, B_EggMove, B_Trainer, B_Item, B_Move, B_Maison, B_TitleScreen, B_OWSE}; exefs = new Control[] {B_MoveTutor, B_TMHM, B_Mart, B_Pickup, B_OPower}; cro = new Control[] {B_TypeChart, B_Starter, B_Gift, B_Static}; B_MoveTutor.Visible = Config.ORAS; // Default false unless loaded @@ -539,50 +539,51 @@ private void B_Trainer_Click(object sender, EventArgs e) private void B_Wild_Click(object sender, EventArgs e) { if (threadActive()) return; - bool advanced = (ModifierKeys == Keys.Alt) || ModifierKeys == (Keys.Alt | Keys.Control); - bool reload = (ModifierKeys == Keys.Control) || ModifierKeys == (Keys.Alt | Keys.Control); new Thread(() => { - if (Config.SM) + string[] files; + Action action; + switch (Config.Generation) { - string[] files = {"encdata", "zonedata"}; - fileGet(files, false); - Invoke((Action)(() => new SMWE().ShowDialog())); - fileSet(files); - } - else - { - if (advanced) - { - string[] files = { "encdata", "storytext", "mapGR", "mapMatrix" }; - if (reload || files.Sum(t => Directory.Exists(t) ? 0 : 1) != 0) // Dev bypass if all exist already - fileGet(files, false); - - // Only want to set back encdata. + case 6: files = new[] { "encdata" }; - Invoke((MethodInvoker)delegate { Enabled = false; }); - { - Invoke((Action)(() => new TextEditor(Directory.GetFiles("storytext")).Show())); - Invoke((Action)(() => new OWSE().Show())); - while (Application.OpenForms.Count > 1) - Thread.Sleep(200); - } - Invoke((MethodInvoker)delegate { Enabled = true; }); - fileSet(files); - } - else - { - string[] files = { "encdata" }; - fileGet(files, false); if (Config.ORAS) - { Invoke((Action)(() => new RSWE().ShowDialog())); } + action = () => new RSWE().ShowDialog(); else if (Config.XY) - { Invoke((Action)(() => new XYWE().ShowDialog())); } - fileSet(files); - } + action = () => new XYWE().ShowDialog(); + else return; + break; + case 7: + files = new [] { "encdata", "zonedata" }; + action = () => new SMWE().ShowDialog(); + break; + default: + return; } + fileGet(files, false); + Invoke(action); + fileSet(files); }).Start(); } + private void B_OWSE_Click(object sender, EventArgs e) + { + bool reload = (ModifierKeys == Keys.Control) || ModifierKeys == (Keys.Alt | Keys.Control); + string[] files = { "encdata", "storytext", "mapGR", "mapMatrix" }; + if (reload || files.Sum(t => Directory.Exists(t) ? 0 : 1) != 0) // Dev bypass if all exist already + fileGet(files, false); + + // Only want to set back encdata. + files = new[] { "encdata" }; + Invoke((MethodInvoker)delegate { Enabled = false; }); + { + Invoke((Action)(() => new TextEditor(Directory.GetFiles("storytext")).Show())); + Invoke((Action)(() => new OWSE().Show())); + while (Application.OpenForms.Count > 1) + Thread.Sleep(200); + } + Invoke((MethodInvoker)delegate { Enabled = true; }); + fileSet(files); + } private void B_Evolution_Click(object sender, EventArgs e) { if (threadActive()) return; @@ -590,7 +591,15 @@ private void B_Evolution_Click(object sender, EventArgs e) { string[] files = { "evolution" }; fileGet(files); - Invoke((Action)(() => new EvolutionEditor6().ShowDialog())); + switch (Config.Generation) + { + case 6: + Invoke((Action)(() => new EvolutionEditor6().ShowDialog())); + break; + case 7: + Invoke((Action)(() => new EvolutionEditor7().ShowDialog())); + break; + } fileSet(files); }).Start(); } @@ -601,6 +610,15 @@ private void B_MegaEvo_Click(object sender, EventArgs e) { string[] files = { "megaevo" }; fileGet(files); + switch (Config.Generation) + { + case 6: + Invoke((Action)(() => new MegaEvoEditor6().ShowDialog())); + break; + case 7: + Invoke((Action)(() => new MegaEvoEditor7().ShowDialog())); + break; + } Invoke((Action)(() => new MegaEvoEditor6().ShowDialog())); fileSet(files); }).Start(); diff --git a/pk3DS/Structures/Gen6/Evolutions.cs b/pk3DS/Structures/Gen6/Evolutions.cs index 77543cc..4cac10f 100644 --- a/pk3DS/Structures/Gen6/Evolutions.cs +++ b/pk3DS/Structures/Gen6/Evolutions.cs @@ -20,27 +20,28 @@ public abstract class EvolutionSet } public class EvolutionSet6 : EvolutionSet { - private const int SIZE = 6; + private const int ENTRY_SIZE = 6; + private const int ENTRY_COUNT = 8; + public const int SIZE = ENTRY_COUNT * ENTRY_SIZE; public EvolutionSet6(byte[] data) { - if (data.Length < SIZE || data.Length % SIZE != 0) return; - int[] argEvos = { 6, 8, 16, 17, 18, 19, 20, 21, 22, 29, 30, 31, 32, 33, 34 }; - PossibleEvolutions = new EvolutionMethod[data.Length / SIZE]; - for (int i = 0; i < data.Length; i += SIZE) + if (data.Length != SIZE) return; + //int[] argEvos = { 6, 8, 16, 17, 18, 19, 20, 21, 22, 29, 30, 31, 32, 33, 34 }; + PossibleEvolutions = new EvolutionMethod[ENTRY_COUNT]; + for (int i = 0; i < data.Length; i += ENTRY_SIZE) { - PossibleEvolutions[i / SIZE] = new EvolutionMethod + PossibleEvolutions[i / ENTRY_SIZE] = new EvolutionMethod { Method = BitConverter.ToUInt16(data, i + 0), Argument = BitConverter.ToUInt16(data, i + 2), Species = BitConverter.ToUInt16(data, i + 4), - // Copy - Level = BitConverter.ToUInt16(data, i + 2), + //Level = BitConverter.ToUInt16(data, i + 2), }; // Argument is used by both Level argument and Item/Move/etc. Clear if appropriate. - if (argEvos.Contains(PossibleEvolutions[i / SIZE].Method)) - PossibleEvolutions[i / SIZE].Level = 0; + //if (argEvos.Contains(PossibleEvolutions[i / SIZE].Method)) + // PossibleEvolutions[i / SIZE].Level = 0; } } public override byte[] Write() @@ -60,14 +61,16 @@ public override byte[] Write() } public class EvolutionSet7 : EvolutionSet { - private const int SIZE = 8; + private const int ENTRY_SIZE = 8; + private const int ENTRY_COUNT = 8; + public const int SIZE = ENTRY_COUNT * ENTRY_SIZE; public EvolutionSet7(byte[] data) { - if (data.Length < SIZE || data.Length % SIZE != 0) return; - PossibleEvolutions = new EvolutionMethod[data.Length / SIZE]; - for (int i = 0; i < data.Length; i += SIZE) + if (data.Length != SIZE) return; + PossibleEvolutions = new EvolutionMethod[ENTRY_COUNT]; + for (int i = 0; i < data.Length; i += ENTRY_SIZE) { - PossibleEvolutions[i / SIZE] = new EvolutionMethod + PossibleEvolutions[i / ENTRY_SIZE] = new EvolutionMethod { Method = BitConverter.ToUInt16(data, i + 0), Argument = BitConverter.ToUInt16(data, i + 2), diff --git a/pk3DS/Subforms/Gen6/EvolutionEditor6.cs b/pk3DS/Subforms/Gen6/EvolutionEditor6.cs index cf8944f..5a25fa2 100644 --- a/pk3DS/Subforms/Gen6/EvolutionEditor6.cs +++ b/pk3DS/Subforms/Gen6/EvolutionEditor6.cs @@ -86,12 +86,12 @@ public EvolutionEditor6() private readonly string[] itemlist = Main.getText(TextName.ItemNames); private readonly string[] typelist = Main.getText(TextName.Types); private bool dumping; - private EvolutionSet evo = new EvolutionSet6(new byte[0x30]); + private EvolutionSet evo = new EvolutionSet6(new byte[EvolutionSet6.SIZE]); private void getList() { entry = Array.IndexOf(specieslist, CB_Species.Text); byte[] input = File.ReadAllBytes(files[entry]); - if (input.Length != 0x30) return; // error + if (input.Length != EvolutionSet6.SIZE) return; // error evo = new EvolutionSet6(input); for (int i = 0; i < evo.PossibleEvolutions.Length; i++) diff --git a/pk3DS/Subforms/Gen7/EvolutionEditor7.Designer.cs b/pk3DS/Subforms/Gen7/EvolutionEditor7.Designer.cs index 9339efd..c8c8286 100644 --- a/pk3DS/Subforms/Gen7/EvolutionEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/EvolutionEditor7.Designer.cs @@ -35,57 +35,89 @@ private void InitializeComponent() this.L_M1 = new System.Windows.Forms.Label(); this.CB_I1 = new System.Windows.Forms.ComboBox(); this.CB_P1 = new System.Windows.Forms.ComboBox(); - this.CB_P2 = new System.Windows.Forms.ComboBox(); - this.CB_I2 = new System.Windows.Forms.ComboBox(); - this.L_M2 = new System.Windows.Forms.Label(); - this.CB_M2 = new System.Windows.Forms.ComboBox(); - this.CB_P3 = new System.Windows.Forms.ComboBox(); - this.CB_I3 = new System.Windows.Forms.ComboBox(); - this.L_M3 = new System.Windows.Forms.Label(); - this.CB_M3 = new System.Windows.Forms.ComboBox(); - this.CB_P4 = new System.Windows.Forms.ComboBox(); - this.CB_I4 = new System.Windows.Forms.ComboBox(); - this.L_M4 = new System.Windows.Forms.Label(); - this.CB_M4 = new System.Windows.Forms.ComboBox(); - this.CB_P5 = new System.Windows.Forms.ComboBox(); - this.CB_I5 = new System.Windows.Forms.ComboBox(); - this.L_M5 = new System.Windows.Forms.Label(); - this.CB_M5 = new System.Windows.Forms.ComboBox(); - this.CB_P8 = new System.Windows.Forms.ComboBox(); - this.CB_I8 = new System.Windows.Forms.ComboBox(); - this.L_M8 = new System.Windows.Forms.Label(); - this.CB_M8 = new System.Windows.Forms.ComboBox(); - this.CB_P7 = new System.Windows.Forms.ComboBox(); - this.CB_I7 = new System.Windows.Forms.ComboBox(); - this.L_M7 = new System.Windows.Forms.Label(); - this.CB_M7 = new System.Windows.Forms.ComboBox(); - this.CB_P6 = new System.Windows.Forms.ComboBox(); - this.CB_I6 = new System.Windows.Forms.ComboBox(); - this.L_M6 = new System.Windows.Forms.Label(); - this.CB_M6 = new System.Windows.Forms.ComboBox(); this.PB_1 = new System.Windows.Forms.PictureBox(); - this.PB_2 = new System.Windows.Forms.PictureBox(); - this.PB_4 = new System.Windows.Forms.PictureBox(); - this.PB_3 = new System.Windows.Forms.PictureBox(); - this.PB_6 = new System.Windows.Forms.PictureBox(); - this.PB_5 = new System.Windows.Forms.PictureBox(); - this.PB_8 = new System.Windows.Forms.PictureBox(); - this.PB_7 = new System.Windows.Forms.PictureBox(); this.B_RandAll = new System.Windows.Forms.Button(); this.GB_Randomizer = new System.Windows.Forms.GroupBox(); this.L_Protip = new System.Windows.Forms.Label(); this.CHK_BST = new System.Windows.Forms.CheckBox(); this.CHK_Type = new System.Windows.Forms.CheckBox(); this.CHK_Exp = new System.Windows.Forms.CheckBox(); + this.NUD_F1 = new System.Windows.Forms.NumericUpDown(); + this.NUD_L1 = new System.Windows.Forms.NumericUpDown(); + this.NUD_L2 = new System.Windows.Forms.NumericUpDown(); + this.NUD_F2 = new System.Windows.Forms.NumericUpDown(); + this.PB_2 = new System.Windows.Forms.PictureBox(); + this.CB_P2 = new System.Windows.Forms.ComboBox(); + this.CB_I2 = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.CB_M2 = new System.Windows.Forms.ComboBox(); + this.NUD_L3 = new System.Windows.Forms.NumericUpDown(); + this.NUD_F3 = new System.Windows.Forms.NumericUpDown(); + this.PB_3 = new System.Windows.Forms.PictureBox(); + this.CB_P3 = new System.Windows.Forms.ComboBox(); + this.CB_I3 = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); + this.CB_M3 = new System.Windows.Forms.ComboBox(); + this.NUD_L4 = new System.Windows.Forms.NumericUpDown(); + this.NUD_F4 = new System.Windows.Forms.NumericUpDown(); + this.PB_4 = new System.Windows.Forms.PictureBox(); + this.CB_P4 = new System.Windows.Forms.ComboBox(); + this.CB_I4 = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); + this.CB_M4 = new System.Windows.Forms.ComboBox(); + this.NUD_L5 = new System.Windows.Forms.NumericUpDown(); + this.NUD_F5 = new System.Windows.Forms.NumericUpDown(); + this.PB_5 = new System.Windows.Forms.PictureBox(); + this.CB_P5 = new System.Windows.Forms.ComboBox(); + this.CB_I5 = new System.Windows.Forms.ComboBox(); + this.label4 = new System.Windows.Forms.Label(); + this.CB_M5 = new System.Windows.Forms.ComboBox(); + this.NUD_L6 = new System.Windows.Forms.NumericUpDown(); + this.NUD_F6 = new System.Windows.Forms.NumericUpDown(); + this.PB_6 = new System.Windows.Forms.PictureBox(); + this.CB_P6 = new System.Windows.Forms.ComboBox(); + this.CB_I6 = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.CB_M6 = new System.Windows.Forms.ComboBox(); + this.NUD_L7 = new System.Windows.Forms.NumericUpDown(); + this.NUD_F7 = new System.Windows.Forms.NumericUpDown(); + this.PB_7 = new System.Windows.Forms.PictureBox(); + this.CB_P7 = new System.Windows.Forms.ComboBox(); + this.CB_I7 = new System.Windows.Forms.ComboBox(); + this.label6 = new System.Windows.Forms.Label(); + this.CB_M7 = new System.Windows.Forms.ComboBox(); + this.NUD_L8 = new System.Windows.Forms.NumericUpDown(); + this.NUD_F8 = new System.Windows.Forms.NumericUpDown(); + this.PB_8 = new System.Windows.Forms.PictureBox(); + this.CB_P8 = new System.Windows.Forms.ComboBox(); + this.CB_I8 = new System.Windows.Forms.ComboBox(); + this.label7 = new System.Windows.Forms.Label(); + this.CB_M8 = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.PB_1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_7)).BeginInit(); this.GB_Randomizer.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_8)).BeginInit(); this.SuspendLayout(); // // CB_Species @@ -123,7 +155,7 @@ private void InitializeComponent() this.CB_M1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_M1.DropDownWidth = 200; this.CB_M1.FormattingEnabled = true; - this.CB_M1.Location = new System.Drawing.Point(79, 46); + this.CB_M1.Location = new System.Drawing.Point(125, 46); this.CB_M1.MaxDropDownItems = 10; this.CB_M1.Name = "CB_M1"; this.CB_M1.Size = new System.Drawing.Size(150, 21); @@ -132,19 +164,19 @@ private void InitializeComponent() // // L_M1 // - this.L_M1.AutoSize = true; - this.L_M1.Location = new System.Drawing.Point(18, 49); + this.L_M1.Location = new System.Drawing.Point(13, 45); this.L_M1.Name = "L_M1"; - this.L_M1.Size = new System.Drawing.Size(55, 13); + this.L_M1.Size = new System.Drawing.Size(60, 20); this.L_M1.TabIndex = 7; this.L_M1.Text = "Method 1:"; + this.L_M1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // CB_I1 // this.CB_I1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_I1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_I1.FormattingEnabled = true; - this.CB_I1.Location = new System.Drawing.Point(277, 46); + this.CB_I1.Location = new System.Drawing.Point(281, 46); this.CB_I1.Name = "CB_I1"; this.CB_I1.Size = new System.Drawing.Size(101, 21); this.CB_I1.TabIndex = 9; @@ -155,369 +187,19 @@ private void InitializeComponent() this.CB_P1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_P1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_P1.FormattingEnabled = true; - this.CB_P1.Location = new System.Drawing.Point(79, 69); + this.CB_P1.Location = new System.Drawing.Point(388, 46); this.CB_P1.Name = "CB_P1"; this.CB_P1.Size = new System.Drawing.Size(121, 21); this.CB_P1.TabIndex = 10; // - // CB_P2 - // - this.CB_P2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_P2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_P2.FormattingEnabled = true; - this.CB_P2.Location = new System.Drawing.Point(79, 123); - this.CB_P2.Name = "CB_P2"; - this.CB_P2.Size = new System.Drawing.Size(121, 21); - this.CB_P2.TabIndex = 16; - // - // CB_I2 - // - this.CB_I2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_I2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_I2.FormattingEnabled = true; - this.CB_I2.Location = new System.Drawing.Point(277, 100); - this.CB_I2.Name = "CB_I2"; - this.CB_I2.Size = new System.Drawing.Size(101, 21); - this.CB_I2.TabIndex = 15; - this.CB_I2.SelectedIndexChanged += new System.EventHandler(this.changeInto); - // - // L_M2 - // - this.L_M2.AutoSize = true; - this.L_M2.Location = new System.Drawing.Point(18, 103); - this.L_M2.Name = "L_M2"; - this.L_M2.Size = new System.Drawing.Size(55, 13); - this.L_M2.TabIndex = 13; - this.L_M2.Text = "Method 2:"; - // - // CB_M2 - // - this.CB_M2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_M2.DropDownWidth = 200; - this.CB_M2.FormattingEnabled = true; - this.CB_M2.Location = new System.Drawing.Point(79, 100); - this.CB_M2.MaxDropDownItems = 10; - this.CB_M2.Name = "CB_M2"; - this.CB_M2.Size = new System.Drawing.Size(150, 21); - this.CB_M2.TabIndex = 12; - this.CB_M2.SelectedIndexChanged += new System.EventHandler(this.changeMethod); - // - // CB_P3 - // - this.CB_P3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_P3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_P3.FormattingEnabled = true; - this.CB_P3.Location = new System.Drawing.Point(79, 177); - this.CB_P3.Name = "CB_P3"; - this.CB_P3.Size = new System.Drawing.Size(121, 21); - this.CB_P3.TabIndex = 22; - // - // CB_I3 - // - this.CB_I3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_I3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_I3.FormattingEnabled = true; - this.CB_I3.Location = new System.Drawing.Point(277, 154); - this.CB_I3.Name = "CB_I3"; - this.CB_I3.Size = new System.Drawing.Size(101, 21); - this.CB_I3.TabIndex = 21; - this.CB_I3.SelectedIndexChanged += new System.EventHandler(this.changeInto); - // - // L_M3 - // - this.L_M3.AutoSize = true; - this.L_M3.Location = new System.Drawing.Point(18, 157); - this.L_M3.Name = "L_M3"; - this.L_M3.Size = new System.Drawing.Size(55, 13); - this.L_M3.TabIndex = 19; - this.L_M3.Text = "Method 3:"; - // - // CB_M3 - // - this.CB_M3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_M3.DropDownWidth = 200; - this.CB_M3.FormattingEnabled = true; - this.CB_M3.Location = new System.Drawing.Point(79, 154); - this.CB_M3.MaxDropDownItems = 10; - this.CB_M3.Name = "CB_M3"; - this.CB_M3.Size = new System.Drawing.Size(150, 21); - this.CB_M3.TabIndex = 18; - this.CB_M3.SelectedIndexChanged += new System.EventHandler(this.changeMethod); - // - // CB_P4 - // - this.CB_P4.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_P4.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_P4.FormattingEnabled = true; - this.CB_P4.Location = new System.Drawing.Point(79, 231); - this.CB_P4.Name = "CB_P4"; - this.CB_P4.Size = new System.Drawing.Size(121, 21); - this.CB_P4.TabIndex = 28; - // - // CB_I4 - // - this.CB_I4.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_I4.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_I4.FormattingEnabled = true; - this.CB_I4.Location = new System.Drawing.Point(277, 208); - this.CB_I4.Name = "CB_I4"; - this.CB_I4.Size = new System.Drawing.Size(101, 21); - this.CB_I4.TabIndex = 27; - this.CB_I4.SelectedIndexChanged += new System.EventHandler(this.changeInto); - // - // L_M4 - // - this.L_M4.AutoSize = true; - this.L_M4.Location = new System.Drawing.Point(18, 211); - this.L_M4.Name = "L_M4"; - this.L_M4.Size = new System.Drawing.Size(55, 13); - this.L_M4.TabIndex = 25; - this.L_M4.Text = "Method 4:"; - // - // CB_M4 - // - this.CB_M4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_M4.DropDownWidth = 200; - this.CB_M4.FormattingEnabled = true; - this.CB_M4.Location = new System.Drawing.Point(79, 208); - this.CB_M4.MaxDropDownItems = 10; - this.CB_M4.Name = "CB_M4"; - this.CB_M4.Size = new System.Drawing.Size(150, 21); - this.CB_M4.TabIndex = 24; - this.CB_M4.SelectedIndexChanged += new System.EventHandler(this.changeMethod); - // - // CB_P5 - // - this.CB_P5.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_P5.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_P5.FormattingEnabled = true; - this.CB_P5.Location = new System.Drawing.Point(79, 285); - this.CB_P5.Name = "CB_P5"; - this.CB_P5.Size = new System.Drawing.Size(121, 21); - this.CB_P5.TabIndex = 34; - // - // CB_I5 - // - this.CB_I5.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_I5.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_I5.FormattingEnabled = true; - this.CB_I5.Location = new System.Drawing.Point(277, 262); - this.CB_I5.Name = "CB_I5"; - this.CB_I5.Size = new System.Drawing.Size(101, 21); - this.CB_I5.TabIndex = 33; - this.CB_I5.SelectedIndexChanged += new System.EventHandler(this.changeInto); - // - // L_M5 - // - this.L_M5.AutoSize = true; - this.L_M5.Location = new System.Drawing.Point(18, 265); - this.L_M5.Name = "L_M5"; - this.L_M5.Size = new System.Drawing.Size(55, 13); - this.L_M5.TabIndex = 31; - this.L_M5.Text = "Method 5:"; - // - // CB_M5 - // - this.CB_M5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_M5.DropDownWidth = 200; - this.CB_M5.FormattingEnabled = true; - this.CB_M5.Location = new System.Drawing.Point(79, 262); - this.CB_M5.MaxDropDownItems = 10; - this.CB_M5.Name = "CB_M5"; - this.CB_M5.Size = new System.Drawing.Size(150, 21); - this.CB_M5.TabIndex = 30; - this.CB_M5.SelectedIndexChanged += new System.EventHandler(this.changeMethod); - // - // CB_P8 - // - this.CB_P8.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_P8.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_P8.FormattingEnabled = true; - this.CB_P8.Location = new System.Drawing.Point(79, 447); - this.CB_P8.Name = "CB_P8"; - this.CB_P8.Size = new System.Drawing.Size(121, 21); - this.CB_P8.TabIndex = 52; - // - // CB_I8 - // - this.CB_I8.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_I8.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_I8.FormattingEnabled = true; - this.CB_I8.Location = new System.Drawing.Point(277, 424); - this.CB_I8.Name = "CB_I8"; - this.CB_I8.Size = new System.Drawing.Size(101, 21); - this.CB_I8.TabIndex = 51; - this.CB_I8.SelectedIndexChanged += new System.EventHandler(this.changeInto); - // - // L_M8 - // - this.L_M8.AutoSize = true; - this.L_M8.Location = new System.Drawing.Point(18, 427); - this.L_M8.Name = "L_M8"; - this.L_M8.Size = new System.Drawing.Size(55, 13); - this.L_M8.TabIndex = 49; - this.L_M8.Text = "Method 8:"; - // - // CB_M8 - // - this.CB_M8.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_M8.DropDownWidth = 200; - this.CB_M8.FormattingEnabled = true; - this.CB_M8.Location = new System.Drawing.Point(79, 424); - this.CB_M8.MaxDropDownItems = 10; - this.CB_M8.Name = "CB_M8"; - this.CB_M8.Size = new System.Drawing.Size(150, 21); - this.CB_M8.TabIndex = 48; - this.CB_M8.SelectedIndexChanged += new System.EventHandler(this.changeMethod); - // - // CB_P7 - // - this.CB_P7.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_P7.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_P7.FormattingEnabled = true; - this.CB_P7.Location = new System.Drawing.Point(79, 393); - this.CB_P7.Name = "CB_P7"; - this.CB_P7.Size = new System.Drawing.Size(121, 21); - this.CB_P7.TabIndex = 46; - // - // CB_I7 - // - this.CB_I7.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_I7.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_I7.FormattingEnabled = true; - this.CB_I7.Location = new System.Drawing.Point(277, 370); - this.CB_I7.Name = "CB_I7"; - this.CB_I7.Size = new System.Drawing.Size(101, 21); - this.CB_I7.TabIndex = 45; - this.CB_I7.SelectedIndexChanged += new System.EventHandler(this.changeInto); - // - // L_M7 - // - this.L_M7.AutoSize = true; - this.L_M7.Location = new System.Drawing.Point(18, 373); - this.L_M7.Name = "L_M7"; - this.L_M7.Size = new System.Drawing.Size(55, 13); - this.L_M7.TabIndex = 43; - this.L_M7.Text = "Method 7:"; - // - // CB_M7 - // - this.CB_M7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_M7.DropDownWidth = 200; - this.CB_M7.FormattingEnabled = true; - this.CB_M7.Location = new System.Drawing.Point(79, 370); - this.CB_M7.MaxDropDownItems = 10; - this.CB_M7.Name = "CB_M7"; - this.CB_M7.Size = new System.Drawing.Size(150, 21); - this.CB_M7.TabIndex = 42; - this.CB_M7.SelectedIndexChanged += new System.EventHandler(this.changeMethod); - // - // CB_P6 - // - this.CB_P6.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_P6.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_P6.FormattingEnabled = true; - this.CB_P6.Location = new System.Drawing.Point(79, 339); - this.CB_P6.Name = "CB_P6"; - this.CB_P6.Size = new System.Drawing.Size(121, 21); - this.CB_P6.TabIndex = 40; - // - // CB_I6 - // - this.CB_I6.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_I6.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_I6.FormattingEnabled = true; - this.CB_I6.Location = new System.Drawing.Point(277, 316); - this.CB_I6.Name = "CB_I6"; - this.CB_I6.Size = new System.Drawing.Size(101, 21); - this.CB_I6.TabIndex = 39; - this.CB_I6.SelectedIndexChanged += new System.EventHandler(this.changeInto); - // - // L_M6 - // - this.L_M6.AutoSize = true; - this.L_M6.Location = new System.Drawing.Point(18, 319); - this.L_M6.Name = "L_M6"; - this.L_M6.Size = new System.Drawing.Size(55, 13); - this.L_M6.TabIndex = 37; - this.L_M6.Text = "Method 6:"; - // - // CB_M6 - // - this.CB_M6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_M6.DropDownWidth = 200; - this.CB_M6.FormattingEnabled = true; - this.CB_M6.Location = new System.Drawing.Point(79, 316); - this.CB_M6.MaxDropDownItems = 10; - this.CB_M6.Name = "CB_M6"; - this.CB_M6.Size = new System.Drawing.Size(150, 21); - this.CB_M6.TabIndex = 36; - this.CB_M6.SelectedIndexChanged += new System.EventHandler(this.changeMethod); - // // PB_1 // - this.PB_1.Location = new System.Drawing.Point(235, 46); + this.PB_1.Location = new System.Drawing.Point(79, 39); this.PB_1.Name = "PB_1"; this.PB_1.Size = new System.Drawing.Size(40, 30); this.PB_1.TabIndex = 54; this.PB_1.TabStop = false; // - // PB_2 - // - this.PB_2.Location = new System.Drawing.Point(235, 100); - this.PB_2.Name = "PB_2"; - this.PB_2.Size = new System.Drawing.Size(40, 30); - this.PB_2.TabIndex = 55; - this.PB_2.TabStop = false; - // - // PB_4 - // - this.PB_4.Location = new System.Drawing.Point(235, 208); - this.PB_4.Name = "PB_4"; - this.PB_4.Size = new System.Drawing.Size(40, 30); - this.PB_4.TabIndex = 57; - this.PB_4.TabStop = false; - // - // PB_3 - // - this.PB_3.Location = new System.Drawing.Point(235, 154); - this.PB_3.Name = "PB_3"; - this.PB_3.Size = new System.Drawing.Size(40, 30); - this.PB_3.TabIndex = 56; - this.PB_3.TabStop = false; - // - // PB_6 - // - this.PB_6.Location = new System.Drawing.Point(235, 316); - this.PB_6.Name = "PB_6"; - this.PB_6.Size = new System.Drawing.Size(40, 30); - this.PB_6.TabIndex = 59; - this.PB_6.TabStop = false; - // - // PB_5 - // - this.PB_5.Location = new System.Drawing.Point(235, 262); - this.PB_5.Name = "PB_5"; - this.PB_5.Size = new System.Drawing.Size(40, 30); - this.PB_5.TabIndex = 58; - this.PB_5.TabStop = false; - // - // PB_8 - // - this.PB_8.Location = new System.Drawing.Point(235, 424); - this.PB_8.Name = "PB_8"; - this.PB_8.Size = new System.Drawing.Size(40, 30); - this.PB_8.TabIndex = 61; - this.PB_8.TabStop = false; - // - // PB_7 - // - this.PB_7.Location = new System.Drawing.Point(235, 370); - this.PB_7.Name = "PB_7"; - this.PB_7.Size = new System.Drawing.Size(40, 30); - this.PB_7.TabIndex = 60; - this.PB_7.TabStop = false; - // // B_RandAll // this.B_RandAll.Location = new System.Drawing.Point(251, 47); @@ -535,7 +217,7 @@ private void InitializeComponent() this.GB_Randomizer.Controls.Add(this.CHK_Type); this.GB_Randomizer.Controls.Add(this.CHK_Exp); this.GB_Randomizer.Controls.Add(this.B_RandAll); - this.GB_Randomizer.Location = new System.Drawing.Point(21, 474); + this.GB_Randomizer.Location = new System.Drawing.Point(16, 292); this.GB_Randomizer.Name = "GB_Randomizer"; this.GB_Randomizer.Size = new System.Drawing.Size(357, 76); this.GB_Randomizer.TabIndex = 63; @@ -588,48 +270,694 @@ private void InitializeComponent() this.CHK_Exp.Text = "Share the same Exp Growth as Evolution"; this.CHK_Exp.UseVisualStyleBackColor = true; // - // Evolution + // NUD_F1 + // + this.NUD_F1.Location = new System.Drawing.Point(515, 47); + this.NUD_F1.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_F1.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_F1.Name = "NUD_F1"; + this.NUD_F1.Size = new System.Drawing.Size(45, 20); + this.NUD_F1.TabIndex = 64; + this.NUD_F1.ValueChanged += new System.EventHandler(this.changeInto); + // + // NUD_L1 + // + this.NUD_L1.Location = new System.Drawing.Point(566, 47); + this.NUD_L1.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_L1.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_L1.Name = "NUD_L1"; + this.NUD_L1.Size = new System.Drawing.Size(45, 20); + this.NUD_L1.TabIndex = 65; + // + // NUD_L2 + // + this.NUD_L2.Location = new System.Drawing.Point(566, 78); + this.NUD_L2.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_L2.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_L2.Name = "NUD_L2"; + this.NUD_L2.Size = new System.Drawing.Size(45, 20); + this.NUD_L2.TabIndex = 72; + // + // NUD_F2 + // + this.NUD_F2.Location = new System.Drawing.Point(515, 78); + this.NUD_F2.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_F2.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_F2.Name = "NUD_F2"; + this.NUD_F2.Size = new System.Drawing.Size(45, 20); + this.NUD_F2.TabIndex = 71; + this.NUD_F2.ValueChanged += new System.EventHandler(this.changeInto); + // + // PB_2 + // + this.PB_2.Location = new System.Drawing.Point(79, 70); + this.PB_2.Name = "PB_2"; + this.PB_2.Size = new System.Drawing.Size(40, 30); + this.PB_2.TabIndex = 70; + this.PB_2.TabStop = false; + // + // CB_P2 + // + this.CB_P2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_P2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_P2.FormattingEnabled = true; + this.CB_P2.Location = new System.Drawing.Point(388, 77); + this.CB_P2.Name = "CB_P2"; + this.CB_P2.Size = new System.Drawing.Size(121, 21); + this.CB_P2.TabIndex = 69; + // + // CB_I2 + // + this.CB_I2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_I2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_I2.FormattingEnabled = true; + this.CB_I2.Location = new System.Drawing.Point(281, 77); + this.CB_I2.Name = "CB_I2"; + this.CB_I2.Size = new System.Drawing.Size(101, 21); + this.CB_I2.TabIndex = 68; + this.CB_I2.SelectedIndexChanged += new System.EventHandler(this.changeInto); + // + // label1 + // + this.label1.Location = new System.Drawing.Point(13, 76); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(60, 20); + this.label1.TabIndex = 67; + this.label1.Text = "Method 2:"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_M2 + // + this.CB_M2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_M2.DropDownWidth = 200; + this.CB_M2.FormattingEnabled = true; + this.CB_M2.Location = new System.Drawing.Point(125, 77); + this.CB_M2.MaxDropDownItems = 10; + this.CB_M2.Name = "CB_M2"; + this.CB_M2.Size = new System.Drawing.Size(150, 21); + this.CB_M2.TabIndex = 66; + this.CB_M2.SelectedIndexChanged += new System.EventHandler(this.changeMethod); + // + // NUD_L3 + // + this.NUD_L3.Location = new System.Drawing.Point(566, 109); + this.NUD_L3.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_L3.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_L3.Name = "NUD_L3"; + this.NUD_L3.Size = new System.Drawing.Size(45, 20); + this.NUD_L3.TabIndex = 79; + // + // NUD_F3 + // + this.NUD_F3.Location = new System.Drawing.Point(515, 109); + this.NUD_F3.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_F3.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_F3.Name = "NUD_F3"; + this.NUD_F3.Size = new System.Drawing.Size(45, 20); + this.NUD_F3.TabIndex = 78; + this.NUD_F3.ValueChanged += new System.EventHandler(this.changeInto); + // + // PB_3 + // + this.PB_3.Location = new System.Drawing.Point(79, 101); + this.PB_3.Name = "PB_3"; + this.PB_3.Size = new System.Drawing.Size(40, 30); + this.PB_3.TabIndex = 77; + this.PB_3.TabStop = false; + // + // CB_P3 + // + this.CB_P3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_P3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_P3.FormattingEnabled = true; + this.CB_P3.Location = new System.Drawing.Point(388, 108); + this.CB_P3.Name = "CB_P3"; + this.CB_P3.Size = new System.Drawing.Size(121, 21); + this.CB_P3.TabIndex = 76; + // + // CB_I3 + // + this.CB_I3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_I3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_I3.FormattingEnabled = true; + this.CB_I3.Location = new System.Drawing.Point(281, 108); + this.CB_I3.Name = "CB_I3"; + this.CB_I3.Size = new System.Drawing.Size(101, 21); + this.CB_I3.TabIndex = 75; + this.CB_I3.SelectedIndexChanged += new System.EventHandler(this.changeInto); + // + // label2 + // + this.label2.Location = new System.Drawing.Point(13, 107); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(60, 20); + this.label2.TabIndex = 74; + this.label2.Text = "Method 3:"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_M3 + // + this.CB_M3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_M3.DropDownWidth = 200; + this.CB_M3.FormattingEnabled = true; + this.CB_M3.Location = new System.Drawing.Point(125, 108); + this.CB_M3.MaxDropDownItems = 10; + this.CB_M3.Name = "CB_M3"; + this.CB_M3.Size = new System.Drawing.Size(150, 21); + this.CB_M3.TabIndex = 73; + this.CB_M3.SelectedIndexChanged += new System.EventHandler(this.changeMethod); + // + // NUD_L4 + // + this.NUD_L4.Location = new System.Drawing.Point(566, 140); + this.NUD_L4.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_L4.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_L4.Name = "NUD_L4"; + this.NUD_L4.Size = new System.Drawing.Size(45, 20); + this.NUD_L4.TabIndex = 86; + // + // NUD_F4 + // + this.NUD_F4.Location = new System.Drawing.Point(515, 140); + this.NUD_F4.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_F4.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_F4.Name = "NUD_F4"; + this.NUD_F4.Size = new System.Drawing.Size(45, 20); + this.NUD_F4.TabIndex = 85; + this.NUD_F4.ValueChanged += new System.EventHandler(this.changeInto); + // + // PB_4 + // + this.PB_4.Location = new System.Drawing.Point(79, 132); + this.PB_4.Name = "PB_4"; + this.PB_4.Size = new System.Drawing.Size(40, 30); + this.PB_4.TabIndex = 84; + this.PB_4.TabStop = false; + // + // CB_P4 + // + this.CB_P4.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_P4.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_P4.FormattingEnabled = true; + this.CB_P4.Location = new System.Drawing.Point(388, 139); + this.CB_P4.Name = "CB_P4"; + this.CB_P4.Size = new System.Drawing.Size(121, 21); + this.CB_P4.TabIndex = 83; + // + // CB_I4 + // + this.CB_I4.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_I4.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_I4.FormattingEnabled = true; + this.CB_I4.Location = new System.Drawing.Point(281, 139); + this.CB_I4.Name = "CB_I4"; + this.CB_I4.Size = new System.Drawing.Size(101, 21); + this.CB_I4.TabIndex = 82; + this.CB_I4.SelectedIndexChanged += new System.EventHandler(this.changeInto); + // + // label3 + // + this.label3.Location = new System.Drawing.Point(13, 138); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(60, 20); + this.label3.TabIndex = 81; + this.label3.Text = "Method 4:"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_M4 + // + this.CB_M4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_M4.DropDownWidth = 200; + this.CB_M4.FormattingEnabled = true; + this.CB_M4.Location = new System.Drawing.Point(125, 139); + this.CB_M4.MaxDropDownItems = 10; + this.CB_M4.Name = "CB_M4"; + this.CB_M4.Size = new System.Drawing.Size(150, 21); + this.CB_M4.TabIndex = 80; + this.CB_M4.SelectedIndexChanged += new System.EventHandler(this.changeMethod); + // + // NUD_L5 + // + this.NUD_L5.Location = new System.Drawing.Point(566, 171); + this.NUD_L5.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_L5.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_L5.Name = "NUD_L5"; + this.NUD_L5.Size = new System.Drawing.Size(45, 20); + this.NUD_L5.TabIndex = 93; + // + // NUD_F5 + // + this.NUD_F5.Location = new System.Drawing.Point(515, 171); + this.NUD_F5.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_F5.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_F5.Name = "NUD_F5"; + this.NUD_F5.Size = new System.Drawing.Size(45, 20); + this.NUD_F5.TabIndex = 92; + this.NUD_F5.ValueChanged += new System.EventHandler(this.changeInto); + // + // PB_5 + // + this.PB_5.Location = new System.Drawing.Point(79, 163); + this.PB_5.Name = "PB_5"; + this.PB_5.Size = new System.Drawing.Size(40, 30); + this.PB_5.TabIndex = 91; + this.PB_5.TabStop = false; + // + // CB_P5 + // + this.CB_P5.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_P5.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_P5.FormattingEnabled = true; + this.CB_P5.Location = new System.Drawing.Point(388, 170); + this.CB_P5.Name = "CB_P5"; + this.CB_P5.Size = new System.Drawing.Size(121, 21); + this.CB_P5.TabIndex = 90; + // + // CB_I5 + // + this.CB_I5.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_I5.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_I5.FormattingEnabled = true; + this.CB_I5.Location = new System.Drawing.Point(281, 170); + this.CB_I5.Name = "CB_I5"; + this.CB_I5.Size = new System.Drawing.Size(101, 21); + this.CB_I5.TabIndex = 89; + this.CB_I5.SelectedIndexChanged += new System.EventHandler(this.changeInto); + // + // label4 + // + this.label4.Location = new System.Drawing.Point(13, 169); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(60, 20); + this.label4.TabIndex = 88; + this.label4.Text = "Method 5:"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_M5 + // + this.CB_M5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_M5.DropDownWidth = 200; + this.CB_M5.FormattingEnabled = true; + this.CB_M5.Location = new System.Drawing.Point(125, 170); + this.CB_M5.MaxDropDownItems = 10; + this.CB_M5.Name = "CB_M5"; + this.CB_M5.Size = new System.Drawing.Size(150, 21); + this.CB_M5.TabIndex = 87; + this.CB_M5.SelectedIndexChanged += new System.EventHandler(this.changeMethod); + // + // NUD_L6 + // + this.NUD_L6.Location = new System.Drawing.Point(566, 202); + this.NUD_L6.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_L6.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_L6.Name = "NUD_L6"; + this.NUD_L6.Size = new System.Drawing.Size(45, 20); + this.NUD_L6.TabIndex = 100; + // + // NUD_F6 + // + this.NUD_F6.Location = new System.Drawing.Point(515, 202); + this.NUD_F6.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_F6.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_F6.Name = "NUD_F6"; + this.NUD_F6.Size = new System.Drawing.Size(45, 20); + this.NUD_F6.TabIndex = 99; + this.NUD_F6.ValueChanged += new System.EventHandler(this.changeInto); + // + // PB_6 + // + this.PB_6.Location = new System.Drawing.Point(79, 194); + this.PB_6.Name = "PB_6"; + this.PB_6.Size = new System.Drawing.Size(40, 30); + this.PB_6.TabIndex = 98; + this.PB_6.TabStop = false; + // + // CB_P6 + // + this.CB_P6.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_P6.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_P6.FormattingEnabled = true; + this.CB_P6.Location = new System.Drawing.Point(388, 201); + this.CB_P6.Name = "CB_P6"; + this.CB_P6.Size = new System.Drawing.Size(121, 21); + this.CB_P6.TabIndex = 97; + // + // CB_I6 + // + this.CB_I6.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_I6.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_I6.FormattingEnabled = true; + this.CB_I6.Location = new System.Drawing.Point(281, 201); + this.CB_I6.Name = "CB_I6"; + this.CB_I6.Size = new System.Drawing.Size(101, 21); + this.CB_I6.TabIndex = 96; + this.CB_I6.SelectedIndexChanged += new System.EventHandler(this.changeInto); + // + // label5 + // + this.label5.Location = new System.Drawing.Point(13, 200); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(60, 20); + this.label5.TabIndex = 95; + this.label5.Text = "Method 6:"; + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_M6 + // + this.CB_M6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_M6.DropDownWidth = 200; + this.CB_M6.FormattingEnabled = true; + this.CB_M6.Location = new System.Drawing.Point(125, 201); + this.CB_M6.MaxDropDownItems = 10; + this.CB_M6.Name = "CB_M6"; + this.CB_M6.Size = new System.Drawing.Size(150, 21); + this.CB_M6.TabIndex = 94; + this.CB_M6.SelectedIndexChanged += new System.EventHandler(this.changeMethod); + // + // NUD_L7 + // + this.NUD_L7.Location = new System.Drawing.Point(566, 233); + this.NUD_L7.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_L7.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_L7.Name = "NUD_L7"; + this.NUD_L7.Size = new System.Drawing.Size(45, 20); + this.NUD_L7.TabIndex = 107; + // + // NUD_F7 + // + this.NUD_F7.Location = new System.Drawing.Point(515, 233); + this.NUD_F7.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_F7.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_F7.Name = "NUD_F7"; + this.NUD_F7.Size = new System.Drawing.Size(45, 20); + this.NUD_F7.TabIndex = 106; + this.NUD_F7.ValueChanged += new System.EventHandler(this.changeInto); + // + // PB_7 + // + this.PB_7.Location = new System.Drawing.Point(79, 225); + this.PB_7.Name = "PB_7"; + this.PB_7.Size = new System.Drawing.Size(40, 30); + this.PB_7.TabIndex = 105; + this.PB_7.TabStop = false; + // + // CB_P7 + // + this.CB_P7.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_P7.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_P7.FormattingEnabled = true; + this.CB_P7.Location = new System.Drawing.Point(388, 232); + this.CB_P7.Name = "CB_P7"; + this.CB_P7.Size = new System.Drawing.Size(121, 21); + this.CB_P7.TabIndex = 104; + // + // CB_I7 + // + this.CB_I7.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_I7.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_I7.FormattingEnabled = true; + this.CB_I7.Location = new System.Drawing.Point(281, 232); + this.CB_I7.Name = "CB_I7"; + this.CB_I7.Size = new System.Drawing.Size(101, 21); + this.CB_I7.TabIndex = 103; + this.CB_I7.SelectedIndexChanged += new System.EventHandler(this.changeInto); + // + // label6 + // + this.label6.Location = new System.Drawing.Point(13, 231); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(60, 20); + this.label6.TabIndex = 102; + this.label6.Text = "Method 7:"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_M7 + // + this.CB_M7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_M7.DropDownWidth = 200; + this.CB_M7.FormattingEnabled = true; + this.CB_M7.Location = new System.Drawing.Point(125, 232); + this.CB_M7.MaxDropDownItems = 10; + this.CB_M7.Name = "CB_M7"; + this.CB_M7.Size = new System.Drawing.Size(150, 21); + this.CB_M7.TabIndex = 101; + this.CB_M7.SelectedIndexChanged += new System.EventHandler(this.changeMethod); + // + // NUD_L8 + // + this.NUD_L8.Location = new System.Drawing.Point(566, 264); + this.NUD_L8.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_L8.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_L8.Name = "NUD_L8"; + this.NUD_L8.Size = new System.Drawing.Size(45, 20); + this.NUD_L8.TabIndex = 114; + // + // NUD_F8 + // + this.NUD_F8.Location = new System.Drawing.Point(515, 264); + this.NUD_F8.Maximum = new decimal(new int[] { + 127, + 0, + 0, + 0}); + this.NUD_F8.Minimum = new decimal(new int[] { + 127, + 0, + 0, + -2147483648}); + this.NUD_F8.Name = "NUD_F8"; + this.NUD_F8.Size = new System.Drawing.Size(45, 20); + this.NUD_F8.TabIndex = 113; + this.NUD_F8.ValueChanged += new System.EventHandler(this.changeInto); + // + // PB_8 + // + this.PB_8.Location = new System.Drawing.Point(79, 256); + this.PB_8.Name = "PB_8"; + this.PB_8.Size = new System.Drawing.Size(40, 30); + this.PB_8.TabIndex = 112; + this.PB_8.TabStop = false; + // + // CB_P8 + // + this.CB_P8.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_P8.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_P8.FormattingEnabled = true; + this.CB_P8.Location = new System.Drawing.Point(388, 263); + this.CB_P8.Name = "CB_P8"; + this.CB_P8.Size = new System.Drawing.Size(121, 21); + this.CB_P8.TabIndex = 111; + // + // CB_I8 + // + this.CB_I8.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_I8.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_I8.FormattingEnabled = true; + this.CB_I8.Location = new System.Drawing.Point(281, 263); + this.CB_I8.Name = "CB_I8"; + this.CB_I8.Size = new System.Drawing.Size(101, 21); + this.CB_I8.TabIndex = 110; + this.CB_I8.SelectedIndexChanged += new System.EventHandler(this.changeInto); + // + // label7 + // + this.label7.Location = new System.Drawing.Point(13, 262); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(60, 20); + this.label7.TabIndex = 109; + this.label7.Text = "Method 8:"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_M8 + // + this.CB_M8.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_M8.DropDownWidth = 200; + this.CB_M8.FormattingEnabled = true; + this.CB_M8.Location = new System.Drawing.Point(125, 263); + this.CB_M8.MaxDropDownItems = 10; + this.CB_M8.Name = "CB_M8"; + this.CB_M8.Size = new System.Drawing.Size(150, 21); + this.CB_M8.TabIndex = 108; + this.CB_M8.SelectedIndexChanged += new System.EventHandler(this.changeMethod); + // + // EvolutionEditor7 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(394, 562); - this.Controls.Add(this.GB_Randomizer); + this.ClientSize = new System.Drawing.Size(624, 376); + this.Controls.Add(this.NUD_L8); + this.Controls.Add(this.NUD_F8); this.Controls.Add(this.PB_8); - this.Controls.Add(this.PB_7); - this.Controls.Add(this.PB_6); - this.Controls.Add(this.PB_5); - this.Controls.Add(this.PB_4); - this.Controls.Add(this.PB_3); - this.Controls.Add(this.PB_2); - this.Controls.Add(this.PB_1); this.Controls.Add(this.CB_P8); this.Controls.Add(this.CB_I8); - this.Controls.Add(this.L_M8); + this.Controls.Add(this.label7); this.Controls.Add(this.CB_M8); + this.Controls.Add(this.NUD_L7); + this.Controls.Add(this.NUD_F7); + this.Controls.Add(this.PB_7); this.Controls.Add(this.CB_P7); this.Controls.Add(this.CB_I7); - this.Controls.Add(this.L_M7); + this.Controls.Add(this.label6); this.Controls.Add(this.CB_M7); + this.Controls.Add(this.NUD_L6); + this.Controls.Add(this.NUD_F6); + this.Controls.Add(this.PB_6); this.Controls.Add(this.CB_P6); this.Controls.Add(this.CB_I6); - this.Controls.Add(this.L_M6); + this.Controls.Add(this.label5); this.Controls.Add(this.CB_M6); + this.Controls.Add(this.NUD_L5); + this.Controls.Add(this.NUD_F5); + this.Controls.Add(this.PB_5); this.Controls.Add(this.CB_P5); this.Controls.Add(this.CB_I5); - this.Controls.Add(this.L_M5); + this.Controls.Add(this.label4); this.Controls.Add(this.CB_M5); + this.Controls.Add(this.NUD_L4); + this.Controls.Add(this.NUD_F4); + this.Controls.Add(this.PB_4); this.Controls.Add(this.CB_P4); this.Controls.Add(this.CB_I4); - this.Controls.Add(this.L_M4); + this.Controls.Add(this.label3); this.Controls.Add(this.CB_M4); + this.Controls.Add(this.NUD_L3); + this.Controls.Add(this.NUD_F3); + this.Controls.Add(this.PB_3); this.Controls.Add(this.CB_P3); this.Controls.Add(this.CB_I3); - this.Controls.Add(this.L_M3); + this.Controls.Add(this.label2); this.Controls.Add(this.CB_M3); + this.Controls.Add(this.NUD_L2); + this.Controls.Add(this.NUD_F2); + this.Controls.Add(this.PB_2); this.Controls.Add(this.CB_P2); this.Controls.Add(this.CB_I2); - this.Controls.Add(this.L_M2); + this.Controls.Add(this.label1); this.Controls.Add(this.CB_M2); + this.Controls.Add(this.NUD_L1); + this.Controls.Add(this.NUD_F1); + this.Controls.Add(this.GB_Randomizer); + this.Controls.Add(this.PB_1); this.Controls.Add(this.CB_P1); this.Controls.Add(this.CB_I1); this.Controls.Add(this.L_M1); @@ -638,22 +966,38 @@ private void InitializeComponent() this.Controls.Add(this.L_Species); this.Controls.Add(this.CB_Species); this.MaximizeBox = false; - this.MaximumSize = new System.Drawing.Size(410, 600); - this.MinimumSize = new System.Drawing.Size(410, 515); - this.Name = "EvolutionEditor6"; + this.MaximumSize = new System.Drawing.Size(640, 415); + this.MinimumSize = new System.Drawing.Size(640, 415); + this.Name = "EvolutionEditor7"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Evolution Editor"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing); ((System.ComponentModel.ISupportInitialize)(this.PB_1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_7)).EndInit(); this.GB_Randomizer.ResumeLayout(false); this.GB_Randomizer.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_L8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_F8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PB_8)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -668,47 +1012,63 @@ private void InitializeComponent() private System.Windows.Forms.Label L_M1; private System.Windows.Forms.ComboBox CB_I1; private System.Windows.Forms.ComboBox CB_P1; - private System.Windows.Forms.ComboBox CB_P2; - private System.Windows.Forms.ComboBox CB_I2; - private System.Windows.Forms.Label L_M2; - private System.Windows.Forms.ComboBox CB_M2; - private System.Windows.Forms.ComboBox CB_P3; - private System.Windows.Forms.ComboBox CB_I3; - private System.Windows.Forms.Label L_M3; - private System.Windows.Forms.ComboBox CB_M3; - private System.Windows.Forms.ComboBox CB_P4; - private System.Windows.Forms.ComboBox CB_I4; - private System.Windows.Forms.Label L_M4; - private System.Windows.Forms.ComboBox CB_M4; - private System.Windows.Forms.ComboBox CB_P5; - private System.Windows.Forms.ComboBox CB_I5; - private System.Windows.Forms.Label L_M5; - private System.Windows.Forms.ComboBox CB_M5; - private System.Windows.Forms.ComboBox CB_P8; - private System.Windows.Forms.ComboBox CB_I8; - private System.Windows.Forms.Label L_M8; - private System.Windows.Forms.ComboBox CB_M8; - private System.Windows.Forms.ComboBox CB_P7; - private System.Windows.Forms.ComboBox CB_I7; - private System.Windows.Forms.Label L_M7; - private System.Windows.Forms.ComboBox CB_M7; - private System.Windows.Forms.ComboBox CB_P6; - private System.Windows.Forms.ComboBox CB_I6; - private System.Windows.Forms.Label L_M6; - private System.Windows.Forms.ComboBox CB_M6; private System.Windows.Forms.PictureBox PB_1; - private System.Windows.Forms.PictureBox PB_2; - private System.Windows.Forms.PictureBox PB_4; - private System.Windows.Forms.PictureBox PB_3; - private System.Windows.Forms.PictureBox PB_6; - private System.Windows.Forms.PictureBox PB_5; - private System.Windows.Forms.PictureBox PB_8; - private System.Windows.Forms.PictureBox PB_7; private System.Windows.Forms.Button B_RandAll; private System.Windows.Forms.GroupBox GB_Randomizer; private System.Windows.Forms.CheckBox CHK_Exp; private System.Windows.Forms.CheckBox CHK_Type; private System.Windows.Forms.CheckBox CHK_BST; private System.Windows.Forms.Label L_Protip; + private System.Windows.Forms.NumericUpDown NUD_F1; + private System.Windows.Forms.NumericUpDown NUD_L1; + private System.Windows.Forms.NumericUpDown NUD_L2; + private System.Windows.Forms.NumericUpDown NUD_F2; + private System.Windows.Forms.PictureBox PB_2; + private System.Windows.Forms.ComboBox CB_P2; + private System.Windows.Forms.ComboBox CB_I2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox CB_M2; + private System.Windows.Forms.NumericUpDown NUD_L3; + private System.Windows.Forms.NumericUpDown NUD_F3; + private System.Windows.Forms.PictureBox PB_3; + private System.Windows.Forms.ComboBox CB_P3; + private System.Windows.Forms.ComboBox CB_I3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.ComboBox CB_M3; + private System.Windows.Forms.NumericUpDown NUD_L4; + private System.Windows.Forms.NumericUpDown NUD_F4; + private System.Windows.Forms.PictureBox PB_4; + private System.Windows.Forms.ComboBox CB_P4; + private System.Windows.Forms.ComboBox CB_I4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.ComboBox CB_M4; + private System.Windows.Forms.NumericUpDown NUD_L5; + private System.Windows.Forms.NumericUpDown NUD_F5; + private System.Windows.Forms.PictureBox PB_5; + private System.Windows.Forms.ComboBox CB_P5; + private System.Windows.Forms.ComboBox CB_I5; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.ComboBox CB_M5; + private System.Windows.Forms.NumericUpDown NUD_L6; + private System.Windows.Forms.NumericUpDown NUD_F6; + private System.Windows.Forms.PictureBox PB_6; + private System.Windows.Forms.ComboBox CB_P6; + private System.Windows.Forms.ComboBox CB_I6; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.ComboBox CB_M6; + private System.Windows.Forms.NumericUpDown NUD_L7; + private System.Windows.Forms.NumericUpDown NUD_F7; + private System.Windows.Forms.PictureBox PB_7; + private System.Windows.Forms.ComboBox CB_P7; + private System.Windows.Forms.ComboBox CB_I7; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.ComboBox CB_M7; + private System.Windows.Forms.NumericUpDown NUD_L8; + private System.Windows.Forms.NumericUpDown NUD_F8; + private System.Windows.Forms.PictureBox PB_8; + private System.Windows.Forms.ComboBox CB_P8; + private System.Windows.Forms.ComboBox CB_I8; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.ComboBox CB_M8; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen7/EvolutionEditor7.cs b/pk3DS/Subforms/Gen7/EvolutionEditor7.cs index 472666f..c94d1dc 100644 --- a/pk3DS/Subforms/Gen7/EvolutionEditor7.cs +++ b/pk3DS/Subforms/Gen7/EvolutionEditor7.cs @@ -16,7 +16,9 @@ public EvolutionEditor7() InitializeComponent(); specieslist[0] = movelist[0] = itemlist[0] = ""; - Array.Resize(ref specieslist, Main.Config.MaxSpeciesID); + Array.Resize(ref specieslist, Main.Config.MaxSpeciesID + 1); + string[][] AltForms = Main.Config.Personal.getFormList(specieslist, Main.Config.MaxSpeciesID); + specieslist = Main.Config.Personal.getPersonalEntryList(AltForms, specieslist, Main.Config.MaxSpeciesID, out baseForms, out formVal); string[] evolutionMethods = { @@ -65,10 +67,12 @@ public EvolutionEditor7() mb = new[] { CB_M1, CB_M2, CB_M3, CB_M4, CB_M5, CB_M6, CB_M7, CB_M8 }; pb = new[] { CB_P1, CB_P2, CB_P3, CB_P4, CB_P5, CB_P6, CB_P7, CB_P8 }; rb = new[] { CB_I1, CB_I2, CB_I3, CB_I4, CB_I5, CB_I6, CB_I7, CB_I8 }; + fb = new[] { NUD_F1, NUD_F2, NUD_F3, NUD_F4, NUD_F5, NUD_F6, NUD_F7, NUD_F8 }; + lb = new[] { NUD_L1, NUD_L2, NUD_L3, NUD_L4, NUD_L5, NUD_L6, NUD_L7, NUD_L8 }; pic = new[] { PB_1, PB_2, PB_3, PB_4, PB_5, PB_6, PB_7, PB_8 }; - foreach (ComboBox cb in mb) { foreach (string s in evolutionMethods) cb.Items.Add(s); } - foreach (ComboBox cb in rb) { foreach (string s in specieslist) cb.Items.Add(s); } + foreach (ComboBox cb in mb) { cb.Items.AddRange(evolutionMethods); } + foreach (ComboBox cb in rb) { cb.Items.AddRange(specieslist.Take(Main.Config.MaxSpeciesID+1).ToArray()); } sortedspecies = (string[])specieslist.Clone(); Array.Sort(sortedspecies); @@ -80,9 +84,8 @@ public EvolutionEditor7() CB_Species.SelectedIndex = 0; } private readonly string[] files = Directory.GetFiles("evolution"); - private readonly ComboBox[] pb; - private readonly ComboBox[] rb; - private readonly ComboBox[] mb; + private readonly ComboBox[] pb, mb, rb; + private readonly NumericUpDown[] fb, lb; private readonly PictureBox[] pic; private int entry = -1; private readonly string[] sortedspecies; @@ -90,22 +93,28 @@ public EvolutionEditor7() private readonly string[] movelist = Main.getText(TextName.MoveNames); private readonly string[] itemlist = Main.getText(TextName.ItemNames); private readonly string[] typelist = Main.getText(TextName.Types); - private bool dumping; - private EvolutionSet evo = new EvolutionSet6(new byte[0x30]); + private bool dumping, loading; + private readonly int[] baseForms, formVal; + private EvolutionSet evo = new EvolutionSet7(new byte[EvolutionSet7.SIZE]); private void getList() { entry = Array.IndexOf(specieslist, CB_Species.Text); byte[] input = File.ReadAllBytes(files[entry]); - if (input.Length != 0x30) return; // error - evo = new EvolutionSet6(input); + if (input.Length != EvolutionSet7.SIZE) return; // error + evo = new EvolutionSet7(input); for (int i = 0; i < evo.PossibleEvolutions.Length; i++) { - if (evo.PossibleEvolutions[i].Method > 34) return; // Invalid! + if (evo.PossibleEvolutions[i].Method > 39) return; // Invalid! + loading = true; + fb[i].Value = evo.PossibleEvolutions[i].Form; + lb[i].Value = evo.PossibleEvolutions[i].Level; mb[i].SelectedIndex = evo.PossibleEvolutions[i].Method; // Which will trigger the params cb to reload the valid params list pb[i].SelectedIndex = evo.PossibleEvolutions[i].Argument; - rb[i].SelectedIndex = evo.PossibleEvolutions[i].Species; + rb[i].SelectedIndex = evo.PossibleEvolutions[i].Species; // Triggers sprite to reload + loading = false; + changeInto(rb[i], null); // refresh sprite } } private void setList() @@ -114,9 +123,11 @@ private void setList() for (int i = 0; i < 8; i++) { + evo.PossibleEvolutions[i].Species = rb[i].SelectedIndex; evo.PossibleEvolutions[i].Method = mb[i].SelectedIndex; evo.PossibleEvolutions[i].Argument = pb[i].SelectedIndex; - evo.PossibleEvolutions[i].Species = rb[i].SelectedIndex; + evo.PossibleEvolutions[i].Form = (sbyte)fb[i].Value; + evo.PossibleEvolutions[i].Level = (int)lb[i].Value; } File.WriteAllBytes(files[entry], evo.Write()); } @@ -128,7 +139,6 @@ private void changeEntry(object sender, EventArgs e) } private static int[] sL; // Random Species List - private byte[][] personal; private void B_RandAll_Click(object sender, EventArgs e) { if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNo, "Randomize all resulting species?", "Evolution methods and parameters will stay the same.")) return; @@ -137,14 +147,6 @@ private void B_RandAll_Click(object sender, EventArgs e) bool rBST = CHK_BST.Checked; bool rEXP = CHK_Exp.Checked; bool rType = CHK_Type.Checked; - if (rBST || rEXP || rType) - { - // initialize personal data - string[] personalList = Directory.GetFiles("personal"); - personal = new byte[personalList.Length][]; - for (int i = 0; i < personalList.Length; i++) - personal[i] = File.ReadAllBytes("personal" + Path.DirectorySeparatorChar + i.ToString("000") + ".bin"); - } int ctr = 0; sL = Randomizer.RandomSpeciesList; @@ -200,7 +202,7 @@ private void B_Dump_Click(object sender, EventArgs e) string result = ""; for (int i = 0; i < CB_Species.Items.Count; i++) { - CB_Species.SelectedIndex = i; // Get new Species + CB_Species.Text = specieslist[i]; // Get new Species result += "======" + Environment.NewLine + entry + " " + CB_Species.Text + Environment.NewLine + "======" + Environment.NewLine; for (int j = 0; j < 8; j++) { @@ -208,7 +210,18 @@ private void B_Dump_Click(object sender, EventArgs e) // int param = pb[j].SelectedIndex; int poke = rb[j].SelectedIndex; if (poke > 0 && methodval > 0) - result += mb[j].Text + (pb[j].Visible ? " [" + pb[j].Text + "]" : "") + " into " + rb[j].Text + Environment.NewLine; + { + string species = rb[j].Text; + int bf = formVal[entry]; + string param = pb[j].Visible ? " [" + pb[j].Text + "]" : ""; + if (lb[j].Value > 0) + param += $"@ level {lb[j].Value}"; + string method = mb[j].Text; + int f = fb[j].Value == -1 ? bf : (int)fb[j].Value; + string form = f == 0 ? "" : "-" + f; + + result += $"{method} {param} into {species}{form}".Replace(" ", " ") + Environment.NewLine; + } } result += Environment.NewLine; @@ -244,10 +257,11 @@ private void changeMethod(object sender, EventArgs e) 1, // 33 - Level @ Night 1, // 34 - Gender Branch 1, // 35 - UNUSED - 1, 1, 1, // Version Specific + 7, 7, 7, // Version Specific + 1, }; - pb[op].Visible = pic[op].Visible = rb[op].Visible = mb[op].SelectedIndex > 0; + pb[op].Visible = pic[op].Visible = rb[op].Visible = fb[op].Visible = lb[op].Visible = mb[op].SelectedIndex > 0; pb[op].Items.Clear(); int cv = methodCase[mb[op].SelectedIndex]; @@ -256,7 +270,7 @@ private void changeMethod(object sender, EventArgs e) case 0: // No Parameter Required { pb[op].Visible = false; pb[op].Items.Add(""); break; } case 1: // Level - { for (int i = 0; i <= 100; i++) pb[op].Items.Add(i.ToString()); break; } + { pb[op].Visible = false; pb[op].Items.Add(""); break; } case 2: // Items { foreach (string t in itemlist) pb[op].Items.Add(t); break; } case 3: // Moves @@ -267,12 +281,22 @@ private void changeMethod(object sender, EventArgs e) { for (int i = 0; i <= 255; i++) pb[op].Items.Add(i.ToString()); break; } case 6: { foreach (string t in typelist) pb[op].Items.Add(t); break; } + case 7: // Version + { for (int i = 0; i <= 255; i++) pb[op].Items.Add(i.ToString()); break; } } pb[op].SelectedIndex = 0; } private void changeInto(object sender, EventArgs e) { - pic[Array.IndexOf(rb, sender as ComboBox)].Image = (Bitmap)Resources.ResourceManager.GetObject("_" + Array.IndexOf(specieslist, (sender as ComboBox).Text)); + if (loading || dumping) + return; + int index = sender is ComboBox ? Array.IndexOf(rb, sender) : Array.IndexOf(fb, sender); + int species = Array.IndexOf(specieslist, rb[index].Text); + int form = (int)fb[index].Value; + if (form == -1) + form = baseForms[species]; + + pic[index].Image = Util.getSprite(species, form, 0, 0); } } } diff --git a/pk3DS/Subforms/Gen7/MegaEvoEditor7.Designer.cs b/pk3DS/Subforms/Gen7/MegaEvoEditor7.Designer.cs index ce1fc28..87437c8 100644 --- a/pk3DS/Subforms/Gen7/MegaEvoEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/MegaEvoEditor7.Designer.cs @@ -47,15 +47,6 @@ private void InitializeComponent() this.CHK_MEvo1 = new System.Windows.Forms.CheckBox(); this.CHK_MEvo2 = new System.Windows.Forms.CheckBox(); this.CB_Species = new System.Windows.Forms.ComboBox(); - this.GB_MEvo3 = new System.Windows.Forms.GroupBox(); - this.LBL_Into3 = new System.Windows.Forms.Label(); - this.PB_M3 = new System.Windows.Forms.PictureBox(); - this.CB_Forme3 = new System.Windows.Forms.ComboBox(); - this.PB_S3 = new System.Windows.Forms.PictureBox(); - this.CB_Item3 = new System.Windows.Forms.ComboBox(); - this.LBL_Forme3 = new System.Windows.Forms.Label(); - this.LBL_Item3 = new System.Windows.Forms.Label(); - this.CHK_MEvo3 = new System.Windows.Forms.CheckBox(); this.bpkx = new System.Windows.Forms.PictureBox(); this.B_Dump = new System.Windows.Forms.Button(); this.GB_MEvo1.SuspendLayout(); @@ -64,9 +55,6 @@ private void InitializeComponent() this.GB_MEvo2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.PB_M2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_S2)).BeginInit(); - this.GB_MEvo3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PB_M3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_S3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx)).BeginInit(); this.SuspendLayout(); // @@ -275,103 +263,6 @@ private void InitializeComponent() this.CB_Species.TabIndex = 15; this.CB_Species.SelectedIndexChanged += new System.EventHandler(this.changeIndex); // - // GB_MEvo3 - // - this.GB_MEvo3.Controls.Add(this.LBL_Into3); - this.GB_MEvo3.Controls.Add(this.PB_M3); - this.GB_MEvo3.Controls.Add(this.CB_Forme3); - this.GB_MEvo3.Controls.Add(this.PB_S3); - this.GB_MEvo3.Controls.Add(this.CB_Item3); - this.GB_MEvo3.Controls.Add(this.LBL_Forme3); - this.GB_MEvo3.Controls.Add(this.LBL_Item3); - this.GB_MEvo3.Enabled = false; - this.GB_MEvo3.Location = new System.Drawing.Point(276, 62); - this.GB_MEvo3.Name = "GB_MEvo3"; - this.GB_MEvo3.Size = new System.Drawing.Size(126, 142); - this.GB_MEvo3.TabIndex = 13; - this.GB_MEvo3.TabStop = false; - this.GB_MEvo3.Text = "Evolution 3"; - // - // LBL_Into3 - // - this.LBL_Into3.AutoSize = true; - this.LBL_Into3.Location = new System.Drawing.Point(48, 117); - this.LBL_Into3.Name = "LBL_Into3"; - this.LBL_Into3.Size = new System.Drawing.Size(28, 13); - this.LBL_Into3.TabIndex = 36; - this.LBL_Into3.Text = "Into:"; - // - // PB_M3 - // - this.PB_M3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.PB_M3.Location = new System.Drawing.Point(79, 106); - this.PB_M3.Name = "PB_M3"; - this.PB_M3.Size = new System.Drawing.Size(42, 32); - this.PB_M3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PB_M3.TabIndex = 35; - this.PB_M3.TabStop = false; - // - // CB_Forme3 - // - this.CB_Forme3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_Forme3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Forme3.FormattingEnabled = true; - this.CB_Forme3.Location = new System.Drawing.Point(3, 82); - this.CB_Forme3.Name = "CB_Forme3"; - this.CB_Forme3.Size = new System.Drawing.Size(121, 21); - this.CB_Forme3.TabIndex = 20; - this.CB_Forme3.SelectedIndexChanged += new System.EventHandler(this.Update_PBs); - // - // PB_S3 - // - this.PB_S3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.PB_S3.Location = new System.Drawing.Point(3, 106); - this.PB_S3.Name = "PB_S3"; - this.PB_S3.Size = new System.Drawing.Size(42, 32); - this.PB_S3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PB_S3.TabIndex = 34; - this.PB_S3.TabStop = false; - // - // CB_Item3 - // - this.CB_Item3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this.CB_Item3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Item3.FormattingEnabled = true; - this.CB_Item3.Location = new System.Drawing.Point(3, 36); - this.CB_Item3.Name = "CB_Item3"; - this.CB_Item3.Size = new System.Drawing.Size(121, 21); - this.CB_Item3.TabIndex = 18; - this.CB_Item3.SelectedValueChanged += new System.EventHandler(this.Update_PBs); - // - // LBL_Forme3 - // - this.LBL_Forme3.AutoSize = true; - this.LBL_Forme3.Location = new System.Drawing.Point(6, 65); - this.LBL_Forme3.Name = "LBL_Forme3"; - this.LBL_Forme3.Size = new System.Drawing.Size(85, 13); - this.LBL_Forme3.TabIndex = 10; - this.LBL_Forme3.Text = "Alt Forme (if any)"; - // - // LBL_Item3 - // - this.LBL_Item3.AutoSize = true; - this.LBL_Item3.Location = new System.Drawing.Point(6, 20); - this.LBL_Item3.Name = "LBL_Item3"; - this.LBL_Item3.Size = new System.Drawing.Size(27, 13); - this.LBL_Item3.TabIndex = 9; - this.LBL_Item3.Text = "Item"; - // - // CHK_MEvo3 - // - this.CHK_MEvo3.AutoSize = true; - this.CHK_MEvo3.Location = new System.Drawing.Point(285, 39); - this.CHK_MEvo3.Name = "CHK_MEvo3"; - this.CHK_MEvo3.Size = new System.Drawing.Size(65, 17); - this.CHK_MEvo3.TabIndex = 16; - this.CHK_MEvo3.Text = "Enabled"; - this.CHK_MEvo3.UseVisualStyleBackColor = true; - this.CHK_MEvo3.CheckedChanged += new System.EventHandler(this.CHK_Changed); - // // bpkx // this.bpkx.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -384,7 +275,7 @@ private void InitializeComponent() // // B_Dump // - this.B_Dump.Location = new System.Drawing.Point(327, 5); + this.B_Dump.Location = new System.Drawing.Point(199, 10); this.B_Dump.Name = "B_Dump"; this.B_Dump.Size = new System.Drawing.Size(75, 23); this.B_Dump.TabIndex = 18; @@ -392,24 +283,22 @@ private void InitializeComponent() this.B_Dump.UseVisualStyleBackColor = true; this.B_Dump.Click += new System.EventHandler(this.B_Dump_Click); // - // MEE + // MegaEvoEditor7 // this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(414, 212); + this.ClientSize = new System.Drawing.Size(284, 211); this.Controls.Add(this.B_Dump); - this.Controls.Add(this.CHK_MEvo3); - this.Controls.Add(this.GB_MEvo3); this.Controls.Add(this.CB_Species); this.Controls.Add(this.CHK_MEvo2); this.Controls.Add(this.CHK_MEvo1); this.Controls.Add(this.GB_MEvo2); this.Controls.Add(this.GB_MEvo1); this.MaximizeBox = false; - this.MaximumSize = new System.Drawing.Size(430, 250); - this.MinimumSize = new System.Drawing.Size(430, 250); - this.Name = "MegaEvoEditor6"; + this.MaximumSize = new System.Drawing.Size(300, 250); + this.MinimumSize = new System.Drawing.Size(300, 250); + this.Name = "MegaEvoEditor7"; this.Text = "Mega Evo Editor"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing); this.GB_MEvo1.ResumeLayout(false); @@ -420,10 +309,6 @@ private void InitializeComponent() this.GB_MEvo2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.PB_M2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_S2)).EndInit(); - this.GB_MEvo3.ResumeLayout(false); - this.GB_MEvo3.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PB_M3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_S3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -441,26 +326,17 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CHK_MEvo1; private System.Windows.Forms.CheckBox CHK_MEvo2; private System.Windows.Forms.ComboBox CB_Species; - private System.Windows.Forms.GroupBox GB_MEvo3; - private System.Windows.Forms.Label LBL_Forme3; - private System.Windows.Forms.Label LBL_Item3; - private System.Windows.Forms.CheckBox CHK_MEvo3; private System.Windows.Forms.ComboBox CB_Item1; private System.Windows.Forms.ComboBox CB_Item2; - private System.Windows.Forms.ComboBox CB_Item3; private System.Windows.Forms.ComboBox CB_Forme1; private System.Windows.Forms.ComboBox CB_Forme2; - private System.Windows.Forms.ComboBox CB_Forme3; private System.Windows.Forms.PictureBox PB_M1; private System.Windows.Forms.PictureBox PB_S1; private System.Windows.Forms.PictureBox PB_M2; private System.Windows.Forms.PictureBox PB_S2; - private System.Windows.Forms.PictureBox PB_M3; - private System.Windows.Forms.PictureBox PB_S3; private System.Windows.Forms.PictureBox bpkx; private System.Windows.Forms.Label LBL_Into1; private System.Windows.Forms.Label LBL_Into2; - private System.Windows.Forms.Label LBL_Into3; private System.Windows.Forms.Button B_Dump; } } diff --git a/pk3DS/Subforms/Gen7/MegaEvoEditor7.cs b/pk3DS/Subforms/Gen7/MegaEvoEditor7.cs index 29f0f60..8ca3292 100644 --- a/pk3DS/Subforms/Gen7/MegaEvoEditor7.cs +++ b/pk3DS/Subforms/Gen7/MegaEvoEditor7.cs @@ -34,16 +34,16 @@ public partial class MegaEvoEditor7 : Form CB_Species.ValueMember = "Value"; #region Intializations - Array.Resize(ref specieslist, Main.Config.MaxSpeciesID); + Array.Resize(ref specieslist, Main.Config.MaxSpeciesID + 1); specieslist[0] = itemlist[0] = ""; specieslist[32] += "♂"; specieslist[29] += "♀"; AltForms = Main.Config.Personal.getFormList(specieslist, Main.Config.MaxSpeciesID); - groupbox_spec = new[] { GB_MEvo1, GB_MEvo2, GB_MEvo3 }; - item_spec = new[] { CB_Item1, CB_Item2, CB_Item3 }; - forme_spec = new[] { CB_Forme1, CB_Forme2, CB_Forme3 }; - checkbox_spec = new[] { CHK_MEvo1, CHK_MEvo2, CHK_MEvo3 }; - picturebox_spec = new[] { new[] { PB_S1, PB_S2, PB_S3 }, new[] { PB_M1, PB_M2, PB_M3 } }; + groupbox_spec = new[] { GB_MEvo1, GB_MEvo2 }; + item_spec = new[] { CB_Item1, CB_Item2 }; + forme_spec = new[] { CB_Forme1, CB_Forme2 }; + checkbox_spec = new[] { CHK_MEvo1, CHK_MEvo2 }; + picturebox_spec = new[] { new[] { PB_S1, PB_S2 }, new[] { PB_M1, PB_M2 } }; #endregion Setup(); CB_Species.SelectedIndex = 0; @@ -112,7 +112,7 @@ private void getEntry() PersonalEditor6.setForms(entry, CB, AltForms); me = new MegaEvolutions(data); - for (int i = 0; i < 3; i++) + for (int i = 0; i < 2; i++) { checkbox_spec[i].Checked = me.Method[i] == 1; item_spec[i].SelectedValue = (int)me.Argument[i]; @@ -122,7 +122,7 @@ private void getEntry() private void setEntry() { if (entry < 1 || entry == 384) return; // Don't edit invalid / Rayquaza. - for (int i = 0; i < 3; i++) + for (int i = 0; i < 2; i++) { if (me.Method[i] > 1) return; // Shouldn't hit this. @@ -194,7 +194,7 @@ private void B_Dump_Click(object sender, EventArgs e) CB_Species.SelectedValue = i; // Get new Species string header = "======" + Environment.NewLine + entry + " " + CB_Species.Text + Environment.NewLine + "======" + Environment.NewLine; bool headered = false; - for (int j = 0; j < 3; j++) + for (int j = 0; j < 2; j++) { if (!checkbox_spec[j].Checked) continue; if (!headered) { result += header; headered = true; } diff --git a/pk3DS/pk3DS.csproj b/pk3DS/pk3DS.csproj index 1b59d75..41500ef 100644 --- a/pk3DS/pk3DS.csproj +++ b/pk3DS/pk3DS.csproj @@ -99,6 +99,12 @@ EggMoveEditor7.cs + + Form + + + EvolutionEditor7.cs + Form @@ -111,6 +117,12 @@ LevelUpEditor7.cs + + Form + + + MegaEvoEditor7.cs + Form @@ -343,12 +355,18 @@ EggMoveEditor7.cs + + EvolutionEditor7.cs + ItemEditor7.cs LevelUpEditor7.cs + + MegaEvoEditor7.cs + MoveEditor7.cs