From bd640bfc704dca67d43b737ee40e101c35cb9ce9 Mon Sep 17 00:00:00 2001 From: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Date: Mon, 15 Jul 2024 23:20:17 +0200 Subject: [PATCH] Revert debug changes --- src/battle-scene.ts | 1 - src/battle.ts | 2 +- src/data/trainer-config.ts | 1 - src/loading-scene.ts | 2 -- src/overrides.ts | 4 ++-- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 5f656a02206b..f20c6503229c 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1025,7 +1025,6 @@ export default class BattleScene extends SceneBase { newBattleType = battleConfig.battleType; this.executeWithSeedOffset(() => newTrainer = battleConfig.getTrainer(this), (battleConfig.seedOffsetWaveIndex || newWaveIndex) << 8); if (newTrainer) { - console.log("Fixed battle", newWaveIndex, newBattleType, newTrainer); this.field.add(newTrainer); } } else { diff --git a/src/battle.ts b/src/battle.ts index f7cd69e9a1fa..238f411876ca 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -446,7 +446,7 @@ export interface FixedBattleConfigs { */ export const classicFixedBattles: FixedBattleConfigs = { [5]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) - .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.BRYONY , TrainerVariant.DEFAULT)), + .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.YOUNGSTER, Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)), [8]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)), [25]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index e742f7fe660a..3231d4449ffc 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -238,7 +238,6 @@ export class TrainerConfig { // Get the derived type for the double trainer since the sprite key is based on the derived type ret = TrainerType[this.getDerivedType(this.trainerTypeDouble)].toString().toLowerCase(); } - console.log(ret); return ret; } diff --git a/src/loading-scene.ts b/src/loading-scene.ts index 304be17a0adc..15cd295d23c8 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -196,9 +196,7 @@ export class LoadingScene extends SceneBase { this.loadAtlas("trainer_f_back_pb", "trainer"); Utils.getEnumValues(TrainerType).map(tt => { - console.log("Loading trainer", tt); const config = trainerConfigs[tt]; - console.log("Loading trainer", config); this.loadAtlas(config.getSpriteKey(), "trainer"); if (config.doubleOnly || config.hasDouble) { this.loadAtlas(config.getSpriteKey(true), "trainer"); diff --git a/src/overrides.ts b/src/overrides.ts index 319ce7635533..3e8949678935 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -33,7 +33,7 @@ export const SEED_OVERRIDE: string = ""; export const WEATHER_OVERRIDE: WeatherType = WeatherType.NONE; export const DOUBLE_BATTLE_OVERRIDE: boolean = false; export const SINGLE_BATTLE_OVERRIDE: boolean = false; -export const STARTING_WAVE_OVERRIDE: integer = 5; +export const STARTING_WAVE_OVERRIDE: integer = 0; export const STARTING_BIOME_OVERRIDE: Biome = Biome.TOWN; export const ARENA_TINT_OVERRIDE: TimeOfDay = null; // Multiplies XP gained by this value including 0. Set to null to ignore the override @@ -69,7 +69,7 @@ export const POKEBALL_OVERRIDE: { active: boolean, pokeballs: PokeballCounts } = export const STARTER_FORM_OVERRIDES: Partial> = {}; // default 5 or 20 for Daily -export const STARTING_LEVEL_OVERRIDE: integer = 100; +export const STARTING_LEVEL_OVERRIDE: integer = 0; /** * SPECIES OVERRIDE * will only apply to the first starter in your party or each enemy pokemon