From c126cd968a612938559d8a3ad9124995efcedd2b Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 6 Aug 2021 09:42:27 -0700 Subject: [PATCH] Only boost templates to 60 in wild area No functional change for legality checks, so should be fine unless you're trying to get tiny edge case stuff. --- .../Legality/Encounters/EncounterSlot/EncounterSlot8.cs | 2 +- .../Legality/Encounters/EncounterStatic/EncounterStatic8.cs | 4 ++-- PKHeX.Core/Legality/Verifiers/MarkVerifier.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs index f0836b3e4..ffb35a4b0 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs @@ -27,7 +27,7 @@ protected override void ApplyDetails(ITrainerInfo sav, EncounterCriteria criteri ((PK8)pk).RibbonMarkCurry = true; base.ApplyDetails(sav, c, pk); - if (Weather is AreaWeather8.Heavy_Fog) + if (Weather is AreaWeather8.Heavy_Fog && EncounterArea8.IsBoostedArea60(Location)) pk.CurrentLevel = pk.Met_Level = EncounterArea8.BoostLevel; var req = GetRequirement(pk); diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8.cs index 8eda303e2..14270b43f 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8.cs @@ -35,7 +35,7 @@ public override bool IsMatchExact(PKM pkm, DexLevel evo) { if (pkm is IDynamaxLevel d && d.DynamaxLevel < DynamaxLevel) return false; - if (pkm.Met_Level < EncounterArea8.BoostLevel && Weather is AreaWeather8.Heavy_Fog && EncounterArea8.IsWildArea8(Location)) + if (pkm.Met_Level < EncounterArea8.BoostLevel && Weather is AreaWeather8.Heavy_Fog && EncounterArea8.IsBoostedArea60(Location)) return false; return base.IsMatchExact(pkm, evo); } @@ -43,7 +43,7 @@ public override bool IsMatchExact(PKM pkm, DexLevel evo) protected override void ApplyDetails(ITrainerInfo sav, EncounterCriteria criteria, PKM pk) { base.ApplyDetails(sav, criteria, pk); - if (Weather is AreaWeather8.Heavy_Fog) + if (Weather is AreaWeather8.Heavy_Fog && EncounterArea8.IsBoostedArea60(Location)) pk.CurrentLevel = pk.Met_Level = EncounterArea8.BoostLevel; var req = GetRequirement(pk); diff --git a/PKHeX.Core/Legality/Verifiers/MarkVerifier.cs b/PKHeX.Core/Legality/Verifiers/MarkVerifier.cs index 8b8398b4f..97dc93c9f 100644 --- a/PKHeX.Core/Legality/Verifiers/MarkVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/MarkVerifier.cs @@ -68,7 +68,7 @@ public static bool IsMarkValid(RibbonIndex mark, PKM pk, IEncounterTemplate enc) { RibbonIndex.MarkCurry when !IsMarkAllowedCurry(pk, x) => false, RibbonIndex.MarkFishing when !IsMarkAllowedFishing(x) => false, - RibbonIndex.MarkMisty when pk.Met_Level < EncounterArea8.BoostLevel && EncounterArea8.IsWildArea8(pk.Met_Location) => false, + RibbonIndex.MarkMisty when pk.Met_Level < EncounterArea8.BoostLevel && EncounterArea8.IsBoostedArea60(pk.Met_Location) => false, RibbonIndex.MarkDestiny => false, >= RibbonIndex.MarkCloudy and <= RibbonIndex.MarkMisty => IsWeatherPermitted(mark, x), _ => true