mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-09-23 23:13:42 +02:00
[Bug][Ability] Queenly Majesty flyout during move select (#6569)
This commit is contained in:
parent
2fe99cc3bf
commit
d3edfb25a1
@ -2466,14 +2466,15 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
|
|||||||
|
|
||||||
if (!cancelledHolder.value) {
|
if (!cancelledHolder.value) {
|
||||||
const defendingSidePlayField = this.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField();
|
const defendingSidePlayField = this.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField();
|
||||||
defendingSidePlayField.forEach(p =>
|
defendingSidePlayField.forEach((p: (typeof defendingSidePlayField)[0]) => {
|
||||||
applyAbAttrs("FieldPriorityMoveImmunityAbAttr", {
|
applyAbAttrs("FieldPriorityMoveImmunityAbAttr", {
|
||||||
pokemon: p,
|
pokemon: p,
|
||||||
opponent: source,
|
opponent: source,
|
||||||
move,
|
move,
|
||||||
cancelled: cancelledHolder,
|
cancelled: cancelledHolder,
|
||||||
}),
|
simulated,
|
||||||
);
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2494,7 +2495,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
|
|||||||
typeMultiplier.value = 0;
|
typeMultiplier.value = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (!cancelledHolder.value ? typeMultiplier.value : 0) as TypeDamageMultiplier;
|
return (cancelledHolder.value ? 0 : typeMultiplier.value) as TypeDamageMultiplier;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user