From 4b954cd1028fdc473fdfe467cba40a24ed388ed0 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 30 Nov 2017 23:07:11 -0800 Subject: [PATCH] Add static/magnet fail enum value can fail leading to regular ESV calc --- PKHeX.Core/Legality/RNG/Frame/FrameFinder.cs | 5 +---- PKHeX.Core/Legality/RNG/Frame/LeadRequired.cs | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/Legality/RNG/Frame/FrameFinder.cs b/PKHeX.Core/Legality/RNG/Frame/FrameFinder.cs index 3314fcfa3..74b36a62e 100644 --- a/PKHeX.Core/Legality/RNG/Frame/FrameFinder.cs +++ b/PKHeX.Core/Legality/RNG/Frame/FrameFinder.cs @@ -169,11 +169,8 @@ private static IEnumerable RefineFrames4(IEnumerable frames, Frame // Slot Modifiers before ESV var force = (info.DPPt ? p16 >> 15 : p16 & 1) == 1; - if (!force) - continue; - var rand = f.Seed >> 16; - yield return info.GetFrame(prev, LeadRequired.StaticMagnet, rand, rand); + yield return info.GetFrame(prev, force ? LeadRequired.StaticMagnet : LeadRequired.StaticMagnetFail, rand, rand); } } diff --git a/PKHeX.Core/Legality/RNG/Frame/LeadRequired.cs b/PKHeX.Core/Legality/RNG/Frame/LeadRequired.cs index e1018bbd8..9a089ad70 100644 --- a/PKHeX.Core/Legality/RNG/Frame/LeadRequired.cs +++ b/PKHeX.Core/Legality/RNG/Frame/LeadRequired.cs @@ -10,6 +10,7 @@ public enum LeadRequired // Slot Modifiers StaticMagnet, + StaticMagnetFail, // Level Modifiers IntimidateKeenEye, // Keen Eye