[Localization] localize reward gain with hard-coded numBerries(item c…

…ount) in ME. (#4379) * localize hard-coded numBerries * Update src/locales/zh_CN/battle.json Co-authored-by: Yonmaru40 <[email protected]> * Update src/locales/zh_TW/battle.json Co-authored-by: Yonmaru40 <[email protected]> * change 'rewardCount' to 'count' (flx's review) * Apply suggestions from code review - count Co-authored-by: flx-sta <[email protected]> * Revert "Apply suggestions from code review - count" This reverts commit 3ce0805. * Apply suggestions from code review Co-authored-by: ImperialSympathizer <[email protected]> * change count to parameter in trash-to-treasure * change key --------- Co-authored-by: Yonmaru40 <[email protected]> Co-authored-by: Lugiad <[email protected]> Co-authored-by: flx-sta <[email protected]> Co-authored-by: ImperialSympathizer <[email protected]>
pagefaultgames · Sep 25, 2024 · 83c18af · 83c18af
1 parent 9a63a68
commit 83c18af
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 8 deletions.
diff --git a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
@@ -128,10 +128,10 @@ export const BerriesAboundEncounter: MysteryEncounter =
         const numBerries = encounter.misc.numBerries;
 
         const doBerryRewards = () => {
-          const berryText = numBerries + " " + i18next.t(`${namespace}.berries`);
+          const berryText = i18next.t(`${namespace}.berries`);
 
           scene.playSound("item_fanfare");
-          queueEncounterMessage(scene, i18next.t("battle:rewardGain", { modifierName: berryText }));
+          queueEncounterMessage(scene, i18next.t("battle:rewardGainCount", { modifierName: berryText, count: numBerries }));
 
           // Generate a random berry and give it to the first Pokemon with room for it
           for (let i = 0; i < numBerries; i++) {
@@ -179,10 +179,10 @@ export const BerriesAboundEncounter: MysteryEncounter =
           if (speedDiff < 1) {
             // Caught and attacked by boss, gets +1 to all stats at start of fight
             const doBerryRewards = () => {
-              const berryText = numBerries + " " + i18next.t(`${namespace}.berries`);
+              const berryText = i18next.t(`${namespace}.berries`);
 
               scene.playSound("item_fanfare");
-              queueEncounterMessage(scene, i18next.t("battle:rewardGain", { modifierName: berryText }));
+              queueEncounterMessage(scene, i18next.t("battle:rewardGainCount", { modifierName: berryText, count: numBerries }));
 
               // Generate a random berry and give it to the first Pokemon with room for it
               for (let i = 0; i < numBerries; i++) {
@@ -210,10 +210,10 @@ export const BerriesAboundEncounter: MysteryEncounter =
             const numBerriesGrabbed = Math.max(Math.min(Math.round((speedDiff - 1)/0.08), numBerries), 2);
             encounter.setDialogueToken("numBerries", String(numBerriesGrabbed));
             const doFasterBerryRewards = () => {
-              const berryText = numBerriesGrabbed + " " + i18next.t(`${namespace}.berries`);
+              const berryText = i18next.t(`${namespace}.berries`);
 
               scene.playSound("item_fanfare");
-              queueEncounterMessage(scene, i18next.t("battle:rewardGain", { modifierName: berryText }));
+              queueEncounterMessage(scene, i18next.t("battle:rewardGainCount", { modifierName: berryText, count: numBerriesGrabbed }));
 
               // Generate a random berry and give it to the first Pokemon with room for it (trying to give to fastest first)
               for (let i = 0; i < numBerriesGrabbed; i++) {

diff --git a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts
@@ -190,7 +190,7 @@ async function tryApplyDigRewardItems(scene: BattleScene) {
   }
 
   scene.playSound("item_fanfare");
-  await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: "2x " + leftovers.name }), null, undefined, true);
+  await showEncounterText(scene, i18next.t("battle:rewardGainCount", { modifierName: leftovers.name, count: 2 }), null, undefined, true);
 
   // First Shell bell
   for (const pokemon of party) {
@@ -217,7 +217,7 @@ async function tryApplyDigRewardItems(scene: BattleScene) {
   }
 
   scene.playSound("item_fanfare");
-  await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: "2x " + shellBell.name }), null, undefined, true);
+  await showEncounterText(scene, i18next.t("battle:rewardGainCount", { modifierName: shellBell.name, count: 2 }), null, undefined, true);
 }
 
 async function doGarbageDig(scene: BattleScene) {

diff --git a/src/locales/de/battle.json b/src/locales/de/battle.json
@@ -32,6 +32,7 @@
   "attackMissed": "Die Attacke hat {{pokemonNameWithAffix}} verfehlt!",
   "attackHitsCount": "{{count}}-mal getroffen!",
   "rewardGain": "Du erhältst {{modifierName}}!",
+  "rewardGainCount": "Du erhältst {{count}} {{modifierName}}!",
   "expGain": "{{pokemonName}} erhält {{exp}} Erfahrungspunkte!",
   "levelUp": "{{pokemonName}} erreicht Lv. {{level}}!",
   "learnMove": "{{pokemonName}} erlernt {{moveName}}!",

diff --git a/src/locales/en/battle.json b/src/locales/en/battle.json
@@ -32,6 +32,7 @@
   "attackMissed": "{{pokemonNameWithAffix}} avoided the attack!",
   "attackHitsCount": "Hit {{count}} time(s)!",
   "rewardGain": "You received\n{{modifierName}}!",
+  "rewardGainCount": "You received\n{{count}} {{modifierName}}!",
   "expGain": "{{pokemonName}} gained\n{{exp}} EXP. Points!",
   "levelUp": "{{pokemonName}} grew to\nLv. {{level}}!",
   "learnMove": "{{pokemonName}} learned\n{{moveName}}!",

diff --git a/src/locales/es/battle.json b/src/locales/es/battle.json
@@ -32,6 +32,7 @@
   "attackMissed": "¡{{pokemonNameWithAffix}}\nha evitado el ataque!",
   "attackHitsCount": "N.º de golpes: {{count}}.",
   "rewardGain": "¡Has conseguido\n{{modifierName}}!",
+  "rewardGainCount": "¡Has conseguido\n{{count}} {{modifierName}}!",
   "expGain": "{{pokemonName}} ha ganado\n{{exp}} puntos de experiencia.",
   "levelUp": "¡{{pokemonName}} ha subido a\nNv. {{level}}!",
   "learnMove": "¡{{pokemonName}} ha aprendido {{moveName}}!",

diff --git a/src/locales/fr/battle.json b/src/locales/fr/battle.json
@@ -32,6 +32,7 @@
   "attackMissed": "{{pokemonNameWithAffix}}\névite l’attaque !",
   "attackHitsCount": "Touché {{count}} fois !",
   "rewardGain": "Vous recevez\n{{modifierName}} !",
+  "rewardGainCount": "Vous recevez\n{{count}} {{modifierName}} !",
   "expGain": "{{pokemonName}} gagne\n{{exp}} Points d’Exp !",
   "levelUp": "{{pokemonName}} monte au\nN. {{level}} !",
   "learnMove": "{{pokemonName}} apprend\n{{moveName}} !",

diff --git a/src/locales/it/battle.json b/src/locales/it/battle.json
@@ -32,6 +32,7 @@
   "attackMissed": "{{pokemonNameWithAffix}}\nevita l’attacco!",
   "attackHitsCount": "Colpito {{count}} volta/e!",
   "rewardGain": "Ricevi\n{{modifierName}}!",
+  "rewardGainCount": "Ricevi\n{{count}} {{modifierName}}!",
   "expGain": "{{pokemonName}} ha guadagnato\n{{exp}} Punti Esperienza!",
   "levelUp": "{{pokemonName}} è salito al\nlivello {{level}}!",
   "learnMove": "{{pokemonName}} impara\n{{moveName}}!",

diff --git a/src/locales/ja/battle.json b/src/locales/ja/battle.json
@@ -28,6 +28,7 @@
   "attackMissed": "{{pokemonNameWithAffix}}には　当たらなかった！",
   "attackHitsCount": "{{count}}かい 当たった！",
   "rewardGain": "{{modifierName}}を　手に入れた!",
+  "rewardGainCount": "{{modifierName}}を　{{count}}個　手に入れた!",
   "expGain": "{{pokemonName}}は\n{{exp}}経験値を　もらった！",
   "levelUp": "{{pokemonName}}は\nレベル{{level}}に　上がった！",
   "learnMove": "{{pokemonName}}は　新しく\n{{moveName}}を　覚えた！",

diff --git a/src/locales/ko/battle.json b/src/locales/ko/battle.json
@@ -32,6 +32,7 @@
   "attackMissed": "{{pokemonNameWithAffix}}에게는\n맞지 않았다!",
   "attackHitsCount": "{{count}}번 맞았다!",
   "rewardGain": "{{modifierName}}[[를]] 받았다!",
+  "rewardGainCount": "{{modifierName}}[[를]]\n{{count}}개 손에 넣었다!",
   "expGain": "{{pokemonName}}[[는]]\n{{exp}} 경험치를 얻었다!",
   "levelUp": "{{pokemonName}}[[는]]\n레벨 {{level}}[[로]] 올랐다!",
   "learnMove": "{{pokemonName}}[[는]] 새로\n{{moveName}}[[를]] 배웠다!",

diff --git a/src/locales/pt_BR/battle.json b/src/locales/pt_BR/battle.json
@@ -32,6 +32,7 @@
   "attackMissed": "{{pokemonNameWithAffix}} desviou do ataque!",
   "attackHitsCount": "Acertou {{count}} vezes.",
   "rewardGain": "Você recebeu\n{{modifierName}}!",
+  "rewardGainCount": "Você recebeu\n{{count}} {{modifierName}}!",
   "expGain": "{{pokemonName}} ganhou\n{{exp}} pontos de experiência.",
   "levelUp": "{{pokemonName}} subiu para \nNv. {{level}}!",
   "learnMove": "{{pokemonName}} aprendeu {{moveName}}!",

diff --git a/src/locales/zh_CN/battle.json b/src/locales/zh_CN/battle.json
@@ -32,6 +32,7 @@
   "attackMissed": "没有命中{{pokemonNameWithAffix}}！",
   "attackHitsCount": "击中{{count}}次！",
   "rewardGain": "你获得了\n{{modifierName}}！",
+  "rewardGainCount": "你获得了\n{{count}}个{{modifierName}}!",
   "expGain": "{{pokemonName}}获得了{{exp}} 点经验值！",
   "levelUp": "{{pokemonName}}升级到Lv.{{level}}！",
   "learnMove": "{{pokemonName}}学会了{{moveName}}！",

diff --git a/src/locales/zh_TW/battle.json b/src/locales/zh_TW/battle.json
@@ -39,6 +39,7 @@
   "attackMissed": "沒有命中{{pokemonNameWithAffix}}！",
   "attackHitsCount": "擊中{{count}}次！",
   "rewardGain": "你獲得了\n{{modifierName}}！",
+  "rewardGainCount": "你獲得了\n{{count}}個{{modifierName}}!",
   "expGain": "{{pokemonName}}獲得了{{exp}} 點經驗值！",
   "levelUp": "{{pokemonName}}升級到Lv.{{level}}！",
   "learnMove": "{{pokemonName}}學會了{{moveName}}！",