From 227efc1fc326761e2d911afd9cf212487537c494 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 5 Nov 2020 21:17:13 -0800 Subject: [PATCH] Only allow checking if lvl60 when lvl<60 --- PKHeX.Core/Legality/Areas/EncounterArea8.cs | 4 +++- .../Legality/Encounters/EncounterStatic/EncounterStatic8.cs | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Areas/EncounterArea8.cs b/PKHeX.Core/Legality/Areas/EncounterArea8.cs index 72a18439f..d239d686c 100644 --- a/PKHeX.Core/Legality/Areas/EncounterArea8.cs +++ b/PKHeX.Core/Legality/Areas/EncounterArea8.cs @@ -67,7 +67,9 @@ private IEnumerable GetBoostedMatches(IReadOnlyList if (slot.Species != evo.Species) continue; - // Ignore met level comparison; we already know it is permissible to boost to level 60. + // Ignore max met level comparison; we already know it is permissible to boost to level 60. + if (slot.LevelMin > 60) + break; // Can't downlevel, only boost to 60. if (slot.Form != evo.Form && !AltFormInfo.WildChangeFormAfter.Contains(evo.Species)) break; diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8.cs index 52b1f700d..35b66622b 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8.cs @@ -12,9 +12,10 @@ public class EncounterStatic8 : EncounterStatic, IDynamaxLevel, IGigantamax, IRe protected override bool IsMatchLevel(PKM pkm, DexLevel evo) { var met = pkm.Met_Level; - if (met == Level) + var lvl = Level; + if (met == lvl) return true; - if (EncounterArea8.IsBoostedArea60(Location)) + if (lvl < 60 && EncounterArea8.IsBoostedArea60(Location)) return met == 60; return false; }