diff --git a/pk3DS/Subforms/Gen6/GiftEditor6.Designer.cs b/pk3DS/Subforms/Gen6/GiftEditor6.Designer.cs index 32c38ef..f558e2b 100644 --- a/pk3DS/Subforms/Gen6/GiftEditor6.Designer.cs +++ b/pk3DS/Subforms/Gen6/GiftEditor6.Designer.cs @@ -58,6 +58,24 @@ private void InitializeComponent() 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.label1 = new System.Windows.Forms.Label(); + this.L_Hint = new System.Windows.Forms.Label(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.NUD_LevelBoost = new System.Windows.Forms.NumericUpDown(); + this.CHK_Level = new System.Windows.Forms.CheckBox(); + this.GB_Tweak = new System.Windows.Forms.GroupBox(); + this.L_RandOpt = new System.Windows.Forms.Label(); + this.CHK_BST = new System.Windows.Forms.CheckBox(); + this.CHK_E = new System.Windows.Forms.CheckBox(); + this.CHK_L = new System.Windows.Forms.CheckBox(); + this.CHK_G6 = new System.Windows.Forms.CheckBox(); + this.CHK_G5 = new System.Windows.Forms.CheckBox(); + this.CHK_G4 = new System.Windows.Forms.CheckBox(); + this.CHK_G3 = new System.Windows.Forms.CheckBox(); + this.CHK_G2 = new System.Windows.Forms.CheckBox(); + this.CHK_G1 = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.NUD_IV0)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_IV1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_IV2)).BeginInit(); @@ -69,12 +87,17 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_Nature)).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_Tweak.SuspendLayout(); this.SuspendLayout(); // // B_Cancel // this.B_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.B_Cancel.Location = new System.Drawing.Point(211, 269); + this.B_Cancel.Location = new System.Drawing.Point(264, 269); this.B_Cancel.Name = "B_Cancel"; this.B_Cancel.Size = new System.Drawing.Size(70, 23); this.B_Cancel.TabIndex = 467; @@ -85,7 +108,7 @@ private void InitializeComponent() // B_Save // this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.B_Save.Location = new System.Drawing.Point(282, 269); + this.B_Save.Location = new System.Drawing.Point(335, 269); this.B_Save.Name = "B_Save"; this.B_Save.Size = new System.Drawing.Size(70, 23); this.B_Save.TabIndex = 466; @@ -107,7 +130,7 @@ private void InitializeComponent() // CB_Species // this.CB_Species.FormattingEnabled = true; - this.CB_Species.Location = new System.Drawing.Point(196, 12); + this.CB_Species.Location = new System.Drawing.Point(106, 3); this.CB_Species.Name = "CB_Species"; this.CB_Species.Size = new System.Drawing.Size(121, 21); this.CB_Species.TabIndex = 469; @@ -116,14 +139,14 @@ private void InitializeComponent() // CB_HeldItem // this.CB_HeldItem.FormattingEnabled = true; - this.CB_HeldItem.Location = new System.Drawing.Point(196, 39); + this.CB_HeldItem.Location = new System.Drawing.Point(106, 30); this.CB_HeldItem.Name = "CB_HeldItem"; this.CB_HeldItem.Size = new System.Drawing.Size(121, 21); this.CB_HeldItem.TabIndex = 470; // // NUD_IV0 // - this.NUD_IV0.Location = new System.Drawing.Point(237, 191); + this.NUD_IV0.Location = new System.Drawing.Point(112, 141); this.NUD_IV0.Maximum = new decimal(new int[] { 31, 0, @@ -145,7 +168,7 @@ private void InitializeComponent() // // NUD_IV1 // - this.NUD_IV1.Location = new System.Drawing.Point(237, 217); + this.NUD_IV1.Location = new System.Drawing.Point(112, 164); this.NUD_IV1.Maximum = new decimal(new int[] { 31, 0, @@ -167,7 +190,7 @@ private void InitializeComponent() // // NUD_IV2 // - this.NUD_IV2.Location = new System.Drawing.Point(237, 243); + this.NUD_IV2.Location = new System.Drawing.Point(112, 187); this.NUD_IV2.Maximum = new decimal(new int[] { 31, 0, @@ -189,7 +212,7 @@ private void InitializeComponent() // // NUD_IV3 // - this.NUD_IV3.Location = new System.Drawing.Point(318, 191); + this.NUD_IV3.Location = new System.Drawing.Point(193, 141); this.NUD_IV3.Maximum = new decimal(new int[] { 31, 0, @@ -211,7 +234,7 @@ private void InitializeComponent() // // NUD_IV4 // - this.NUD_IV4.Location = new System.Drawing.Point(318, 217); + this.NUD_IV4.Location = new System.Drawing.Point(193, 164); this.NUD_IV4.Maximum = new decimal(new int[] { 31, 0, @@ -233,7 +256,7 @@ private void InitializeComponent() // // NUD_IV5 // - this.NUD_IV5.Location = new System.Drawing.Point(318, 243); + this.NUD_IV5.Location = new System.Drawing.Point(193, 187); this.NUD_IV5.Maximum = new decimal(new int[] { 31, 0, @@ -255,7 +278,7 @@ private void InitializeComponent() // // L_Species // - this.L_Species.Location = new System.Drawing.Point(96, 12); + this.L_Species.Location = new System.Drawing.Point(6, 3); this.L_Species.Name = "L_Species"; this.L_Species.Size = new System.Drawing.Size(94, 21); this.L_Species.TabIndex = 477; @@ -264,7 +287,7 @@ private void InitializeComponent() // // L_HeldItem // - this.L_HeldItem.Location = new System.Drawing.Point(96, 38); + this.L_HeldItem.Location = new System.Drawing.Point(6, 29); this.L_HeldItem.Name = "L_HeldItem"; this.L_HeldItem.Size = new System.Drawing.Size(94, 21); this.L_HeldItem.TabIndex = 478; @@ -273,7 +296,7 @@ private void InitializeComponent() // // NUD_Level // - this.NUD_Level.Location = new System.Drawing.Point(196, 66); + this.NUD_Level.Location = new System.Drawing.Point(106, 57); this.NUD_Level.Name = "NUD_Level"; this.NUD_Level.Size = new System.Drawing.Size(41, 20); this.NUD_Level.TabIndex = 479; @@ -285,7 +308,7 @@ private void InitializeComponent() // // L_Level // - this.L_Level.Location = new System.Drawing.Point(97, 64); + this.L_Level.Location = new System.Drawing.Point(7, 55); this.L_Level.Name = "L_Level"; this.L_Level.Size = new System.Drawing.Size(94, 21); this.L_Level.TabIndex = 480; @@ -294,14 +317,14 @@ private void InitializeComponent() // // NUD_Form // - this.NUD_Form.Location = new System.Drawing.Point(283, 66); + this.NUD_Form.Location = new System.Drawing.Point(193, 57); this.NUD_Form.Name = "NUD_Form"; this.NUD_Form.Size = new System.Drawing.Size(34, 20); this.NUD_Form.TabIndex = 481; // // L_Form // - this.L_Form.Location = new System.Drawing.Point(189, 64); + this.L_Form.Location = new System.Drawing.Point(99, 55); this.L_Form.Name = "L_Form"; this.L_Form.Size = new System.Drawing.Size(94, 21); this.L_Form.TabIndex = 482; @@ -310,7 +333,7 @@ private void InitializeComponent() // // L_HP // - this.L_HP.Location = new System.Drawing.Point(143, 189); + this.L_HP.Location = new System.Drawing.Point(18, 139); this.L_HP.Name = "L_HP"; this.L_HP.Size = new System.Drawing.Size(94, 21); this.L_HP.TabIndex = 483; @@ -319,7 +342,7 @@ private void InitializeComponent() // // L_ATK // - this.L_ATK.Location = new System.Drawing.Point(143, 215); + this.L_ATK.Location = new System.Drawing.Point(18, 162); this.L_ATK.Name = "L_ATK"; this.L_ATK.Size = new System.Drawing.Size(94, 21); this.L_ATK.TabIndex = 484; @@ -328,7 +351,7 @@ private void InitializeComponent() // // L_DEF // - this.L_DEF.Location = new System.Drawing.Point(143, 241); + this.L_DEF.Location = new System.Drawing.Point(18, 185); this.L_DEF.Name = "L_DEF"; this.L_DEF.Size = new System.Drawing.Size(94, 21); this.L_DEF.TabIndex = 485; @@ -337,7 +360,7 @@ private void InitializeComponent() // // L_SPA // - this.L_SPA.Location = new System.Drawing.Point(224, 189); + this.L_SPA.Location = new System.Drawing.Point(99, 139); this.L_SPA.Name = "L_SPA"; this.L_SPA.Size = new System.Drawing.Size(94, 21); this.L_SPA.TabIndex = 486; @@ -346,7 +369,7 @@ private void InitializeComponent() // // L_SPE // - this.L_SPE.Location = new System.Drawing.Point(224, 241); + this.L_SPE.Location = new System.Drawing.Point(99, 185); this.L_SPE.Name = "L_SPE"; this.L_SPE.Size = new System.Drawing.Size(94, 21); this.L_SPE.TabIndex = 487; @@ -355,7 +378,7 @@ private void InitializeComponent() // // L_SPD // - this.L_SPD.Location = new System.Drawing.Point(224, 215); + this.L_SPD.Location = new System.Drawing.Point(99, 162); this.L_SPD.Name = "L_SPD"; this.L_SPD.Size = new System.Drawing.Size(94, 21); this.L_SPD.TabIndex = 488; @@ -364,7 +387,7 @@ private void InitializeComponent() // // L_Nature // - this.L_Nature.Location = new System.Drawing.Point(97, 91); + this.L_Nature.Location = new System.Drawing.Point(7, 79); this.L_Nature.Name = "L_Nature"; this.L_Nature.Size = new System.Drawing.Size(94, 21); this.L_Nature.TabIndex = 490; @@ -373,7 +396,7 @@ private void InitializeComponent() // // NUD_Nature // - this.NUD_Nature.Location = new System.Drawing.Point(196, 91); + this.NUD_Nature.Location = new System.Drawing.Point(106, 79); this.NUD_Nature.Maximum = new decimal(new int[] { 24, 0, @@ -395,7 +418,7 @@ private void InitializeComponent() // // L_Ability // - this.L_Ability.Location = new System.Drawing.Point(190, 89); + this.L_Ability.Location = new System.Drawing.Point(99, 77); this.L_Ability.Name = "L_Ability"; this.L_Ability.Size = new System.Drawing.Size(94, 21); this.L_Ability.TabIndex = 493; @@ -404,7 +427,7 @@ private void InitializeComponent() // // NUD_Ability // - this.NUD_Ability.Location = new System.Drawing.Point(284, 91); + this.NUD_Ability.Location = new System.Drawing.Point(193, 79); this.NUD_Ability.Maximum = new decimal(new int[] { 2, 0, @@ -421,7 +444,7 @@ private void InitializeComponent() // // L_Gender // - this.L_Gender.Location = new System.Drawing.Point(190, 115); + this.L_Gender.Location = new System.Drawing.Point(99, 100); this.L_Gender.Name = "L_Gender"; this.L_Gender.Size = new System.Drawing.Size(94, 21); this.L_Gender.TabIndex = 495; @@ -430,7 +453,7 @@ private void InitializeComponent() // // NUD_Gender // - this.NUD_Gender.Location = new System.Drawing.Point(284, 117); + this.NUD_Gender.Location = new System.Drawing.Point(193, 102); this.NUD_Gender.Maximum = new decimal(new int[] { 2, 0, @@ -443,7 +466,7 @@ private void InitializeComponent() // B_RandAll // this.B_RandAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.B_RandAll.Location = new System.Drawing.Point(128, 269); + this.B_RandAll.Location = new System.Drawing.Point(181, 269); this.B_RandAll.Name = "B_RandAll"; this.B_RandAll.Size = new System.Drawing.Size(83, 23); this.B_RandAll.TabIndex = 496; @@ -451,44 +474,268 @@ private void InitializeComponent() this.B_RandAll.UseVisualStyleBackColor = true; this.B_RandAll.Click += new System.EventHandler(this.B_RandAll_Click); // - // Gifts + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(128, 12); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(280, 251); + this.tabControl1.TabIndex = 502; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.label1); + this.tabPage1.Controls.Add(this.L_DEF); + this.tabPage1.Controls.Add(this.L_ATK); + this.tabPage1.Controls.Add(this.L_Hint); + this.tabPage1.Controls.Add(this.L_HP); + this.tabPage1.Controls.Add(this.NUD_IV0); + this.tabPage1.Controls.Add(this.NUD_IV1); + this.tabPage1.Controls.Add(this.NUD_IV2); + 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.NUD_Nature); + this.tabPage1.Controls.Add(this.L_Ability); + this.tabPage1.Controls.Add(this.L_SPA); + this.tabPage1.Controls.Add(this.L_Nature); + this.tabPage1.Controls.Add(this.L_SPE); + this.tabPage1.Controls.Add(this.L_SPD); + this.tabPage1.Controls.Add(this.L_Species); + this.tabPage1.Controls.Add(this.L_HeldItem); + this.tabPage1.Controls.Add(this.NUD_Level); + this.tabPage1.Controls.Add(this.L_Level); + this.tabPage1.Controls.Add(this.L_Form); + this.tabPage1.Controls.Add(this.CB_HeldItem); + this.tabPage1.Controls.Add(this.NUD_Form); + this.tabPage1.Controls.Add(this.NUD_IV5); + this.tabPage1.Controls.Add(this.NUD_IV4); + this.tabPage1.Controls.Add(this.NUD_IV3); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(272, 225); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "Editor"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 155); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(59, 65); + this.label1.TabIndex = 502; + this.label1.Text = "Ability:\r\n0: Random\r\n1: Ability 0\r\n2: Ability 1\r\n3: Hidden"; + // + // L_Hint + // + this.L_Hint.AutoSize = true; + this.L_Hint.Location = new System.Drawing.Point(7, 99); + this.L_Hint.Name = "L_Hint"; + this.L_Hint.Size = new System.Drawing.Size(67, 52); + this.L_Hint.TabIndex = 500; + this.L_Hint.Text = "Gender:\r\n0: Random/-\r\n1: Male\r\n2: Female"; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.GB_Tweak); + 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(272, 225); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Rand Options"; + this.tabPage2.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(8, 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; + // + // GB_Tweak + // + this.GB_Tweak.Controls.Add(this.L_RandOpt); + this.GB_Tweak.Controls.Add(this.CHK_BST); + this.GB_Tweak.Controls.Add(this.CHK_E); + this.GB_Tweak.Controls.Add(this.CHK_L); + this.GB_Tweak.Controls.Add(this.CHK_G6); + this.GB_Tweak.Controls.Add(this.CHK_G5); + this.GB_Tweak.Controls.Add(this.CHK_G4); + 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(7, 62); + this.GB_Tweak.Name = "GB_Tweak"; + this.GB_Tweak.Size = new System.Drawing.Size(258, 100); + this.GB_Tweak.TabIndex = 509; + this.GB_Tweak.TabStop = false; + this.GB_Tweak.Text = "Extra Randomization Tweaks"; + // + // L_RandOpt + // + this.L_RandOpt.AutoSize = true; + this.L_RandOpt.Location = new System.Drawing.Point(6, 16); + this.L_RandOpt.Name = "L_RandOpt"; + this.L_RandOpt.Size = new System.Drawing.Size(105, 13); + this.L_RandOpt.TabIndex = 294; + this.L_RandOpt.Text = "Randomizer Options:"; + // + // CHK_BST + // + this.CHK_BST.AutoSize = true; + this.CHK_BST.Checked = true; + this.CHK_BST.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_BST.Location = new System.Drawing.Point(128, 64); + this.CHK_BST.Name = "CHK_BST"; + this.CHK_BST.Size = new System.Drawing.Size(117, 17); + this.CHK_BST.TabIndex = 288; + this.CHK_BST.Text = "Randomize by BST"; + this.CHK_BST.UseVisualStyleBackColor = true; + // + // CHK_E + // + this.CHK_E.AutoSize = true; + this.CHK_E.Location = new System.Drawing.Point(128, 49); + this.CHK_E.Name = "CHK_E"; + this.CHK_E.Size = new System.Drawing.Size(98, 17); + this.CHK_E.TabIndex = 287; + this.CHK_E.Text = "Event Legends"; + this.CHK_E.UseVisualStyleBackColor = true; + // + // CHK_L + // + this.CHK_L.AutoSize = true; + this.CHK_L.Checked = true; + this.CHK_L.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_L.Location = new System.Drawing.Point(128, 34); + this.CHK_L.Name = "CHK_L"; + this.CHK_L.Size = new System.Drawing.Size(98, 17); + this.CHK_L.TabIndex = 286; + this.CHK_L.Text = "Game Legends"; + this.CHK_L.UseVisualStyleBackColor = true; + // + // CHK_G6 + // + this.CHK_G6.AutoSize = true; + this.CHK_G6.Checked = true; + this.CHK_G6.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_G6.Location = new System.Drawing.Point(67, 64); + this.CHK_G6.Name = "CHK_G6"; + this.CHK_G6.Size = new System.Drawing.Size(55, 17); + this.CHK_G6.TabIndex = 285; + this.CHK_G6.Text = "Gen 6"; + this.CHK_G6.UseVisualStyleBackColor = true; + // + // CHK_G5 + // + this.CHK_G5.AutoSize = true; + this.CHK_G5.Checked = true; + this.CHK_G5.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_G5.Location = new System.Drawing.Point(67, 49); + this.CHK_G5.Name = "CHK_G5"; + this.CHK_G5.Size = new System.Drawing.Size(55, 17); + this.CHK_G5.TabIndex = 284; + this.CHK_G5.Text = "Gen 5"; + this.CHK_G5.UseVisualStyleBackColor = true; + // + // CHK_G4 + // + this.CHK_G4.AutoSize = true; + this.CHK_G4.Checked = true; + this.CHK_G4.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_G4.Location = new System.Drawing.Point(67, 34); + this.CHK_G4.Name = "CHK_G4"; + this.CHK_G4.Size = new System.Drawing.Size(55, 17); + this.CHK_G4.TabIndex = 283; + this.CHK_G4.Text = "Gen 4"; + this.CHK_G4.UseVisualStyleBackColor = true; + // + // CHK_G3 + // + this.CHK_G3.AutoSize = true; + this.CHK_G3.Checked = true; + this.CHK_G3.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_G3.Location = new System.Drawing.Point(9, 64); + this.CHK_G3.Name = "CHK_G3"; + this.CHK_G3.Size = new System.Drawing.Size(55, 17); + this.CHK_G3.TabIndex = 282; + this.CHK_G3.Text = "Gen 3"; + this.CHK_G3.UseVisualStyleBackColor = true; + // + // CHK_G2 + // + this.CHK_G2.AutoSize = true; + this.CHK_G2.Checked = true; + this.CHK_G2.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_G2.Location = new System.Drawing.Point(9, 49); + this.CHK_G2.Name = "CHK_G2"; + this.CHK_G2.Size = new System.Drawing.Size(55, 17); + this.CHK_G2.TabIndex = 281; + this.CHK_G2.Text = "Gen 2"; + this.CHK_G2.UseVisualStyleBackColor = true; + // + // CHK_G1 + // + this.CHK_G1.AutoSize = true; + this.CHK_G1.Checked = true; + this.CHK_G1.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_G1.Location = new System.Drawing.Point(9, 34); + this.CHK_G1.Name = "CHK_G1"; + this.CHK_G1.Size = new System.Drawing.Size(55, 17); + this.CHK_G1.TabIndex = 280; + this.CHK_G1.Text = "Gen 1"; + this.CHK_G1.UseVisualStyleBackColor = true; + // + // GiftEditor6 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(364, 304); + this.ClientSize = new System.Drawing.Size(417, 304); + this.Controls.Add(this.tabControl1); this.Controls.Add(this.B_RandAll); - this.Controls.Add(this.L_Gender); - this.Controls.Add(this.NUD_Gender); - this.Controls.Add(this.NUD_Nature); this.Controls.Add(this.LB_Gifts); - this.Controls.Add(this.L_Nature); - this.Controls.Add(this.L_DEF); - this.Controls.Add(this.L_ATK); - this.Controls.Add(this.L_HP); - this.Controls.Add(this.NUD_Level); - this.Controls.Add(this.L_Form); - this.Controls.Add(this.NUD_Form); - this.Controls.Add(this.NUD_IV5); - this.Controls.Add(this.NUD_IV4); - this.Controls.Add(this.NUD_IV3); - this.Controls.Add(this.NUD_IV2); - this.Controls.Add(this.NUD_IV1); - this.Controls.Add(this.NUD_IV0); - this.Controls.Add(this.CB_HeldItem); - this.Controls.Add(this.CB_Species); this.Controls.Add(this.B_Cancel); this.Controls.Add(this.B_Save); - this.Controls.Add(this.L_Level); - this.Controls.Add(this.L_HeldItem); - this.Controls.Add(this.L_Species); - this.Controls.Add(this.L_SPD); - this.Controls.Add(this.L_SPE); - this.Controls.Add(this.L_SPA); - this.Controls.Add(this.L_Ability); - this.Controls.Add(this.NUD_Ability); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; - this.MinimumSize = new System.Drawing.Size(380, 343); + this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(433, 343); this.Name = "GiftEditor6"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Gift Editor"; @@ -503,6 +750,14 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_Nature)).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_Tweak.ResumeLayout(false); + this.GB_Tweak.PerformLayout(); this.ResumeLayout(false); } @@ -539,5 +794,23 @@ private void InitializeComponent() 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; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.NumericUpDown NUD_LevelBoost; + private System.Windows.Forms.CheckBox CHK_Level; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label L_Hint; + private System.Windows.Forms.GroupBox GB_Tweak; + private System.Windows.Forms.Label L_RandOpt; + private System.Windows.Forms.CheckBox CHK_BST; + private System.Windows.Forms.CheckBox CHK_E; + private System.Windows.Forms.CheckBox CHK_L; + private System.Windows.Forms.CheckBox CHK_G6; + private System.Windows.Forms.CheckBox CHK_G5; + private System.Windows.Forms.CheckBox CHK_G4; + private System.Windows.Forms.CheckBox CHK_G3; + private System.Windows.Forms.CheckBox CHK_G2; + private System.Windows.Forms.CheckBox CHK_G1; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen6/GiftEditor6.cs b/pk3DS/Subforms/Gen6/GiftEditor6.cs index c76e04e..de59be5 100644 --- a/pk3DS/Subforms/Gen6/GiftEditor6.cs +++ b/pk3DS/Subforms/Gen6/GiftEditor6.cs @@ -173,7 +173,8 @@ private void B_RandAll_Click(object sender, EventArgs e) } // Randomize by BST - int[] sL = Randomizer.getSpeciesList(G1: true, G2: true, G3: true, G4: true, G5: true, G6: true, G7: false, L: false, E: false, Shedinja: false); + int[] sL = Randomizer.getSpeciesList(CHK_G1.Checked, CHK_G2.Checked, CHK_G3.Checked, CHK_G4.Checked, CHK_G5.Checked, CHK_G6.Checked, false, + CHK_L.Checked, CHK_E.Checked); int ctr = 0; for (int i = 0; i < LB_Gifts.Items.Count; i++) { @@ -186,6 +187,9 @@ private void B_RandAll_Click(object sender, EventArgs e) CB_Species.SelectedIndex = species; NUD_Form.Value = Randomizer.GetRandomForme(species, false, true); NUD_Gender.Value = 0; // random + + if (CHK_Level.Checked) + NUD_Level.Value = Randomizer.getModifiedLevel((int)NUD_Level.Value, NUD_LevelBoost.Value); } } diff --git a/pk3DS/Subforms/Gen6/StaticEncounterEditor6.Designer.cs b/pk3DS/Subforms/Gen6/StaticEncounterEditor6.Designer.cs index ba57c68..a470351 100644 --- a/pk3DS/Subforms/Gen6/StaticEncounterEditor6.Designer.cs +++ b/pk3DS/Subforms/Gen6/StaticEncounterEditor6.Designer.cs @@ -48,16 +48,38 @@ private void InitializeComponent() this.CHK_NoShiny = new System.Windows.Forms.CheckBox(); this.CHK_3IV_2 = new System.Windows.Forms.CheckBox(); this.L_Hint = new System.Windows.Forms.Label(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.label1 = new System.Windows.Forms.Label(); + this.NUD_LevelBoost = new System.Windows.Forms.NumericUpDown(); + this.CHK_Level = new System.Windows.Forms.CheckBox(); + this.GB_Tweak = new System.Windows.Forms.GroupBox(); + this.L_RandOpt = new System.Windows.Forms.Label(); + this.CHK_BST = new System.Windows.Forms.CheckBox(); + this.CHK_E = new System.Windows.Forms.CheckBox(); + this.CHK_L = new System.Windows.Forms.CheckBox(); + this.CHK_G6 = new System.Windows.Forms.CheckBox(); + this.CHK_G5 = new System.Windows.Forms.CheckBox(); + this.CHK_G4 = new System.Windows.Forms.CheckBox(); + this.CHK_G3 = new System.Windows.Forms.CheckBox(); + this.CHK_G2 = new System.Windows.Forms.CheckBox(); + this.CHK_G1 = 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_Tweak.SuspendLayout(); this.SuspendLayout(); // // B_Cancel // this.B_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.B_Cancel.Location = new System.Drawing.Point(211, 296); + this.B_Cancel.Location = new System.Drawing.Point(261, 296); this.B_Cancel.Name = "B_Cancel"; this.B_Cancel.Size = new System.Drawing.Size(70, 23); this.B_Cancel.TabIndex = 467; @@ -68,7 +90,7 @@ private void InitializeComponent() // B_Save // this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.B_Save.Location = new System.Drawing.Point(282, 296); + this.B_Save.Location = new System.Drawing.Point(332, 296); this.B_Save.Name = "B_Save"; this.B_Save.Size = new System.Drawing.Size(70, 23); this.B_Save.TabIndex = 466; @@ -90,7 +112,7 @@ private void InitializeComponent() // CB_Species // this.CB_Species.FormattingEnabled = true; - this.CB_Species.Location = new System.Drawing.Point(196, 12); + this.CB_Species.Location = new System.Drawing.Point(106, 3); this.CB_Species.Name = "CB_Species"; this.CB_Species.Size = new System.Drawing.Size(121, 21); this.CB_Species.TabIndex = 469; @@ -98,7 +120,7 @@ private void InitializeComponent() // // L_Species // - this.L_Species.Location = new System.Drawing.Point(96, 12); + this.L_Species.Location = new System.Drawing.Point(6, 3); this.L_Species.Name = "L_Species"; this.L_Species.Size = new System.Drawing.Size(94, 21); this.L_Species.TabIndex = 477; @@ -107,7 +129,7 @@ private void InitializeComponent() // // NUD_Level // - this.NUD_Level.Location = new System.Drawing.Point(196, 66); + this.NUD_Level.Location = new System.Drawing.Point(106, 57); this.NUD_Level.Name = "NUD_Level"; this.NUD_Level.Size = new System.Drawing.Size(41, 20); this.NUD_Level.TabIndex = 479; @@ -119,23 +141,23 @@ private void InitializeComponent() // // L_Level // - this.L_Level.Location = new System.Drawing.Point(97, 64); + this.L_Level.Location = new System.Drawing.Point(9, 55); this.L_Level.Name = "L_Level"; - this.L_Level.Size = new System.Drawing.Size(94, 21); + this.L_Level.Size = new System.Drawing.Size(92, 21); this.L_Level.TabIndex = 480; this.L_Level.Text = "Level:"; this.L_Level.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // NUD_Form // - this.NUD_Form.Location = new System.Drawing.Point(283, 66); + this.NUD_Form.Location = new System.Drawing.Point(193, 57); this.NUD_Form.Name = "NUD_Form"; this.NUD_Form.Size = new System.Drawing.Size(34, 20); this.NUD_Form.TabIndex = 481; // // L_Form // - this.L_Form.Location = new System.Drawing.Point(189, 64); + this.L_Form.Location = new System.Drawing.Point(99, 55); this.L_Form.Name = "L_Form"; this.L_Form.Size = new System.Drawing.Size(94, 21); this.L_Form.TabIndex = 482; @@ -145,7 +167,7 @@ private void InitializeComponent() // B_RandAll // this.B_RandAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.B_RandAll.Location = new System.Drawing.Point(128, 296); + this.B_RandAll.Location = new System.Drawing.Point(178, 296); this.B_RandAll.Name = "B_RandAll"; this.B_RandAll.Size = new System.Drawing.Size(83, 23); this.B_RandAll.TabIndex = 496; @@ -155,7 +177,7 @@ private void InitializeComponent() // // L_HeldItem // - this.L_HeldItem.Location = new System.Drawing.Point(96, 38); + this.L_HeldItem.Location = new System.Drawing.Point(6, 29); this.L_HeldItem.Name = "L_HeldItem"; this.L_HeldItem.Size = new System.Drawing.Size(94, 21); this.L_HeldItem.TabIndex = 478; @@ -165,14 +187,14 @@ private void InitializeComponent() // CB_HeldItem // this.CB_HeldItem.FormattingEnabled = true; - this.CB_HeldItem.Location = new System.Drawing.Point(196, 39); + this.CB_HeldItem.Location = new System.Drawing.Point(106, 30); this.CB_HeldItem.Name = "CB_HeldItem"; this.CB_HeldItem.Size = new System.Drawing.Size(121, 21); this.CB_HeldItem.TabIndex = 470; // // NUD_Ability // - this.NUD_Ability.Location = new System.Drawing.Point(284, 91); + this.NUD_Ability.Location = new System.Drawing.Point(194, 82); this.NUD_Ability.Maximum = new decimal(new int[] { 3, 0, @@ -184,7 +206,7 @@ private void InitializeComponent() // // L_Ability // - this.L_Ability.Location = new System.Drawing.Point(190, 89); + this.L_Ability.Location = new System.Drawing.Point(100, 80); this.L_Ability.Name = "L_Ability"; this.L_Ability.Size = new System.Drawing.Size(94, 21); this.L_Ability.TabIndex = 493; @@ -193,7 +215,7 @@ private void InitializeComponent() // // NUD_Gender // - this.NUD_Gender.Location = new System.Drawing.Point(284, 117); + this.NUD_Gender.Location = new System.Drawing.Point(194, 108); this.NUD_Gender.Maximum = new decimal(new int[] { 2, 0, @@ -205,7 +227,7 @@ private void InitializeComponent() // // L_Gender // - this.L_Gender.Location = new System.Drawing.Point(190, 115); + this.L_Gender.Location = new System.Drawing.Point(100, 106); this.L_Gender.Name = "L_Gender"; this.L_Gender.Size = new System.Drawing.Size(94, 21); this.L_Gender.TabIndex = 495; @@ -215,7 +237,7 @@ private void InitializeComponent() // CHK_3IV // this.CHK_3IV.AutoSize = true; - this.CHK_3IV.Location = new System.Drawing.Point(132, 118); + this.CHK_3IV.Location = new System.Drawing.Point(9, 106); this.CHK_3IV.Name = "CHK_3IV"; this.CHK_3IV.Size = new System.Drawing.Size(42, 17); this.CHK_3IV.TabIndex = 497; @@ -225,7 +247,7 @@ private void InitializeComponent() // CHK_NoShiny // this.CHK_NoShiny.AutoSize = true; - this.CHK_NoShiny.Location = new System.Drawing.Point(132, 92); + this.CHK_NoShiny.Location = new System.Drawing.Point(9, 83); this.CHK_NoShiny.Name = "CHK_NoShiny"; this.CHK_NoShiny.Size = new System.Drawing.Size(79, 17); this.CHK_NoShiny.TabIndex = 498; @@ -235,7 +257,7 @@ private void InitializeComponent() // CHK_3IV_2 // this.CHK_3IV_2.AutoSize = true; - this.CHK_3IV_2.Location = new System.Drawing.Point(132, 141); + this.CHK_3IV_2.Location = new System.Drawing.Point(9, 129); this.CHK_3IV_2.Name = "CHK_3IV_2"; this.CHK_3IV_2.Size = new System.Drawing.Size(54, 17); this.CHK_3IV_2.TabIndex = 499; @@ -245,40 +267,253 @@ private void InitializeComponent() // L_Hint // this.L_Hint.AutoSize = true; - this.L_Hint.Location = new System.Drawing.Point(201, 142); + this.L_Hint.Location = new System.Drawing.Point(161, 148); this.L_Hint.Name = "L_Hint"; - this.L_Hint.Size = new System.Drawing.Size(117, 130); + this.L_Hint.Size = new System.Drawing.Size(67, 52); this.L_Hint.TabIndex = 500; - this.L_Hint.Text = "Ability:\r\n0: Random\r\n1: Ability 0\r\n2: Ability 1\r\n3: Hidden\r\n\r\nGender:\r\n0: Random/" + - "Genderless\r\n1: Male\r\n2: Female"; + this.L_Hint.Text = "Gender:\r\n0: Random/-\r\n1: Male\r\n2: Female"; // - // StaticEncounters + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(128, 12); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(280, 260); + this.tabControl1.TabIndex = 501; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.label1); + this.tabPage1.Controls.Add(this.L_Hint); + this.tabPage1.Controls.Add(this.CB_Species); + this.tabPage1.Controls.Add(this.NUD_Ability); + this.tabPage1.Controls.Add(this.CHK_3IV_2); + this.tabPage1.Controls.Add(this.CHK_NoShiny); + this.tabPage1.Controls.Add(this.L_Species); + this.tabPage1.Controls.Add(this.CHK_3IV); + this.tabPage1.Controls.Add(this.L_HeldItem); + this.tabPage1.Controls.Add(this.L_Level); + this.tabPage1.Controls.Add(this.L_Gender); + this.tabPage1.Controls.Add(this.CB_HeldItem); + this.tabPage1.Controls.Add(this.NUD_Gender); + this.tabPage1.Controls.Add(this.NUD_Form); + this.tabPage1.Controls.Add(this.NUD_Level); + this.tabPage1.Controls.Add(this.L_Ability); + this.tabPage1.Controls.Add(this.L_Form); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(272, 234); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "Editor"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.GB_Tweak); + 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(272, 234); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Rand Options"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(90, 148); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(59, 65); + this.label1.TabIndex = 502; + this.label1.Text = "Ability:\r\n0: Random\r\n1: Ability 0\r\n2: Ability 1\r\n3: Hidden"; + // + // 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(8, 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; + // + // GB_Tweak + // + this.GB_Tweak.Controls.Add(this.L_RandOpt); + this.GB_Tweak.Controls.Add(this.CHK_BST); + this.GB_Tweak.Controls.Add(this.CHK_E); + this.GB_Tweak.Controls.Add(this.CHK_L); + this.GB_Tweak.Controls.Add(this.CHK_G6); + this.GB_Tweak.Controls.Add(this.CHK_G5); + this.GB_Tweak.Controls.Add(this.CHK_G4); + 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(7, 67); + this.GB_Tweak.Name = "GB_Tweak"; + this.GB_Tweak.Size = new System.Drawing.Size(258, 100); + this.GB_Tweak.TabIndex = 509; + this.GB_Tweak.TabStop = false; + this.GB_Tweak.Text = "Extra Randomization Tweaks"; + // + // L_RandOpt + // + this.L_RandOpt.AutoSize = true; + this.L_RandOpt.Location = new System.Drawing.Point(6, 16); + this.L_RandOpt.Name = "L_RandOpt"; + this.L_RandOpt.Size = new System.Drawing.Size(105, 13); + this.L_RandOpt.TabIndex = 294; + this.L_RandOpt.Text = "Randomizer Options:"; + // + // CHK_BST + // + this.CHK_BST.AutoSize = true; + this.CHK_BST.Checked = true; + this.CHK_BST.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_BST.Location = new System.Drawing.Point(128, 64); + this.CHK_BST.Name = "CHK_BST"; + this.CHK_BST.Size = new System.Drawing.Size(117, 17); + this.CHK_BST.TabIndex = 288; + this.CHK_BST.Text = "Randomize by BST"; + this.CHK_BST.UseVisualStyleBackColor = true; + // + // CHK_E + // + this.CHK_E.AutoSize = true; + this.CHK_E.Location = new System.Drawing.Point(128, 49); + this.CHK_E.Name = "CHK_E"; + this.CHK_E.Size = new System.Drawing.Size(98, 17); + this.CHK_E.TabIndex = 287; + this.CHK_E.Text = "Event Legends"; + this.CHK_E.UseVisualStyleBackColor = true; + // + // CHK_L + // + this.CHK_L.AutoSize = true; + this.CHK_L.Checked = true; + this.CHK_L.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_L.Location = new System.Drawing.Point(128, 34); + this.CHK_L.Name = "CHK_L"; + this.CHK_L.Size = new System.Drawing.Size(98, 17); + this.CHK_L.TabIndex = 286; + this.CHK_L.Text = "Game Legends"; + this.CHK_L.UseVisualStyleBackColor = true; + // + // CHK_G6 + // + this.CHK_G6.AutoSize = true; + this.CHK_G6.Checked = true; + this.CHK_G6.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_G6.Location = new System.Drawing.Point(67, 64); + this.CHK_G6.Name = "CHK_G6"; + this.CHK_G6.Size = new System.Drawing.Size(55, 17); + this.CHK_G6.TabIndex = 285; + this.CHK_G6.Text = "Gen 6"; + this.CHK_G6.UseVisualStyleBackColor = true; + // + // CHK_G5 + // + this.CHK_G5.AutoSize = true; + this.CHK_G5.Checked = true; + this.CHK_G5.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_G5.Location = new System.Drawing.Point(67, 49); + this.CHK_G5.Name = "CHK_G5"; + this.CHK_G5.Size = new System.Drawing.Size(55, 17); + this.CHK_G5.TabIndex = 284; + this.CHK_G5.Text = "Gen 5"; + this.CHK_G5.UseVisualStyleBackColor = true; + // + // CHK_G4 + // + this.CHK_G4.AutoSize = true; + this.CHK_G4.Checked = true; + this.CHK_G4.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_G4.Location = new System.Drawing.Point(67, 34); + this.CHK_G4.Name = "CHK_G4"; + this.CHK_G4.Size = new System.Drawing.Size(55, 17); + this.CHK_G4.TabIndex = 283; + this.CHK_G4.Text = "Gen 4"; + this.CHK_G4.UseVisualStyleBackColor = true; + // + // CHK_G3 + // + this.CHK_G3.AutoSize = true; + this.CHK_G3.Checked = true; + this.CHK_G3.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_G3.Location = new System.Drawing.Point(9, 64); + this.CHK_G3.Name = "CHK_G3"; + this.CHK_G3.Size = new System.Drawing.Size(55, 17); + this.CHK_G3.TabIndex = 282; + this.CHK_G3.Text = "Gen 3"; + this.CHK_G3.UseVisualStyleBackColor = true; + // + // CHK_G2 + // + this.CHK_G2.AutoSize = true; + this.CHK_G2.Checked = true; + this.CHK_G2.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_G2.Location = new System.Drawing.Point(9, 49); + this.CHK_G2.Name = "CHK_G2"; + this.CHK_G2.Size = new System.Drawing.Size(55, 17); + this.CHK_G2.TabIndex = 281; + this.CHK_G2.Text = "Gen 2"; + this.CHK_G2.UseVisualStyleBackColor = true; + // + // CHK_G1 + // + this.CHK_G1.AutoSize = true; + this.CHK_G1.Checked = true; + this.CHK_G1.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_G1.Location = new System.Drawing.Point(9, 34); + this.CHK_G1.Name = "CHK_G1"; + this.CHK_G1.Size = new System.Drawing.Size(55, 17); + this.CHK_G1.TabIndex = 280; + this.CHK_G1.Text = "Gen 1"; + this.CHK_G1.UseVisualStyleBackColor = true; + // + // StaticEncounterEditor6 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(364, 331); - this.Controls.Add(this.L_Hint); - this.Controls.Add(this.CHK_3IV_2); - this.Controls.Add(this.CHK_NoShiny); - this.Controls.Add(this.CHK_3IV); + this.ClientSize = new System.Drawing.Size(414, 331); + this.Controls.Add(this.tabControl1); this.Controls.Add(this.B_RandAll); - this.Controls.Add(this.L_Gender); - this.Controls.Add(this.NUD_Gender); this.Controls.Add(this.LB_Encounters); - this.Controls.Add(this.NUD_Level); - this.Controls.Add(this.L_Form); - this.Controls.Add(this.NUD_Form); - this.Controls.Add(this.CB_HeldItem); - this.Controls.Add(this.CB_Species); this.Controls.Add(this.B_Cancel); this.Controls.Add(this.B_Save); - this.Controls.Add(this.L_Level); - this.Controls.Add(this.L_HeldItem); - this.Controls.Add(this.L_Species); - this.Controls.Add(this.L_Ability); - this.Controls.Add(this.NUD_Ability); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; + this.MinimizeBox = false; this.MinimumSize = new System.Drawing.Size(380, 370); this.Name = "StaticEncounterEditor6"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; @@ -287,8 +522,15 @@ private void InitializeComponent() ((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_Tweak.ResumeLayout(false); + this.GB_Tweak.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -314,5 +556,22 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CHK_NoShiny; private System.Windows.Forms.CheckBox CHK_3IV_2; private System.Windows.Forms.Label L_Hint; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.NumericUpDown NUD_LevelBoost; + private System.Windows.Forms.CheckBox CHK_Level; + private System.Windows.Forms.GroupBox GB_Tweak; + private System.Windows.Forms.Label L_RandOpt; + private System.Windows.Forms.CheckBox CHK_BST; + private System.Windows.Forms.CheckBox CHK_E; + private System.Windows.Forms.CheckBox CHK_L; + private System.Windows.Forms.CheckBox CHK_G6; + private System.Windows.Forms.CheckBox CHK_G5; + private System.Windows.Forms.CheckBox CHK_G4; + private System.Windows.Forms.CheckBox CHK_G3; + private System.Windows.Forms.CheckBox CHK_G2; + private System.Windows.Forms.CheckBox CHK_G1; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs b/pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs index 839d19b..8b856ca 100644 --- a/pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs +++ b/pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs @@ -134,7 +134,8 @@ private void B_RandAll_Click(object sender, EventArgs e) } // Randomize by BST - int[] sL = Randomizer.getSpeciesList(G1: true, G2: true, G3: true, G4: true, G5: true, G6: true, G7:false, L: false, E: false, Shedinja: false); + int[] sL = Randomizer.getSpeciesList(CHK_G1.Checked, CHK_G2.Checked, CHK_G3.Checked, CHK_G4.Checked, CHK_G5.Checked, CHK_G6.Checked, false, + CHK_L.Checked, CHK_E.Checked); int ctr = 0; for (int i = 0; i < LB_Encounters.Items.Count; i++) { @@ -145,6 +146,9 @@ private void B_RandAll_Click(object sender, EventArgs e) CB_Species.SelectedIndex = species; NUD_Form.Value = Randomizer.GetRandomForme(species, false, true); NUD_Gender.Value = 0; // random + + if (CHK_Level.Checked) + NUD_Level.Value = Randomizer.getModifiedLevel((int)NUD_Level.Value, NUD_LevelBoost.Value); } } diff --git a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs index e68d1fd..f131327 100644 --- a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs @@ -30,7 +30,6 @@ private void InitializeComponent() { this.TC_Tabs = new System.Windows.Forms.TabControl(); this.Tab_Gifts = new System.Windows.Forms.TabPage(); - this.B_Starters = new System.Windows.Forms.Button(); this.CB_GHeldItem = new System.Windows.Forms.ComboBox(); this.L_GHeldItem = new System.Windows.Forms.Label(); this.CB_GSpecies = new System.Windows.Forms.ComboBox(); @@ -41,6 +40,11 @@ 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.GB_EMoves = new System.Windows.Forms.GroupBox(); + this.CB_EMove3 = new System.Windows.Forms.ComboBox(); + this.CB_EMove2 = new System.Windows.Forms.ComboBox(); + this.CB_EMove1 = new System.Windows.Forms.ComboBox(); + this.CB_EMove0 = new System.Windows.Forms.ComboBox(); this.CB_EHeldItem = new System.Windows.Forms.ComboBox(); this.L_EHeldItem = new System.Windows.Forms.Label(); this.CB_ESpecies = new System.Windows.Forms.ComboBox(); @@ -51,6 +55,11 @@ 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_TRequest = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.L_TTID = new System.Windows.Forms.Label(); + this.L_TID = new System.Windows.Forms.Label(); + this.NUD_TID = new System.Windows.Forms.NumericUpDown(); this.CB_THeldItem = new System.Windows.Forms.ComboBox(); this.L_THeldItem = new System.Windows.Forms.Label(); this.CB_TSpecies = new System.Windows.Forms.ComboBox(); @@ -60,18 +69,8 @@ private void InitializeComponent() this.L_TSpecies = new System.Windows.Forms.Label(); this.NUD_TLevel = new System.Windows.Forms.NumericUpDown(); this.LB_Trade = new System.Windows.Forms.ListBox(); - this.B_Save = new System.Windows.Forms.Button(); - this.GB_EMoves = new System.Windows.Forms.GroupBox(); - this.CB_EMove0 = new System.Windows.Forms.ComboBox(); - this.CB_EMove1 = new System.Windows.Forms.ComboBox(); - this.CB_EMove2 = new System.Windows.Forms.ComboBox(); - this.CB_EMove3 = new System.Windows.Forms.ComboBox(); - this.NUD_TID = new System.Windows.Forms.NumericUpDown(); - this.L_TID = new System.Windows.Forms.Label(); - this.L_TTID = new System.Windows.Forms.Label(); - this.CB_TRequest = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); this.Tab_Randomizer = new System.Windows.Forms.TabPage(); + this.B_RandAll = new System.Windows.Forms.Button(); this.GB_Tweak = new System.Windows.Forms.GroupBox(); this.CHK_G7 = new System.Windows.Forms.CheckBox(); this.L_RandOpt = new System.Windows.Forms.Label(); @@ -84,22 +83,26 @@ 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_RandAll = new System.Windows.Forms.Button(); + 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.NUD_LevelBoost = new System.Windows.Forms.NumericUpDown(); + this.CHK_Level = new System.Windows.Forms.CheckBox(); this.TC_Tabs.SuspendLayout(); this.Tab_Gifts.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_GForm)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_GLevel)).BeginInit(); this.Tab_Encounters.SuspendLayout(); + this.GB_EMoves.SuspendLayout(); ((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.GB_EMoves.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_TID)).BeginInit(); this.Tab_Randomizer.SuspendLayout(); this.GB_Tweak.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).BeginInit(); this.SuspendLayout(); // // TC_Tabs @@ -135,16 +138,6 @@ private void InitializeComponent() this.Tab_Gifts.Text = "Gifts"; this.Tab_Gifts.UseVisualStyleBackColor = true; // - // B_Starters - // - this.B_Starters.Location = new System.Drawing.Point(132, 272); - this.B_Starters.Name = "B_Starters"; - this.B_Starters.Size = new System.Drawing.Size(122, 23); - this.B_Starters.TabIndex = 9; - this.B_Starters.Text = "Randomize Starters"; - this.B_Starters.UseVisualStyleBackColor = true; - this.B_Starters.Click += new System.EventHandler(this.B_Starters_Click); - // // CB_GHeldItem // this.CB_GHeldItem.FormattingEnabled = true; @@ -263,6 +256,51 @@ private void InitializeComponent() this.Tab_Encounters.Text = "Encounters"; this.Tab_Encounters.UseVisualStyleBackColor = true; // + // GB_EMoves + // + this.GB_EMoves.Controls.Add(this.CB_EMove3); + 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(218, 114); + this.GB_EMoves.Name = "GB_EMoves"; + this.GB_EMoves.Size = new System.Drawing.Size(133, 112); + this.GB_EMoves.TabIndex = 17; + this.GB_EMoves.TabStop = false; + this.GB_EMoves.Text = "Moves"; + // + // CB_EMove3 + // + this.CB_EMove3.FormattingEnabled = true; + this.CB_EMove3.Location = new System.Drawing.Point(6, 85); + this.CB_EMove3.Name = "CB_EMove3"; + this.CB_EMove3.Size = new System.Drawing.Size(121, 21); + this.CB_EMove3.TabIndex = 20; + // + // CB_EMove2 + // + this.CB_EMove2.FormattingEnabled = true; + this.CB_EMove2.Location = new System.Drawing.Point(6, 63); + this.CB_EMove2.Name = "CB_EMove2"; + this.CB_EMove2.Size = new System.Drawing.Size(121, 21); + this.CB_EMove2.TabIndex = 19; + // + // CB_EMove1 + // + this.CB_EMove1.FormattingEnabled = true; + this.CB_EMove1.Location = new System.Drawing.Point(6, 41); + this.CB_EMove1.Name = "CB_EMove1"; + this.CB_EMove1.Size = new System.Drawing.Size(121, 21); + this.CB_EMove1.TabIndex = 18; + // + // CB_EMove0 + // + this.CB_EMove0.FormattingEnabled = true; + this.CB_EMove0.Location = new System.Drawing.Point(6, 19); + this.CB_EMove0.Name = "CB_EMove0"; + this.CB_EMove0.Size = new System.Drawing.Size(121, 21); + this.CB_EMove0.TabIndex = 17; + // // CB_EHeldItem // this.CB_EHeldItem.FormattingEnabled = true; @@ -385,6 +423,60 @@ private void InitializeComponent() this.Tab_Trades.Text = "Trades"; this.Tab_Trades.UseVisualStyleBackColor = true; // + // CB_TRequest + // + this.CB_TRequest.FormattingEnabled = true; + this.CB_TRequest.Location = new System.Drawing.Point(230, 137); + 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(124, 135); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(100, 23); + this.label1.TabIndex = 28; + this.label1.Text = "Request Species:"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // L_TTID + // + this.L_TTID.AutoSize = true; + this.L_TTID.Location = new System.Drawing.Point(268, 113); + this.L_TTID.Name = "L_TTID"; + this.L_TTID.Size = new System.Drawing.Size(28, 13); + this.L_TTID.TabIndex = 27; + this.L_TTID.Text = "TID:"; + this.L_TTID.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // L_TID + // + this.L_TID.Location = new System.Drawing.Point(124, 108); + this.L_TID.Name = "L_TID"; + this.L_TID.Size = new System.Drawing.Size(50, 23); + this.L_TID.TabIndex = 26; + this.L_TID.Text = "ID:"; + this.L_TID.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // NUD_TID + // + this.NUD_TID.Location = new System.Drawing.Point(180, 111); + this.NUD_TID.Maximum = new decimal(new int[] { + -1, + 0, + 0, + 0}); + this.NUD_TID.Name = "NUD_TID"; + this.NUD_TID.Size = new System.Drawing.Size(82, 20); + this.NUD_TID.TabIndex = 25; + this.NUD_TID.Value = new decimal(new int[] { + -1, + 0, + 0, + 0}); + this.NUD_TID.ValueChanged += new System.EventHandler(this.changeTID); + // // CB_THeldItem // this.CB_THeldItem.FormattingEnabled = true; @@ -483,117 +575,10 @@ private void InitializeComponent() this.LB_Trade.TabIndex = 2; this.LB_Trade.SelectedIndexChanged += new System.EventHandler(this.LB_Trade_SelectedIndexChanged); // - // B_Save - // - this.B_Save.Location = new System.Drawing.Point(328, 365); - this.B_Save.Name = "B_Save"; - this.B_Save.Size = new System.Drawing.Size(75, 23); - this.B_Save.TabIndex = 1; - this.B_Save.Text = "Save"; - this.B_Save.UseVisualStyleBackColor = true; - this.B_Save.Click += new System.EventHandler(this.B_Save_Click); - // - // GB_EMoves - // - this.GB_EMoves.Controls.Add(this.CB_EMove3); - 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(218, 114); - this.GB_EMoves.Name = "GB_EMoves"; - this.GB_EMoves.Size = new System.Drawing.Size(133, 112); - this.GB_EMoves.TabIndex = 17; - this.GB_EMoves.TabStop = false; - this.GB_EMoves.Text = "Moves"; - // - // CB_EMove0 - // - this.CB_EMove0.FormattingEnabled = true; - this.CB_EMove0.Location = new System.Drawing.Point(6, 19); - this.CB_EMove0.Name = "CB_EMove0"; - this.CB_EMove0.Size = new System.Drawing.Size(121, 21); - this.CB_EMove0.TabIndex = 17; - // - // CB_EMove1 - // - this.CB_EMove1.FormattingEnabled = true; - this.CB_EMove1.Location = new System.Drawing.Point(6, 41); - this.CB_EMove1.Name = "CB_EMove1"; - this.CB_EMove1.Size = new System.Drawing.Size(121, 21); - this.CB_EMove1.TabIndex = 18; - // - // CB_EMove2 - // - this.CB_EMove2.FormattingEnabled = true; - this.CB_EMove2.Location = new System.Drawing.Point(6, 63); - this.CB_EMove2.Name = "CB_EMove2"; - this.CB_EMove2.Size = new System.Drawing.Size(121, 21); - this.CB_EMove2.TabIndex = 19; - // - // CB_EMove3 - // - this.CB_EMove3.FormattingEnabled = true; - this.CB_EMove3.Location = new System.Drawing.Point(6, 85); - this.CB_EMove3.Name = "CB_EMove3"; - this.CB_EMove3.Size = new System.Drawing.Size(121, 21); - this.CB_EMove3.TabIndex = 20; - // - // NUD_TID - // - this.NUD_TID.Location = new System.Drawing.Point(180, 111); - this.NUD_TID.Maximum = new decimal(new int[] { - -1, - 0, - 0, - 0}); - this.NUD_TID.Name = "NUD_TID"; - this.NUD_TID.Size = new System.Drawing.Size(82, 20); - this.NUD_TID.TabIndex = 25; - this.NUD_TID.Value = new decimal(new int[] { - -1, - 0, - 0, - 0}); - this.NUD_TID.ValueChanged += new System.EventHandler(this.changeTID); - // - // L_TID - // - this.L_TID.Location = new System.Drawing.Point(124, 108); - this.L_TID.Name = "L_TID"; - this.L_TID.Size = new System.Drawing.Size(50, 23); - this.L_TID.TabIndex = 26; - this.L_TID.Text = "ID:"; - this.L_TID.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // L_TTID - // - this.L_TTID.AutoSize = true; - this.L_TTID.Location = new System.Drawing.Point(268, 113); - this.L_TTID.Name = "L_TTID"; - this.L_TTID.Size = new System.Drawing.Size(28, 13); - this.L_TTID.TabIndex = 27; - this.L_TTID.Text = "TID:"; - this.L_TTID.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // CB_TRequest - // - this.CB_TRequest.FormattingEnabled = true; - this.CB_TRequest.Location = new System.Drawing.Point(230, 137); - 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(124, 135); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 23); - this.label1.TabIndex = 28; - this.label1.Text = "Request Species:"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // Tab_Randomizer // + this.Tab_Randomizer.Controls.Add(this.NUD_LevelBoost); + this.Tab_Randomizer.Controls.Add(this.CHK_Level); this.Tab_Randomizer.Controls.Add(this.B_RandAll); this.Tab_Randomizer.Controls.Add(this.GB_Tweak); this.Tab_Randomizer.Controls.Add(this.B_Starters); @@ -605,6 +590,16 @@ private void InitializeComponent() this.Tab_Randomizer.Text = "Randomizer"; this.Tab_Randomizer.UseVisualStyleBackColor = true; // + // B_RandAll + // + this.B_RandAll.Location = new System.Drawing.Point(132, 243); + this.B_RandAll.Name = "B_RandAll"; + this.B_RandAll.Size = new System.Drawing.Size(122, 23); + this.B_RandAll.TabIndex = 509; + this.B_RandAll.Text = "Randomize All"; + this.B_RandAll.UseVisualStyleBackColor = true; + this.B_RandAll.Click += new System.EventHandler(this.B_RandAll_Click); + // // GB_Tweak // this.GB_Tweak.Controls.Add(this.CHK_G7); @@ -752,15 +747,25 @@ private void InitializeComponent() this.CHK_G1.Text = "Gen 1"; this.CHK_G1.UseVisualStyleBackColor = true; // - // B_RandAll + // B_Starters // - this.B_RandAll.Location = new System.Drawing.Point(132, 243); - this.B_RandAll.Name = "B_RandAll"; - this.B_RandAll.Size = new System.Drawing.Size(122, 23); - this.B_RandAll.TabIndex = 509; - this.B_RandAll.Text = "Randomize All"; - this.B_RandAll.UseVisualStyleBackColor = true; - this.B_RandAll.Click += new System.EventHandler(this.B_RandAll_Click); + this.B_Starters.Location = new System.Drawing.Point(132, 272); + this.B_Starters.Name = "B_Starters"; + this.B_Starters.Size = new System.Drawing.Size(122, 23); + this.B_Starters.TabIndex = 9; + this.B_Starters.Text = "Randomize Starters"; + this.B_Starters.UseVisualStyleBackColor = true; + this.B_Starters.Click += new System.EventHandler(this.B_Starters_Click); + // + // B_Save + // + this.B_Save.Location = new System.Drawing.Point(328, 365); + this.B_Save.Name = "B_Save"; + this.B_Save.Size = new System.Drawing.Size(75, 23); + this.B_Save.TabIndex = 1; + this.B_Save.Text = "Save"; + this.B_Save.UseVisualStyleBackColor = true; + this.B_Save.Click += new System.EventHandler(this.B_Save_Click); // // B_Cancel // @@ -772,6 +777,41 @@ private void InitializeComponent() this.B_Cancel.UseVisualStyleBackColor = true; this.B_Cancel.Click += new System.EventHandler(this.B_Cancel_Click); // + // 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(231, 74); + 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 = 511; + 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(99, 75); + this.CHK_Level.Name = "CHK_Level"; + this.CHK_Level.Size = new System.Drawing.Size(130, 17); + this.CHK_Level.TabIndex = 510; + this.CHK_Level.Text = "Multiply PKM Level by"; + this.CHK_Level.UseVisualStyleBackColor = true; + // // StaticEncounterEditor7 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -787,17 +827,19 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_GForm)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_GLevel)).EndInit(); this.Tab_Encounters.ResumeLayout(false); + this.GB_EMoves.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.NUD_EForm)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_ELevel)).EndInit(); this.Tab_Trades.ResumeLayout(false); this.Tab_Trades.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_TID)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_TForm)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_TLevel)).EndInit(); - this.GB_EMoves.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.NUD_TID)).EndInit(); this.Tab_Randomizer.ResumeLayout(false); + this.Tab_Randomizer.PerformLayout(); this.GB_Tweak.ResumeLayout(false); this.GB_Tweak.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).EndInit(); this.ResumeLayout(false); } @@ -862,5 +904,7 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CHK_G1; private System.Windows.Forms.Button B_RandAll; private System.Windows.Forms.Button B_Cancel; + private System.Windows.Forms.NumericUpDown NUD_LevelBoost; + private System.Windows.Forms.CheckBox CHK_Level; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs index bebe028..522b063 100644 --- a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs +++ b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs @@ -311,6 +311,8 @@ private void B_Starters_Click(object sender, EventArgs e) var t = Gifts[i]; t.Species = Randomizer.getRandomSpecies(ref sL, ref ctr, oldStarters[i], CHK_BST.Checked, Main.SpeciesStat); t.Form = Randomizer.GetRandomForme(t.Species, false, true); + + // no level boosting } getListBoxEntries(); @@ -332,6 +334,9 @@ private void B_RandAll_Click(object sender, EventArgs e) var t = Gifts[i]; t.Species = Randomizer.getRandomSpecies(ref sL, ref ctr, t.Species, CHK_BST.Checked, Main.SpeciesStat); t.Form = Randomizer.GetRandomForme(t.Species, false, true); + + if (CHK_Level.Checked) + t.Level = Randomizer.getModifiedLevel(t.Level, NUD_LevelBoost.Value); } foreach (EncounterStatic7 t in Encounters) { @@ -339,12 +344,18 @@ private void B_RandAll_Click(object sender, EventArgs e) t.Form = Randomizer.GetRandomForme(t.Species, false, true); int[] moves = Main.Config.Learnsets[t.Species].getCurrentMoves(t.Level); Array.Resize(ref moves, 4); t.RelearnMoves = moves; + + if (CHK_Level.Checked) + t.Level = Randomizer.getModifiedLevel(t.Level, NUD_LevelBoost.Value); } foreach (EncounterTrade7 t in Trades) { t.Species = Randomizer.getRandomSpecies(ref sL, ref ctr, t.Species, CHK_BST.Checked, Main.SpeciesStat); t.Form = Randomizer.GetRandomForme(t.Species, false, true); t.TradeRequestSpecies = Randomizer.getRandomSpecies(ref sL, ref ctr, t.TradeRequestSpecies, CHK_BST.Checked, Main.SpeciesStat); + + if (CHK_Level.Checked) + t.Level = Randomizer.getModifiedLevel(t.Level, NUD_LevelBoost.Value); } getListBoxEntries();