From 6fcc6c10b850e2651950a37810f4eb5277efc63b Mon Sep 17 00:00:00 2001 From: James Diefenbach Date: Sun, 12 May 2024 13:46:40 +1000 Subject: [PATCH] reverted overrides --- src/battle-scene.ts | 1 + src/data/pokemon-evolutions.ts | 2 +- src/overrides.ts | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 09bc04310..94d87cd10 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1027,6 +1027,7 @@ export default class BattleScene extends SceneBase { } return 0; } + return this.arena.getSpeciesFormIndex(species); } diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts index 352e9c6ac..003efcde8 100644 --- a/src/data/pokemon-evolutions.ts +++ b/src/data/pokemon-evolutions.ts @@ -1394,7 +1394,7 @@ export const pokemonEvolutions: PokemonEvolutions = { ], [Species.ROCKRUFF]: [ new SpeciesFormEvolution(Species.LYCANROC, '', 'midday', 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.DAY) && (p.formIndex === 0)), null), - new SpeciesFormEvolution(Species.LYCANROC, '', 'dusk', 25, null, new SpeciesEvolutionCondition(p => p.formIndex === 1), null), + new SpeciesFormEvolution(Species.LYCANROC, '', 'dusk', 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.DUSK) && (p.formIndex === 1)), null), new SpeciesFormEvolution(Species.LYCANROC, '', 'midnight', 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT) && (p.formIndex === 0)), null) ], [Species.STEENEE]: [ diff --git a/src/overrides.ts b/src/overrides.ts index e3050d553..2b6106a74 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -23,7 +23,7 @@ import { Stat } from './data/pokemon-stat'; export const SEED_OVERRIDE: string = ''; export const WEATHER_OVERRIDE: WeatherType = WeatherType.NONE; export const DOUBLE_BATTLE_OVERRIDE: boolean = false; -export const STARTING_WAVE_OVERRIDE: integer = 15; +export const STARTING_WAVE_OVERRIDE: integer = 0; export const STARTING_BIOME_OVERRIDE: Biome = Biome.TOWN; // default 1000 export const STARTING_MONEY_OVERRIDE: integer = 0; @@ -35,7 +35,7 @@ export const STARTING_MONEY_OVERRIDE: integer = 0; // forms can be found in pokemon-species.ts export const STARTER_FORM_OVERRIDE: integer = 0; // default 5 or 20 for Daily -export const STARTING_LEVEL_OVERRIDE: integer = 24; +export const STARTING_LEVEL_OVERRIDE: integer = 0; export const ABILITY_OVERRIDE: Abilities = Abilities.NONE; export const PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE; export const MOVESET_OVERRIDE: Array = []; @@ -57,7 +57,7 @@ export const OPP_VARIANT_OVERRIDE: Variant = 0; * @example SPECIES_OVERRIDE = Species.Bulbasaur; */ export const STARTER_SPECIES_OVERRIDE: Species | integer = 0; -export const OPP_SPECIES_OVERRIDE: Species | integer = Species.ROCKRUFF; +export const OPP_SPECIES_OVERRIDE: Species | integer = 0; /** * MODIFIER / ITEM OVERRIDES