From d381734aca8b8ac6db20c62155708f65248f9086 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Thu, 19 Sep 2024 03:04:34 -0700 Subject: [PATCH] Add a check for MEs on the X1 wave This allows capture on the X2 wave instead --- src/data/challenge.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/data/challenge.ts b/src/data/challenge.ts index 6ecca574f44..4379ce56982 100644 --- a/src/data/challenge.ts +++ b/src/data/challenge.ts @@ -929,7 +929,6 @@ export class NoStarterLegendsChallenge extends Challenge { } } -// TODO: Check for ME compatibility /** Challenge that only allows the first pokemon of every 10 waves to be caught */ export class LimitedCatchChallenge extends Challenge { constructor() { @@ -937,7 +936,9 @@ export class LimitedCatchChallenge extends Challenge { } override applyAddPokemonToParty(pokemon: EnemyPokemon, waveIndex: number, canAddToParty: BooleanHolder): boolean { - canAddToParty.value = waveIndex % 10 === 1; + if (!(waveIndex % 10 === 1) && !(pokemon.scene.lastMysteryEncounter && (waveIndex % 10 === 2))) { + canAddToParty.value = false; + } return true; }