From 76307c66bf8722cfd1529cb3da4ae077e1a5a608 Mon Sep 17 00:00:00 2001 From: sora10pls Date: Mon, 18 Dec 2017 22:25:27 -0500 Subject: [PATCH] Add gen7 gift nature --- .../Gen7/StaticEncounterEditor7.Designer.cs | 603 +++++++++--------- pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs | 8 +- 2 files changed, 319 insertions(+), 292 deletions(-) diff --git a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs index ccbfd9c..28c3737 100644 --- a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs @@ -30,6 +30,10 @@ private void InitializeComponent() { this.TC_Tabs = new System.Windows.Forms.TabControl(); this.Tab_Gifts = new System.Windows.Forms.TabPage(); + this.CHK_IsEgg = new System.Windows.Forms.CheckBox(); + this.CHK_GIV3 = new System.Windows.Forms.CheckBox(); + this.CB_SpecialMove = new System.Windows.Forms.ComboBox(); + this.L_SpecialMove = new System.Windows.Forms.Label(); this.L_GGender = new System.Windows.Forms.Label(); this.NUD_GGender = new System.Windows.Forms.NumericUpDown(); this.CHK_G_Lock = new System.Windows.Forms.CheckBox(); @@ -90,6 +94,21 @@ private void InitializeComponent() this.NUD_ELevel = new System.Windows.Forms.NumericUpDown(); this.LB_Encounter = new System.Windows.Forms.ListBox(); this.Tab_Trades = new System.Windows.Forms.TabPage(); + this.CB_TNature = new System.Windows.Forms.ComboBox(); + this.L_TNature = new System.Windows.Forms.Label(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label8 = new System.Windows.Forms.Label(); + this.NUD_TIV3 = new System.Windows.Forms.NumericUpDown(); + this.NUD_TIV4 = new System.Windows.Forms.NumericUpDown(); + this.NUD_TIV5 = new System.Windows.Forms.NumericUpDown(); + this.label9 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.NUD_TIV2 = new System.Windows.Forms.NumericUpDown(); + this.NUD_TIV1 = new System.Windows.Forms.NumericUpDown(); + this.NUD_TIV0 = new System.Windows.Forms.NumericUpDown(); + this.label12 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); this.CB_TRequest = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); this.L_TTID = new System.Windows.Forms.Label(); @@ -126,25 +145,8 @@ private void InitializeComponent() this.B_Starters = new System.Windows.Forms.Button(); this.B_Save = new System.Windows.Forms.Button(); this.B_Cancel = new System.Windows.Forms.Button(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label8 = new System.Windows.Forms.Label(); - this.NUD_TIV3 = new System.Windows.Forms.NumericUpDown(); - this.NUD_TIV4 = new System.Windows.Forms.NumericUpDown(); - this.NUD_TIV5 = new System.Windows.Forms.NumericUpDown(); - this.label9 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.NUD_TIV2 = new System.Windows.Forms.NumericUpDown(); - this.NUD_TIV1 = new System.Windows.Forms.NumericUpDown(); - this.NUD_TIV0 = new System.Windows.Forms.NumericUpDown(); - this.label12 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.CB_TNature = new System.Windows.Forms.ComboBox(); - this.L_TNature = new System.Windows.Forms.Label(); - this.CB_SpecialMove = new System.Windows.Forms.ComboBox(); - this.L_SpecialMove = new System.Windows.Forms.Label(); - this.CHK_GIV3 = new System.Windows.Forms.CheckBox(); - this.CHK_IsEgg = new System.Windows.Forms.CheckBox(); + this.CB_GNature = new System.Windows.Forms.ComboBox(); + this.L_GNature = new System.Windows.Forms.Label(); this.TC_Tabs.SuspendLayout(); this.Tab_Gifts.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_GGender)).BeginInit(); @@ -169,12 +171,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_EForm)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_ELevel)).BeginInit(); this.Tab_Trades.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_TID)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_TForm)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_TLevel)).BeginInit(); - this.Tab_Randomizer.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).BeginInit(); - this.GB_Tweak.SuspendLayout(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV4)).BeginInit(); @@ -182,6 +178,12 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV0)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_TID)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_TForm)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_TLevel)).BeginInit(); + this.Tab_Randomizer.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).BeginInit(); + this.GB_Tweak.SuspendLayout(); this.SuspendLayout(); // // TC_Tabs @@ -201,6 +203,8 @@ private void InitializeComponent() // // Tab_Gifts // + this.Tab_Gifts.Controls.Add(this.CB_GNature); + this.Tab_Gifts.Controls.Add(this.L_GNature); this.Tab_Gifts.Controls.Add(this.CHK_IsEgg); this.Tab_Gifts.Controls.Add(this.CHK_GIV3); this.Tab_Gifts.Controls.Add(this.CB_SpecialMove); @@ -224,6 +228,43 @@ private void InitializeComponent() this.Tab_Gifts.Text = "Gifts"; this.Tab_Gifts.UseVisualStyleBackColor = true; // + // CHK_IsEgg + // + this.CHK_IsEgg.AutoSize = true; + this.CHK_IsEgg.Location = new System.Drawing.Point(187, 197); + this.CHK_IsEgg.Name = "CHK_IsEgg"; + this.CHK_IsEgg.Size = new System.Drawing.Size(56, 17); + this.CHK_IsEgg.TabIndex = 509; + this.CHK_IsEgg.Text = "Is Egg"; + this.CHK_IsEgg.UseVisualStyleBackColor = true; + // + // CHK_GIV3 + // + this.CHK_GIV3.AutoSize = true; + this.CHK_GIV3.Location = new System.Drawing.Point(187, 182); + this.CHK_GIV3.Name = "CHK_GIV3"; + this.CHK_GIV3.Size = new System.Drawing.Size(42, 17); + this.CHK_GIV3.TabIndex = 508; + this.CHK_GIV3.Text = "3IV"; + this.CHK_GIV3.UseVisualStyleBackColor = true; + // + // CB_SpecialMove + // + this.CB_SpecialMove.FormattingEnabled = true; + this.CB_SpecialMove.Location = new System.Drawing.Point(187, 142); + this.CB_SpecialMove.Name = "CB_SpecialMove"; + this.CB_SpecialMove.Size = new System.Drawing.Size(121, 21); + this.CB_SpecialMove.TabIndex = 507; + // + // L_SpecialMove + // + this.L_SpecialMove.Location = new System.Drawing.Point(121, 140); + this.L_SpecialMove.Name = "L_SpecialMove"; + this.L_SpecialMove.Size = new System.Drawing.Size(65, 23); + this.L_SpecialMove.TabIndex = 506; + this.L_SpecialMove.Text = "Gift Move:"; + this.L_SpecialMove.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // L_GGender // this.L_GGender.Location = new System.Drawing.Point(131, 71); @@ -253,7 +294,7 @@ private void InitializeComponent() // CHK_G_Lock // this.CHK_G_Lock.AutoSize = true; - this.CHK_G_Lock.Location = new System.Drawing.Point(187, 144); + this.CHK_G_Lock.Location = new System.Drawing.Point(187, 167); this.CHK_G_Lock.Name = "CHK_G_Lock"; this.CHK_G_Lock.Size = new System.Drawing.Size(79, 17); this.CHK_G_Lock.TabIndex = 19; @@ -994,6 +1035,230 @@ private void InitializeComponent() this.Tab_Trades.Text = "Trades"; this.Tab_Trades.UseVisualStyleBackColor = true; // + // CB_TNature + // + this.CB_TNature.FormattingEnabled = true; + this.CB_TNature.Location = new System.Drawing.Point(187, 97); + this.CB_TNature.Name = "CB_TNature"; + this.CB_TNature.Size = new System.Drawing.Size(121, 21); + this.CB_TNature.TabIndex = 505; + // + // L_TNature + // + this.L_TNature.Location = new System.Drawing.Point(131, 95); + this.L_TNature.Name = "L_TNature"; + this.L_TNature.Size = new System.Drawing.Size(55, 23); + this.L_TNature.TabIndex = 504; + this.L_TNature.Text = "Nature:"; + this.L_TNature.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.label8); + this.groupBox1.Controls.Add(this.NUD_TIV3); + this.groupBox1.Controls.Add(this.NUD_TIV4); + this.groupBox1.Controls.Add(this.NUD_TIV5); + this.groupBox1.Controls.Add(this.label9); + this.groupBox1.Controls.Add(this.label10); + this.groupBox1.Controls.Add(this.label11); + this.groupBox1.Controls.Add(this.NUD_TIV2); + this.groupBox1.Controls.Add(this.NUD_TIV1); + this.groupBox1.Controls.Add(this.NUD_TIV0); + this.groupBox1.Controls.Add(this.label12); + this.groupBox1.Controls.Add(this.label13); + this.groupBox1.Location = new System.Drawing.Point(129, 177); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(148, 112); + this.groupBox1.TabIndex = 30; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "IVs"; + // + // label8 + // + this.label8.Location = new System.Drawing.Point(4, 16); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(29, 21); + this.label8.TabIndex = 495; + this.label8.Text = "HP:"; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // NUD_TIV3 + // + this.NUD_TIV3.Location = new System.Drawing.Point(104, 18); + this.NUD_TIV3.Maximum = new decimal(new int[] { + 31, + 0, + 0, + 0}); + this.NUD_TIV3.Minimum = new decimal(new int[] { + 4, + 0, + 0, + -2147483648}); + this.NUD_TIV3.Name = "NUD_TIV3"; + this.NUD_TIV3.Size = new System.Drawing.Size(34, 20); + this.NUD_TIV3.TabIndex = 492; + this.NUD_TIV3.Value = new decimal(new int[] { + 31, + 0, + 0, + 0}); + // + // NUD_TIV4 + // + this.NUD_TIV4.Location = new System.Drawing.Point(104, 49); + this.NUD_TIV4.Maximum = new decimal(new int[] { + 31, + 0, + 0, + 0}); + this.NUD_TIV4.Minimum = new decimal(new int[] { + 4, + 0, + 0, + -2147483648}); + this.NUD_TIV4.Name = "NUD_TIV4"; + this.NUD_TIV4.Size = new System.Drawing.Size(34, 20); + this.NUD_TIV4.TabIndex = 493; + this.NUD_TIV4.Value = new decimal(new int[] { + 31, + 0, + 0, + 0}); + // + // NUD_TIV5 + // + this.NUD_TIV5.Location = new System.Drawing.Point(104, 80); + this.NUD_TIV5.Maximum = new decimal(new int[] { + 31, + 0, + 0, + 0}); + this.NUD_TIV5.Minimum = new decimal(new int[] { + 4, + 0, + 0, + -2147483648}); + this.NUD_TIV5.Name = "NUD_TIV5"; + this.NUD_TIV5.Size = new System.Drawing.Size(34, 20); + this.NUD_TIV5.TabIndex = 494; + this.NUD_TIV5.Value = new decimal(new int[] { + 31, + 0, + 0, + 0}); + // + // label9 + // + this.label9.Location = new System.Drawing.Point(73, 47); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(31, 21); + this.label9.TabIndex = 500; + this.label9.Text = "SpD:"; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label10 + // + this.label10.Location = new System.Drawing.Point(73, 78); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(31, 21); + this.label10.TabIndex = 499; + this.label10.Text = "Spe:"; + this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label11 + // + this.label11.Location = new System.Drawing.Point(73, 16); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(31, 21); + this.label11.TabIndex = 498; + this.label11.Text = "SpA:"; + this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // NUD_TIV2 + // + this.NUD_TIV2.Location = new System.Drawing.Point(33, 80); + this.NUD_TIV2.Maximum = new decimal(new int[] { + 31, + 0, + 0, + 0}); + this.NUD_TIV2.Minimum = new decimal(new int[] { + 4, + 0, + 0, + -2147483648}); + this.NUD_TIV2.Name = "NUD_TIV2"; + this.NUD_TIV2.Size = new System.Drawing.Size(34, 20); + this.NUD_TIV2.TabIndex = 491; + this.NUD_TIV2.Value = new decimal(new int[] { + 31, + 0, + 0, + 0}); + // + // NUD_TIV1 + // + this.NUD_TIV1.Location = new System.Drawing.Point(33, 49); + this.NUD_TIV1.Maximum = new decimal(new int[] { + 31, + 0, + 0, + 0}); + this.NUD_TIV1.Minimum = new decimal(new int[] { + 4, + 0, + 0, + -2147483648}); + this.NUD_TIV1.Name = "NUD_TIV1"; + this.NUD_TIV1.Size = new System.Drawing.Size(34, 20); + this.NUD_TIV1.TabIndex = 490; + this.NUD_TIV1.Value = new decimal(new int[] { + 31, + 0, + 0, + 0}); + // + // NUD_TIV0 + // + this.NUD_TIV0.Location = new System.Drawing.Point(33, 18); + this.NUD_TIV0.Maximum = new decimal(new int[] { + 31, + 0, + 0, + 0}); + this.NUD_TIV0.Minimum = new decimal(new int[] { + 4, + 0, + 0, + -2147483648}); + this.NUD_TIV0.Name = "NUD_TIV0"; + this.NUD_TIV0.Size = new System.Drawing.Size(34, 20); + this.NUD_TIV0.TabIndex = 489; + this.NUD_TIV0.Value = new decimal(new int[] { + 31, + 0, + 0, + 0}); + // + // label12 + // + this.label12.Location = new System.Drawing.Point(7, 47); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(26, 21); + this.label12.TabIndex = 496; + this.label12.Text = "Atk:"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label13 + // + this.label13.Location = new System.Drawing.Point(4, 78); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(29, 21); + this.label13.TabIndex = 497; + this.label13.Text = "Def:"; + this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CB_TRequest // this.CB_TRequest.FormattingEnabled = true; @@ -1418,266 +1683,22 @@ private void InitializeComponent() this.B_Cancel.UseVisualStyleBackColor = true; this.B_Cancel.Click += new System.EventHandler(this.B_Cancel_Click); // - // groupBox1 + // CB_GNature // - this.groupBox1.Controls.Add(this.label8); - this.groupBox1.Controls.Add(this.NUD_TIV3); - this.groupBox1.Controls.Add(this.NUD_TIV4); - this.groupBox1.Controls.Add(this.NUD_TIV5); - this.groupBox1.Controls.Add(this.label9); - this.groupBox1.Controls.Add(this.label10); - this.groupBox1.Controls.Add(this.label11); - this.groupBox1.Controls.Add(this.NUD_TIV2); - this.groupBox1.Controls.Add(this.NUD_TIV1); - this.groupBox1.Controls.Add(this.NUD_TIV0); - this.groupBox1.Controls.Add(this.label12); - this.groupBox1.Controls.Add(this.label13); - this.groupBox1.Location = new System.Drawing.Point(129, 177); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(148, 112); - this.groupBox1.TabIndex = 30; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "IVs"; + this.CB_GNature.FormattingEnabled = true; + this.CB_GNature.Location = new System.Drawing.Point(187, 119); + this.CB_GNature.Name = "CB_GNature"; + this.CB_GNature.Size = new System.Drawing.Size(121, 21); + this.CB_GNature.TabIndex = 511; // - // label8 + // L_GNature // - this.label8.Location = new System.Drawing.Point(4, 16); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(29, 21); - this.label8.TabIndex = 495; - this.label8.Text = "HP:"; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // NUD_TIV3 - // - this.NUD_TIV3.Location = new System.Drawing.Point(104, 18); - this.NUD_TIV3.Maximum = new decimal(new int[] { - 31, - 0, - 0, - 0}); - this.NUD_TIV3.Minimum = new decimal(new int[] { - 4, - 0, - 0, - -2147483648}); - this.NUD_TIV3.Name = "NUD_TIV3"; - this.NUD_TIV3.Size = new System.Drawing.Size(34, 20); - this.NUD_TIV3.TabIndex = 492; - this.NUD_TIV3.Value = new decimal(new int[] { - 31, - 0, - 0, - 0}); - // - // NUD_TIV4 - // - this.NUD_TIV4.Location = new System.Drawing.Point(104, 49); - this.NUD_TIV4.Maximum = new decimal(new int[] { - 31, - 0, - 0, - 0}); - this.NUD_TIV4.Minimum = new decimal(new int[] { - 4, - 0, - 0, - -2147483648}); - this.NUD_TIV4.Name = "NUD_TIV4"; - this.NUD_TIV4.Size = new System.Drawing.Size(34, 20); - this.NUD_TIV4.TabIndex = 493; - this.NUD_TIV4.Value = new decimal(new int[] { - 31, - 0, - 0, - 0}); - // - // NUD_TIV5 - // - this.NUD_TIV5.Location = new System.Drawing.Point(104, 80); - this.NUD_TIV5.Maximum = new decimal(new int[] { - 31, - 0, - 0, - 0}); - this.NUD_TIV5.Minimum = new decimal(new int[] { - 4, - 0, - 0, - -2147483648}); - this.NUD_TIV5.Name = "NUD_TIV5"; - this.NUD_TIV5.Size = new System.Drawing.Size(34, 20); - this.NUD_TIV5.TabIndex = 494; - this.NUD_TIV5.Value = new decimal(new int[] { - 31, - 0, - 0, - 0}); - // - // label9 - // - this.label9.Location = new System.Drawing.Point(73, 47); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(31, 21); - this.label9.TabIndex = 500; - this.label9.Text = "SpD:"; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label10 - // - this.label10.Location = new System.Drawing.Point(73, 78); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(31, 21); - this.label10.TabIndex = 499; - this.label10.Text = "Spe:"; - this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label11 - // - this.label11.Location = new System.Drawing.Point(73, 16); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(31, 21); - this.label11.TabIndex = 498; - this.label11.Text = "SpA:"; - this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // NUD_TIV2 - // - this.NUD_TIV2.Location = new System.Drawing.Point(33, 80); - this.NUD_TIV2.Maximum = new decimal(new int[] { - 31, - 0, - 0, - 0}); - this.NUD_TIV2.Minimum = new decimal(new int[] { - 4, - 0, - 0, - -2147483648}); - this.NUD_TIV2.Name = "NUD_TIV2"; - this.NUD_TIV2.Size = new System.Drawing.Size(34, 20); - this.NUD_TIV2.TabIndex = 491; - this.NUD_TIV2.Value = new decimal(new int[] { - 31, - 0, - 0, - 0}); - // - // NUD_TIV1 - // - this.NUD_TIV1.Location = new System.Drawing.Point(33, 49); - this.NUD_TIV1.Maximum = new decimal(new int[] { - 31, - 0, - 0, - 0}); - this.NUD_TIV1.Minimum = new decimal(new int[] { - 4, - 0, - 0, - -2147483648}); - this.NUD_TIV1.Name = "NUD_TIV1"; - this.NUD_TIV1.Size = new System.Drawing.Size(34, 20); - this.NUD_TIV1.TabIndex = 490; - this.NUD_TIV1.Value = new decimal(new int[] { - 31, - 0, - 0, - 0}); - // - // NUD_TIV0 - // - this.NUD_TIV0.Location = new System.Drawing.Point(33, 18); - this.NUD_TIV0.Maximum = new decimal(new int[] { - 31, - 0, - 0, - 0}); - this.NUD_TIV0.Minimum = new decimal(new int[] { - 4, - 0, - 0, - -2147483648}); - this.NUD_TIV0.Name = "NUD_TIV0"; - this.NUD_TIV0.Size = new System.Drawing.Size(34, 20); - this.NUD_TIV0.TabIndex = 489; - this.NUD_TIV0.Value = new decimal(new int[] { - 31, - 0, - 0, - 0}); - // - // label12 - // - this.label12.Location = new System.Drawing.Point(7, 47); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(26, 21); - this.label12.TabIndex = 496; - this.label12.Text = "Atk:"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // label13 - // - this.label13.Location = new System.Drawing.Point(4, 78); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(29, 21); - this.label13.TabIndex = 497; - this.label13.Text = "Def:"; - this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // CB_TNature - // - this.CB_TNature.FormattingEnabled = true; - this.CB_TNature.Location = new System.Drawing.Point(187, 97); - this.CB_TNature.Name = "CB_TNature"; - this.CB_TNature.Size = new System.Drawing.Size(121, 21); - this.CB_TNature.TabIndex = 505; - // - // L_TNature - // - this.L_TNature.Location = new System.Drawing.Point(131, 95); - this.L_TNature.Name = "L_TNature"; - this.L_TNature.Size = new System.Drawing.Size(55, 23); - this.L_TNature.TabIndex = 504; - this.L_TNature.Text = "Nature:"; - this.L_TNature.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // CB_SpecialMove - // - this.CB_SpecialMove.FormattingEnabled = true; - this.CB_SpecialMove.Location = new System.Drawing.Point(187, 119); - this.CB_SpecialMove.Name = "CB_SpecialMove"; - this.CB_SpecialMove.Size = new System.Drawing.Size(121, 21); - this.CB_SpecialMove.TabIndex = 507; - // - // L_SpecialMove - // - this.L_SpecialMove.Location = new System.Drawing.Point(121, 117); - this.L_SpecialMove.Name = "L_SpecialMove"; - this.L_SpecialMove.Size = new System.Drawing.Size(65, 23); - this.L_SpecialMove.TabIndex = 506; - this.L_SpecialMove.Text = "Gift Move:"; - this.L_SpecialMove.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // CHK_GIV3 - // - this.CHK_GIV3.AutoSize = true; - this.CHK_GIV3.Location = new System.Drawing.Point(187, 159); - this.CHK_GIV3.Name = "CHK_GIV3"; - this.CHK_GIV3.Size = new System.Drawing.Size(42, 17); - this.CHK_GIV3.TabIndex = 508; - this.CHK_GIV3.Text = "3IV"; - this.CHK_GIV3.UseVisualStyleBackColor = true; - // - // CHK_IsEgg - // - this.CHK_IsEgg.AutoSize = true; - this.CHK_IsEgg.Location = new System.Drawing.Point(187, 174); - this.CHK_IsEgg.Name = "CHK_IsEgg"; - this.CHK_IsEgg.Size = new System.Drawing.Size(56, 17); - this.CHK_IsEgg.TabIndex = 509; - this.CHK_IsEgg.Text = "Is Egg"; - this.CHK_IsEgg.UseVisualStyleBackColor = true; + this.L_GNature.Location = new System.Drawing.Point(131, 117); + this.L_GNature.Name = "L_GNature"; + this.L_GNature.Size = new System.Drawing.Size(55, 23); + this.L_GNature.TabIndex = 510; + this.L_GNature.Text = "Nature:"; + this.L_GNature.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // StaticEncounterEditor7 // @@ -1716,6 +1737,13 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_ELevel)).EndInit(); this.Tab_Trades.ResumeLayout(false); this.Tab_Trades.PerformLayout(); + this.groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV0)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_TID)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_TForm)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_TLevel)).EndInit(); @@ -1724,13 +1752,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).EndInit(); this.GB_Tweak.ResumeLayout(false); this.GB_Tweak.PerformLayout(); - this.groupBox1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_TIV0)).EndInit(); this.ResumeLayout(false); } @@ -1854,5 +1875,7 @@ private void InitializeComponent() private System.Windows.Forms.Label L_SpecialMove; private System.Windows.Forms.CheckBox CHK_IsEgg; private System.Windows.Forms.CheckBox CHK_GIV3; + private System.Windows.Forms.ComboBox CB_GNature; + private System.Windows.Forms.Label L_GNature; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs index 07c540c..94c8fc5 100644 --- a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs +++ b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs @@ -108,7 +108,9 @@ public StaticEncounterEditor7(byte[][] infiles) CB_EMove3.Items.Add(s); CB_SpecialMove.Items.Add(s); } - + + CB_GNature.Items.Add("Random"); + CB_GNature.Items.AddRange(natures.Take(25).ToArray()); CB_ENature.Items.Add("Random"); CB_ENature.Items.AddRange(natures.Take(25).ToArray()); CB_TNature.Items.AddRange(natures.Take(25).ToArray()); @@ -213,6 +215,7 @@ private void getGift() NUD_GLevel.Value = entry.Level; NUD_GForm.Value = entry.Form; NUD_GGender.Value = entry.Gender; + CB_GNature.SelectedIndex = entry.Nature + 1; CB_SpecialMove.SelectedIndex = entry.SpecialMove; CHK_G_Lock.Checked = entry.ShinyLock; CHK_GIV3.Checked = entry.IV3; @@ -231,6 +234,7 @@ private void setGift() entry.Level = (int)NUD_GLevel.Value; entry.Form = (int)NUD_GForm.Value; entry.Gender = (int) NUD_GGender.Value; + entry.Nature = (sbyte)(CB_GNature.SelectedIndex - 1); entry.SpecialMove = CB_SpecialMove.SelectedIndex; entry.ShinyLock = CHK_G_Lock.Checked; entry.IsEgg = CHK_IsEgg.Checked; @@ -387,7 +391,7 @@ private void changeSpecies(object sender, EventArgs e) entry.Species = cb.SelectedIndex; LB_Encounter.Items[eEntry] = getEntryText(entry, eEntry); } - else if(sender == CB_TSpecies) + else if (sender == CB_TSpecies) { var entry = Trades[tEntry]; entry.Species = cb.SelectedIndex;