From 8222d674083103620b10ac21196e85548ad2813e Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sat, 21 Oct 2023 09:00:42 -0400 Subject: [PATCH] Prevent trainer battles on the first wave of a new biome --- src/battle-scene.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index c7e126283..9442966fa 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -588,10 +588,11 @@ export default class BattleScene extends Phaser.Scene { if (battleType === undefined) { if (newWaveIndex > 10 && newWaveIndex % 20 === 10) newBattleType = BattleType.TRAINER; - else { + else if (newWaveIndex % 10 !== 1) { const trainerChance = this.arena.getTrainerChance(); newBattleType = trainerChance && !Utils.randSeedInt(trainerChance) ? BattleType.TRAINER : BattleType.WILD; - } + } else + newBattleType = BattleType.WILD; } else newBattleType = battleType;