mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-04 15:32:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactors to async/await pattern, adds back removed anims/sounds from last commit

Browse Source
This commit is contained in:
Christopher Schmidt 2024-08-27 13:43:59 -04:00
parent 562aa60f97
commit 370a93a681
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/data/ability.ts
View File

@ -2328,6 +2328,7 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
if (simulated || !targets.length) { if (simulated || !targets.length) {
return simulated; return simulated;
} }
const promises: Promise<void>[] = [];
let target: Pokemon; let target: Pokemon;
if (targets.length > 1) { if (targets.length > 1) {
@ -2351,9 +2352,13 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
return new PokemonMove(m?.moveId!, 0, ppUp); return new PokemonMove(m?.moveId!, 0, ppUp);
}); });
pokemon.summonData.types = target.getTypes(); pokemon.summonData.types = target.getTypes();
await pokemon.updateInfo(); promises.push(pokemon.updateInfo());
pokemon.scene.queueMessage(i18next.t("abilityTriggers:postSummonTransform", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), targetName: target!.name, })); pokemon.scene.queueMessage(i18next.t("abilityTriggers:postSummonTransform", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), targetName: target!.name, }));
pokemon.scene.playSound("battle_anims/PRSFX- Transform");
promises.push(pokemon.loadAssets(false).then(() => pokemon.playAnim()));
await Promise.all(promises);
return true; return true;
} }

17
src/data/move.ts
View File

@ -5951,12 +5951,12 @@ export class SuppressAbilitiesIfActedAttr extends MoveEffectAttr {
} }
export class TransformAttr extends MoveEffectAttr { export class TransformAttr extends MoveEffectAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> { async apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
return new Promise(resolve => {
if (!super.apply(user, target, move, args)) { if (!super.apply(user, target, move, args)) {
return resolve(false); return false;
} }
const promises: Promise<void>[] = [];
user.summonData.speciesForm = target.getSpeciesForm(); user.summonData.speciesForm = target.getSpeciesForm();
user.summonData.fusionSpeciesForm = target.getFusionSpeciesForm(); user.summonData.fusionSpeciesForm = target.getFusionSpeciesForm();
user.summonData.ability = target.getAbility().id; user.summonData.ability = target.getAbility().id;
@ -5971,15 +5971,16 @@ export class TransformAttr extends MoveEffectAttr {
return new PokemonMove(m?.moveId!, 0, ppUp); return new PokemonMove(m?.moveId!, 0, ppUp);
}); });
user.summonData.types = target.getTypes(); user.summonData.types = target.getTypes();
user.updateInfo(); promises.push(user.updateInfo());
user.scene.queueMessage(i18next.t("moveTriggers:transformedIntoTarget", {pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target)})); user.scene.queueMessage(i18next.t("moveTriggers:transformedIntoTarget", {pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target)}));
user.loadAssets(false).then(() => { promises.push(user.loadAssets(false).then(() => {
user.playAnim(); user.playAnim();
resolve(true); }));
});
}); await Promise.all(promises);
return true;
} }
} }