diff --git a/pk3DS/Subforms/Gen6/GiftEditor6.Designer.cs b/pk3DS/Subforms/Gen6/GiftEditor6.Designer.cs index a1d3aed..10818de 100644 --- a/pk3DS/Subforms/Gen6/GiftEditor6.Designer.cs +++ b/pk3DS/Subforms/Gen6/GiftEditor6.Designer.cs @@ -40,19 +40,10 @@ private void InitializeComponent() this.NUD_Form = new System.Windows.Forms.NumericUpDown(); this.L_Form = new System.Windows.Forms.Label(); this.L_Nature = new System.Windows.Forms.Label(); - this.L_Ability = new System.Windows.Forms.Label(); - this.NUD_Ability = new System.Windows.Forms.NumericUpDown(); - this.L_Gender = new System.Windows.Forms.Label(); - this.NUD_Gender = new System.Windows.Forms.NumericUpDown(); this.B_RandAll = new System.Windows.Forms.Button(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); - this.CHK_ShinyLock = new System.Windows.Forms.CheckBox(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.L_Mega = new System.Windows.Forms.Label(); - this.CHK_ReplaceMega = new System.Windows.Forms.CheckBox(); - this.NUD_LevelBoost = new System.Windows.Forms.NumericUpDown(); - this.CHK_Level = new System.Windows.Forms.CheckBox(); + this.CB_Nature = new System.Windows.Forms.ComboBox(); this.GB_EIVs = new System.Windows.Forms.GroupBox(); this.L_HP = new System.Windows.Forms.Label(); this.NUD_IV3 = new System.Windows.Forms.NumericUpDown(); @@ -66,7 +57,9 @@ private void InitializeComponent() this.NUD_IV0 = new System.Windows.Forms.NumericUpDown(); this.L_ATK = new System.Windows.Forms.Label(); this.L_DEF = new System.Windows.Forms.Label(); - this.CB_Nature = new System.Windows.Forms.ComboBox(); + this.CHK_ShinyLock = new System.Windows.Forms.CheckBox(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.B_ModifyLevel = new System.Windows.Forms.Button(); this.GB_Tweak = new System.Windows.Forms.GroupBox(); this.CHK_RemoveShinyLock = new System.Windows.Forms.CheckBox(); this.CHK_AllowMega = new System.Windows.Forms.CheckBox(); @@ -81,15 +74,19 @@ private void InitializeComponent() this.CHK_G3 = new System.Windows.Forms.CheckBox(); this.CHK_G2 = new System.Windows.Forms.CheckBox(); this.CHK_G1 = new System.Windows.Forms.CheckBox(); - this.B_ModifyLevel = new System.Windows.Forms.Button(); + this.L_Mega = new System.Windows.Forms.Label(); + this.CHK_ReplaceMega = new System.Windows.Forms.CheckBox(); + this.NUD_LevelBoost = new System.Windows.Forms.NumericUpDown(); + this.CHK_Level = new System.Windows.Forms.CheckBox(); + this.L_Gender = new System.Windows.Forms.Label(); + this.CB_Gender = new System.Windows.Forms.ComboBox(); + this.L_Ability = new System.Windows.Forms.Label(); + this.CB_Ability = new System.Windows.Forms.ComboBox(); + this.CHK_RandomAbility = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Level)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Form)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_Ability)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_Gender)).BeginInit(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); - this.tabPage2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).BeginInit(); this.GB_EIVs.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_IV3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_IV4)).BeginInit(); @@ -97,7 +94,9 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_IV2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_IV1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_IV0)).BeginInit(); + this.tabPage2.SuspendLayout(); this.GB_Tweak.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).BeginInit(); this.SuspendLayout(); // // B_Cancel @@ -145,7 +144,7 @@ private void InitializeComponent() // CB_HeldItem // this.CB_HeldItem.FormattingEnabled = true; - this.CB_HeldItem.Location = new System.Drawing.Point(65, 118); + this.CB_HeldItem.Location = new System.Drawing.Point(65, 120); this.CB_HeldItem.Name = "CB_HeldItem"; this.CB_HeldItem.Size = new System.Drawing.Size(121, 21); this.CB_HeldItem.TabIndex = 470; @@ -161,7 +160,7 @@ private void InitializeComponent() // // L_HeldItem // - this.L_HeldItem.Location = new System.Drawing.Point(9, 117); + this.L_HeldItem.Location = new System.Drawing.Point(9, 119); this.L_HeldItem.Name = "L_HeldItem"; this.L_HeldItem.Size = new System.Drawing.Size(55, 23); this.L_HeldItem.TabIndex = 478; @@ -207,60 +206,13 @@ private void InitializeComponent() // // L_Nature // - this.L_Nature.Location = new System.Drawing.Point(9, 140); + this.L_Nature.Location = new System.Drawing.Point(9, 142); this.L_Nature.Name = "L_Nature"; this.L_Nature.Size = new System.Drawing.Size(55, 23); this.L_Nature.TabIndex = 490; this.L_Nature.Text = "Nature:"; this.L_Nature.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // L_Ability - // - this.L_Ability.Location = new System.Drawing.Point(9, 71); - this.L_Ability.Name = "L_Ability"; - this.L_Ability.Size = new System.Drawing.Size(55, 23); - this.L_Ability.TabIndex = 493; - this.L_Ability.Text = "Ability:"; - this.L_Ability.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // NUD_Ability - // - this.NUD_Ability.Location = new System.Drawing.Point(65, 74); - this.NUD_Ability.Maximum = new decimal(new int[] { - 3, - 0, - 0, - 0}); - this.NUD_Ability.Minimum = new decimal(new int[] { - 1, - 0, - 0, - -2147483648}); - this.NUD_Ability.Name = "NUD_Ability"; - this.NUD_Ability.Size = new System.Drawing.Size(41, 20); - this.NUD_Ability.TabIndex = 492; - // - // L_Gender - // - this.L_Gender.Location = new System.Drawing.Point(9, 96); - this.L_Gender.Name = "L_Gender"; - this.L_Gender.Size = new System.Drawing.Size(55, 23); - this.L_Gender.TabIndex = 495; - this.L_Gender.Text = "Gender:"; - this.L_Gender.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // NUD_Gender - // - this.NUD_Gender.Location = new System.Drawing.Point(65, 96); - this.NUD_Gender.Maximum = new decimal(new int[] { - 2, - 0, - 0, - 0}); - this.NUD_Gender.Name = "NUD_Gender"; - this.NUD_Gender.Size = new System.Drawing.Size(41, 20); - this.NUD_Gender.TabIndex = 494; - // // B_RandAll // this.B_RandAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -284,14 +236,14 @@ private void InitializeComponent() // // tabPage1 // + this.tabPage1.Controls.Add(this.L_Gender); + this.tabPage1.Controls.Add(this.CB_Gender); + this.tabPage1.Controls.Add(this.L_Ability); + this.tabPage1.Controls.Add(this.CB_Ability); this.tabPage1.Controls.Add(this.CB_Nature); this.tabPage1.Controls.Add(this.GB_EIVs); this.tabPage1.Controls.Add(this.CHK_ShinyLock); - this.tabPage1.Controls.Add(this.L_Gender); this.tabPage1.Controls.Add(this.CB_Species); - this.tabPage1.Controls.Add(this.NUD_Gender); - this.tabPage1.Controls.Add(this.NUD_Ability); - this.tabPage1.Controls.Add(this.L_Ability); this.tabPage1.Controls.Add(this.L_Nature); this.tabPage1.Controls.Add(this.L_Species); this.tabPage1.Controls.Add(this.L_HeldItem); @@ -308,87 +260,13 @@ private void InitializeComponent() this.tabPage1.Text = "Editor"; this.tabPage1.UseVisualStyleBackColor = true; // - // CHK_ShinyLock + // CB_Nature // - this.CHK_ShinyLock.AutoSize = true; - this.CHK_ShinyLock.Location = new System.Drawing.Point(65, 165); - this.CHK_ShinyLock.Name = "CHK_ShinyLock"; - this.CHK_ShinyLock.Size = new System.Drawing.Size(79, 17); - this.CHK_ShinyLock.TabIndex = 503; - this.CHK_ShinyLock.Text = "Shiny Lock"; - this.CHK_ShinyLock.UseVisualStyleBackColor = true; - // - // tabPage2 - // - this.tabPage2.Controls.Add(this.B_ModifyLevel); - this.tabPage2.Controls.Add(this.GB_Tweak); - this.tabPage2.Controls.Add(this.L_Mega); - this.tabPage2.Controls.Add(this.CHK_ReplaceMega); - this.tabPage2.Controls.Add(this.NUD_LevelBoost); - this.tabPage2.Controls.Add(this.CHK_Level); - this.tabPage2.Location = new System.Drawing.Point(4, 22); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(269, 296); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Randomizer Options"; - this.tabPage2.UseVisualStyleBackColor = true; - // - // L_Mega - // - this.L_Mega.Location = new System.Drawing.Point(24, 261); - this.L_Mega.Name = "L_Mega"; - this.L_Mega.Size = new System.Drawing.Size(113, 33); - this.L_Mega.TabIndex = 512; - this.L_Mega.Text = "XY - Lucario\nORAS - Latias/Latios"; - this.L_Mega.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // CHK_ReplaceMega - // - this.CHK_ReplaceMega.AutoSize = true; - this.CHK_ReplaceMega.Checked = true; - this.CHK_ReplaceMega.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_ReplaceMega.Location = new System.Drawing.Point(7, 247); - this.CHK_ReplaceMega.Name = "CHK_ReplaceMega"; - this.CHK_ReplaceMega.Size = new System.Drawing.Size(264, 17); - this.CHK_ReplaceMega.TabIndex = 511; - this.CHK_ReplaceMega.Text = "Replace Megas with Another Mega (via Held Item)"; - this.CHK_ReplaceMega.UseVisualStyleBackColor = true; - // - // NUD_LevelBoost - // - this.NUD_LevelBoost.DecimalPlaces = 2; - this.NUD_LevelBoost.Increment = new decimal(new int[] { - 5, - 0, - 0, - 131072}); - this.NUD_LevelBoost.Location = new System.Drawing.Point(140, 6); - this.NUD_LevelBoost.Maximum = new decimal(new int[] { - 3, - 0, - 0, - 0}); - this.NUD_LevelBoost.Name = "NUD_LevelBoost"; - this.NUD_LevelBoost.Size = new System.Drawing.Size(43, 20); - this.NUD_LevelBoost.TabIndex = 303; - this.NUD_LevelBoost.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); - // - // CHK_Level - // - this.CHK_Level.AutoSize = true; - this.CHK_Level.Checked = true; - this.CHK_Level.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_Level.Location = new System.Drawing.Point(9, 7); - this.CHK_Level.Name = "CHK_Level"; - this.CHK_Level.Size = new System.Drawing.Size(130, 17); - this.CHK_Level.TabIndex = 302; - this.CHK_Level.Text = "Multiply PKM Level by"; - this.CHK_Level.UseVisualStyleBackColor = true; + this.CB_Nature.FormattingEnabled = true; + this.CB_Nature.Location = new System.Drawing.Point(65, 143); + this.CB_Nature.Name = "CB_Nature"; + this.CB_Nature.Size = new System.Drawing.Size(121, 21); + this.CB_Nature.TabIndex = 505; // // GB_EIVs // @@ -404,7 +282,7 @@ private void InitializeComponent() this.GB_EIVs.Controls.Add(this.NUD_IV0); this.GB_EIVs.Controls.Add(this.L_ATK); this.GB_EIVs.Controls.Add(this.L_DEF); - this.GB_EIVs.Location = new System.Drawing.Point(12, 179); + this.GB_EIVs.Location = new System.Drawing.Point(12, 181); this.GB_EIVs.Name = "GB_EIVs"; this.GB_EIVs.Size = new System.Drawing.Size(148, 112); this.GB_EIVs.TabIndex = 504; @@ -597,16 +475,45 @@ private void InitializeComponent() this.L_DEF.Text = "Def:"; this.L_DEF.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // CB_Nature + // CHK_ShinyLock // - this.CB_Nature.FormattingEnabled = true; - this.CB_Nature.Location = new System.Drawing.Point(65, 141); - this.CB_Nature.Name = "CB_Nature"; - this.CB_Nature.Size = new System.Drawing.Size(121, 21); - this.CB_Nature.TabIndex = 505; + this.CHK_ShinyLock.AutoSize = true; + this.CHK_ShinyLock.Location = new System.Drawing.Point(65, 167); + this.CHK_ShinyLock.Name = "CHK_ShinyLock"; + this.CHK_ShinyLock.Size = new System.Drawing.Size(79, 17); + this.CHK_ShinyLock.TabIndex = 503; + this.CHK_ShinyLock.Text = "Shiny Lock"; + this.CHK_ShinyLock.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.B_ModifyLevel); + this.tabPage2.Controls.Add(this.GB_Tweak); + this.tabPage2.Controls.Add(this.L_Mega); + this.tabPage2.Controls.Add(this.CHK_ReplaceMega); + this.tabPage2.Controls.Add(this.NUD_LevelBoost); + this.tabPage2.Controls.Add(this.CHK_Level); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(269, 296); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Randomizer Options"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // B_ModifyLevel + // + this.B_ModifyLevel.Location = new System.Drawing.Point(189, 5); + this.B_ModifyLevel.Name = "B_ModifyLevel"; + this.B_ModifyLevel.Size = new System.Drawing.Size(70, 23); + this.B_ModifyLevel.TabIndex = 514; + this.B_ModifyLevel.Text = "× Current"; + this.B_ModifyLevel.UseVisualStyleBackColor = true; + this.B_ModifyLevel.Click += new System.EventHandler(this.ModifyLevels); // // GB_Tweak // + this.GB_Tweak.Controls.Add(this.CHK_RandomAbility); this.GB_Tweak.Controls.Add(this.CHK_RemoveShinyLock); this.GB_Tweak.Controls.Add(this.CHK_AllowMega); this.GB_Tweak.Controls.Add(this.CHK_Item); @@ -620,9 +527,9 @@ private void InitializeComponent() this.GB_Tweak.Controls.Add(this.CHK_G3); this.GB_Tweak.Controls.Add(this.CHK_G2); this.GB_Tweak.Controls.Add(this.CHK_G1); - this.GB_Tweak.Location = new System.Drawing.Point(5, 83); + this.GB_Tweak.Location = new System.Drawing.Point(5, 71); this.GB_Tweak.Name = "GB_Tweak"; - this.GB_Tweak.Size = new System.Drawing.Size(258, 129); + this.GB_Tweak.Size = new System.Drawing.Size(258, 147); this.GB_Tweak.TabIndex = 513; this.GB_Tweak.TabStop = false; this.GB_Tweak.Text = "Extra Randomization Tweaks"; @@ -630,7 +537,7 @@ private void InitializeComponent() // CHK_RemoveShinyLock // this.CHK_RemoveShinyLock.AutoSize = true; - this.CHK_RemoveShinyLock.Location = new System.Drawing.Point(9, 109); + this.CHK_RemoveShinyLock.Location = new System.Drawing.Point(9, 94); this.CHK_RemoveShinyLock.Name = "CHK_RemoveShinyLock"; this.CHK_RemoveShinyLock.Size = new System.Drawing.Size(127, 17); this.CHK_RemoveShinyLock.TabIndex = 297; @@ -640,7 +547,7 @@ private void InitializeComponent() // CHK_AllowMega // this.CHK_AllowMega.AutoSize = true; - this.CHK_AllowMega.Location = new System.Drawing.Point(9, 94); + this.CHK_AllowMega.Location = new System.Drawing.Point(9, 126); this.CHK_AllowMega.Name = "CHK_AllowMega"; this.CHK_AllowMega.Size = new System.Drawing.Size(155, 17); this.CHK_AllowMega.TabIndex = 296; @@ -774,15 +681,105 @@ private void InitializeComponent() this.CHK_G1.Text = "Gen 1"; this.CHK_G1.UseVisualStyleBackColor = true; // - // B_ModifyLevel + // L_Mega // - this.B_ModifyLevel.Location = new System.Drawing.Point(189, 5); - this.B_ModifyLevel.Name = "B_ModifyLevel"; - this.B_ModifyLevel.Size = new System.Drawing.Size(70, 23); - this.B_ModifyLevel.TabIndex = 514; - this.B_ModifyLevel.Text = "× Current"; - this.B_ModifyLevel.UseVisualStyleBackColor = true; - this.B_ModifyLevel.Click += new System.EventHandler(this.ModifyLevels); + this.L_Mega.Location = new System.Drawing.Point(24, 261); + this.L_Mega.Name = "L_Mega"; + this.L_Mega.Size = new System.Drawing.Size(113, 33); + this.L_Mega.TabIndex = 512; + this.L_Mega.Text = "XY - Lucario\nORAS - Latias/Latios"; + this.L_Mega.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // CHK_ReplaceMega + // + this.CHK_ReplaceMega.AutoSize = true; + this.CHK_ReplaceMega.Checked = true; + this.CHK_ReplaceMega.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_ReplaceMega.Location = new System.Drawing.Point(7, 247); + this.CHK_ReplaceMega.Name = "CHK_ReplaceMega"; + this.CHK_ReplaceMega.Size = new System.Drawing.Size(264, 17); + this.CHK_ReplaceMega.TabIndex = 511; + this.CHK_ReplaceMega.Text = "Replace Megas with Another Mega (via Held Item)"; + this.CHK_ReplaceMega.UseVisualStyleBackColor = true; + // + // NUD_LevelBoost + // + this.NUD_LevelBoost.DecimalPlaces = 2; + this.NUD_LevelBoost.Increment = new decimal(new int[] { + 5, + 0, + 0, + 131072}); + this.NUD_LevelBoost.Location = new System.Drawing.Point(140, 6); + this.NUD_LevelBoost.Maximum = new decimal(new int[] { + 3, + 0, + 0, + 0}); + this.NUD_LevelBoost.Name = "NUD_LevelBoost"; + this.NUD_LevelBoost.Size = new System.Drawing.Size(43, 20); + this.NUD_LevelBoost.TabIndex = 303; + this.NUD_LevelBoost.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // CHK_Level + // + this.CHK_Level.AutoSize = true; + this.CHK_Level.Checked = true; + this.CHK_Level.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_Level.Location = new System.Drawing.Point(9, 7); + this.CHK_Level.Name = "CHK_Level"; + this.CHK_Level.Size = new System.Drawing.Size(130, 17); + this.CHK_Level.TabIndex = 302; + this.CHK_Level.Text = "Multiply PKM Level by"; + this.CHK_Level.UseVisualStyleBackColor = true; + // + // L_Gender + // + this.L_Gender.Location = new System.Drawing.Point(9, 96); + this.L_Gender.Name = "L_Gender"; + this.L_Gender.Size = new System.Drawing.Size(55, 23); + this.L_Gender.TabIndex = 532; + this.L_Gender.Text = "Gender:"; + this.L_Gender.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_Gender + // + this.CB_Gender.FormattingEnabled = true; + this.CB_Gender.Location = new System.Drawing.Point(65, 97); + this.CB_Gender.Name = "CB_Gender"; + this.CB_Gender.Size = new System.Drawing.Size(121, 21); + this.CB_Gender.TabIndex = 531; + // + // L_Ability + // + this.L_Ability.Location = new System.Drawing.Point(9, 73); + this.L_Ability.Name = "L_Ability"; + this.L_Ability.Size = new System.Drawing.Size(55, 23); + this.L_Ability.TabIndex = 530; + this.L_Ability.Text = "Ability:"; + this.L_Ability.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_Ability + // + this.CB_Ability.FormattingEnabled = true; + this.CB_Ability.Location = new System.Drawing.Point(65, 74); + this.CB_Ability.Name = "CB_Ability"; + this.CB_Ability.Size = new System.Drawing.Size(121, 21); + this.CB_Ability.TabIndex = 529; + // + // CHK_RandomAbility + // + this.CHK_RandomAbility.AutoSize = true; + this.CHK_RandomAbility.Location = new System.Drawing.Point(9, 110); + this.CHK_RandomAbility.Name = "CHK_RandomAbility"; + this.CHK_RandomAbility.Size = new System.Drawing.Size(183, 17); + this.CHK_RandomAbility.TabIndex = 298; + this.CHK_RandomAbility.Text = "Random Abilities (1, 2, or Hidden)"; + this.CHK_RandomAbility.UseVisualStyleBackColor = true; // // GiftEditor6 // @@ -803,14 +800,9 @@ private void InitializeComponent() this.Text = "Gift Editor"; ((System.ComponentModel.ISupportInitialize)(this.NUD_Level)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Form)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_Ability)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_Gender)).EndInit(); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); - this.tabPage2.ResumeLayout(false); - this.tabPage2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).EndInit(); this.GB_EIVs.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.NUD_IV3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_IV4)).EndInit(); @@ -818,8 +810,11 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_IV2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_IV1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_IV0)).EndInit(); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); this.GB_Tweak.ResumeLayout(false); this.GB_Tweak.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).EndInit(); this.ResumeLayout(false); } @@ -838,10 +833,6 @@ private void InitializeComponent() private System.Windows.Forms.NumericUpDown NUD_Form; private System.Windows.Forms.Label L_Form; private System.Windows.Forms.Label L_Nature; - private System.Windows.Forms.Label L_Ability; - private System.Windows.Forms.NumericUpDown NUD_Ability; - private System.Windows.Forms.Label L_Gender; - private System.Windows.Forms.NumericUpDown NUD_Gender; private System.Windows.Forms.Button B_RandAll; private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabPage tabPage1; @@ -880,5 +871,10 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CHK_G2; private System.Windows.Forms.CheckBox CHK_G1; private System.Windows.Forms.Button B_ModifyLevel; + private System.Windows.Forms.Label L_Gender; + private System.Windows.Forms.ComboBox CB_Gender; + private System.Windows.Forms.Label L_Ability; + private System.Windows.Forms.ComboBox CB_Ability; + private System.Windows.Forms.CheckBox CHK_RandomAbility; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen6/GiftEditor6.cs b/pk3DS/Subforms/Gen6/GiftEditor6.cs index 8640b9f..def62cd 100644 --- a/pk3DS/Subforms/Gen6/GiftEditor6.cs +++ b/pk3DS/Subforms/Gen6/GiftEditor6.cs @@ -59,6 +59,20 @@ public GiftEditor6() private readonly string[] specieslist = Main.Config.getText(TextName.SpeciesNames); private readonly string[] natureslist = Main.Config.getText(TextName.Natures); private readonly Dictionary MegaDictionary; + + private readonly string[] ability = + { + "Random (1 or 2)", + "Ability 1", + "Ability 2", + "Hidden Ability", + }; + private readonly string[] gender = + { + "Random/Genderless", + "Male", + "Female", + }; private void B_Save_Click(object sender, EventArgs e) { saveEntry(); @@ -80,6 +94,10 @@ private void loadData() GiftData[i] = new EncounterGift6(FieldData.Skip(fieldOffset + i * fieldSize).Take(fieldSize).ToArray(), Main.Config.ORAS); LB_Gifts.Items.Add($"{i:00} - {specieslist[GiftData[i].Species]}"); } + + foreach (var s in ability) CB_Ability.Items.Add(s); + foreach (var s in gender) CB_Gender.Items.Add(s); + loaded = true; LB_Gifts.SelectedIndex = 0; } @@ -143,8 +161,8 @@ private void loadEntry() NUD_Level.Value = GiftData[entry].Level; NUD_Form.Value = GiftData[entry].Form; CB_Nature.SelectedIndex = GiftData[entry].Nature + 1; - NUD_Ability.Value = GiftData[entry].Ability; - NUD_Gender.Value = GiftData[entry].Gender; + CB_Ability.SelectedIndex = GiftData[entry].Ability + 1; + CB_Gender.SelectedIndex = GiftData[entry].Gender; CHK_ShinyLock.Checked = GiftData[entry].ShinyLock; NUD_IV0.Value = GiftData[entry].IVs[0]; @@ -166,8 +184,8 @@ private void saveEntry() GiftData[entry].Level = (byte)NUD_Level.Value; GiftData[entry].Form = (byte)NUD_Form.Value; GiftData[entry].Nature = (sbyte)(CB_Nature.SelectedIndex - 1); - GiftData[entry].Ability = (sbyte)NUD_Ability.Value; - GiftData[entry].Gender = (sbyte)NUD_Gender.Value; + GiftData[entry].Ability = (sbyte)(CB_Ability.SelectedIndex - 1); + GiftData[entry].Gender = (sbyte)CB_Gender.SelectedIndex; GiftData[entry].ShinyLock = CHK_ShinyLock.Checked; GiftData[entry].IVs[0] = (sbyte)NUD_IV0.Value; @@ -226,7 +244,7 @@ private void B_RandAll_Click(object sender, EventArgs e) CB_Species.SelectedIndex = species; NUD_Form.Value = formrand.GetRandomForme(species); - NUD_Gender.Value = 0; // random + CB_Gender.SelectedIndex = 0; // random CB_Nature.SelectedIndex = 0; // random if (MegaDictionary.Values.Any(z => z.Contains(CB_HeldItem.SelectedIndex)) && NUD_Form.Value > 0) @@ -237,6 +255,9 @@ private void B_RandAll_Click(object sender, EventArgs e) if (CHK_Level.Checked) NUD_Level.Value = Randomizer.getModifiedLevel((int)NUD_Level.Value, NUD_LevelBoost.Value); + + if (CHK_RandomAbility.Checked) + CB_Ability.SelectedIndex = (Util.rand.Next(1, 4)); // 1, 2 , or H } WinFormsUtil.Alert("Randomized all Gift Pokémon according to specification!"); } diff --git a/pk3DS/Subforms/Gen6/StaticEncounterEditor6.Designer.cs b/pk3DS/Subforms/Gen6/StaticEncounterEditor6.Designer.cs index f53a3d6..5b0835d 100644 --- a/pk3DS/Subforms/Gen6/StaticEncounterEditor6.Designer.cs +++ b/pk3DS/Subforms/Gen6/StaticEncounterEditor6.Designer.cs @@ -34,12 +34,13 @@ private void InitializeComponent() this.B_RandAll = new System.Windows.Forms.Button(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); - this.CHK_ShinyLock = new System.Windows.Forms.CheckBox(); this.L_Gender = new System.Windows.Forms.Label(); - this.CB_Species = new System.Windows.Forms.ComboBox(); - this.NUD_Gender = new System.Windows.Forms.NumericUpDown(); - this.NUD_Ability = new System.Windows.Forms.NumericUpDown(); + this.CB_Gender = new System.Windows.Forms.ComboBox(); this.L_Ability = new System.Windows.Forms.Label(); + this.CB_Ability = new System.Windows.Forms.ComboBox(); + this.CHK_IV3 = new System.Windows.Forms.CheckBox(); + this.CHK_ShinyLock = new System.Windows.Forms.CheckBox(); + this.CB_Species = new System.Windows.Forms.ComboBox(); this.L_Species = new System.Windows.Forms.Label(); this.L_HeldItem = new System.Windows.Forms.Label(); this.NUD_Level = new System.Windows.Forms.NumericUpDown(); @@ -50,6 +51,7 @@ private void InitializeComponent() this.tabPage2 = new System.Windows.Forms.TabPage(); this.B_ModifyLevel = new System.Windows.Forms.Button(); this.GB_Tweak = new System.Windows.Forms.GroupBox(); + this.CHK_RandomAbility = new System.Windows.Forms.CheckBox(); this.CHK_RemoveShinyLock = new System.Windows.Forms.CheckBox(); this.CHK_AllowMega = new System.Windows.Forms.CheckBox(); this.CHK_Item = new System.Windows.Forms.CheckBox(); @@ -65,11 +67,8 @@ private void InitializeComponent() this.CHK_G1 = new System.Windows.Forms.CheckBox(); this.NUD_LevelBoost = new System.Windows.Forms.NumericUpDown(); this.CHK_Level = new System.Windows.Forms.CheckBox(); - this.CHK_IV3 = new System.Windows.Forms.CheckBox(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_Gender)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_Ability)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Level)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Form)).BeginInit(); this.tabPage2.SuspendLayout(); @@ -133,13 +132,13 @@ private void InitializeComponent() // // tabPage1 // + this.tabPage1.Controls.Add(this.L_Gender); + this.tabPage1.Controls.Add(this.CB_Gender); + this.tabPage1.Controls.Add(this.L_Ability); + this.tabPage1.Controls.Add(this.CB_Ability); this.tabPage1.Controls.Add(this.CHK_IV3); this.tabPage1.Controls.Add(this.CHK_ShinyLock); - this.tabPage1.Controls.Add(this.L_Gender); this.tabPage1.Controls.Add(this.CB_Species); - this.tabPage1.Controls.Add(this.NUD_Gender); - this.tabPage1.Controls.Add(this.NUD_Ability); - this.tabPage1.Controls.Add(this.L_Ability); this.tabPage1.Controls.Add(this.L_Species); this.tabPage1.Controls.Add(this.L_HeldItem); this.tabPage1.Controls.Add(this.NUD_Level); @@ -155,25 +154,60 @@ private void InitializeComponent() this.tabPage1.Text = "Editor"; this.tabPage1.UseVisualStyleBackColor = true; // - // CHK_ShinyLock - // - this.CHK_ShinyLock.AutoSize = true; - this.CHK_ShinyLock.Location = new System.Drawing.Point(65, 141); - this.CHK_ShinyLock.Name = "CHK_ShinyLock"; - this.CHK_ShinyLock.Size = new System.Drawing.Size(79, 17); - this.CHK_ShinyLock.TabIndex = 519; - this.CHK_ShinyLock.Text = "Shiny Lock"; - this.CHK_ShinyLock.UseVisualStyleBackColor = true; - // // L_Gender // this.L_Gender.Location = new System.Drawing.Point(9, 96); this.L_Gender.Name = "L_Gender"; this.L_Gender.Size = new System.Drawing.Size(55, 23); - this.L_Gender.TabIndex = 518; + this.L_Gender.TabIndex = 526; this.L_Gender.Text = "Gender:"; this.L_Gender.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // CB_Gender + // + this.CB_Gender.FormattingEnabled = true; + this.CB_Gender.Location = new System.Drawing.Point(65, 97); + this.CB_Gender.Name = "CB_Gender"; + this.CB_Gender.Size = new System.Drawing.Size(121, 21); + this.CB_Gender.TabIndex = 525; + // + // L_Ability + // + this.L_Ability.Location = new System.Drawing.Point(9, 73); + this.L_Ability.Name = "L_Ability"; + this.L_Ability.Size = new System.Drawing.Size(55, 23); + this.L_Ability.TabIndex = 524; + this.L_Ability.Text = "Ability:"; + this.L_Ability.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_Ability + // + this.CB_Ability.FormattingEnabled = true; + this.CB_Ability.Location = new System.Drawing.Point(65, 74); + this.CB_Ability.Name = "CB_Ability"; + this.CB_Ability.Size = new System.Drawing.Size(121, 21); + this.CB_Ability.TabIndex = 523; + // + // CHK_IV3 + // + this.CHK_IV3.AutoSize = true; + this.CHK_IV3.Location = new System.Drawing.Point(65, 158); + this.CHK_IV3.Name = "CHK_IV3"; + this.CHK_IV3.Size = new System.Drawing.Size(42, 17); + this.CHK_IV3.TabIndex = 522; + this.CHK_IV3.Text = "3IV"; + this.CHK_IV3.UseVisualStyleBackColor = true; + // + // CHK_ShinyLock + // + this.CHK_ShinyLock.AutoSize = true; + this.CHK_ShinyLock.Location = new System.Drawing.Point(65, 143); + this.CHK_ShinyLock.Name = "CHK_ShinyLock"; + this.CHK_ShinyLock.Size = new System.Drawing.Size(79, 17); + this.CHK_ShinyLock.TabIndex = 519; + this.CHK_ShinyLock.Text = "Shiny Lock"; + this.CHK_ShinyLock.UseVisualStyleBackColor = true; + // // CB_Species // this.CB_Species.FormattingEnabled = true; @@ -182,44 +216,6 @@ private void InitializeComponent() this.CB_Species.Size = new System.Drawing.Size(121, 21); this.CB_Species.TabIndex = 506; // - // NUD_Gender - // - this.NUD_Gender.Location = new System.Drawing.Point(65, 96); - this.NUD_Gender.Maximum = new decimal(new int[] { - 2, - 0, - 0, - 0}); - this.NUD_Gender.Name = "NUD_Gender"; - this.NUD_Gender.Size = new System.Drawing.Size(41, 20); - this.NUD_Gender.TabIndex = 517; - // - // NUD_Ability - // - this.NUD_Ability.Location = new System.Drawing.Point(65, 74); - this.NUD_Ability.Maximum = new decimal(new int[] { - 3, - 0, - 0, - 0}); - this.NUD_Ability.Minimum = new decimal(new int[] { - 1, - 0, - 0, - -2147483648}); - this.NUD_Ability.Name = "NUD_Ability"; - this.NUD_Ability.Size = new System.Drawing.Size(41, 20); - this.NUD_Ability.TabIndex = 515; - // - // L_Ability - // - this.L_Ability.Location = new System.Drawing.Point(9, 71); - this.L_Ability.Name = "L_Ability"; - this.L_Ability.Size = new System.Drawing.Size(55, 23); - this.L_Ability.TabIndex = 516; - this.L_Ability.Text = "Ability:"; - this.L_Ability.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // L_Species // this.L_Species.Location = new System.Drawing.Point(9, 6); @@ -231,7 +227,7 @@ private void InitializeComponent() // // L_HeldItem // - this.L_HeldItem.Location = new System.Drawing.Point(9, 117); + this.L_HeldItem.Location = new System.Drawing.Point(9, 119); this.L_HeldItem.Name = "L_HeldItem"; this.L_HeldItem.Size = new System.Drawing.Size(55, 23); this.L_HeldItem.TabIndex = 509; @@ -271,7 +267,7 @@ private void InitializeComponent() // CB_HeldItem // this.CB_HeldItem.FormattingEnabled = true; - this.CB_HeldItem.Location = new System.Drawing.Point(65, 118); + this.CB_HeldItem.Location = new System.Drawing.Point(65, 120); this.CB_HeldItem.Name = "CB_HeldItem"; this.CB_HeldItem.Size = new System.Drawing.Size(121, 21); this.CB_HeldItem.TabIndex = 507; @@ -309,6 +305,7 @@ private void InitializeComponent() // // GB_Tweak // + this.GB_Tweak.Controls.Add(this.CHK_RandomAbility); this.GB_Tweak.Controls.Add(this.CHK_RemoveShinyLock); this.GB_Tweak.Controls.Add(this.CHK_AllowMega); this.GB_Tweak.Controls.Add(this.CHK_Item); @@ -324,15 +321,25 @@ private void InitializeComponent() this.GB_Tweak.Controls.Add(this.CHK_G1); this.GB_Tweak.Location = new System.Drawing.Point(5, 83); this.GB_Tweak.Name = "GB_Tweak"; - this.GB_Tweak.Size = new System.Drawing.Size(258, 129); + this.GB_Tweak.Size = new System.Drawing.Size(258, 147); this.GB_Tweak.TabIndex = 509; this.GB_Tweak.TabStop = false; this.GB_Tweak.Text = "Extra Randomization Tweaks"; // + // CHK_RandomAbility + // + this.CHK_RandomAbility.AutoSize = true; + this.CHK_RandomAbility.Location = new System.Drawing.Point(9, 109); + this.CHK_RandomAbility.Name = "CHK_RandomAbility"; + this.CHK_RandomAbility.Size = new System.Drawing.Size(183, 17); + this.CHK_RandomAbility.TabIndex = 303; + this.CHK_RandomAbility.Text = "Random Abilities (1, 2, or Hidden)"; + this.CHK_RandomAbility.UseVisualStyleBackColor = true; + // // CHK_RemoveShinyLock // this.CHK_RemoveShinyLock.AutoSize = true; - this.CHK_RemoveShinyLock.Location = new System.Drawing.Point(9, 109); + this.CHK_RemoveShinyLock.Location = new System.Drawing.Point(9, 94); this.CHK_RemoveShinyLock.Name = "CHK_RemoveShinyLock"; this.CHK_RemoveShinyLock.Size = new System.Drawing.Size(127, 17); this.CHK_RemoveShinyLock.TabIndex = 297; @@ -342,7 +349,7 @@ private void InitializeComponent() // CHK_AllowMega // this.CHK_AllowMega.AutoSize = true; - this.CHK_AllowMega.Location = new System.Drawing.Point(9, 94); + this.CHK_AllowMega.Location = new System.Drawing.Point(9, 125); this.CHK_AllowMega.Name = "CHK_AllowMega"; this.CHK_AllowMega.Size = new System.Drawing.Size(155, 17); this.CHK_AllowMega.TabIndex = 296; @@ -511,16 +518,6 @@ private void InitializeComponent() this.CHK_Level.Text = "Multiply PKM Level by"; this.CHK_Level.UseVisualStyleBackColor = true; // - // CHK_IV3 - // - this.CHK_IV3.AutoSize = true; - this.CHK_IV3.Location = new System.Drawing.Point(65, 156); - this.CHK_IV3.Name = "CHK_IV3"; - this.CHK_IV3.Size = new System.Drawing.Size(42, 17); - this.CHK_IV3.TabIndex = 522; - this.CHK_IV3.Text = "3IV"; - this.CHK_IV3.UseVisualStyleBackColor = true; - // // StaticEncounterEditor6 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -541,8 +538,6 @@ private void InitializeComponent() this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_Gender)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_Ability)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Level)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Form)).EndInit(); this.tabPage2.ResumeLayout(false); @@ -580,11 +575,7 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CHK_AllowMega; private System.Windows.Forms.CheckBox CHK_RemoveShinyLock; private System.Windows.Forms.CheckBox CHK_ShinyLock; - private System.Windows.Forms.Label L_Gender; private System.Windows.Forms.ComboBox CB_Species; - private System.Windows.Forms.NumericUpDown NUD_Gender; - private System.Windows.Forms.NumericUpDown NUD_Ability; - private System.Windows.Forms.Label L_Ability; private System.Windows.Forms.Label L_Species; private System.Windows.Forms.Label L_HeldItem; private System.Windows.Forms.NumericUpDown NUD_Level; @@ -594,5 +585,10 @@ private void InitializeComponent() private System.Windows.Forms.NumericUpDown NUD_Form; private System.Windows.Forms.Button B_ModifyLevel; private System.Windows.Forms.CheckBox CHK_IV3; + private System.Windows.Forms.Label L_Gender; + private System.Windows.Forms.ComboBox CB_Gender; + private System.Windows.Forms.Label L_Ability; + private System.Windows.Forms.ComboBox CB_Ability; + private System.Windows.Forms.CheckBox CHK_RandomAbility; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs b/pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs index 8c6a9a2..9d6bcac 100644 --- a/pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs +++ b/pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs @@ -42,6 +42,20 @@ public StaticEncounterEditor6() private EncounterStatic6[] EncounterData; private readonly string[] itemlist = Main.Config.getText(TextName.ItemNames); private readonly string[] specieslist = Main.Config.getText(TextName.SpeciesNames); + + private readonly string[] ability = + { + "Random (1 or 2)", + "Ability 1", + "Ability 2", + "Hidden Ability", + }; + private readonly string[] gender = + { + "Random/Genderless", + "Male", + "Female", + }; private void B_Save_Click(object sender, EventArgs e) { saveEntry(); @@ -63,6 +77,10 @@ private void loadData() EncounterData[i] = new EncounterStatic6(FieldData.Skip(fieldOffset + i * fieldSize).Take(fieldSize).ToArray()); LB_Encounters.Items.Add($"{i:00} - {specieslist[EncounterData[i].Species]}"); } + + foreach (var s in ability) CB_Ability.Items.Add(s); + foreach (var s in gender) CB_Gender.Items.Add(s); + loaded = true; LB_Encounters.SelectedIndex = 0; } @@ -99,8 +117,8 @@ private void loadEntry() CB_HeldItem.SelectedIndex = EncounterData[entry].HeldItem; NUD_Level.Value = EncounterData[entry].Level; NUD_Form.Value = EncounterData[entry].Form; - NUD_Ability.Value = EncounterData[entry].Ability; - NUD_Gender.Value = EncounterData[entry].Gender; + CB_Ability.SelectedIndex = EncounterData[entry].Ability; + CB_Gender.SelectedIndex = EncounterData[entry].Gender; CHK_ShinyLock.Checked = EncounterData[entry].ShinyLock; CHK_IV3.Checked = EncounterData[entry].IV3; @@ -115,8 +133,8 @@ private void saveEntry() EncounterData[entry].HeldItem = CB_HeldItem.SelectedIndex; EncounterData[entry].Level = (byte)NUD_Level.Value; EncounterData[entry].Form = (byte)NUD_Form.Value; - EncounterData[entry].Ability = (sbyte)NUD_Ability.Value; - EncounterData[entry].Gender = (sbyte)NUD_Gender.Value; + EncounterData[entry].Ability = (sbyte)CB_Ability.SelectedIndex; + EncounterData[entry].Gender = (sbyte)CB_Gender.SelectedIndex; EncounterData[entry].ShinyLock = CHK_ShinyLock.Checked; EncounterData[entry].IV3 = CHK_IV3.Checked; } @@ -151,7 +169,7 @@ private void B_RandAll_Click(object sender, EventArgs e) species = specrand.GetRandomSpecies(species); CB_Species.SelectedIndex = species; NUD_Form.Value = formrand.GetRandomForme(species); - NUD_Gender.Value = 0; // random + CB_Gender.SelectedIndex = 0; // random if (CHK_AllowMega.Checked) formrand.AllowMega = true; @@ -164,6 +182,9 @@ private void B_RandAll_Click(object sender, EventArgs e) if (CHK_RemoveShinyLock.Checked) CHK_ShinyLock.Checked = false; + + if (CHK_RandomAbility.Checked) + CB_Ability.SelectedIndex = (Util.rand.Next(1, 4)); // 1, 2 , or H } WinFormsUtil.Alert("Randomized all Static Encounters according to specification!"); } diff --git a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs index 22e6604..2d5a420 100644 --- a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs @@ -30,14 +30,14 @@ private void InitializeComponent() { this.TC_Tabs = new System.Windows.Forms.TabControl(); this.Tab_Gifts = new System.Windows.Forms.TabPage(); + this.CB_GAbility = new System.Windows.Forms.ComboBox(); + this.L_GAbility = new System.Windows.Forms.Label(); this.CB_GNature = new System.Windows.Forms.ComboBox(); this.L_GNature = new System.Windows.Forms.Label(); 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(); this.CB_GHeldItem = new System.Windows.Forms.ComboBox(); this.L_GHeldItem = new System.Windows.Forms.Label(); @@ -49,6 +49,8 @@ private void InitializeComponent() this.NUD_GLevel = new System.Windows.Forms.NumericUpDown(); this.LB_Gift = new System.Windows.Forms.ListBox(); this.Tab_Encounters = new System.Windows.Forms.TabPage(); + this.CB_EAbility = new System.Windows.Forms.ComboBox(); + this.L_EAbility = new System.Windows.Forms.Label(); this.CHK_EIV3 = new System.Windows.Forms.CheckBox(); this.CB_ENature = new System.Windows.Forms.ComboBox(); this.L_ENature = new System.Windows.Forms.Label(); @@ -96,6 +98,8 @@ 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_TAbility = new System.Windows.Forms.ComboBox(); + this.L_TAbility = new System.Windows.Forms.Label(); this.CB_TNature = new System.Windows.Forms.ComboBox(); this.L_TNature = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); @@ -131,6 +135,8 @@ private void InitializeComponent() this.CHK_Level = new System.Windows.Forms.CheckBox(); this.B_RandAll = new System.Windows.Forms.Button(); this.GB_Tweak = new System.Windows.Forms.GroupBox(); + this.CHK_RandomAbility = new System.Windows.Forms.CheckBox(); + this.CHK_SpecialMove = new System.Windows.Forms.CheckBox(); this.CHK_RandomAura = new System.Windows.Forms.CheckBox(); this.CHK_RemoveShinyLock = new System.Windows.Forms.CheckBox(); this.CHK_AllowMega = new System.Windows.Forms.CheckBox(); @@ -149,10 +155,12 @@ 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.CHK_SpecialMove = new System.Windows.Forms.CheckBox(); + this.L_EGender = new System.Windows.Forms.Label(); + this.NUD_EGender = new System.Windows.Forms.NumericUpDown(); + this.L_TGender = new System.Windows.Forms.Label(); + this.NUD_TGender = new System.Windows.Forms.NumericUpDown(); this.TC_Tabs.SuspendLayout(); this.Tab_Gifts.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_GGender)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_GForm)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_GLevel)).BeginInit(); this.Tab_Encounters.SuspendLayout(); @@ -187,6 +195,8 @@ private void InitializeComponent() this.Tab_Randomizer.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).BeginInit(); this.GB_Tweak.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_EGender)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_TGender)).BeginInit(); this.SuspendLayout(); // // TC_Tabs @@ -201,19 +211,19 @@ private void InitializeComponent() this.TC_Tabs.Location = new System.Drawing.Point(12, 12); this.TC_Tabs.Name = "TC_Tabs"; this.TC_Tabs.SelectedIndex = 0; - this.TC_Tabs.Size = new System.Drawing.Size(506, 463); + this.TC_Tabs.Size = new System.Drawing.Size(506, 502); this.TC_Tabs.TabIndex = 0; // // Tab_Gifts // + this.Tab_Gifts.Controls.Add(this.CB_GAbility); + this.Tab_Gifts.Controls.Add(this.L_GAbility); 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); this.Tab_Gifts.Controls.Add(this.L_SpecialMove); - this.Tab_Gifts.Controls.Add(this.L_GGender); - this.Tab_Gifts.Controls.Add(this.NUD_GGender); this.Tab_Gifts.Controls.Add(this.CHK_G_Lock); this.Tab_Gifts.Controls.Add(this.CB_GHeldItem); this.Tab_Gifts.Controls.Add(this.L_GHeldItem); @@ -226,22 +236,39 @@ private void InitializeComponent() this.Tab_Gifts.Controls.Add(this.LB_Gift); this.Tab_Gifts.Location = new System.Drawing.Point(4, 22); this.Tab_Gifts.Name = "Tab_Gifts"; - this.Tab_Gifts.Size = new System.Drawing.Size(498, 437); + this.Tab_Gifts.Size = new System.Drawing.Size(498, 476); this.Tab_Gifts.TabIndex = 2; this.Tab_Gifts.Text = "Gifts"; this.Tab_Gifts.UseVisualStyleBackColor = true; // + // CB_GAbility + // + this.CB_GAbility.FormattingEnabled = true; + this.CB_GAbility.Location = new System.Drawing.Point(187, 74); + this.CB_GAbility.Name = "CB_GAbility"; + this.CB_GAbility.Size = new System.Drawing.Size(121, 21); + this.CB_GAbility.TabIndex = 513; + // + // L_GAbility + // + this.L_GAbility.Location = new System.Drawing.Point(131, 72); + this.L_GAbility.Name = "L_GAbility"; + this.L_GAbility.Size = new System.Drawing.Size(55, 23); + this.L_GAbility.TabIndex = 512; + this.L_GAbility.Text = "Ability:"; + this.L_GAbility.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CB_GNature // this.CB_GNature.FormattingEnabled = true; - this.CB_GNature.Location = new System.Drawing.Point(187, 119); + this.CB_GNature.Location = new System.Drawing.Point(187, 120); this.CB_GNature.Name = "CB_GNature"; this.CB_GNature.Size = new System.Drawing.Size(121, 21); this.CB_GNature.TabIndex = 511; // // L_GNature // - this.L_GNature.Location = new System.Drawing.Point(131, 117); + this.L_GNature.Location = new System.Drawing.Point(131, 118); this.L_GNature.Name = "L_GNature"; this.L_GNature.Size = new System.Drawing.Size(55, 23); this.L_GNature.TabIndex = 510; @@ -251,7 +278,7 @@ private void InitializeComponent() // CHK_IsEgg // this.CHK_IsEgg.AutoSize = true; - this.CHK_IsEgg.Location = new System.Drawing.Point(187, 197); + this.CHK_IsEgg.Location = new System.Drawing.Point(187, 198); this.CHK_IsEgg.Name = "CHK_IsEgg"; this.CHK_IsEgg.Size = new System.Drawing.Size(56, 17); this.CHK_IsEgg.TabIndex = 509; @@ -261,7 +288,7 @@ private void InitializeComponent() // CHK_GIV3 // this.CHK_GIV3.AutoSize = true; - this.CHK_GIV3.Location = new System.Drawing.Point(187, 182); + this.CHK_GIV3.Location = new System.Drawing.Point(187, 183); this.CHK_GIV3.Name = "CHK_GIV3"; this.CHK_GIV3.Size = new System.Drawing.Size(42, 17); this.CHK_GIV3.TabIndex = 508; @@ -271,45 +298,24 @@ private void InitializeComponent() // CB_SpecialMove // this.CB_SpecialMove.FormattingEnabled = true; - this.CB_SpecialMove.Location = new System.Drawing.Point(187, 142); + this.CB_SpecialMove.Location = new System.Drawing.Point(187, 143); 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.Location = new System.Drawing.Point(121, 141); 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); - this.L_GGender.Name = "L_GGender"; - this.L_GGender.Size = new System.Drawing.Size(55, 23); - this.L_GGender.TabIndex = 21; - this.L_GGender.Text = "Gender:"; - this.L_GGender.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // NUD_GGender - // - this.NUD_GGender.Location = new System.Drawing.Point(187, 74); - this.NUD_GGender.Maximum = new decimal(new int[] { - 2, - 0, - 0, - 0}); - this.NUD_GGender.Name = "NUD_GGender"; - this.NUD_GGender.Size = new System.Drawing.Size(34, 20); - this.NUD_GGender.TabIndex = 20; - // // CHK_G_Lock // this.CHK_G_Lock.AutoSize = true; - this.CHK_G_Lock.Location = new System.Drawing.Point(187, 167); + this.CHK_G_Lock.Location = new System.Drawing.Point(187, 168); 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; @@ -319,14 +325,14 @@ private void InitializeComponent() // CB_GHeldItem // this.CB_GHeldItem.FormattingEnabled = true; - this.CB_GHeldItem.Location = new System.Drawing.Point(187, 96); + this.CB_GHeldItem.Location = new System.Drawing.Point(187, 97); this.CB_GHeldItem.Name = "CB_GHeldItem"; this.CB_GHeldItem.Size = new System.Drawing.Size(121, 21); this.CB_GHeldItem.TabIndex = 8; // // L_GHeldItem // - this.L_GHeldItem.Location = new System.Drawing.Point(131, 94); + this.L_GHeldItem.Location = new System.Drawing.Point(131, 95); this.L_GHeldItem.Name = "L_GHeldItem"; this.L_GHeldItem.Size = new System.Drawing.Size(55, 23); this.L_GHeldItem.TabIndex = 7; @@ -405,12 +411,16 @@ private void InitializeComponent() this.LB_Gift.FormattingEnabled = true; this.LB_Gift.Location = new System.Drawing.Point(3, 3); this.LB_Gift.Name = "LB_Gift"; - this.LB_Gift.Size = new System.Drawing.Size(115, 433); + this.LB_Gift.Size = new System.Drawing.Size(115, 472); this.LB_Gift.TabIndex = 0; this.LB_Gift.SelectedIndexChanged += new System.EventHandler(this.LB_Gift_SelectedIndexChanged); // // Tab_Encounters // + this.Tab_Encounters.Controls.Add(this.L_EGender); + this.Tab_Encounters.Controls.Add(this.NUD_EGender); + this.Tab_Encounters.Controls.Add(this.CB_EAbility); + this.Tab_Encounters.Controls.Add(this.L_EAbility); this.Tab_Encounters.Controls.Add(this.CHK_EIV3); this.Tab_Encounters.Controls.Add(this.CB_ENature); this.Tab_Encounters.Controls.Add(this.L_ENature); @@ -432,15 +442,32 @@ private void InitializeComponent() this.Tab_Encounters.Location = new System.Drawing.Point(4, 22); this.Tab_Encounters.Name = "Tab_Encounters"; this.Tab_Encounters.Padding = new System.Windows.Forms.Padding(3); - this.Tab_Encounters.Size = new System.Drawing.Size(498, 437); + this.Tab_Encounters.Size = new System.Drawing.Size(498, 476); this.Tab_Encounters.TabIndex = 0; this.Tab_Encounters.Text = "Encounters"; this.Tab_Encounters.UseVisualStyleBackColor = true; // + // CB_EAbility + // + this.CB_EAbility.FormattingEnabled = true; + this.CB_EAbility.Location = new System.Drawing.Point(187, 96); + this.CB_EAbility.Name = "CB_EAbility"; + this.CB_EAbility.Size = new System.Drawing.Size(121, 21); + this.CB_EAbility.TabIndex = 517; + // + // L_EAbility + // + this.L_EAbility.Location = new System.Drawing.Point(131, 94); + this.L_EAbility.Name = "L_EAbility"; + this.L_EAbility.Size = new System.Drawing.Size(55, 23); + this.L_EAbility.TabIndex = 516; + this.L_EAbility.Text = "Ability:"; + this.L_EAbility.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CHK_EIV3 // this.CHK_EIV3.AutoSize = true; - this.CHK_EIV3.Location = new System.Drawing.Point(187, 160); + this.CHK_EIV3.Location = new System.Drawing.Point(187, 205); this.CHK_EIV3.Name = "CHK_EIV3"; this.CHK_EIV3.Size = new System.Drawing.Size(42, 17); this.CHK_EIV3.TabIndex = 504; @@ -450,14 +477,14 @@ private void InitializeComponent() // CB_ENature // this.CB_ENature.FormattingEnabled = true; - this.CB_ENature.Location = new System.Drawing.Point(187, 97); + this.CB_ENature.Location = new System.Drawing.Point(187, 142); this.CB_ENature.Name = "CB_ENature"; this.CB_ENature.Size = new System.Drawing.Size(121, 21); this.CB_ENature.TabIndex = 503; // // L_ENature // - this.L_ENature.Location = new System.Drawing.Point(131, 95); + this.L_ENature.Location = new System.Drawing.Point(131, 140); this.L_ENature.Name = "L_ENature"; this.L_ENature.Size = new System.Drawing.Size(55, 23); this.L_ENature.TabIndex = 502; @@ -478,7 +505,7 @@ private void InitializeComponent() this.GB_EEVs.Controls.Add(this.label3); this.GB_EEVs.Controls.Add(this.label4); this.GB_EEVs.Controls.Add(this.label5); - this.GB_EEVs.Location = new System.Drawing.Point(284, 295); + this.GB_EEVs.Location = new System.Drawing.Point(284, 333); this.GB_EEVs.Name = "GB_EEVs"; this.GB_EEVs.Size = new System.Drawing.Size(160, 112); this.GB_EEVs.TabIndex = 501; @@ -655,7 +682,7 @@ private void InitializeComponent() this.GB_EIVs.Controls.Add(this.NUD_EIV0); this.GB_EIVs.Controls.Add(this.L_ATK); this.GB_EIVs.Controls.Add(this.L_DEF); - this.GB_EIVs.Location = new System.Drawing.Point(129, 295); + this.GB_EIVs.Location = new System.Drawing.Point(129, 333); this.GB_EIVs.Name = "GB_EIVs"; this.GB_EIVs.Size = new System.Drawing.Size(148, 112); this.GB_EIVs.TabIndex = 21; @@ -850,7 +877,7 @@ private void InitializeComponent() // // L_Aura // - this.L_Aura.Location = new System.Drawing.Point(131, 118); + this.L_Aura.Location = new System.Drawing.Point(131, 163); this.L_Aura.Name = "L_Aura"; this.L_Aura.Size = new System.Drawing.Size(55, 23); this.L_Aura.TabIndex = 22; @@ -860,7 +887,7 @@ private void InitializeComponent() // CB_Aura // this.CB_Aura.FormattingEnabled = true; - this.CB_Aura.Location = new System.Drawing.Point(187, 120); + this.CB_Aura.Location = new System.Drawing.Point(187, 165); this.CB_Aura.Name = "CB_Aura"; this.CB_Aura.Size = new System.Drawing.Size(121, 21); this.CB_Aura.TabIndex = 21; @@ -868,7 +895,7 @@ private void InitializeComponent() // CHK_ShinyLock // this.CHK_ShinyLock.AutoSize = true; - this.CHK_ShinyLock.Location = new System.Drawing.Point(187, 145); + this.CHK_ShinyLock.Location = new System.Drawing.Point(187, 190); this.CHK_ShinyLock.Name = "CHK_ShinyLock"; this.CHK_ShinyLock.Size = new System.Drawing.Size(79, 17); this.CHK_ShinyLock.TabIndex = 18; @@ -881,7 +908,7 @@ private void InitializeComponent() this.GB_EMoves.Controls.Add(this.CB_EMove2); this.GB_EMoves.Controls.Add(this.CB_EMove1); this.GB_EMoves.Controls.Add(this.CB_EMove0); - this.GB_EMoves.Location = new System.Drawing.Point(129, 177); + this.GB_EMoves.Location = new System.Drawing.Point(129, 220); this.GB_EMoves.Name = "GB_EMoves"; this.GB_EMoves.Size = new System.Drawing.Size(133, 112); this.GB_EMoves.TabIndex = 17; @@ -923,14 +950,14 @@ private void InitializeComponent() // CB_EHeldItem // this.CB_EHeldItem.FormattingEnabled = true; - this.CB_EHeldItem.Location = new System.Drawing.Point(187, 74); + this.CB_EHeldItem.Location = new System.Drawing.Point(187, 119); this.CB_EHeldItem.Name = "CB_EHeldItem"; this.CB_EHeldItem.Size = new System.Drawing.Size(121, 21); this.CB_EHeldItem.TabIndex = 16; // // L_EHeldItem // - this.L_EHeldItem.Location = new System.Drawing.Point(131, 72); + this.L_EHeldItem.Location = new System.Drawing.Point(131, 117); this.L_EHeldItem.Name = "L_EHeldItem"; this.L_EHeldItem.Size = new System.Drawing.Size(55, 23); this.L_EHeldItem.TabIndex = 15; @@ -1009,12 +1036,16 @@ private void InitializeComponent() this.LB_Encounter.FormattingEnabled = true; this.LB_Encounter.Location = new System.Drawing.Point(3, 3); this.LB_Encounter.Name = "LB_Encounter"; - this.LB_Encounter.Size = new System.Drawing.Size(115, 433); + this.LB_Encounter.Size = new System.Drawing.Size(115, 472); this.LB_Encounter.TabIndex = 1; this.LB_Encounter.SelectedIndexChanged += new System.EventHandler(this.LB_Encounter_SelectedIndexChanged); // // Tab_Trades // + this.Tab_Trades.Controls.Add(this.L_TGender); + this.Tab_Trades.Controls.Add(this.NUD_TGender); + this.Tab_Trades.Controls.Add(this.CB_TAbility); + this.Tab_Trades.Controls.Add(this.L_TAbility); this.Tab_Trades.Controls.Add(this.CB_TNature); this.Tab_Trades.Controls.Add(this.L_TNature); this.Tab_Trades.Controls.Add(this.groupBox1); @@ -1035,22 +1066,39 @@ private void InitializeComponent() this.Tab_Trades.Location = new System.Drawing.Point(4, 22); this.Tab_Trades.Name = "Tab_Trades"; this.Tab_Trades.Padding = new System.Windows.Forms.Padding(3); - this.Tab_Trades.Size = new System.Drawing.Size(498, 437); + this.Tab_Trades.Size = new System.Drawing.Size(498, 476); this.Tab_Trades.TabIndex = 1; this.Tab_Trades.Text = "Trades"; this.Tab_Trades.UseVisualStyleBackColor = true; // + // CB_TAbility + // + this.CB_TAbility.FormattingEnabled = true; + this.CB_TAbility.Location = new System.Drawing.Point(187, 96); + this.CB_TAbility.Name = "CB_TAbility"; + this.CB_TAbility.Size = new System.Drawing.Size(121, 21); + this.CB_TAbility.TabIndex = 521; + // + // L_TAbility + // + this.L_TAbility.Location = new System.Drawing.Point(131, 94); + this.L_TAbility.Name = "L_TAbility"; + this.L_TAbility.Size = new System.Drawing.Size(55, 23); + this.L_TAbility.TabIndex = 520; + this.L_TAbility.Text = "Ability:"; + this.L_TAbility.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.Location = new System.Drawing.Point(187, 142); 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.Location = new System.Drawing.Point(131, 140); this.L_TNature.Name = "L_TNature"; this.L_TNature.Size = new System.Drawing.Size(55, 23); this.L_TNature.TabIndex = 504; @@ -1071,7 +1119,7 @@ private void InitializeComponent() 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.Location = new System.Drawing.Point(129, 222); this.groupBox1.Name = "groupBox1"; this.groupBox1.Size = new System.Drawing.Size(148, 112); this.groupBox1.TabIndex = 30; @@ -1267,14 +1315,14 @@ private void InitializeComponent() // CB_TRequest // this.CB_TRequest.FormattingEnabled = true; - this.CB_TRequest.Location = new System.Drawing.Point(230, 147); + this.CB_TRequest.Location = new System.Drawing.Point(230, 194); this.CB_TRequest.Name = "CB_TRequest"; this.CB_TRequest.Size = new System.Drawing.Size(121, 21); this.CB_TRequest.TabIndex = 29; // // label1 // - this.label1.Location = new System.Drawing.Point(121, 145); + this.label1.Location = new System.Drawing.Point(121, 192); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(106, 23); this.label1.TabIndex = 28; @@ -1284,7 +1332,7 @@ private void InitializeComponent() // L_TTID // this.L_TTID.AutoSize = true; - this.L_TTID.Location = new System.Drawing.Point(252, 123); + this.L_TTID.Location = new System.Drawing.Point(252, 170); this.L_TTID.Name = "L_TTID"; this.L_TTID.Size = new System.Drawing.Size(53, 13); this.L_TTID.TabIndex = 27; @@ -1293,7 +1341,7 @@ private void InitializeComponent() // // L_TID // - this.L_TID.Location = new System.Drawing.Point(136, 118); + this.L_TID.Location = new System.Drawing.Point(136, 165); this.L_TID.Name = "L_TID"; this.L_TID.Size = new System.Drawing.Size(50, 23); this.L_TID.TabIndex = 26; @@ -1302,7 +1350,7 @@ private void InitializeComponent() // // NUD_TID // - this.NUD_TID.Location = new System.Drawing.Point(187, 120); + this.NUD_TID.Location = new System.Drawing.Point(187, 167); this.NUD_TID.Maximum = new decimal(new int[] { 999999, 0, @@ -1321,14 +1369,14 @@ private void InitializeComponent() // CB_THeldItem // this.CB_THeldItem.FormattingEnabled = true; - this.CB_THeldItem.Location = new System.Drawing.Point(187, 74); + this.CB_THeldItem.Location = new System.Drawing.Point(187, 119); this.CB_THeldItem.Name = "CB_THeldItem"; this.CB_THeldItem.Size = new System.Drawing.Size(121, 21); this.CB_THeldItem.TabIndex = 24; // // L_THeldItem // - this.L_THeldItem.Location = new System.Drawing.Point(131, 72); + this.L_THeldItem.Location = new System.Drawing.Point(131, 117); this.L_THeldItem.Name = "L_THeldItem"; this.L_THeldItem.Size = new System.Drawing.Size(55, 23); this.L_THeldItem.TabIndex = 23; @@ -1407,7 +1455,7 @@ private void InitializeComponent() this.LB_Trade.FormattingEnabled = true; this.LB_Trade.Location = new System.Drawing.Point(3, 3); this.LB_Trade.Name = "LB_Trade"; - this.LB_Trade.Size = new System.Drawing.Size(115, 433); + this.LB_Trade.Size = new System.Drawing.Size(115, 472); this.LB_Trade.TabIndex = 2; this.LB_Trade.SelectedIndexChanged += new System.EventHandler(this.LB_Trade_SelectedIndexChanged); // @@ -1422,7 +1470,7 @@ private void InitializeComponent() this.Tab_Randomizer.Location = new System.Drawing.Point(4, 22); this.Tab_Randomizer.Name = "Tab_Randomizer"; this.Tab_Randomizer.Padding = new System.Windows.Forms.Padding(3); - this.Tab_Randomizer.Size = new System.Drawing.Size(498, 437); + this.Tab_Randomizer.Size = new System.Drawing.Size(498, 476); this.Tab_Randomizer.TabIndex = 3; this.Tab_Randomizer.Text = "Randomizer Options"; this.Tab_Randomizer.UseVisualStyleBackColor = true; @@ -1474,7 +1522,7 @@ private void InitializeComponent() // // B_RandAll // - this.B_RandAll.Location = new System.Drawing.Point(192, 289); + this.B_RandAll.Location = new System.Drawing.Point(192, 321); this.B_RandAll.Name = "B_RandAll"; this.B_RandAll.Size = new System.Drawing.Size(122, 23); this.B_RandAll.TabIndex = 509; @@ -1484,6 +1532,7 @@ private void InitializeComponent() // // GB_Tweak // + this.GB_Tweak.Controls.Add(this.CHK_RandomAbility); this.GB_Tweak.Controls.Add(this.CHK_SpecialMove); this.GB_Tweak.Controls.Add(this.CHK_RandomAura); this.GB_Tweak.Controls.Add(this.CHK_RemoveShinyLock); @@ -1502,15 +1551,35 @@ private void InitializeComponent() this.GB_Tweak.Controls.Add(this.CHK_G1); this.GB_Tweak.Location = new System.Drawing.Point(119, 113); this.GB_Tweak.Name = "GB_Tweak"; - this.GB_Tweak.Size = new System.Drawing.Size(258, 173); + this.GB_Tweak.Size = new System.Drawing.Size(258, 193); this.GB_Tweak.TabIndex = 508; this.GB_Tweak.TabStop = false; this.GB_Tweak.Text = "Extra Randomization Tweaks"; // + // CHK_RandomAbility + // + this.CHK_RandomAbility.AutoSize = true; + this.CHK_RandomAbility.Location = new System.Drawing.Point(9, 124); + this.CHK_RandomAbility.Name = "CHK_RandomAbility"; + this.CHK_RandomAbility.Size = new System.Drawing.Size(183, 17); + this.CHK_RandomAbility.TabIndex = 302; + this.CHK_RandomAbility.Text = "Random Abilities (1, 2, or Hidden)"; + this.CHK_RandomAbility.UseVisualStyleBackColor = true; + // + // CHK_SpecialMove + // + this.CHK_SpecialMove.AutoSize = true; + this.CHK_SpecialMove.Location = new System.Drawing.Point(9, 155); + this.CHK_SpecialMove.Name = "CHK_SpecialMove"; + this.CHK_SpecialMove.Size = new System.Drawing.Size(197, 17); + this.CHK_SpecialMove.TabIndex = 301; + this.CHK_SpecialMove.Text = "Random Gift Move for Gift Pokémon"; + this.CHK_SpecialMove.UseVisualStyleBackColor = true; + // // CHK_RandomAura // this.CHK_RandomAura.AutoSize = true; - this.CHK_RandomAura.Location = new System.Drawing.Point(9, 139); + this.CHK_RandomAura.Location = new System.Drawing.Point(9, 140); this.CHK_RandomAura.Name = "CHK_RandomAura"; this.CHK_RandomAura.Size = new System.Drawing.Size(172, 17); this.CHK_RandomAura.TabIndex = 300; @@ -1520,7 +1589,7 @@ private void InitializeComponent() // CHK_RemoveShinyLock // this.CHK_RemoveShinyLock.AutoSize = true; - this.CHK_RemoveShinyLock.Location = new System.Drawing.Point(9, 124); + this.CHK_RemoveShinyLock.Location = new System.Drawing.Point(9, 109); this.CHK_RemoveShinyLock.Name = "CHK_RemoveShinyLock"; this.CHK_RemoveShinyLock.Size = new System.Drawing.Size(127, 17); this.CHK_RemoveShinyLock.TabIndex = 299; @@ -1530,7 +1599,7 @@ private void InitializeComponent() // CHK_AllowMega // this.CHK_AllowMega.AutoSize = true; - this.CHK_AllowMega.Location = new System.Drawing.Point(9, 109); + this.CHK_AllowMega.Location = new System.Drawing.Point(9, 171); this.CHK_AllowMega.Name = "CHK_AllowMega"; this.CHK_AllowMega.Size = new System.Drawing.Size(155, 17); this.CHK_AllowMega.TabIndex = 298; @@ -1678,7 +1747,7 @@ private void InitializeComponent() // // B_Starters // - this.B_Starters.Location = new System.Drawing.Point(192, 318); + this.B_Starters.Location = new System.Drawing.Point(192, 350); this.B_Starters.Name = "B_Starters"; this.B_Starters.Size = new System.Drawing.Size(122, 23); this.B_Starters.TabIndex = 9; @@ -1688,7 +1757,7 @@ private void InitializeComponent() // // B_Save // - this.B_Save.Location = new System.Drawing.Point(435, 445); + this.B_Save.Location = new System.Drawing.Point(435, 481); this.B_Save.Name = "B_Save"; this.B_Save.Size = new System.Drawing.Size(75, 23); this.B_Save.TabIndex = 1; @@ -1698,7 +1767,7 @@ private void InitializeComponent() // // B_Cancel // - this.B_Cancel.Location = new System.Drawing.Point(354, 445); + this.B_Cancel.Location = new System.Drawing.Point(354, 481); this.B_Cancel.Name = "B_Cancel"; this.B_Cancel.Size = new System.Drawing.Size(75, 23); this.B_Cancel.TabIndex = 2; @@ -1706,21 +1775,53 @@ private void InitializeComponent() this.B_Cancel.UseVisualStyleBackColor = true; this.B_Cancel.Click += new System.EventHandler(this.B_Cancel_Click); // - // CHK_SpecialMove + // L_EGender // - this.CHK_SpecialMove.AutoSize = true; - this.CHK_SpecialMove.Location = new System.Drawing.Point(9, 154); - this.CHK_SpecialMove.Name = "CHK_SpecialMove"; - this.CHK_SpecialMove.Size = new System.Drawing.Size(197, 17); - this.CHK_SpecialMove.TabIndex = 301; - this.CHK_SpecialMove.Text = "Random Gift Move for Gift Pokémon"; - this.CHK_SpecialMove.UseVisualStyleBackColor = true; + this.L_EGender.Location = new System.Drawing.Point(131, 71); + this.L_EGender.Name = "L_EGender"; + this.L_EGender.Size = new System.Drawing.Size(55, 23); + this.L_EGender.TabIndex = 519; + this.L_EGender.Text = "Gender:"; + this.L_EGender.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // NUD_EGender + // + this.NUD_EGender.Location = new System.Drawing.Point(187, 74); + this.NUD_EGender.Maximum = new decimal(new int[] { + 2, + 0, + 0, + 0}); + this.NUD_EGender.Name = "NUD_EGender"; + this.NUD_EGender.Size = new System.Drawing.Size(34, 20); + this.NUD_EGender.TabIndex = 518; + // + // L_TGender + // + this.L_TGender.Location = new System.Drawing.Point(131, 71); + this.L_TGender.Name = "L_TGender"; + this.L_TGender.Size = new System.Drawing.Size(55, 23); + this.L_TGender.TabIndex = 523; + this.L_TGender.Text = "Gender:"; + this.L_TGender.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // NUD_TGender + // + this.NUD_TGender.Location = new System.Drawing.Point(187, 74); + this.NUD_TGender.Maximum = new decimal(new int[] { + 2, + 0, + 0, + 0}); + this.NUD_TGender.Name = "NUD_TGender"; + this.NUD_TGender.Size = new System.Drawing.Size(34, 20); + this.NUD_TGender.TabIndex = 522; // // StaticEncounterEditor7 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(530, 511); + this.ClientSize = new System.Drawing.Size(530, 535); this.Controls.Add(this.B_Cancel); this.Controls.Add(this.B_Save); this.Controls.Add(this.TC_Tabs); @@ -1729,7 +1830,6 @@ private void InitializeComponent() this.TC_Tabs.ResumeLayout(false); this.Tab_Gifts.ResumeLayout(false); this.Tab_Gifts.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_GGender)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_GForm)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_GLevel)).EndInit(); this.Tab_Encounters.ResumeLayout(false); @@ -1768,6 +1868,8 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).EndInit(); this.GB_Tweak.ResumeLayout(false); this.GB_Tweak.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_EGender)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_TGender)).EndInit(); this.ResumeLayout(false); } @@ -1835,7 +1937,6 @@ private void InitializeComponent() private System.Windows.Forms.NumericUpDown NUD_LevelBoost; private System.Windows.Forms.CheckBox CHK_Level; private System.Windows.Forms.CheckBox CHK_ShinyLock; - private System.Windows.Forms.NumericUpDown NUD_GGender; private System.Windows.Forms.CheckBox CHK_G_Lock; private System.Windows.Forms.CheckBox CHK_Item; private System.Windows.Forms.CheckBox CHK_AllowMega; @@ -1871,7 +1972,6 @@ private void InitializeComponent() private System.Windows.Forms.ComboBox CB_ENature; private System.Windows.Forms.Label L_ENature; private System.Windows.Forms.CheckBox CHK_EIV3; - private System.Windows.Forms.Label L_GGender; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Label label8; private System.Windows.Forms.NumericUpDown NUD_TIV3; @@ -1896,5 +1996,16 @@ private void InitializeComponent() private System.Windows.Forms.Button B_ModifyLevel; private System.Windows.Forms.CheckBox CHK_RandomAura; private System.Windows.Forms.CheckBox CHK_SpecialMove; + private System.Windows.Forms.ComboBox CB_GAbility; + private System.Windows.Forms.Label L_GAbility; + private System.Windows.Forms.ComboBox CB_EAbility; + private System.Windows.Forms.Label L_EAbility; + private System.Windows.Forms.ComboBox CB_TAbility; + private System.Windows.Forms.Label L_TAbility; + private System.Windows.Forms.CheckBox CHK_RandomAbility; + private System.Windows.Forms.Label L_EGender; + private System.Windows.Forms.NumericUpDown NUD_EGender; + private System.Windows.Forms.Label L_TGender; + private System.Windows.Forms.NumericUpDown NUD_TGender; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs index bc0e60f..dbb5028 100644 --- a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs +++ b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs @@ -21,6 +21,13 @@ public partial class StaticEncounterEditor7 : Form private readonly string[] types = Main.Config.getText(TextName.Types); private readonly int[] oldStarters; + private readonly string[] ability = + { + "Random (1 or 2)", + "Ability 1", + "Ability 2", + "Hidden Ability", + }; private readonly string[] aura = { "(None)", @@ -94,6 +101,12 @@ public StaticEncounterEditor7(byte[][] infiles) CB_TSpecies.Items.Add(s); CB_TRequest.Items.Add(s); } + foreach (var s in ability) + { + CB_GAbility.Items.Add(s); + CB_EAbility.Items.Add(s); + CB_TAbility.Items.Add(s); + } foreach (var s in itemlist) { CB_GHeldItem.Items.Add(s); @@ -215,7 +228,7 @@ private void getGift() CB_GHeldItem.SelectedIndex = entry.HeldItem; NUD_GLevel.Value = entry.Level; NUD_GForm.Value = entry.Form; - NUD_GGender.Value = entry.Gender; + CB_GAbility.SelectedIndex = entry.Ability + 1; CB_GNature.SelectedIndex = entry.Nature + 1; CB_SpecialMove.SelectedIndex = entry.SpecialMove; CHK_G_Lock.Checked = entry.ShinyLock; @@ -234,7 +247,7 @@ private void setGift() entry.HeldItem = CB_GHeldItem.SelectedIndex; entry.Level = (int)NUD_GLevel.Value; entry.Form = (int)NUD_GForm.Value; - entry.Gender = (int) NUD_GGender.Value; + entry.Ability = (sbyte)(CB_GAbility.SelectedIndex - 1); entry.Nature = (sbyte)(CB_GNature.SelectedIndex - 1); entry.SpecialMove = CB_SpecialMove.SelectedIndex; entry.ShinyLock = CHK_G_Lock.Checked; @@ -253,6 +266,8 @@ private void getEncounter() CB_EHeldItem.SelectedIndex = entry.HeldItem; NUD_ELevel.Value = entry.Level; NUD_EForm.Value = entry.Form; + NUD_EGender.Value = entry.Gender; + CB_EAbility.SelectedIndex = entry.Ability; int[] moves = entry.RelearnMoves; CB_EMove0.SelectedIndex = moves[0]; @@ -293,6 +308,8 @@ private void setEncounter() entry.HeldItem = CB_EHeldItem.SelectedIndex; entry.Level = (int)NUD_ELevel.Value; entry.Form = (int)NUD_EForm.Value; + entry.Gender = (int)NUD_EGender.Value; + entry.Ability = CB_EAbility.SelectedIndex; entry.RelearnMoves = new[] { CB_EMove0.SelectedIndex, @@ -333,6 +350,8 @@ private void getTrade() CB_THeldItem.SelectedIndex = entry.HeldItem; NUD_TLevel.Value = entry.Level; NUD_TForm.Value = entry.Form; + NUD_TGender.Value = entry.Gender; + CB_TAbility.SelectedIndex = entry.Ability + 1; CB_TNature.SelectedIndex = entry.Nature; NUD_TID.Value = entry.ID; @@ -358,6 +377,8 @@ private void setTrade() entry.HeldItem = CB_THeldItem.SelectedIndex; entry.Level = (int)NUD_TLevel.Value; entry.Form = (int)NUD_TForm.Value; + entry.Gender = (int)NUD_TGender.Value; + entry.Ability = (CB_TAbility.SelectedIndex - 1); entry.Nature = CB_TNature.SelectedIndex; entry.TID = (int)NUD_TID.Value; @@ -458,6 +479,9 @@ private void B_Starters_Click(object sender, EventArgs e) if (CHK_SpecialMove.Checked) t.SpecialMove = Util.rand.Next(1, CB_SpecialMove.Items.Count); // don't allow none + + if (CHK_RandomAbility.Checked) + t.Ability = (sbyte)(Util.rand.Next(0, 3)); // 1, 2 , or H } getListBoxEntries(); @@ -500,12 +524,16 @@ private void B_RandAll_Click(object sender, EventArgs e) if (CHK_SpecialMove.Checked) t.SpecialMove = Util.rand.Next(1, CB_SpecialMove.Items.Count); // don't allow none + + if (CHK_RandomAbility.Checked) + t.Ability = (sbyte)(Util.rand.Next(0, 3)); // 1, 2 , or H } foreach (EncounterStatic7 t in Encounters) { t.Species = specrand.GetRandomSpecies(t.Species); t.Form = formrand.GetRandomForme(t.Species); t.RelearnMoves = move.GetCurrentMoves(t.Species, t.Form, t.Level, 4); + t.Gender = 0; // random t.Nature = 0; // random if (CHK_AllowMega.Checked) @@ -522,6 +550,9 @@ private void B_RandAll_Click(object sender, EventArgs e) if (CHK_RandomAura.Checked && t.Aura != 0) // don't apply aura to a pkm without it t.Aura = Util.rand.Next(1, CB_Aura.Items.Count); // don't allow none + + if (CHK_RandomAbility.Checked) + t.Ability = (sbyte)(Util.rand.Next(1, 4)); // 1, 2 , or H } foreach (EncounterTrade7 t in Trades) { @@ -538,6 +569,9 @@ private void B_RandAll_Click(object sender, EventArgs e) if (CHK_Level.Checked) t.Level = Randomizer.getModifiedLevel(t.Level, NUD_LevelBoost.Value); + + if (CHK_RandomAbility.Checked) + t.Ability = (sbyte)(Util.rand.Next(0, 3)); // 1, 2 , or H } getListBoxEntries();