From 95054f005447fd176108350bc17e42bbfdf94de4 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 8 May 2022 09:28:41 -0700 Subject: [PATCH] Clamp too-high numeric values from cheats Closes #3493 --- .../Subforms/Save Editors/Gen8/SAV_Trainer8a.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8a.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8a.cs index 6f69eeac0..90b90ca86 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8a.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8a.cs @@ -56,10 +56,16 @@ private void GetTextBoxes() CAL_AdventureStartDate.Value = CAL_AdventureStartTime.Value = SAV.AdventureStart.Timestamp; - NUD_MeritCurrent.Value = (uint)SAV.Blocks.GetBlockValue(SaveBlockAccessor8LA.KMeritCurrent); - NUD_MeritEarned.Value = (uint)SAV.Blocks.GetBlockValue(SaveBlockAccessor8LA.KMeritEarnedTotal); - NUD_Rank.Value = (uint)SAV.Blocks.GetBlockValue(SaveBlockAccessor8LA.KExpeditionTeamRank); - NUD_Satchel.Value = (uint)SAV.Blocks.GetBlockValue(SaveBlockAccessor8LA.KSatchelUpgrades); + LoadClamp(NUD_MeritCurrent, SaveBlockAccessor8LA.KMeritCurrent); + LoadClamp(NUD_MeritEarned, SaveBlockAccessor8LA.KMeritEarnedTotal); + LoadClamp(NUD_Rank, SaveBlockAccessor8LA.KExpeditionTeamRank); + LoadClamp(NUD_Satchel, SaveBlockAccessor8LA.KSatchelUpgrades); + } + + private void LoadClamp(NumericUpDown nud, uint key) + { + var actual = (uint)SAV.Blocks.GetBlockValue(key); + nud.Value = Math.Min(actual, nud.Maximum); } private void Save()