diff --git a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs index 91d334a..22e6604 100644 --- a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.Designer.cs @@ -131,6 +131,7 @@ 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_RandomAura = 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(); @@ -148,7 +149,7 @@ 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_RandomAura = new System.Windows.Forms.CheckBox(); + this.CHK_SpecialMove = new System.Windows.Forms.CheckBox(); this.TC_Tabs.SuspendLayout(); this.Tab_Gifts.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_GGender)).BeginInit(); @@ -1292,7 +1293,7 @@ private void InitializeComponent() // // L_TID // - this.L_TID.Location = new System.Drawing.Point(136, 117); + this.L_TID.Location = new System.Drawing.Point(136, 118); this.L_TID.Name = "L_TID"; this.L_TID.Size = new System.Drawing.Size(50, 23); this.L_TID.TabIndex = 26; @@ -1428,7 +1429,7 @@ private void InitializeComponent() // // B_ModifyLevel // - this.B_ModifyLevel.Location = new System.Drawing.Point(306, 101); + this.B_ModifyLevel.Location = new System.Drawing.Point(306, 89); this.B_ModifyLevel.Name = "B_ModifyLevel"; this.B_ModifyLevel.Size = new System.Drawing.Size(70, 23); this.B_ModifyLevel.TabIndex = 512; @@ -1444,7 +1445,7 @@ private void InitializeComponent() 0, 0, 131072}); - this.NUD_LevelBoost.Location = new System.Drawing.Point(257, 102); + this.NUD_LevelBoost.Location = new System.Drawing.Point(257, 90); this.NUD_LevelBoost.Maximum = new decimal(new int[] { 3, 0, @@ -1464,7 +1465,7 @@ private void InitializeComponent() 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(125, 103); + this.CHK_Level.Location = new System.Drawing.Point(125, 91); this.CHK_Level.Name = "CHK_Level"; this.CHK_Level.Size = new System.Drawing.Size(130, 17); this.CHK_Level.TabIndex = 510; @@ -1483,6 +1484,7 @@ private void InitializeComponent() // // GB_Tweak // + this.GB_Tweak.Controls.Add(this.CHK_SpecialMove); this.GB_Tweak.Controls.Add(this.CHK_RandomAura); this.GB_Tweak.Controls.Add(this.CHK_RemoveShinyLock); this.GB_Tweak.Controls.Add(this.CHK_AllowMega); @@ -1498,13 +1500,23 @@ 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(119, 125); + 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, 160); + this.GB_Tweak.Size = new System.Drawing.Size(258, 173); this.GB_Tweak.TabIndex = 508; this.GB_Tweak.TabStop = false; this.GB_Tweak.Text = "Extra Randomization Tweaks"; // + // CHK_RandomAura + // + this.CHK_RandomAura.AutoSize = true; + this.CHK_RandomAura.Location = new System.Drawing.Point(9, 139); + this.CHK_RandomAura.Name = "CHK_RandomAura"; + this.CHK_RandomAura.Size = new System.Drawing.Size(172, 17); + this.CHK_RandomAura.TabIndex = 300; + this.CHK_RandomAura.Text = "Random Totem Pokémon Aura"; + this.CHK_RandomAura.UseVisualStyleBackColor = true; + // // CHK_RemoveShinyLock // this.CHK_RemoveShinyLock.AutoSize = true; @@ -1694,15 +1706,15 @@ private void InitializeComponent() this.B_Cancel.UseVisualStyleBackColor = true; this.B_Cancel.Click += new System.EventHandler(this.B_Cancel_Click); // - // CHK_RandomAura + // CHK_SpecialMove // - this.CHK_RandomAura.AutoSize = true; - this.CHK_RandomAura.Location = new System.Drawing.Point(9, 139); - this.CHK_RandomAura.Name = "CHK_RandomAura"; - this.CHK_RandomAura.Size = new System.Drawing.Size(172, 17); - this.CHK_RandomAura.TabIndex = 300; - this.CHK_RandomAura.Text = "Random Totem Pokémon Aura"; - this.CHK_RandomAura.UseVisualStyleBackColor = true; + 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; // // StaticEncounterEditor7 // @@ -1883,5 +1895,6 @@ private void InitializeComponent() private System.Windows.Forms.Label L_GNature; private System.Windows.Forms.Button B_ModifyLevel; private System.Windows.Forms.CheckBox CHK_RandomAura; + private System.Windows.Forms.CheckBox CHK_SpecialMove; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs index 910039a..bc0e60f 100644 --- a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs +++ b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs @@ -108,6 +108,7 @@ public StaticEncounterEditor7(byte[][] infiles) CB_EMove3.Items.Add(s); CB_SpecialMove.Items.Add(s); } + foreach (string s in aura) CB_Aura.Items.Add(s); CB_GNature.Items.Add("Random"); CB_GNature.Items.AddRange(natures.Take(25).ToArray()); @@ -115,8 +116,6 @@ public StaticEncounterEditor7(byte[][] infiles) CB_ENature.Items.AddRange(natures.Take(25).ToArray()); CB_TNature.Items.AddRange(natures.Take(25).ToArray()); - foreach (string s in aura) CB_Aura.Items.Add(s); - getListBoxEntries(); LB_Gift.SelectedIndex = 0; LB_Encounter.SelectedIndex = 0; @@ -416,7 +415,7 @@ private SpeciesRandomizer getRandomizer() G4 = CHK_G4.Checked, G5 = CHK_G5.Checked, G6 = CHK_G6.Checked, - G7 = false, + G7 = CHK_G7.Checked, E = CHK_E.Checked, L = CHK_L.Checked, @@ -443,6 +442,7 @@ private void B_Starters_Click(object sender, EventArgs e) var t = Gifts[i]; t.Species = specrand.GetRandomSpecies(oldStarters[i]); t.Form = formrand.GetRandomForme(t.Species); + t.Nature = -1; // random if (CHK_AllowMega.Checked) formrand.AllowMega = true; @@ -455,6 +455,9 @@ private void B_Starters_Click(object sender, EventArgs e) if (CHK_RemoveShinyLock.Checked) t.ShinyLock = false; // in case any user modifications locked the starters + + if (CHK_SpecialMove.Checked) + t.SpecialMove = Util.rand.Next(1, CB_SpecialMove.Items.Count); // don't allow none } getListBoxEntries(); @@ -481,6 +484,7 @@ private void B_RandAll_Click(object sender, EventArgs e) var t = Gifts[i]; t.Species = specrand.GetRandomSpecies(t.Species); t.Form = formrand.GetRandomForme(t.Species); + t.Nature = -1; // random if (CHK_AllowMega.Checked) formrand.AllowMega = true; @@ -493,12 +497,16 @@ private void B_RandAll_Click(object sender, EventArgs e) if (CHK_RemoveShinyLock.Checked) t.ShinyLock = false; + + if (CHK_SpecialMove.Checked) + t.SpecialMove = Util.rand.Next(1, CB_SpecialMove.Items.Count); // don't allow none } 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.Nature = 0; // random if (CHK_AllowMega.Checked) formrand.AllowMega = true; @@ -520,6 +528,7 @@ private void B_RandAll_Click(object sender, EventArgs e) t.Species = specrand.GetRandomSpecies(t.Species); t.Form = formrand.GetRandomForme(t.Species); t.TradeRequestSpecies = specrand.GetRandomSpecies(t.TradeRequestSpecies); + t.Nature = (int)(Util.rnd32() % CB_TNature.Items.Count); // randomly selected if (CHK_AllowMega.Checked) formrand.AllowMega = true;