From 50d1a94c3811d26b7dd616d19f1859f08ad05bb9 Mon Sep 17 00:00:00 2001 From: James Diefenbach Date: Sun, 12 May 2024 12:36:12 +1000 Subject: [PATCH] rockruff OT uses formIndex for dusk form evolution, removed temporary debug rockruff getFormIndex changes --- src/battle-scene.ts | 3 --- src/data/pokemon-evolutions.ts | 1 - 2 files changed, 4 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 7a248e518..09bc04310 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1005,9 +1005,6 @@ export default class BattleScene extends SceneBase { return Utils.randSeedInt(6); case Species.ALCREMIE: return Utils.randSeedInt(9); - case Species.ROCKRUFF: - console.log('rockruff species called') - return Utils.randSeedInt(2); case Species.MEOWSTIC: case Species.INDEEDEE: case Species.BASCULEGION: diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts index 530964376..352e9c6ac 100644 --- a/src/data/pokemon-evolutions.ts +++ b/src/data/pokemon-evolutions.ts @@ -1395,7 +1395,6 @@ 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.getSpeciesFormIndex(p.species) === 1), null), new SpeciesFormEvolution(Species.LYCANROC, '', 'midnight', 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT) && (p.formIndex === 0)), null) ], [Species.STEENEE]: [