From d97db1cc40c5b6f0a436ccdd82d13f0d1af4f8f0 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 11 Feb 2020 20:36:10 -0800 Subject: [PATCH] Allow pk7->pk8 pikachu cap transfer --- PKHeX.Core/Legality/Verifiers/FormVerifier.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs index 7db6d473f..3d416af3e 100644 --- a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs @@ -60,12 +60,13 @@ private CheckResult VerifyForm(LegalityAnalysis data) return GetInvalid(isStatic ? LFormPikachuCosplayInvalid : LFormPikachuCosplay); break; - case (int)Species.Pikachu when Info.Generation == 7: // Cap + case (int)Species.Pikachu when Info.Generation >= 7: // Cap bool IsValidPikachuCap() { return EncounterMatch switch { WC7 wc7 => (wc7.Form == form), + WC8 wc => (wc.Form == form), EncounterStatic s => (s.Form == form), _ => (form == 0) }; @@ -73,7 +74,7 @@ bool IsValidPikachuCap() if (!IsValidPikachuCap()) { - bool gift = EncounterMatch is WC7 g && g.Form != form; + bool gift = EncounterMatch is MysteryGift g && g.Form != form; var msg = gift ? LFormPikachuEventInvalid : LFormInvalidGame; return GetInvalid(msg); } @@ -189,7 +190,7 @@ bool IsValidPikachuCap() } if (format >= 8 && Info.Generation < 8) { - if (species == 25 || Legal.GalarOriginForms.Contains(species) || Legal.GalarVariantFormEvolutions.Contains(data.EncounterOriginal.Species)) + if (Legal.GalarOriginForms.Contains(species) || Legal.GalarVariantFormEvolutions.Contains(data.EncounterOriginal.Species)) return GetInvalid(LFormInvalidGame); }