From 84363eb8eb1736bbe730f28904d12ebdaaf47e1a Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 21 Mar 2024 21:22:56 -0500 Subject: [PATCH] Next seed if activation fails ty santacrab for pointing this out --- PKHeX.Core/Legality/RNG/ClassicEra/Gen3/GenerateMethodH.cs | 3 +++ PKHeX.Core/Legality/RNG/ClassicEra/Gen4/GenerateMethodJ.cs | 3 +++ PKHeX.Core/Legality/RNG/ClassicEra/Gen4/GenerateMethodK.cs | 3 +++ 3 files changed, 9 insertions(+) diff --git a/PKHeX.Core/Legality/RNG/ClassicEra/Gen3/GenerateMethodH.cs b/PKHeX.Core/Legality/RNG/ClassicEra/Gen3/GenerateMethodH.cs index b39b717f0..9e1815c44 100644 --- a/PKHeX.Core/Legality/RNG/ClassicEra/Gen3/GenerateMethodH.cs +++ b/PKHeX.Core/Legality/RNG/ClassicEra/Gen3/GenerateMethodH.cs @@ -22,7 +22,10 @@ public static void SetRandom(this T enc, PK3 pk, PersonalInfo3 pi, EncounterC { var check = new LeadSeed(seed, LeadRequired.None); if (!MethodH.CheckEncounterActivation(enc, ref check)) + { + seed = LCRNG.Next(seed); continue; + } } var esv = LCRNG.Next16(ref seed) % 100; if (esv < min || esv > max) diff --git a/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/GenerateMethodJ.cs b/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/GenerateMethodJ.cs index a9f3d874a..2ac010489 100644 --- a/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/GenerateMethodJ.cs +++ b/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/GenerateMethodJ.cs @@ -32,7 +32,10 @@ public static uint SetRandomJ(this T enc, PK4 pk, PersonalInfo4 pi, Encounter { var check = new LeadSeed(seed, LeadRequired.None); if (!MethodJ.CheckEncounterActivation(enc, ref check)) + { + seed = LCRNG.Next(seed); continue; + } } var esv = LCRNG.Next16(ref seed) / 656; if (esv < min || esv > max) diff --git a/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/GenerateMethodK.cs b/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/GenerateMethodK.cs index 6e25215a5..f92ac3e3b 100644 --- a/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/GenerateMethodK.cs +++ b/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/GenerateMethodK.cs @@ -33,7 +33,10 @@ public static uint SetRandomK(this T enc, PK4 pk, PersonalInfo4 pi, Encounter { var check = new LeadSeed(seed, LeadRequired.None); if (!MethodK.CheckEncounterActivation(enc, ref check)) + { + seed = LCRNG.Next(seed); continue; + } } var esv = LCRNG.Next16(ref seed) % modulo; if (esv < min || esv > max)