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

Safeguarding against weird Instruct interactions

Browse Source
This commit is contained in:
innerthunder 2024-09-30 23:37:24 -07:00
parent a432d22837
commit c61eb6eb63
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/move.ts
View File

@ -2725,12 +2725,12 @@ export class AwaitCombinedPledgeAttr extends OverrideMoveEffectAttr {
if (allyMovePhase) { if (allyMovePhase) {
const allyMove = allyMovePhase.move.getMove(); const allyMove = allyMovePhase.move.getMove();
if (allyMove !== move && allyMove.hasAttr(AwaitCombinedPledgeAttr)) { if (allyMove !== move && allyMove.hasAttr(AwaitCombinedPledgeAttr)) {
[user, user.getAlly()].forEach(p => p.turnData.combiningPledge = move.id); [user, allyMovePhase.pokemon].forEach(p => p.turnData.combiningPledge = move.id);
// "{userPokemonName} is waiting for {allyPokemonName}'s move..." // "{userPokemonName} is waiting for {allyPokemonName}'s move..."
user.scene.queueMessage(i18next.t("moveTriggers:awaitingPledge", { user.scene.queueMessage(i18next.t("moveTriggers:awaitingPledge", {
userPokemonName: getPokemonNameWithAffix(user), userPokemonName: getPokemonNameWithAffix(user),
allyPokemonName: getPokemonNameWithAffix(user.getAlly()) allyPokemonName: getPokemonNameWithAffix(allyMovePhase.pokemon)
})); }));
// Move the ally's MovePhase (if needed) so that the ally moves next // Move the ally's MovePhase (if needed) so that the ally moves next