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

Don't splat args to getTriggerMessage

Browse Source
This commit is contained in:
Zach Day 2024-06-17 16:13:27 -04:00
parent 76e484f3ce
commit ebd11eecd7
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/ability.ts
View File

@ -3312,7 +3312,7 @@ export class FieldPreventMovesAbAttr extends AbAttr {
} }
/** @param args See {@linkcode FieldPreventMovesAbAttr}. */ /** @param args See {@linkcode FieldPreventMovesAbAttr}. */
getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { getTriggerMessage(pokemon: Pokemon, abilityName: string, args: any[]): string {
return i18next.t("abilityTriggers:movePrevented", return i18next.t("abilityTriggers:movePrevented",
{ moveUser: getPokemonNameWithAffix(args[1] as Pokemon), moveName: (args[0] as Move).name }); { moveUser: getPokemonNameWithAffix(args[1] as Pokemon), moveName: (args[0] as Move).name });
} }
@ -3685,7 +3685,7 @@ function applyAbAttrsInternal<TAttr extends AbAttr>(attrType: { new(...args: any
} }
} }
if (!quiet) { if (!quiet) {
const message = attr.getTriggerMessage(pokemon, (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name, ...args); const message = attr.getTriggerMessage(pokemon, (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name, args);
if (message) { if (message) {
if (isAsync) { if (isAsync) {
pokemon.scene.ui.showText(message, null, () => pokemon.scene.ui.showText(null, 0), null, true); pokemon.scene.ui.showText(message, null, () => pokemon.scene.ui.showText(null, 0), null, true);