diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 8a50423ecdd..72c91e96e1c 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -2658,7 +2658,7 @@ export default class BattleScene extends SceneBase { } } } - return true; + return success; } addEnemyModifier(modifier: PersistentModifier, ignoreUpdate?: boolean, instant?: boolean): Promise { diff --git a/src/data/move.ts b/src/data/move.ts index 2e5a263948e..658534eb48f 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -6044,14 +6044,14 @@ export class RevivalBlessingAttr extends MoveEffectAttr { getCondition(): MoveConditionFunc { return (user, target, move) => - (user instanceof PlayerPokemon && globalScene.getPlayerParty().findIndex((p) => p.isFainted()) > -1) || + (user instanceof PlayerPokemon && globalScene.getPlayerParty().some((p) => p.isFainted())) || (user instanceof EnemyPokemon && user.hasTrainer() && - globalScene.getEnemyParty().findIndex((p) => p.isFainted()) > -1); + globalScene.getEnemyParty().some((p) => p.isFainted() && !p.isBoss())); } - getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number { - if (user.hasTrainer() && globalScene.getEnemyParty().findIndex(p => p.isFainted() && !p.isBoss()) > -1) { + override getUserBenefitScore(user: Pokemon, _target: Pokemon, _move: Move): number { + if (user.hasTrainer() && globalScene.getEnemyParty().some((p) => p.isFainted() && !p.isBoss())) { return 20; }