mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-23 16:52:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Incorporate Despair-Games/poketernity/pull/48

Browse Source
This commit is contained in:
PigeonBar 2024-12-11 20:35:55 -05:00 committed by Sirz Benjie
parent f1b5f4ba89
commit 5967a4240a
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle-scene.ts
View File

@ -2658,7 +2658,7 @@ export default class BattleScene extends SceneBase {
} }
} }
} }
return true; return success;
} }
addEnemyModifier(modifier: PersistentModifier, ignoreUpdate?: boolean, instant?: boolean): Promise<void> { addEnemyModifier(modifier: PersistentModifier, ignoreUpdate?: boolean, instant?: boolean): Promise<void> {

8
src/data/move.ts
View File

@ -6044,14 +6044,14 @@ export class RevivalBlessingAttr extends MoveEffectAttr {
getCondition(): MoveConditionFunc { getCondition(): MoveConditionFunc {
return (user, target, move) => 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 instanceof EnemyPokemon &&
user.hasTrainer() && 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 { override getUserBenefitScore(user: Pokemon, _target: Pokemon, _move: Move): number {
if (user.hasTrainer() && globalScene.getEnemyParty().findIndex(p => p.isFainted() && !p.isBoss()) > -1) { if (user.hasTrainer() && globalScene.getEnemyParty().some((p) => p.isFainted() && !p.isBoss())) {
return 20; return 20;
} }