mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-27 02:32:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename override for disabling random trainers

Browse Source
This commit is contained in:
Michael Li 2025-01-11 21:23:59 -05:00 committed by Sirz Benjie
parent ac6853dc60
commit 031ea40fa8
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle-scene.ts
View File

@ -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;

2
src/overrides.ts
View File

@ -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();

6
test/utils/helpers/overridesHelper.ts
View File

@ -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;
}