From 031ea40fa85e2a6a1037b24351beff03a4b87d1e Mon Sep 17 00:00:00 2001 From: Michael Li Date: Sat, 11 Jan 2025 21:23:59 -0500 Subject: [PATCH] Rename override for disabling random trainers --- src/battle-scene.ts | 5 ++++- src/overrides.ts | 2 +- test/utils/helpers/overridesHelper.ts | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 97363838c9c..c6a44d506ad 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1240,7 +1240,10 @@ export default class BattleScene extends SceneBase { this.field.add(newTrainer); } } else { - if (!this.gameMode.hasTrainers || (Overrides.DISABLE_TRAINERS_OVERRIDE && isNullOrUndefined(trainerData))) { + if ( + !this.gameMode.hasTrainers + || (Overrides.DISABLE_RANDOM_TRAINERS_OVERRIDE && isNullOrUndefined(trainerData)) + ) { newBattleType = BattleType.WILD; } else if (battleType === undefined) { newBattleType = this.gameMode.isWaveTrainer(newWaveIndex, this.arena) ? BattleType.TRAINER : BattleType.WILD; diff --git a/src/overrides.ts b/src/overrides.ts index aacd36b922e..936ca7e0961 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -248,7 +248,7 @@ class DefaultOverrides { /** * If `true`, disable all non-scripted opponent trainer encounters. */ - readonly DISABLE_TRAINERS_OVERRIDE: boolean = false; + readonly DISABLE_RANDOM_TRAINERS_OVERRIDE: boolean = false; } export const defaultOverrides = new DefaultOverrides(); diff --git a/test/utils/helpers/overridesHelper.ts b/test/utils/helpers/overridesHelper.ts index 2f318ff8035..cd87a96048b 100644 --- a/test/utils/helpers/overridesHelper.ts +++ b/test/utils/helpers/overridesHelper.ts @@ -220,12 +220,12 @@ export class OverridesHelper extends GameManagerHelper { } /** - * Override each wave to not have standard trainer battles + * Override each wave to not have random trainer battles * @returns `this` */ public disableTrainerWaves(): this { - vi.spyOn(Overrides, "DISABLE_TRAINERS_OVERRIDE", "get").mockReturnValue(true); - this.log("Standard trainer waves are disabled!"); + vi.spyOn(Overrides, "DISABLE_RANDOM_TRAINERS_OVERRIDE", "get").mockReturnValue(true); + this.log("Random trainer waves are disabled!"); return this; }