From 4eeb6e91a66bca2bea970d5f2f996edca0a8df48 Mon Sep 17 00:00:00 2001 From: Kris Johnson <11083252+KrisXV@users.noreply.github.com> Date: Sat, 18 Jul 2020 11:27:20 -0600 Subject: [PATCH] Cross Evolution: Simplify validation (#7016) All NFE Pokemon are going to be banned instead of restricted from now on, so the second check is useless. --- config/formats.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/formats.ts b/config/formats.ts index 8abccd69de..cf1b019db0 100644 --- a/config/formats.ts +++ b/config/formats.ts @@ -519,8 +519,7 @@ export const Formats: (FormatsData | {section: string, column?: number})[] = [ if (crossSpecies.battleOnly || crossIsUnreleased || !crossSpecies.prevo) { return [`${species.name} cannot cross evolve into ${crossSpecies.name} because it isn't an evolution.`]; } - if (this.ruleTable.isRestrictedSpecies(crossSpecies) || - (this.ruleTable.isRestrictedSpecies(species) && !species.prevo)) { + if (this.ruleTable.isRestrictedSpecies(crossSpecies)) { return [`${species.name} cannot cross evolve into ${crossSpecies.name} because it is banned.`]; } const crossPrevoSpecies = this.dex.getSpecies(crossSpecies.prevo);