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

[Bug][Ability] Queenly Majesty flyout during move select (#6569)

Browse Source
This commit is contained in:
Sirz Benjie 2025-09-21 14:04:57 -05:00 committed by GitHub
parent 2fe99cc3bf
commit d3edfb25a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/field/pokemon.ts
View File

@ -2466,14 +2466,15 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
if (!cancelledHolder.value) {
const defendingSidePlayField = this.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField();
defendingSidePlayField.forEach(p =>
defendingSidePlayField.forEach((p: (typeof defendingSidePlayField)[0]) => {
applyAbAttrs("FieldPriorityMoveImmunityAbAttr", {
pokemon: p,
opponent: source,
move,
cancelled: cancelledHolder,
}),
);
simulated,
});
});
}
}
@ -2494,7 +2495,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
typeMultiplier.value = 0;
}
return (!cancelledHolder.value ? typeMultiplier.value : 0) as TypeDamageMultiplier;
return (cancelledHolder.value ? 0 : typeMultiplier.value) as TypeDamageMultiplier;
}
/**