From f45d730fafc9aae409eaf84ca841ee5d954d337b Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 3 Dec 2019 19:54:34 -0800 Subject: [PATCH] Add TrainerID for trainer card Closes #2556 --- .../Saves/Substructures/Gen8/TrainerCard8.cs | 9 ++++++- .../Gen8/SAV_Trainer8.Designer.cs | 27 ++++++++++++++++++- .../Save Editors/Gen8/SAV_Trainer8.cs | 2 ++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Saves/Substructures/Gen8/TrainerCard8.cs b/PKHeX.Core/Saves/Substructures/Gen8/TrainerCard8.cs index 2fa65db3a..7e7fb08dd 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/TrainerCard8.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/TrainerCard8.cs @@ -1,4 +1,5 @@ -using System.Text; +using System; +using System.Text; namespace PKHeX.Core { @@ -12,6 +13,12 @@ public string OT set => SAV.SetData(Data, SAV.SetString(value, SAV.OTLength), 0x00); } + public int TrainerID + { + get => BitConverter.ToInt32(Data, 0x1C); + set => SAV.SetData(BitConverter.GetBytes(value), 0x1C); + } + public string Number { get => Encoding.ASCII.GetString(Data, 0x39, 3); diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs index b0dfa858d..22d9f640f 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs @@ -93,6 +93,7 @@ private void InitializeComponent() this.L_SinglesC = new System.Windows.Forms.Label(); this.TC_Editor = new System.Windows.Forms.TabControl(); this.Tab_Overview = new System.Windows.Forms.TabPage(); + this.MT_TrainerCardID = new System.Windows.Forms.MaskedTextBox(); this.TB_TrainerCardNumber = new System.Windows.Forms.TextBox(); this.L_TRCardNumber = new System.Windows.Forms.Label(); this.TB_TrainerCardName = new System.Windows.Forms.TextBox(); @@ -122,6 +123,7 @@ private void InitializeComponent() this.L_CurrentMap = new System.Windows.Forms.Label(); this.L_Z = new System.Windows.Forms.Label(); this.L_X = new System.Windows.Forms.Label(); + this.L_TRCardID = new System.Windows.Forms.Label(); this.TC_Editor.SuspendLayout(); this.Tab_Overview.SuspendLayout(); this.GB_Stats.SuspendLayout(); @@ -648,6 +650,8 @@ private void InitializeComponent() // // Tab_Overview // + this.Tab_Overview.Controls.Add(this.L_TRCardID); + this.Tab_Overview.Controls.Add(this.MT_TrainerCardID); this.Tab_Overview.Controls.Add(this.TB_TrainerCardNumber); this.Tab_Overview.Controls.Add(this.L_TRCardNumber); this.Tab_Overview.Controls.Add(this.TB_TrainerCardName); @@ -672,6 +676,16 @@ private void InitializeComponent() this.Tab_Overview.Text = "Overview"; this.Tab_Overview.UseVisualStyleBackColor = true; // + // MT_TRCardID + // + this.MT_TrainerCardID.Location = new System.Drawing.Point(331, 59); + this.MT_TrainerCardID.Mask = "000000"; + this.MT_TrainerCardID.Name = "MT_TrainerCardID"; + this.MT_TrainerCardID.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.MT_TrainerCardID.Size = new System.Drawing.Size(43, 20); + this.MT_TrainerCardID.TabIndex = 72; + this.MT_TrainerCardID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // TB_TrainerCardNumber // this.TB_TrainerCardNumber.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -689,7 +703,7 @@ private void InitializeComponent() this.L_TRCardNumber.Name = "L_TRCardNumber"; this.L_TRCardNumber.Size = new System.Drawing.Size(117, 16); this.L_TRCardNumber.TabIndex = 71; - this.L_TRCardNumber.Text = "League Card ID:"; + this.L_TRCardNumber.Text = "League Uniform ID:"; this.L_TRCardNumber.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // TB_TrainerCardName @@ -1038,6 +1052,15 @@ private void InitializeComponent() this.L_X.Text = "X Coordinate:"; this.L_X.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // L_TRCardID + // + this.L_TRCardID.Location = new System.Drawing.Point(209, 60); + this.L_TRCardID.Name = "L_TRCardID"; + this.L_TRCardID.Size = new System.Drawing.Size(117, 16); + this.L_TRCardID.TabIndex = 73; + this.L_TRCardID.Text = "League TrainerID:"; + this.L_TRCardID.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // SAV_Trainer8 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1167,5 +1190,7 @@ private void InitializeComponent() private System.Windows.Forms.Label L_TRCardName; private System.Windows.Forms.TextBox TB_TrainerCardNumber; private System.Windows.Forms.Label L_TRCardNumber; + private System.Windows.Forms.MaskedTextBox MT_TrainerCardID; + private System.Windows.Forms.Label L_TRCardID; } } \ No newline at end of file diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs index b8b414068..1c20565dc 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs @@ -56,6 +56,7 @@ private void GetTextBoxes() TB_OTName.Text = SAV.OT; TB_TrainerCardName.Text = SAV.Blocks.TrainerCard.OT; TB_TrainerCardNumber.Text = SAV.Blocks.TrainerCard.Number; + MT_TrainerCardID.Text = SAV.Blocks.TrainerCard.TrainerID.ToString("000000"); trainerID1.LoadIDValues(SAV); MT_Money.Text = SAV.Money.ToString(); CB_Language.SelectedValue = SAV.Language; @@ -112,6 +113,7 @@ private void SaveTrainerInfo() SAV.OT = TB_OTName.Text; SAV.Blocks.TrainerCard.OT = TB_TrainerCardName.Text; SAV.Blocks.TrainerCard.Number = TB_TrainerCardNumber.Text; + SAV.Blocks.TrainerCard.TrainerID = Util.ToInt32(MT_TrainerCardID.Text); SAV.Misc.BP = (int)NUD_BP.Value;