From 8826183777b6f3d6154646a4fa162dd62be144e5 Mon Sep 17 00:00:00 2001 From: ImperialSympathizer Date: Mon, 19 Aug 2024 10:58:17 -0400 Subject: [PATCH] small cleanup for winstrates --- src/battle-scene.ts | 4 ---- src/data/trainer-config.ts | 10 +++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index d35c73c2a0d..cac73d6791b 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1067,10 +1067,6 @@ export default class BattleScene extends SceneBase { newBattleType = battleType; } - if (waveIndex === 64) { - newBattleType = BattleType.TRAINER; - } - if (newBattleType === BattleType.TRAINER) { const trainerType = this.arena.randomTrainerType(newWaveIndex); let doubleTrainer = false; diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index fff80d3e750..54efc6bd900 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -1959,18 +1959,18 @@ export const trainerConfigs: TrainerConfigs = { p.pokeball = PokeballType.MASTER_BALL; })), [TrainerType.VICTOR]: new TrainerConfig(++t).setName("Victor").setTitle("The Winstrates") - .setMoneyMultiplier(0.4) // The 5 Winstrate trainers have total money multiplier of 2.6 + .setMoneyMultiplier(1) // The Winstrate trainers have total money multiplier of 6 .setPartyTemplates(trainerPartyTemplates.ONE_AVG_ONE_STRONG), [TrainerType.VICTORIA]: new TrainerConfig(++t).setName("Victoria").setTitle("The Winstrates") - .setMoneyMultiplier(0.4) + .setMoneyMultiplier(1) .setPartyTemplates(trainerPartyTemplates.ONE_AVG_ONE_STRONG), [TrainerType.VIVI]: new TrainerConfig(++t).setName("Vivi").setTitle("The Winstrates") - .setMoneyMultiplier(0.4) + .setMoneyMultiplier(1) .setPartyTemplates(trainerPartyTemplates.TWO_AVG_ONE_STRONG), [TrainerType.VICKY]: new TrainerConfig(++t).setName("Vicky").setTitle("The Winstrates") - .setMoneyMultiplier(0.4) + .setMoneyMultiplier(1) .setPartyTemplates(trainerPartyTemplates.ONE_STRONG), [TrainerType.VITO]: new TrainerConfig(++t).setName("Vito").setTitle("The Winstrates") - .setMoneyMultiplier(1) + .setMoneyMultiplier(2) .setPartyTemplates(new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(2, PartyMemberStrength.STRONG))) };