From 956a3f1a5f423debb1e770c8305a3b4feda4ccf0 Mon Sep 17 00:00:00 2001 From: AJ Fontaine Date: Sat, 3 May 2025 23:50:41 -0400 Subject: [PATCH] Fix evil grunts using wrong template --- src/data/trainers/TrainerPartyTemplate.ts | 25 +++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/data/trainers/TrainerPartyTemplate.ts b/src/data/trainers/TrainerPartyTemplate.ts index 1952bcc179e..ab53ce1d135 100644 --- a/src/data/trainers/TrainerPartyTemplate.ts +++ b/src/data/trainers/TrainerPartyTemplate.ts @@ -224,17 +224,20 @@ export const trainerPartyTemplates = { */ export function getEvilGruntPartyTemplate(): TrainerPartyTemplate { const waveIndex = globalScene.currentBattle?.waveIndex; - switch (waveIndex) { - case ClassicFixedBossWaves.EVIL_GRUNT_1: - return trainerPartyTemplates.TWO_AVG; - case ClassicFixedBossWaves.EVIL_GRUNT_2: - return trainerPartyTemplates.THREE_AVG; - case ClassicFixedBossWaves.EVIL_GRUNT_3: - return trainerPartyTemplates.TWO_AVG_ONE_STRONG; - case ClassicFixedBossWaves.EVIL_ADMIN_1: - return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger - default: - return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger + if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_1){ + return trainerPartyTemplates.TWO_AVG; + } + else if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_2){ + return trainerPartyTemplates.THREE_AVG; + } + else if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_3){ + return trainerPartyTemplates.TWO_AVG_ONE_STRONG; + } + else if (waveIndex <= ClassicFixedBossWaves.EVIL_ADMIN_1){ + return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger + } + else { + return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger } }