Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-07-16 19:31:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update tower record set

Browse Source 
Record ID const declaration for reuse
Change 255->300 for streak max
Set record as well (ignore currently set value if modified via dropdown)
Closes #2649

Not sure if Money and BP can get a similar record-set treatment.
This commit is contained in:
Kurt 2020-01-20 18:16:46 -08:00
parent 1a3d8b1fab
commit 6fdc71b2e4
3 changed files with 69 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PKHeX.Core/Saves/Substructures/Records.cs
View File

@ -580,9 +580,12 @@ public static int GetOffset(int baseOfs, int recordID)
{44, "total_money"},
{45, "create_license_card"},
{46, "change_hair"},
{47, "battle_tower_single_win"},
{48, "battle_tower_double_win"},
/* 47 */ {G8BattleTowerSingleWin, "battle_tower_single_win"},
/* 48 */ {G8BattleTowerDoubleWin, "battle_tower_double_win"},
{49, "now_money"},
};
public const int G8BattleTowerSingleWin = 47;
public const int G8BattleTowerDoubleWin = 48;
}
}

110
PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs generated
View File

@ -131,14 +131,14 @@ private void InitializeComponent()
this.L_X = new System.Windows.Forms.Label();
this.Tab_MiscValues = new System.Windows.Forms.TabPage();
this.GB_BattleTower = new System.Windows.Forms.GroupBox();
this.L_Singles = new System.Windows.Forms.Label();
this.MT_BattleTowerSinglesWin = new System.Windows.Forms.MaskedTextBox();
this.L_BattleTowerWins = new System.Windows.Forms.Label();
this.L_BattleTowerStreak = new System.Windows.Forms.Label();
this.MT_BattleTowerSinglesStreak = new System.Windows.Forms.MaskedTextBox();
this.MT_BattleTowerDoublesStreak = new System.Windows.Forms.MaskedTextBox();
this.L_Doubles = new System.Windows.Forms.Label();
this.MT_BattleTowerDoublesWin = new System.Windows.Forms.MaskedTextBox();
this.L_BattleTowerStreak = new System.Windows.Forms.Label();
this.MT_BattleTowerSinglesStreak = new System.Windows.Forms.MaskedTextBox();
this.L_BattleTowerWins = new System.Windows.Forms.Label();
this.L_Singles = new System.Windows.Forms.Label();
this.MT_BattleTowerSinglesWin = new System.Windows.Forms.MaskedTextBox();
this.TC_Editor.SuspendLayout();
this.Tab_Overview.SuspendLayout();
this.GB_Stats.SuspendLayout();
@ -1159,56 +1159,9 @@ private void InitializeComponent()
this.GB_BattleTower.TabStop = false;
this.GB_BattleTower.Text = "Battle Tower";
//
// L_Singles
//
this.L_Singles.Location = new System.Drawing.Point(6, 34);
this.L_Singles.Name = "L_Singles";
this.L_Singles.Size = new System.Drawing.Size(76, 20);
this.L_Singles.TabIndex = 77;
this.L_Singles.Text = "Singles:";
this.L_Singles.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// MT_BattleTowerSinglesWin
//
this.MT_BattleTowerSinglesWin.Location = new System.Drawing.Point(88, 34);
this.MT_BattleTowerSinglesWin.Mask = "000000";
this.MT_BattleTowerSinglesWin.Name = "MT_BattleTowerSinglesWin";
this.MT_BattleTowerSinglesWin.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.MT_BattleTowerSinglesWin.Size = new System.Drawing.Size(43, 20);
this.MT_BattleTowerSinglesWin.TabIndex = 76;
this.MT_BattleTowerSinglesWin.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// L_BattleTowerWins
//
this.L_BattleTowerWins.Location = new System.Drawing.Point(85, 11);
this.L_BattleTowerWins.Name = "L_BattleTowerWins";
this.L_BattleTowerWins.Size = new System.Drawing.Size(46, 20);
this.L_BattleTowerWins.TabIndex = 78;
this.L_BattleTowerWins.Text = "Wins";
this.L_BattleTowerWins.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// L_BattleTowerStreak
//
this.L_BattleTowerStreak.Location = new System.Drawing.Point(134, 12);
this.L_BattleTowerStreak.Name = "L_BattleTowerStreak";
this.L_BattleTowerStreak.Size = new System.Drawing.Size(46, 20);
this.L_BattleTowerStreak.TabIndex = 80;
this.L_BattleTowerStreak.Text = "Streak";
this.L_BattleTowerStreak.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// MT_BattleTowerSinglesStreak
//
this.MT_BattleTowerSinglesStreak.Location = new System.Drawing.Point(137, 35);
this.MT_BattleTowerSinglesStreak.Mask = "000";
this.MT_BattleTowerSinglesStreak.Name = "MT_BattleTowerSinglesStreak";
this.MT_BattleTowerSinglesStreak.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.MT_BattleTowerSinglesStreak.Size = new System.Drawing.Size(43, 20);
this.MT_BattleTowerSinglesStreak.TabIndex = 79;
this.MT_BattleTowerSinglesStreak.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// MT_BattleTowerDoublesStreak
//
this.MT_BattleTowerDoublesStreak.Location = new System.Drawing.Point(137, 61);
this.MT_BattleTowerDoublesStreak.Location = new System.Drawing.Point(145, 61);
this.MT_BattleTowerDoublesStreak.Mask = "000";
this.MT_BattleTowerDoublesStreak.Name = "MT_BattleTowerDoublesStreak";
this.MT_BattleTowerDoublesStreak.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
@ -1228,13 +1181,60 @@ private void InitializeComponent()
// MT_BattleTowerDoublesWin
//
this.MT_BattleTowerDoublesWin.Location = new System.Drawing.Point(88, 60);
this.MT_BattleTowerDoublesWin.Mask = "000000";
this.MT_BattleTowerDoublesWin.Mask = "0000000";
this.MT_BattleTowerDoublesWin.Name = "MT_BattleTowerDoublesWin";
this.MT_BattleTowerDoublesWin.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.MT_BattleTowerDoublesWin.Size = new System.Drawing.Size(43, 20);
this.MT_BattleTowerDoublesWin.Size = new System.Drawing.Size(51, 20);
this.MT_BattleTowerDoublesWin.TabIndex = 81;
this.MT_BattleTowerDoublesWin.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// L_BattleTowerStreak
//
this.L_BattleTowerStreak.Location = new System.Drawing.Point(142, 12);
this.L_BattleTowerStreak.Name = "L_BattleTowerStreak";
this.L_BattleTowerStreak.Size = new System.Drawing.Size(46, 20);
this.L_BattleTowerStreak.TabIndex = 80;
this.L_BattleTowerStreak.Text = "Streak";
this.L_BattleTowerStreak.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// MT_BattleTowerSinglesStreak
//
this.MT_BattleTowerSinglesStreak.Location = new System.Drawing.Point(145, 35);
this.MT_BattleTowerSinglesStreak.Mask = "000";
this.MT_BattleTowerSinglesStreak.Name = "MT_BattleTowerSinglesStreak";
this.MT_BattleTowerSinglesStreak.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.MT_BattleTowerSinglesStreak.Size = new System.Drawing.Size(43, 20);
this.MT_BattleTowerSinglesStreak.TabIndex = 79;
this.MT_BattleTowerSinglesStreak.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// L_BattleTowerWins
//
this.L_BattleTowerWins.Location = new System.Drawing.Point(85, 11);
this.L_BattleTowerWins.Name = "L_BattleTowerWins";
this.L_BattleTowerWins.Size = new System.Drawing.Size(46, 20);
this.L_BattleTowerWins.TabIndex = 78;
this.L_BattleTowerWins.Text = "Wins";
this.L_BattleTowerWins.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// L_Singles
//
this.L_Singles.Location = new System.Drawing.Point(6, 34);
this.L_Singles.Name = "L_Singles";
this.L_Singles.Size = new System.Drawing.Size(76, 20);
this.L_Singles.TabIndex = 77;
this.L_Singles.Text = "Singles:";
this.L_Singles.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// MT_BattleTowerSinglesWin
//
this.MT_BattleTowerSinglesWin.Location = new System.Drawing.Point(88, 34);
this.MT_BattleTowerSinglesWin.Mask = "0000000";
this.MT_BattleTowerSinglesWin.Name = "MT_BattleTowerSinglesWin";
this.MT_BattleTowerSinglesWin.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.MT_BattleTowerSinglesWin.Size = new System.Drawing.Size(51, 20);
this.MT_BattleTowerSinglesWin.TabIndex = 76;
this.MT_BattleTowerSinglesWin.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// SAV_Trainer8
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

13
PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs
View File

@ -112,10 +112,15 @@ private void GetMiscValues()
private void SaveMiscValues()
{
SAV.SetValue(SaveBlockAccessorSWSH.KBattleTowerSinglesVictory, Math.Min(999_999u, Util.ToUInt32(MT_BattleTowerSinglesWin.Text)));
SAV.SetValue(SaveBlockAccessorSWSH.KBattleTowerDoublesVictory, Math.Min(999_999u, Util.ToUInt32(MT_BattleTowerDoublesWin.Text)));
SAV.SetValue(SaveBlockAccessorSWSH.KBattleTowerSinglesStreak, (ushort)Math.Min(255, Util.ToUInt32(MT_BattleTowerSinglesStreak.Text)));
SAV.SetValue(SaveBlockAccessorSWSH.KBattleTowerDoublesStreak, (ushort)Math.Min(255, Util.ToUInt32(MT_BattleTowerDoublesStreak.Text)));
var singles = Math.Min(9_999_999u, Util.ToUInt32(MT_BattleTowerSinglesWin.Text));
var doubles = Math.Min(9_999_999u, Util.ToUInt32(MT_BattleTowerDoublesWin.Text));
SAV.SetValue(SaveBlockAccessorSWSH.KBattleTowerSinglesVictory, singles);
SAV.SetValue(SaveBlockAccessorSWSH.KBattleTowerDoublesVictory, doubles);
SAV.SetValue(SaveBlockAccessorSWSH.KBattleTowerSinglesStreak, (ushort)Math.Min(300, Util.ToUInt32(MT_BattleTowerSinglesStreak.Text)));
SAV.SetValue(SaveBlockAccessorSWSH.KBattleTowerDoublesStreak, (ushort)Math.Min(300, Util.ToUInt32(MT_BattleTowerDoublesStreak.Text)));
SAV.SetRecord(Records.G8BattleTowerSingleWin, (int)singles);
SAV.SetRecord(Records.G8BattleTowerDoubleWin, (int)doubles);
}
private void Save()