useMove + pokemon affix localization

src/data/ability.ts

@@ -3,7 +3,7 @@ import { Type } from "./type";
 import * as Utils from "../utils";
 import { BattleStat, getBattleStatName } from "./battle-stat";
 import { MovePhase, PokemonHealPhase, ShowAbilityPhase, StatChangePhase } from "../phases";
-import { getPokemonMessage, getPokemonPrefix } from "../messages";
+import { getPokemonMessage, getPokemonNameWithAffix } from "../messages";
 import { Weather, WeatherType } from "./weather";
 import { BattlerTag } from "./battler-tags";
 import { BattlerTagType } from "./enums/battler-tag-type";
@@ -146,7 +146,7 @@ export class BlockRecoilDamageAttr extends AbAttr {
   }
 
   getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]) {
-    return i18next.t("abilityTriggers:blockRecoilDamage", {pokemonName: `${getPokemonPrefix(pokemon)}${pokemon.name}`, abilityName: abilityName});
+    return i18next.t("abilityTriggers:blockRecoilDamage", {pokemonName: getPokemonNameWithAffix(pokemon), abilityName: abilityName});
   }
 }
 
@@ -2640,7 +2640,7 @@ export class PostTurnHurtIfSleepingAbAttr extends PostTurnAbAttr {
     for (const opp of pokemon.getOpponents()) {
       if (opp.status?.effect === StatusEffect.SLEEP || opp.hasAbility(Abilities.COMATOSE)) {
         opp.damageAndUpdate(Math.floor(Math.max(1, opp.getMaxHp() / 8)), HitResult.OTHER);
-        pokemon.scene.queueMessage(i18next.t("abilityTriggers:badDreams", {pokemonName: `${getPokemonPrefix(opp)}${opp.name}`}));
+        pokemon.scene.queueMessage(i18next.t("abilityTriggers:badDreams", {pokemonName: getPokemonNameWithAffix(opp)}));
         hadEffect = true;
       }
 

src/data/battler-tags.ts

@@ -1,6 +1,6 @@
 import { CommonAnim, CommonBattleAnim } from "./battle-anims";
 import { CommonAnimPhase, MoveEffectPhase, MovePhase, PokemonHealPhase, ShowAbilityPhase, StatChangePhase } from "../phases";
-import { getPokemonMessage, getPokemonPrefix } from "../messages";
+import { getPokemonMessage } from "../messages";
 import Pokemon, { MoveResult, HitResult } from "../field/pokemon";
 import { Stat, getStatName } from "./pokemon-stat";
 import { StatusEffect } from "./status-effect";

src/data/weather.ts

@@ -1,5 +1,5 @@
 import { Biome } from "./enums/biome";
-import { getPokemonMessage, getPokemonPrefix } from "../messages";
+import { getPokemonMessage, getPokemonNameWithAffix } from "../messages";
 import Pokemon from "../field/pokemon";
 import { Type } from "./type";
 import Move, { AttackMove } from "./move";
@@ -180,9 +180,9 @@ export function getWeatherLapseMessage(weatherType: WeatherType): string {
 export function getWeatherDamageMessage(weatherType: WeatherType, pokemon: Pokemon): string {
   switch (weatherType) {
   case WeatherType.SANDSTORM:
-    return i18next.t("weather:sandstormDamageMessage", {pokemonPrefix: getPokemonPrefix(pokemon), pokemonName: pokemon.name});
+    return i18next.t("weather:sandstormDamageMessage", {pokemonNameWithAffix: getPokemonNameWithAffix(pokemon)});
   case WeatherType.HAIL:
-    return i18next.t("weather:hailDamageMessage", {pokemonPrefix: getPokemonPrefix(pokemon), pokemonName: pokemon.name});
+    return i18next.t("weather:hailDamageMessage", {pokemonNameWithAffix: getPokemonNameWithAffix(pokemon)});
   }
 
   return null;

src/locales/de/battle.ts

@@ -55,5 +55,8 @@ export const battle: SimpleTranslationEntries = {
   "skipItemQuestion": "Bist du sicher, dass du kein Item nehmen willst?",
   "notDisabled": "{{pokemonName}}'s {{moveName}} ist\nnicht mehr deaktiviert!",
   "eggHatching": "Oh?",
-  "ivScannerUseQuestion": "IV-Scanner auf {{pokemonName}} benutzen?"
+  "ivScannerUseQuestion": "IV-Scanner auf {{pokemonName}} benutzen?",
+  "wildPokemonWithAffix": "{{pokemonName}} (wild)",
+  "foePokemonWithAffix": "{{pokemonName}} (Gegner)",
+  "useMove": "{{pokemonNameWithAffix}} setzt {{moveName}} ein!"
 } as const;

src/locales/de/weather.ts

@@ -15,12 +15,12 @@ export const weather: SimpleTranslationEntries = {
   "sandstormStartMessage": "Ein Sandsturm kommt auf!",
   "sandstormLapseMessage": "Der Sandsturm tobt.",
   "sandstormClearMessage": "Der Sandsturm legt sich.",
-  "sandstormDamageMessage": " Der Sandsturm fügt {{pokemonPrefix}}{{pokemonName}} Schaden zu!",
+  "sandstormDamageMessage": " Der Sandsturm fügt {{pokemonNameWithAffix}} Schaden zu!",
 
   "hailStartMessage": "Es fängt an zu hageln!",
   "hailLapseMessage": "Der Hagelsturm tobt.",
   "hailClearMessage": "Der Hagelsturm legt sich.",
-  "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} wird von Hagelkörnern getroffen!",
+  "hailDamageMessage": "{{pokemonNameWithAffix}} wird von Hagelkörnern getroffen!",
 
   "snowStartMessage": "Es fängt an zu schneien!",
   "snowLapseMessage": "Der Schneesturm tobt.",

src/locales/en/battle.ts

@@ -55,5 +55,8 @@ export const battle: SimpleTranslationEntries = {
   "notDisabled": "{{pokemonName}}'s {{moveName}} is disabled\nno more!",
   "skipItemQuestion": "Are you sure you want to skip taking an item?",
   "eggHatching": "Oh?",
-  "ivScannerUseQuestion": "Use IV Scanner on {{pokemonName}}?"
+  "ivScannerUseQuestion": "Use IV Scanner on {{pokemonName}}?",
+  "wildPokemonWithAffix": "Wild {{pokemonName}}",
+  "foePokemonWithAffix": "Foe {{pokemonName}}",
+  "useMove": "{{pokemonNameWithAffix}} used {{moveName}}!"
 } as const;

src/locales/en/weather.ts

@@ -15,12 +15,12 @@ export const weather: SimpleTranslationEntries = {
   "sandstormStartMessage": "A sandstorm brewed!",
   "sandstormLapseMessage": "The sandstorm rages.",
   "sandstormClearMessage": "The sandstorm subsided.",
-  "sandstormDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is buffeted\nby the sandstorm!",
+  "sandstormDamageMessage": "{{pokemonNameWithAffix}} is buffeted\nby the sandstorm!",
 
   "hailStartMessage": "It started to hail!",
   "hailLapseMessage": "Hail continues to fall.",
   "hailClearMessage": "The hail stopped.",
-  "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is pelted\nby the hail!",
+  "hailDamageMessage": "{{pokemonNameWithAffix}} is pelted\nby the hail!",
 
   "snowStartMessage": "It started to snow!",
   "snowLapseMessage": "The snow is falling down.",

src/locales/es/battle.ts

@@ -55,5 +55,8 @@ export const battle: SimpleTranslationEntries = {
   "notDisabled": "¡El movimiento {{moveName}} de {{pokemonName}}\nya no está anulado!",
   "skipItemQuestion": "¿Estás seguro de que no quieres coger un objeto?",
   "eggHatching": "¿Y esto?",
-  "ivScannerUseQuestion": "¿Quieres usar el Escáner de IVs en {{pokemonName}}?"
+  "ivScannerUseQuestion": "¿Quieres usar el Escáner de IVs en {{pokemonName}}?",
+  "wildPokemonWithAffix": "Wild {{pokemonName}}",
+  "foePokemonWithAffix": "Foe {{pokemonName}}",
+  "useMove": "{{pokemonNameWithAffix}} used {{moveName}}!"
 } as const;

src/locales/es/weather.ts

@@ -15,12 +15,12 @@ export const weather: SimpleTranslationEntries = {
   "sandstormStartMessage": "A sandstorm brewed!",
   "sandstormLapseMessage": "The sandstorm rages.",
   "sandstormClearMessage": "The sandstorm subsided.",
-  "sandstormDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is buffeted\nby the sandstorm!",
+  "sandstormDamageMessage": "{{pokemonNameWithAffix}} is buffeted\nby the sandstorm!",
 
   "hailStartMessage": "It started to hail!",
   "hailLapseMessage": "Hail continues to fall.",
   "hailClearMessage": "The hail stopped.",
-  "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} is pelted\nby the hail!",
+  "hailDamageMessage": "{{pokemonNameWithAffix}} is pelted\nby the hail!",
 
   "snowStartMessage": "It started to snow!",
   "snowLapseMessage": "The snow is falling down.",

src/locales/fr/battle.ts

@@ -55,5 +55,8 @@ export const battle: SimpleTranslationEntries = {
   "notDisabled": "La capacité {{moveName}}\nde {{pokemonName}} n’est plus sous entrave !",
   "skipItemQuestion": "Êtes-vous sûr·e de ne pas vouloir prendre d’objet ?",
   "eggHatching": "Oh ?",
-  "ivScannerUseQuestion": "Utiliser le Scanner d’IV sur {{pokemonName}} ?"
+  "ivScannerUseQuestion": "Utiliser le Scanner d’IV sur {{pokemonName}} ?",
+  "wildPokemonWithAffix": "{{pokemonName}} sauvage",
+  "foePokemonWithAffix": "{{pokemonName}} ennemi",
+  "useMove": "{{pokemonNameWithAffix}} utilise\n{{moveName}} !"
 } as const;

src/locales/fr/weather.ts

@@ -15,12 +15,12 @@ export const weather: SimpleTranslationEntries = {
   "sandstormStartMessage": "Une tempête de sable se prépare !",
   "sandstormLapseMessage": "La tempête de sable fait rage !",
   "sandstormClearMessage": "La tempête de sable se calme !",
-  "sandstormDamageMessage": "La tempête de sable inflige des dégâts\nà {{pokemonPrefix}}{{pokemonName}} !",
+  "sandstormDamageMessage": "La tempête de sable inflige des dégâts\nà {{pokemonNameWithAffix}} !",
 
   "hailStartMessage": "Il commence à grêler !",
   "hailLapseMessage": "La grêle continue de tomber !",
   "hailClearMessage": "La grêle s’est arrêtée !",
-  "hailDamageMessage": "La grêle inflige des dégâts\nà {{pokemonPrefix}}{{pokemonName}} !",
+  "hailDamageMessage": "La grêle inflige des dégâts\nà {{pokemonNameWithAffix}} !",
 
   "snowStartMessage": "Il commence à neiger !",
   "snowLapseMessage": "Il y a une tempête de neige !",

src/locales/it/battle.ts

@@ -55,5 +55,8 @@ export const battle: SimpleTranslationEntries = {
   "notDisabled": "{{pokemonName}}'s {{moveName}} non è più\ndisabilitata!",
   "skipItemQuestion": "Sei sicuro di non voler prendere nessun oggetto?",
   "eggHatching": "Oh!",
-  "ivScannerUseQuestion": "Vuoi usare lo scanner di IV su {{pokemonName}}?"
+  "ivScannerUseQuestion": "Vuoi usare lo scanner di IV su {{pokemonName}}?",
+  "wildPokemonWithAffix": "Wild {{pokemonName}}",
+  "foePokemonWithAffix": "Foe {{pokemonName}}",
+  "useMove": "{{pokemonNameWithAffix}} used {{moveName}}!"
 } as const;

src/locales/it/weather.ts

@@ -15,12 +15,12 @@ export const weather: SimpleTranslationEntries = {
   "sandstormStartMessage": "Si è scatenata una tempesta di sabbia!",
   "sandstormLapseMessage": "La tempesta di sabbia infuria.",
   "sandstormClearMessage": "La tempesta di sabbia si è placata.",
-  "sandstormDamageMessage": "{{pokemonPrefix}}{{pokemonName}} è stato colpito\ndalla tempesta di sabbia!",
+  "sandstormDamageMessage": "{{pokemonNameWithAffix}} è stato colpito\ndalla tempesta di sabbia!",
 
   "hailStartMessage": "Ha iniziato a grandinare!",
   "hailLapseMessage": "La grandine continua a cadere.",
   "hailClearMessage": "Ha smesso di grandinare.",
-  "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} è stato colpito\ndalla grandine!",
+  "hailDamageMessage": "{{pokemonNameWithAffix}} è stato colpito\ndalla grandine!",
 
   "snowStartMessage": "Ha iniziato a nevicare!",
   "snowLapseMessage": "La neve sta continuando a cadere.",

src/locales/ko/battle.ts

@@ -55,5 +55,8 @@ export const battle: SimpleTranslationEntries = {
   "notDisabled": "{{pokemonName}}의\n{{moveName}} 사슬묶기가 풀렸다!",
   "skipItemQuestion": "아이템을 받지 않고 넘어가시겠습니까?",
   "eggHatching": "어라…?",
-  "ivScannerUseQuestion": "{{pokemonName}}에게 개체값탐지기를 사용하시겠습니까?"
+  "ivScannerUseQuestion": "{{pokemonName}}에게 개체값탐지기를 사용하시겠습니까?",
+  "wildPokemonWithAffix": "Wild {{pokemonName}}",
+  "foePokemonWithAffix": "Foe {{pokemonName}}",
+  "useMove": "{{pokemonNameWithAffix}} used {{moveName}}!"
 } as const;

src/locales/pt_BR/battle.ts

@@ -55,5 +55,8 @@ export const battle: SimpleTranslationEntries = {
   "notDisabled": "O movimento {{moveName}}\nnão está mais desabilitado!",
   "skipItemQuestion": "Tem certeza de que não quer escolher um item?",
   "eggHatching": "Opa?",
-  "ivScannerUseQuestion": "Quer usar o Scanner de IVs em {{pokemonName}}?"
+  "ivScannerUseQuestion": "Quer usar o Scanner de IVs em {{pokemonName}}?",
+  "wildPokemonWithAffix": "Wild {{pokemonName}}",
+  "foePokemonWithAffix": "Foe {{pokemonName}}",
+  "useMove": "{{pokemonNameWithAffix}} used {{moveName}}!"
 } as const;

src/locales/pt_BR/weather.ts

@@ -15,12 +15,12 @@ export const weather: SimpleTranslationEntries = {
   "sandstormStartMessage": "Uma tempestade de areia se formou!",
   "sandstormLapseMessage": "A tempestade de areia é violenta.",
   "sandstormClearMessage": "A tempestade de areia diminuiu.",
-  "sandstormDamageMessage": "{{pokemonPrefix}}{{pokemonName}} é atingido\npela tempestade de areia!",
+  "sandstormDamageMessage": "{{pokemonNameWithAffix}} é atingido\npela tempestade de areia!",
 
   "hailStartMessage": "Começou a chover granizo!",
   "hailLapseMessage": "Granizo cai do céu.",
   "hailClearMessage": "O granizo parou.",
-  "hailDamageMessage": "{{pokemonPrefix}}{{pokemonName}} é atingido\npelo granizo!",
+  "hailDamageMessage": "{{pokemonNameWithAffix}} é atingido\npelo granizo!",
 
   "snowStartMessage": "Começou a nevar!",
   "snowLapseMessage": "A neve continua caindo.",

src/locales/zh_CN/battle.ts

@@ -55,5 +55,8 @@ export const battle: SimpleTranslationEntries = {
   "notDisabled": "{{moveName}} 不再被禁用！",
   "skipItemQuestion": "你确定要跳过拾取道具吗？",
   "eggHatching": "咦？",
-  "ivScannerUseQuestion": "对 {{pokemonName}} 使用个体值扫描仪？"
+  "ivScannerUseQuestion": "对 {{pokemonName}} 使用个体值扫描仪？",
+  "wildPokemonWithAffix": "Wild {{pokemonName}}",
+  "foePokemonWithAffix": "Foe {{pokemonName}}",
+  "useMove": "{{pokemonNameWithAffix}} used {{moveName}}!"
 } as const;

src/locales/zh_CN/weather.ts

@@ -15,12 +15,12 @@ export const weather: SimpleTranslationEntries = {
   "sandstormStartMessage": "开始刮沙暴了！",
   "sandstormLapseMessage": "沙暴肆虐。",
   "sandstormClearMessage": "沙暴停止了！",
-  "sandstormDamageMessage": "沙暴袭击了{{pokemonPrefix}}{{pokemonName}}！",
+  "sandstormDamageMessage": "沙暴袭击了{{pokemonNameWithAffix}}！",
 
   "hailStartMessage": "开始下冰雹了！",
   "hailLapseMessage": "冰雹继续肆虐。",
   "hailClearMessage": "冰雹不再下了。",
-  "hailDamageMessage": "冰雹袭击了{{pokemonPrefix}}{{pokemonName}}！",
+  "hailDamageMessage": "冰雹袭击了{{pokemonNameWithAffix}}！",
 
   "snowStartMessage": "开始下雪了！",
   "snowLapseMessage": "雪继续下。",

src/locales/zh_TW/battle.ts

@@ -52,5 +52,8 @@ export const battle: SimpleTranslationEntries = {
   "notDisabled": "{{moveName}} 不再被禁用!",
   "skipItemQuestion": "你要跳過拾取道具嗎?",
   "eggHatching": "咦?",
-  "ivScannerUseQuestion": "對 {{pokemonName}} 使用個體值掃描?"
+  "ivScannerUseQuestion": "對 {{pokemonName}} 使用個體值掃描?",
+  "wildPokemonWithAffix": "Wild {{pokemonName}}",
+  "foePokemonWithAffix": "Foe {{pokemonName}}",
+  "useMove": "{{pokemonNameWithAffix}} used {{moveName}}!"
 } as const;

src/locales/zh_TW/weather.ts

@@ -15,12 +15,12 @@ export const weather: SimpleTranslationEntries = {
   "sandstormStartMessage": "開始刮沙暴了！",
   "sandstormLapseMessage": "沙暴肆虐。",
   "sandstormClearMessage": "沙暴停止了。",
-  "sandstormDamageMessage": "沙暴襲擊了{{pokemonPrefix}}{{pokemonName}}!",
+  "sandstormDamageMessage": "沙暴襲擊了{{pokemonNameWithAffix}}!",
 
   "hailStartMessage": "開始下冰雹了!",
   "hailLapseMessage": "冰雹繼續肆虐。",
   "hailClearMessage": "冰雹不再下了。",
-  "hailDamageMessage": "冰雹襲擊了{{pokemonPrefix}}{{pokemonName}}!",
+  "hailDamageMessage": "冰雹襲擊了{{pokemonNameWithAffix}}!",
 
   "snowStartMessage": "開始下雪了!",
   "snowLapseMessage": "雪繼續下。",

src/messages.ts

@@ -1,19 +1,40 @@
 import { BattleSpec } from "./enums/battle-spec";
 import Pokemon from "./field/pokemon";
+import i18next from "./plugins/i18n";
 
+/**
+ * Builds a message by concatenating the Pokemon name with its potential affix and the given text
+ * @param pokemon {@linkcode Pokemon} name and battle context will be retrieved from this instance for {@linkcode getPokemonNameWithAffix}
+ * @param {string} content any text
+ * @returns {string} ex: "Wild Gengar fainted!", "Ectoplasma sauvage est K.O!"
+ * @see {@linkcode getPokemonNameWithAffix} for the Pokemon's name and potentiel affix
+ */
 export function getPokemonMessage(pokemon: Pokemon, content: string): string {
-  return `${getPokemonPrefix(pokemon)}${pokemon.name}${content}`;
+  return `${getPokemonNameWithAffix(pokemon)}${content}`;
 }
 
-export function getPokemonPrefix(pokemon: Pokemon): string {
-  let prefix: string;
+/**
+ * Retrieves the Pokemon's name, potentially with an affix indicating its role (wild or foe) in the current battle context, translated
+ * @param pokemon {@linkcode Pokemon} name and battle context will be retrieved from this instance
+ * @returns {string} ex: "Wild Gengar", "Ectoplasma sauvage"
+ */
+export function getPokemonNameWithAffix(pokemon: Pokemon): string {
   switch (pokemon.scene.currentBattle.battleSpec) {
   case BattleSpec.DEFAULT:
-    prefix = !pokemon.isPlayer() ? pokemon.hasTrainer() ? "Foe " : "Wild " : "";
-    break;
+    return !pokemon.isPlayer()
+      ? pokemon.hasTrainer()
+        ? i18next.t("battle:foePokemonWithAffix", {
+          pokemonName: pokemon.name,
+        })
+        : i18next.t("battle:wildPokemonWithAffix", {
+          pokemonName: pokemon.name,
+        })
+      : pokemon.name;
   case BattleSpec.FINAL_BOSS:
-    prefix = !pokemon.isPlayer() ? "Foe " : "";
-    break;
+    return !pokemon.isPlayer()
+      ? i18next.t("battle:foePokemonWithAffix", { pokemonName: pokemon.name })
+      : pokemon.name;
+  default:
+    return pokemon.name;
   }
-  return prefix;
 }

src/phases.ts

@@ -23,7 +23,7 @@ import { FusePokemonModifierType, ModifierPoolType, ModifierType, ModifierTypeFu
 import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
 import { BattlerTagLapseType, EncoreTag, HideSpriteTag as HiddenTag, ProtectedTag, TrappedTag } from "./data/battler-tags";
 import { BattlerTagType } from "./data/enums/battler-tag-type";
-import { getPokemonMessage, getPokemonPrefix } from "./messages";
+import { getPokemonMessage, getPokemonNameWithAffix } from "./messages";
 import { Starter } from "./ui/starter-select-ui-handler";
 import { Gender } from "./data/gender";
 import { Weather, WeatherType, getRandomWeatherType, getTerrainBlockMessage, getWeatherDamageMessage, getWeatherLapseMessage } from "./data/weather";
@@ -2266,7 +2266,7 @@ export class TurnEndPhase extends FieldPhase {
       pokemon.lapseTags(BattlerTagLapseType.TURN_END);
 
       if (pokemon.summonData.disabledMove && !--pokemon.summonData.disabledTurns) {
-        this.scene.pushPhase(new MessagePhase(this.scene, i18next.t("battle:notDisabled", { pokemonName: `${getPokemonPrefix(pokemon)}${pokemon.name}`, moveName: allMoves[pokemon.summonData.disabledMove].name })));
+        this.scene.pushPhase(new MessagePhase(this.scene, i18next.t("battle:notDisabled", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: allMoves[pokemon.summonData.disabledMove].name })));
         pokemon.summonData.disabledMove = Moves.NONE;
       }
 
@@ -2631,7 +2631,10 @@ export class MovePhase extends BattlePhase {
     if (this.move.getMove().getAttrs(ChargeAttr).length) {
       const lastMove = this.pokemon.getLastXMoves() as TurnMove[];
       if (!lastMove.length || lastMove[0].move !== this.move.getMove().id || lastMove[0].result !== MoveResult.OTHER) {
-        this.scene.queueMessage(getPokemonMessage(this.pokemon, ` used\n${this.move.getName()}!`), 500);
+        this.scene.queueMessage(i18next.t("battle:useMove", {
+          pokemonNameWithAffix: getPokemonNameWithAffix(this.pokemon),
+          moveName: this.move.getName()
+        }), 500);
         return;
       }
     }
@@ -2640,7 +2643,10 @@ export class MovePhase extends BattlePhase {
       return;
     }
 
-    this.scene.queueMessage(getPokemonMessage(this.pokemon, ` used\n${this.move.getName()}!`), 500);
+    this.scene.queueMessage(i18next.t("battle:useMove", {
+      pokemonNameWithAffix: getPokemonNameWithAffix(this.pokemon),
+      moveName: this.move.getName()
+    }), 500);
     applyMoveAttrs(PreMoveMessageAttr, this.pokemon, this.pokemon.getOpponents().find(() => true), this.move.getMove());
   }