IAmChrisAMA
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug with generating moves before form

pull/14/head
Flashfyre 2023-12-26 12:01:56 -05:00
parent 40439817ac
commit e265c1961f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle-phases.ts
View File

@ -3087,14 +3087,14 @@ export class AttemptRunPhase extends PokemonPhase {
onComplete: () => enemyField.forEach(enemyPokemon => enemyPokemon.destroy()) onComplete: () => enemyField.forEach(enemyPokemon => enemyPokemon.destroy())
}); });
this.scene.clearEnemyHeldItemModifiers();
enemyField.forEach(enemyPokemon => { enemyField.forEach(enemyPokemon => {
enemyPokemon.hideInfo().then(() => enemyPokemon.destroy()); enemyPokemon.hideInfo().then(() => enemyPokemon.destroy());
enemyPokemon.hp = 0; enemyPokemon.hp = 0;
enemyPokemon.trySetStatus(StatusEffect.FAINT); enemyPokemon.trySetStatus(StatusEffect.FAINT);
}); });
this.scene.clearEnemyHeldItemModifiers();
this.scene.pushPhase(new BattleEndPhase(this.scene)); this.scene.pushPhase(new BattleEndPhase(this.scene));
this.scene.pushPhase(new NewBattlePhase(this.scene)); this.scene.pushPhase(new NewBattlePhase(this.scene));
} else } else

1
src/battle-scene.ts
View File

@ -1423,6 +1423,7 @@ export default class BattleScene extends Phaser.Scene {
updatePartyForModifiers(party: Pokemon[], instant?: boolean): Promise<void> { updatePartyForModifiers(party: Pokemon[], instant?: boolean): Promise<void> {
return new Promise(resolve => { return new Promise(resolve => {
Promise.allSettled(party.map(p => { Promise.allSettled(party.map(p => {
if (p.scene)
p.calculateStats(); p.calculateStats();
return p.updateInfo(instant); return p.updateInfo(instant);
})).then(() => resolve()); })).then(() => resolve());

4
src/pokemon.ts
View File

@ -132,8 +132,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.fusionShiny = dataSource.fusionShiny; this.fusionShiny = dataSource.fusionShiny;
this.fusionGender = dataSource.fusionGender; this.fusionGender = dataSource.fusionGender;
} else { } else {
this.generateAndPopulateMoveset();
this.id = Utils.randSeedInt(4294967295); this.id = Utils.randSeedInt(4294967295);
this.ivs = ivs || [ this.ivs = ivs || [
Utils.binToDec(Utils.decToBin(this.id).substring(0, 5)), Utils.binToDec(Utils.decToBin(this.id).substring(0, 5)),
@ -167,6 +165,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (scene.gameMode === GameMode.SPLICED_ENDLESS) if (scene.gameMode === GameMode.SPLICED_ENDLESS)
this.generateFusionSpecies(); this.generateFusionSpecies();
this.generateAndPopulateMoveset();
} }
this.generateName(); this.generateName();