From 5a3d436a6bccea4e80ac9753d9f70ba65c819893 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 10 Dec 2016 19:39:00 -0800 Subject: [PATCH] Add pinfo specific Z Move editing --- .../Subforms/Gen7/PersonalEditor7.Designer.cs | 83 +++++++++++++++++++ pk3DS/Subforms/Gen7/PersonalEditor7.cs | 38 +++++++-- 2 files changed, 115 insertions(+), 6 deletions(-) diff --git a/pk3DS/Subforms/Gen7/PersonalEditor7.Designer.cs b/pk3DS/Subforms/Gen7/PersonalEditor7.Designer.cs index e1e0fad..167fc95 100644 --- a/pk3DS/Subforms/Gen7/PersonalEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/PersonalEditor7.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.CHK_Variant = new System.Windows.Forms.CheckBox(); this.TB_BST = new System.Windows.Forms.TextBox(); this.L_BST = new System.Windows.Forms.Label(); this.TB_RawColor = new System.Windows.Forms.TextBox(); @@ -99,6 +100,12 @@ private void InitializeComponent() this.L_EVYield = new System.Windows.Forms.Label(); this.L_BaseStats = new System.Windows.Forms.Label(); this.TP_MoveTutors = new System.Windows.Forms.TabPage(); + this.label1 = new System.Windows.Forms.Label(); + this.CB_ZMove = new System.Windows.Forms.ComboBox(); + this.L_BaseMove = new System.Windows.Forms.Label(); + this.L_ZItem = new System.Windows.Forms.Label(); + this.CB_ZBaseMove = new System.Windows.Forms.ComboBox(); + this.CB_ZItem = new System.Windows.Forms.ComboBox(); this.L_Special = new System.Windows.Forms.Label(); this.L_TM = new System.Windows.Forms.Label(); this.CLB_MoveTutors = new System.Windows.Forms.CheckedListBox(); @@ -188,6 +195,7 @@ private void InitializeComponent() // // TP_General // + this.TP_General.Controls.Add(this.CHK_Variant); this.TP_General.Controls.Add(this.TB_BST); this.TP_General.Controls.Add(this.L_BST); this.TP_General.Controls.Add(this.TB_RawColor); @@ -262,6 +270,17 @@ private void InitializeComponent() this.TP_General.Text = "General Info"; this.TP_General.UseVisualStyleBackColor = true; // + // CHK_Variant + // + this.CHK_Variant.AutoSize = true; + this.CHK_Variant.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Variant.Location = new System.Drawing.Point(318, 319); + this.CHK_Variant.Name = "CHK_Variant"; + this.CHK_Variant.Size = new System.Drawing.Size(88, 17); + this.CHK_Variant.TabIndex = 91; + this.CHK_Variant.Text = "Local Variant"; + this.CHK_Variant.UseVisualStyleBackColor = true; + // // TB_BST // this.TB_BST.Location = new System.Drawing.Point(387, 27); @@ -918,6 +937,12 @@ private void InitializeComponent() // // TP_MoveTutors // + this.TP_MoveTutors.Controls.Add(this.label1); + this.TP_MoveTutors.Controls.Add(this.CB_ZMove); + this.TP_MoveTutors.Controls.Add(this.L_BaseMove); + this.TP_MoveTutors.Controls.Add(this.L_ZItem); + this.TP_MoveTutors.Controls.Add(this.CB_ZBaseMove); + this.TP_MoveTutors.Controls.Add(this.CB_ZItem); this.TP_MoveTutors.Controls.Add(this.L_Special); this.TP_MoveTutors.Controls.Add(this.L_TM); this.TP_MoveTutors.Controls.Add(this.CLB_MoveTutors); @@ -930,6 +955,57 @@ private void InitializeComponent() this.TP_MoveTutors.Text = "Move Tutors"; this.TP_MoveTutors.UseVisualStyleBackColor = true; // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(301, 83); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(44, 13); + this.label1.TabIndex = 13; + this.label1.Text = "Z Move"; + // + // CB_ZMove + // + this.CB_ZMove.FormattingEnabled = true; + this.CB_ZMove.Location = new System.Drawing.Point(301, 99); + this.CB_ZMove.Name = "CB_ZMove"; + this.CB_ZMove.Size = new System.Drawing.Size(121, 21); + this.CB_ZMove.TabIndex = 12; + // + // L_BaseMove + // + this.L_BaseMove.AutoSize = true; + this.L_BaseMove.Location = new System.Drawing.Point(301, 43); + this.L_BaseMove.Name = "L_BaseMove"; + this.L_BaseMove.Size = new System.Drawing.Size(61, 13); + this.L_BaseMove.TabIndex = 11; + this.L_BaseMove.Text = "Base Move"; + // + // L_ZItem + // + this.L_ZItem.AutoSize = true; + this.L_ZItem.Location = new System.Drawing.Point(301, 3); + this.L_ZItem.Name = "L_ZItem"; + this.L_ZItem.Size = new System.Drawing.Size(37, 13); + this.L_ZItem.TabIndex = 10; + this.L_ZItem.Text = "Z Item"; + // + // CB_ZBaseMove + // + this.CB_ZBaseMove.FormattingEnabled = true; + this.CB_ZBaseMove.Location = new System.Drawing.Point(301, 59); + this.CB_ZBaseMove.Name = "CB_ZBaseMove"; + this.CB_ZBaseMove.Size = new System.Drawing.Size(121, 21); + this.CB_ZBaseMove.TabIndex = 9; + // + // CB_ZItem + // + this.CB_ZItem.FormattingEnabled = true; + this.CB_ZItem.Location = new System.Drawing.Point(301, 19); + this.CB_ZItem.Name = "CB_ZItem"; + this.CB_ZItem.Size = new System.Drawing.Size(121, 21); + this.CB_ZItem.TabIndex = 8; + // // L_Special // this.L_Special.AutoSize = true; @@ -1563,5 +1639,12 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CHK_QuickHatch; private System.Windows.Forms.Label L_Same; private System.Windows.Forms.NumericUpDown NUD_Egg; + private System.Windows.Forms.Label L_ZItem; + private System.Windows.Forms.ComboBox CB_ZBaseMove; + private System.Windows.Forms.ComboBox CB_ZItem; + private System.Windows.Forms.Label L_BaseMove; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox CB_ZMove; + private System.Windows.Forms.CheckBox CHK_Variant; } } diff --git a/pk3DS/Subforms/Gen7/PersonalEditor7.cs b/pk3DS/Subforms/Gen7/PersonalEditor7.cs index 334c141..e59dbe2 100644 --- a/pk3DS/Subforms/Gen7/PersonalEditor7.cs +++ b/pk3DS/Subforms/Gen7/PersonalEditor7.cs @@ -85,6 +85,13 @@ private void Setup() foreach (string it in items) cb.Items.Add(it); + foreach (string it in items) + CB_ZItem.Items.Add(it); + foreach (string m in moves) + CB_ZBaseMove.Items.Add(m); + foreach (string m in moves) + CB_ZMove.Items.Add(m); + foreach (ComboBox cb in ability_boxes) foreach (string ab in abilities) cb.Items.Add(ab); @@ -179,6 +186,14 @@ private void readInfo() for (int i = 0; i < CLB_MoveTutors.Items.Count; i++) CLB_MoveTutors.SetItemChecked(i, pkm.TypeTutors[i]); // Bitflags for Tutors + + if (Main.Config.SM) + { + PersonalInfoSM sm = (PersonalInfoSM) pkm; + CB_ZItem.SelectedIndex = sm.SpecialZ_Item; + CB_ZBaseMove.SelectedIndex = sm.SpecialZ_BaseMove; + CB_ZMove.SelectedIndex = sm.SpecialZ_ZMove; + } } private void readEntry() { @@ -250,6 +265,14 @@ private void savePersonal() for (int t = 0; t < CLB_MoveTutors.Items.Count; t++) pkm.TypeTutors[t] = CLB_MoveTutors.GetItemChecked(t); + + if (Main.Config.SM) + { + PersonalInfoSM sm = (PersonalInfoSM)pkm; + sm.SpecialZ_Item = CB_ZItem.SelectedIndex; + sm.SpecialZ_BaseMove = CB_ZBaseMove.SelectedIndex; + sm.SpecialZ_ZMove = CB_ZMove.SelectedIndex; + } } private void saveEntry() { @@ -390,13 +413,14 @@ private void B_Dump_Click(object sender, EventArgs e) CB_Species.SelectedIndex = i; // Get new Species result += "======" + Environment.NewLine + entry + " - " + CB_Species.Text + " (Stage: " + TB_Stage.Text + ")" + Environment.NewLine + "======" + Environment.NewLine; - result += - $"Base Stats: {TB_BaseHP.Text}.{TB_BaseATK.Text}.{TB_BaseDEF.Text}.{TB_BaseSPA.Text}.{TB_BaseSPD.Text}.{TB_BaseSPE.Text} (BST: {pkm.BST})" + Environment.NewLine; - result += - $"EV Yield: {TB_HPEVs.Text}.{TB_ATKEVs.Text}.{TB_DEFEVs.Text}.{TB_SPAEVs.Text}.{TB_SPDEVs.Text}.{TB_SPEEVs.Text}" + Environment.NewLine; + result += $"Base Stats: {TB_BaseHP.Text}.{TB_BaseATK.Text}.{TB_BaseDEF.Text}.{TB_BaseSPA.Text}.{TB_BaseSPD.Text}.{TB_BaseSPE.Text} (BST: {pkm.BST})" + Environment.NewLine; + result += $"EV Yield: {TB_HPEVs.Text}.{TB_ATKEVs.Text}.{TB_DEFEVs.Text}.{TB_SPAEVs.Text}.{TB_SPDEVs.Text}.{TB_SPEEVs.Text}" + Environment.NewLine; result += $"Abilities: {CB_Ability1.Text} (1) | {CB_Ability2.Text} (2) | {CB_Ability3.Text} (H)" + Environment.NewLine; - result += string.Format(CB_Type1.SelectedIndex != CB_Type2.SelectedIndex ? "Type: {0} / {1}" : "Type: {0}", CB_Type1.Text, CB_Type2.Text) + Environment.NewLine; + if (CB_Type1.SelectedIndex == CB_Type2.SelectedIndex) + result += $"Type: {CB_Type1.Text} / {CB_Type2.Text}" + Environment.NewLine; + else + result += $"Type: {CB_Type1.Text}" + Environment.NewLine; result += $"Item 1 (50%): {CB_HeldItem1.Text}" + Environment.NewLine; result += $"Item 2 (5%): {CB_HeldItem2.Text}" + Environment.NewLine; @@ -408,8 +432,10 @@ private void B_Dump_Click(object sender, EventArgs e) result += string.Format(CB_EggGroup1.SelectedIndex != CB_EggGroup2.SelectedIndex ? "Egg Group: {0} / {1}" : "Egg Group: {0}", CB_EggGroup1.Text, CB_EggGroup2.Text) + Environment.NewLine; result += $"Hatch Cycles: {TB_HatchCycles.Text}" + Environment.NewLine; + result += $"Height: {TB_Height.Text} m, Weight: {TB_Weight.Text} kg, Color: {CB_Color.Text}" + Environment.NewLine; - result += String.Format("Height: {0} m, Weight: {1} kg, Color: {2}", TB_Height.Text, TB_Weight.Text, CB_Color.Text) + Environment.NewLine; + if (CB_ZBaseMove.SelectedIndex > 0) + result += $"{CB_ZBaseMove.Text} + {CB_ZItem.Text} => {CB_ZMove.Text}" + Environment.NewLine; result += Environment.NewLine; }