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

Fix reviver seed causing infinite loop and clear status on revive

pull/2/head
Flashfyre 2023-10-22 10:41:49 -04:00
parent e0065fca7c
commit 08364d9060
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modifier/modifier.ts
View File

@ -685,6 +685,8 @@ export class PokemonInstantReviveModifier extends PokemonHeldItemModifier {
pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, pokemon.getBattlerIndex(), pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, pokemon.getBattlerIndex(),
Math.max(Math.floor(pokemon.getMaxHp() / 2), 1), getPokemonMessage(pokemon, ` was revived\nby its ${this.type.name}!`), false, false, true)); Math.max(Math.floor(pokemon.getMaxHp() / 2), 1), getPokemonMessage(pokemon, ` was revived\nby its ${this.type.name}!`), false, false, true));
pokemon.resetStatus();
return true; return true;
} }

3
src/pokemon.ts
View File

@ -760,9 +760,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
} }
heal(amount: integer): void { heal(amount: integer): void {
if (this.isFainted())
return;
this.hp = Math.min(this.hp + amount, this.getMaxHp()); this.hp = Math.min(this.hp + amount, this.getMaxHp());
} }