From 3cf894bdbf01451c7368b12e77df36b016eaaad2 Mon Sep 17 00:00:00 2001 From: Matt Date: Sun, 23 Sep 2018 19:38:47 -0400 Subject: [PATCH] Add full HM compatiblity mod (#381) --- pk3DS/Subforms/Gen6/GiftEditor6.cs | 1 + .../Subforms/Gen6/PersonalEditor6.Designer.cs | 33 +++++++++++++------ pk3DS/Subforms/Gen6/PersonalEditor6.cs | 4 +++ pk3DS/Subforms/Gen7/MartEditor7UU.cs | 1 - pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs | 8 +++++ 5 files changed, 36 insertions(+), 11 deletions(-) diff --git a/pk3DS/Subforms/Gen6/GiftEditor6.cs b/pk3DS/Subforms/Gen6/GiftEditor6.cs index 567db08..803d390 100644 --- a/pk3DS/Subforms/Gen6/GiftEditor6.cs +++ b/pk3DS/Subforms/Gen6/GiftEditor6.cs @@ -267,6 +267,7 @@ private void B_RandAll_Click(object sender, EventArgs e) NUD_Form.Value = formrand.GetRandomForme(species); CB_Gender.SelectedIndex = 0; // random CB_Nature.SelectedIndex = 0; // random + NUD_IV0.Value = NUD_IV1.Value = NUD_IV2.Value = NUD_IV3.Value = NUD_IV4.Value = NUD_IV5.Value = -1; // random if (MegaDictionary.Values.Any(z => z.Contains(CB_HeldItem.SelectedIndex)) && NUD_Form.Value != 0) NUD_Form.Value = 0; // don't allow mega gifts to be form 1 diff --git a/pk3DS/Subforms/Gen6/PersonalEditor6.Designer.cs b/pk3DS/Subforms/Gen6/PersonalEditor6.Designer.cs index debe636..186cfcd 100644 --- a/pk3DS/Subforms/Gen6/PersonalEditor6.Designer.cs +++ b/pk3DS/Subforms/Gen6/PersonalEditor6.Designer.cs @@ -32,6 +32,7 @@ private void InitializeComponent() this.L_Species_Precursor = new System.Windows.Forms.Label(); this.TC_Pokemon = new System.Windows.Forms.TabControl(); this.TP_General = new System.Windows.Forms.TabPage(); + this.TB_RawColor = new System.Windows.Forms.TextBox(); this.L_HiddenAbility = new System.Windows.Forms.Label(); this.L_Ability2 = new System.Windows.Forms.Label(); this.L_Ability1 = new System.Windows.Forms.Label(); @@ -148,7 +149,7 @@ private void InitializeComponent() this.B_Randomize = new System.Windows.Forms.Button(); this.PB_MonSprite = new System.Windows.Forms.PictureBox(); this.B_Dump = new System.Windows.Forms.Button(); - this.TB_RawColor = new System.Windows.Forms.TextBox(); + this.CHK_FullHMCompatibility = new System.Windows.Forms.CheckBox(); this.TC_Pokemon.SuspendLayout(); this.TP_General.SuspendLayout(); this.TP_MoveTutors.SuspendLayout(); @@ -275,6 +276,16 @@ private void InitializeComponent() this.TP_General.Text = "General Info"; this.TP_General.UseVisualStyleBackColor = true; // + // TB_RawColor + // + this.TB_RawColor.Location = new System.Drawing.Point(229, 209); + this.TB_RawColor.Name = "TB_RawColor"; + this.TB_RawColor.ReadOnly = true; + this.TB_RawColor.Size = new System.Drawing.Size(30, 20); + this.TB_RawColor.TabIndex = 419; + this.TB_RawColor.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_RawColor.Visible = false; + // // L_HiddenAbility // this.L_HiddenAbility.AutoSize = true; @@ -1037,6 +1048,7 @@ private void InitializeComponent() // // GB_Modifier // + this.GB_Modifier.Controls.Add(this.CHK_FullHMCompatibility); this.GB_Modifier.Controls.Add(this.CHK_NoTutor); this.GB_Modifier.Controls.Add(this.CHK_CatchRateMod); this.GB_Modifier.Controls.Add(this.L_CatchRateMod); @@ -1049,7 +1061,7 @@ private void InitializeComponent() this.GB_Modifier.Controls.Add(this.CHK_NoEV); this.GB_Modifier.Location = new System.Drawing.Point(4, 147); this.GB_Modifier.Name = "GB_Modifier"; - this.GB_Modifier.Size = new System.Drawing.Size(345, 129); + this.GB_Modifier.Size = new System.Drawing.Size(345, 152); this.GB_Modifier.TabIndex = 419; this.GB_Modifier.TabStop = false; this.GB_Modifier.Text = "Modifier Options"; @@ -1523,15 +1535,15 @@ private void InitializeComponent() this.B_Dump.UseVisualStyleBackColor = true; this.B_Dump.Click += new System.EventHandler(this.B_Dump_Click); // - // TB_RawColor + // CHK_FullHMCompatibility // - this.TB_RawColor.Location = new System.Drawing.Point(229, 209); - this.TB_RawColor.Name = "TB_RawColor"; - this.TB_RawColor.ReadOnly = true; - this.TB_RawColor.Size = new System.Drawing.Size(30, 20); - this.TB_RawColor.TabIndex = 419; - this.TB_RawColor.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_RawColor.Visible = false; + this.CHK_FullHMCompatibility.AutoSize = true; + this.CHK_FullHMCompatibility.Location = new System.Drawing.Point(6, 127); + this.CHK_FullHMCompatibility.Name = "CHK_FullHMCompatibility"; + this.CHK_FullHMCompatibility.Size = new System.Drawing.Size(123, 17); + this.CHK_FullHMCompatibility.TabIndex = 21; + this.CHK_FullHMCompatibility.Text = "Full HM Compatibility"; + this.CHK_FullHMCompatibility.UseVisualStyleBackColor = true; // // PersonalEditor6 // @@ -1694,5 +1706,6 @@ private void InitializeComponent() private System.Windows.Forms.Label L_Ability2; private System.Windows.Forms.Label L_Ability1; private System.Windows.Forms.TextBox TB_RawColor; + private System.Windows.Forms.CheckBox CHK_FullHMCompatibility; } } diff --git a/pk3DS/Subforms/Gen6/PersonalEditor6.cs b/pk3DS/Subforms/Gen6/PersonalEditor6.cs index 0f963ee..784b91d 100644 --- a/pk3DS/Subforms/Gen6/PersonalEditor6.cs +++ b/pk3DS/Subforms/Gen6/PersonalEditor6.cs @@ -400,6 +400,10 @@ private void B_ModifyAll(object sender, EventArgs e) CLB_ORASTutors.SetItemCheckState(ao, CheckState.Unchecked); } + if (CHK_FullHMCompatibility.Checked) + for (int h = 100; h < CLB_TMHM.Items.Count; h++) + CLB_TMHM.SetItemCheckState(h, CheckState.Checked); + if (CHK_QuickHatch.Checked) TB_HatchCycles.Text = 1.ToString(); if (CHK_CatchRateMod.Checked) diff --git a/pk3DS/Subforms/Gen7/MartEditor7UU.cs b/pk3DS/Subforms/Gen7/MartEditor7UU.cs index 049d99c..ab9fd82 100644 --- a/pk3DS/Subforms/Gen7/MartEditor7UU.cs +++ b/pk3DS/Subforms/Gen7/MartEditor7UU.cs @@ -103,7 +103,6 @@ private void setupDGV() private int entryItem = -1; private int entryBPItem = -1; - private int entryBPMove = -1; private void changeIndexItem(object sender, EventArgs e) { diff --git a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs index 6804969..aa98ba2 100644 --- a/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs +++ b/pk3DS/Subforms/Gen7/StaticEncounterEditor7.cs @@ -666,6 +666,13 @@ private void B_RandAll_Click(object sender, EventArgs e) if (CHK_ForceFullyEvolved.Checked && t.Level >= NUD_ForceFullyEvolved.Value && !FinalEvo.Contains(t.Species)) t.Species = FinalEvo[randFinalEvo()]; + if (t.IV3) + t.IVs = new[] { -4, -1, -1, -1, -1, -1 }; // random with IV3 flag + else + t.IVs = new[] { -1, -1, -1, -1, -1, -1 }; // random + + t.EVs = new[] { 0, 0, 0, 0, 0, 0 }; // reset EVs + t.Form = Randomizer.GetRandomForme(t.Species, CHK_AllowMega.Checked, true, Main.SpeciesStat); t.Gender = 0; // random t.Nature = 0; // random @@ -697,6 +704,7 @@ private void B_RandAll_Click(object sender, EventArgs e) t.Form = Randomizer.GetRandomForme(t.Species, CHK_AllowMega.Checked, true, Main.SpeciesStat); t.Nature = (int)(Util.rnd32() % CB_TNature.Items.Count); // randomly selected + t.IVs = new[] { -1, -1, -1, -1, -1, -1 }; // random } GetListBoxEntries();