From 740da4edde301cbff770295b6b8a7a52fe43399c Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 21 Dec 2023 18:01:03 -0800 Subject: [PATCH] Update FormArgumentVerifier.cs --- PKHeX.Core/Legality/Verifiers/FormArgumentVerifier.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Verifiers/FormArgumentVerifier.cs b/PKHeX.Core/Legality/Verifiers/FormArgumentVerifier.cs index 4f5530968..d5527ec4b 100644 --- a/PKHeX.Core/Legality/Verifiers/FormArgumentVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/FormArgumentVerifier.cs @@ -64,8 +64,9 @@ private CheckResult VerifyFormArgument(LegalityAnalysis data, IFormArgument f) Overqwil => arg switch { > 9_999 => GetInvalid(LFormArgumentHigh), - < 20 when !data.Info.EvoChainsAllGens.HasVisitedGen9 => GetInvalid(LFormArgumentLow), - >= 20 when !data.Info.EvoChainsAllGens.HasVisitedPLA => GetInvalid(LFormArgumentLow), + < 20 when !data.Info.EvoChainsAllGens.HasVisitedGen9 || pk.CurrentLevel < 28 => GetInvalid(LFormArgumentLow), + >= 20 when !data.Info.EvoChainsAllGens.HasVisitedPLA || pk.CurrentLevel < 25 => GetInvalid(LFormArgumentLow), + _ when pk is IHomeTrack { HasTracker: false } and PA8 { CurrentLevel: < 25 } => GetInvalid(LEvoInvalid), _ => GetValid(LFormArgumentValid), }, Stantler => arg switch @@ -95,6 +96,7 @@ private CheckResult VerifyFormArgument(LegalityAnalysis data, IFormArgument f) }, Runerigus => VerifyFormArgumentRange(enc.Species, Runerigus, arg, 49, 9999), Alcremie => VerifyFormArgumentRange(enc.Species, Alcremie, arg, 0, (uint)AlcremieDecoration.Ribbon), + Wyrdeer when pk.CurrentLevel < 31 => GetInvalid(LEvoInvalid), Wyrdeer => VerifyFormArgumentRange(enc.Species, Wyrdeer, arg, 20, 9999), Basculegion => VerifyFormArgumentRange(enc.Species, Basculegion, arg, 294, 9999), Annihilape => VerifyFormArgumentRange(enc.Species, Annihilape, arg, 20, 9999),