From 5852cae36bbcde64866bfd4ef652bb27c55ad7e5 Mon Sep 17 00:00:00 2001 From: Enoch Date: Sun, 14 Jul 2024 03:31:36 +0900 Subject: [PATCH] [Localization] Localize Berry Heal message (#2996) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Localize berry heal message (HP/PP) * Change location of translation * conflict resolve * Update src/locales/de/battle.ts Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Update src/locales/de/battle.ts Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Update src/locales/de/battle.ts Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> * Update src/locales/zh_CN/battle.ts Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com> * Update src/locales/zh_TW/battle.ts Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com> * Update src/locales/fr/battle.ts Co-authored-by: Lugiad' * Update src/locales/pt_BR/battle.ts Co-authored-by: José Ricardo Fleury Oliveira * Update src/locales/pt_BR/battle.ts Co-authored-by: José Ricardo Fleury Oliveira * Update battle.ts (Berries ITALIAN) --------- Co-authored-by: 송지원 Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Co-authored-by: mercurius-00 <80205689+mercurius-00@users.noreply.github.com> Co-authored-by: Lugiad' Co-authored-by: José Ricardo Fleury Oliveira Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com> --- src/data/berry.ts | 6 +++--- src/locales/de/battle.ts | 2 ++ src/locales/en/battle.ts | 2 ++ src/locales/es/battle.ts | 2 ++ src/locales/fr/battle.ts | 2 ++ src/locales/it/battle.ts | 2 ++ src/locales/ko/battle.ts | 2 ++ src/locales/pt_BR/battle.ts | 2 ++ src/locales/zh_CN/battle.ts | 2 ++ src/locales/zh_TW/battle.ts | 2 ++ 10 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/data/berry.ts b/src/data/berry.ts index 2f0f466d8a9..5ca64544544 100644 --- a/src/data/berry.ts +++ b/src/data/berry.ts @@ -1,5 +1,5 @@ import { PokemonHealPhase, StatChangePhase } from "../phases"; -import { getPokemonMessage, getPokemonNameWithAffix } from "../messages"; +import { getPokemonNameWithAffix } from "../messages"; import Pokemon, { HitResult } from "../field/pokemon"; import { BattleStat } from "./battle-stat"; import { getStatusEffectHealText } from "./status-effect"; @@ -72,7 +72,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc { const hpHealed = new Utils.NumberHolder(Math.floor(pokemon.getMaxHp() / 4)); applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, hpHealed); pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, pokemon.getBattlerIndex(), - hpHealed.value, getPokemonMessage(pokemon, `'s ${getBerryName(berryType)}\nrestored its HP!`), true)); + hpHealed.value, i18next.t("battle:hpHealBerry", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), berryName: getBerryName(berryType) }), true)); }; case BerryType.LUM: return (pokemon: Pokemon) => { @@ -123,7 +123,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc { const ppRestoreMove = pokemon.getMoveset().find(m => !m.getPpRatio()) ? pokemon.getMoveset().find(m => !m.getPpRatio()) : pokemon.getMoveset().find(m => m.getPpRatio() < 1); if (ppRestoreMove !== undefined) { ppRestoreMove.ppUsed = Math.max(ppRestoreMove.ppUsed - 10, 0); - pokemon.scene.queueMessage(getPokemonMessage(pokemon, ` restored PP to its move ${ppRestoreMove.getName()}\nusing its ${getBerryName(berryType)}!`)); + pokemon.scene.queueMessage(i18next.t("battle:ppHealBerry", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: ppRestoreMove.getName(), berryName: getBerryName(berryType) })); } }; } diff --git a/src/locales/de/battle.ts b/src/locales/de/battle.ts index f6fcb8f2467..1b9c1a861e8 100644 --- a/src/locales/de/battle.ts +++ b/src/locales/de/battle.ts @@ -68,6 +68,8 @@ export const battle: SimpleTranslationEntries = { "drainMessage": "{{pokemonName}} wurde Energie abgesaugt", "regainHealth": "KP von {{pokemonName}} wurden wieder aufgefrischt!", "stealEatBerry": "{{pokemonName}} stole and ate\n{{targetName}}'s {{berryName}}!", + "ppHealBerry": "{{berryName}} von {{pokemonNameWithAffix}} füllt AP von {{moveName}} auf!", + "hpHealBerry": "{{berryName}} füllt KP von {{pokemonNameWithAffix}} auf!", "fainted": "{{pokemonNameWithAffix}} wurde besiegt!", "statsAnd": "und", "stats": "Alle Werte", diff --git a/src/locales/en/battle.ts b/src/locales/en/battle.ts index b037ed0d1a6..5752633779e 100644 --- a/src/locales/en/battle.ts +++ b/src/locales/en/battle.ts @@ -68,6 +68,8 @@ export const battle: SimpleTranslationEntries = { "drainMessage": "{{pokemonName}} had its\nenergy drained!", "regainHealth": "{{pokemonName}} regained\nhealth!", "stealEatBerry": "{{pokemonName}} stole and ate\n{{targetName}}'s {{berryName}}!", + "ppHealBerry": "{{pokemonNameWithAffix}} restored PP to its move {{moveName}}\nusing its {{berryName}}!", + "hpHealBerry": "{{pokemonNameWithAffix}} restored its health using\nits {{berryName}}!", "fainted": "{{pokemonNameWithAffix}} fainted!", "statsAnd": "and", "stats": "Stats", diff --git a/src/locales/es/battle.ts b/src/locales/es/battle.ts index 1d0f0397947..ef4bd4da282 100644 --- a/src/locales/es/battle.ts +++ b/src/locales/es/battle.ts @@ -68,6 +68,8 @@ export const battle: SimpleTranslationEntries = { "drainMessage": "¡{{pokemonName}} tuvo su\nenergía absorbida!", "regainHealth": "¡{{pokemonName}} recuperó\nPS!", "stealEatBerry": "¡{{pokemonName}} robó la {{berryName}}\nde {{targetName}} y se la comió!", + "ppHealBerry": "{{pokemonNameWithAffix}} restored PP to its move {{moveName}}\nusing its {{berryName}}!", + "hpHealBerry": "{{pokemonNameWithAffix}} restored its health using\nits {{berryName}}!", "fainted": "¡{{pokemonNameWithAffix}} se debilitó!", "statsAnd": "y", "stats": "Las estadísticas", diff --git a/src/locales/fr/battle.ts b/src/locales/fr/battle.ts index fa1d6027ba5..336b5e44633 100644 --- a/src/locales/fr/battle.ts +++ b/src/locales/fr/battle.ts @@ -66,6 +66,8 @@ export const battle: SimpleTranslationEntries = { "foePokemonWithAffix": "{{pokemonName}} ennemi", "useMove": "{{pokemonNameWithAffix}} utilise\n{{moveName}} !", "stealEatBerry": "{{pokemonName}} vole et mange\nla {{berryName}} de {{targetName}} !", + "ppHealBerry": "La {{berryName}} de {{pokemonNameWithAffix}}\nrestaure les PP de sa capacité {{moveName}} !", + "hpHealBerry": "La {{berryName}} de {{pokemonNameWithAffix}}\nrestaure son énergie !", "drainMessage": "L’énergie de {{pokemonName}}\nest drainée !", "regainHealth": "{{pokemonName}} récupère\ndes PV !", "fainted": "{{pokemonNameWithAffix}}\nest K.O. !", diff --git a/src/locales/it/battle.ts b/src/locales/it/battle.ts index 83ee0b86306..e77faca10aa 100644 --- a/src/locales/it/battle.ts +++ b/src/locales/it/battle.ts @@ -63,6 +63,8 @@ export const battle: SimpleTranslationEntries = { "eggHatching": "Oh?", "ivScannerUseQuestion": "Vuoi usare lo scanner di IV su {{pokemonName}}?", "stealEatBerry": "{{pokemonName}} ha rubato e mangiato\nla {{berryName}} di {{targetName}}!", + "ppHealBerry": "{{pokemonNameWithAffix}} recupera i PP della mossa {{moveName}}\ncon la sua {{berryName}}!", + "hpHealBerry": "{{pokemonNameWithAffix}} ristabilisce la sua salute\ncon la sua {{berryName}}!", "wildPokemonWithAffix": "{{pokemonName}} selvatico", "foePokemonWithAffix": "{{pokemonName}} avversario", "useMove": "{{pokemonNameWithAffix}} usa {{moveName}}!", diff --git a/src/locales/ko/battle.ts b/src/locales/ko/battle.ts index 10f76f91e6e..75f30a488f2 100644 --- a/src/locales/ko/battle.ts +++ b/src/locales/ko/battle.ts @@ -67,6 +67,8 @@ export const battle: SimpleTranslationEntries = { "useMove": "{{pokemonNameWithAffix}}의 {{moveName}}!", "drainMessage": "{{pokemonName}}[[로]]부터\n체력을 흡수했다!", "stealEatBerry": "{{pokemonName}}[[가]]\n{{targetName}}의 {{berryName}}[[를]] 빼앗아 먹었다!", + "ppHealBerry": "{{pokemonNameWithAffix}}[[는]] {{berryName}}[[로]]\n{{moveName}}의 PP를 회복했다!", + "hpHealBerry": "{{pokemonNameWithAffix}}[[는]] {{berryName}}[[로]]\n체력을 회복했다!", "regainHealth": "{{pokemonName}}[[는]]\n체력을 회복했다!", "fainted": "{{pokemonNameWithAffix}}[[는]] 쓰러졌다!", "statsAnd": "그리고", diff --git a/src/locales/pt_BR/battle.ts b/src/locales/pt_BR/battle.ts index d04f25a505f..39433f65556 100644 --- a/src/locales/pt_BR/battle.ts +++ b/src/locales/pt_BR/battle.ts @@ -68,6 +68,8 @@ export const battle: SimpleTranslationEntries = { "drainMessage": "{{pokemonName}} teve sua\nenergia drenada!", "regainHealth": "{{pokemonName}} recuperou\npontos de saúde!", "stealEatBerry": "{{pokemonName}} stole and ate\n{{targetName}}'s {{berryName}}!", + "ppHealBerry": "{{pokemonNameWithAffix}} restaurou PP do movimento {{moveName}}\nusando sua {{berryName}}!", + "hpHealBerry": "{{pokemonNameWithAffix}} restarou sua saúde usando\nsua {{berryName}}!", "fainted": "{{pokemonNameWithAffix}} desmaiou!", "statsAnd": "e", "stats": "Os atributos", diff --git a/src/locales/zh_CN/battle.ts b/src/locales/zh_CN/battle.ts index 2b6c08c4161..d541eed5765 100644 --- a/src/locales/zh_CN/battle.ts +++ b/src/locales/zh_CN/battle.ts @@ -62,6 +62,8 @@ export const battle: SimpleTranslationEntries = { "skipItemQuestion": "你确定要跳过拾取道具吗？", "eggHatching": "咦？", "stealEatBerry": "{{pokemonName}} stole and ate\n{{targetName}}'s {{berryName}}!", + "ppHealBerry": "{{pokemonNameWithAffix}}用{{berryName}}\n回复了{{moveName}}的PP！", + "hpHealBerry": "{{pokemonNameWithAffix}}用{{berryName}}\n回复了体力！", "ivScannerUseQuestion": "对{{pokemonName}}使用个体值扫描仪？", "wildPokemonWithAffix": "野生的{{pokemonName}}", "foePokemonWithAffix": "对手 {{pokemonName}}", diff --git a/src/locales/zh_TW/battle.ts b/src/locales/zh_TW/battle.ts index 05ee89db860..15ffbcb0536 100644 --- a/src/locales/zh_TW/battle.ts +++ b/src/locales/zh_TW/battle.ts @@ -54,6 +54,8 @@ export const battle: SimpleTranslationEntries = { "escapeVerbSwitch": "切換", "escapeVerbFlee": "逃跑", "stealEatBerry": "{{pokemonName}} stole and ate\n{{targetName}}'s {{berryName}}!", + "ppHealBerry": "{{pokemonNameWithAffix}}用{{berryName}}\n回復了{{moveName}}的PP！", + "hpHealBerry": "{{pokemonNameWithAffix}}用{{berryName}}\n回復了體力！", "notDisabled": "{{moveName}} 不再被禁用！", "turnEndHpRestore": "{{pokemonName}}'s HP was restored.", "hpIsFull": "{{pokemonName}}'s\nHP is full!",