From c4c51b5d9deab3d7ebb3dcbe75c1c03dc5d37be6 Mon Sep 17 00:00:00 2001 From: shayebeadlingkl Date: Wed, 8 May 2024 20:29:44 -0400 Subject: [PATCH] adds override to resetStatus to not allow revive --- src/field/pokemon.ts | 9 ++++++++- src/overrides.ts | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 8110bf96bfd..84fcb649d4a 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1959,8 +1959,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return true; } - resetStatus(): void { + /** + * Resets the status of a pokemon + * @param revive whether revive should be cured, defaults to true + */ + resetStatus(revive: boolean = true): void { const lastStatus = this.status?.effect; + if (!revive && lastStatus === StatusEffect.FAINT) { + return; + } this.status = undefined; if (lastStatus === StatusEffect.SLEEP) { this.setFrameRate(12); diff --git a/src/overrides.ts b/src/overrides.ts index 7608275ea0f..f7cc7ede0da 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -14,7 +14,7 @@ export const STARTING_MONEY_OVERRIDE = 0; export const WEATHER_OVERRIDE = WeatherType.NONE; export const DOUBLE_BATTLE_OVERRIDE = false; -export const ABILITY_OVERRIDE = Abilities.NONE; +export const ABILITY_OVERRIDE = Abilities.CURSED_BODY; export const PASSIVE_ABILITY_OVERRIDE = Abilities.NONE; export const MOVE_OVERRIDE = Moves.NONE; export const MOVE_OVERRIDE_2 = Moves.NONE;