diff --git a/src/locales/de/battle.ts b/src/locales/de/battle.ts index 4a09bfc5f8f..e60833cb27a 100644 --- a/src/locales/de/battle.ts +++ b/src/locales/de/battle.ts @@ -4,6 +4,7 @@ export const battle: SimpleTranslationEntries = { "bossAppeared": "{{bossName}} erscheint.", "trainerAppeared": "{{trainerName}}\nmöchte kämpfen!", "trainerAppearedDouble": "{{trainerName}}\nmöchten kämpfen!", + "trainerSendOut": "{{trainerName}} setzt\n{{pokemonName}} ein!", "singleWildAppeared": "Ein wildes {{pokemonName}} erscheint!", "multiWildAppeared": "Ein wildes {{pokemonName1}}\nund {{pokemonName2}} erscheinen!", "playerComeBack": "Komm zurück, {{pokemonName}}!", @@ -12,7 +13,9 @@ export const battle: SimpleTranslationEntries = { "trainerGo": "{{trainerName}} sendet {{pokemonName}} raus!", "switchQuestion": "Möchtest du\n{{pokemonName}} auswechseln?", "trainerDefeated": "{{trainerName}}\nwurde besiegt!", + "moneyWon": "Du gewinnst\n{{moneyAmount}} ₽!", "pokemonCaught": "{{pokemonName}} wurde gefangen!", + "partyFull": "Dein Team ist voll.\nMöchtest du ein Pokémon durch {{pokemonName}} ersetzen?", "pokemon": "Pokémon", "sendOutPokemon": "Los, {{pokemonName}}!", "hitResultCriticalHit": "Ein Volltreffer!", diff --git a/src/locales/en/battle.ts b/src/locales/en/battle.ts index 5ba0a588e19..a2eb9e4a9c9 100644 --- a/src/locales/en/battle.ts +++ b/src/locales/en/battle.ts @@ -4,6 +4,7 @@ export const battle: SimpleTranslationEntries = { "bossAppeared": "{{bossName}} appeared.", "trainerAppeared": "{{trainerName}}\nwould like to battle!", "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!", + "trainerSendOut": "{{trainerName}} sent out\n{{pokemonName}}!", "singleWildAppeared": "A wild {{pokemonName}} appeared!", "multiWildAppeared": "A wild {{pokemonName1}}\nand {{pokemonName2}} appeared!", "playerComeBack": "Come back, {{pokemonName}}!", @@ -12,7 +13,9 @@ export const battle: SimpleTranslationEntries = { "trainerGo": "{{trainerName}} sent out {{pokemonName}}!", "switchQuestion": "Will you switch\n{{pokemonName}}?", "trainerDefeated": "You defeated\n{{trainerName}}!", + "moneyWon": "You got\n₽{{moneyAmount}} for winning!", "pokemonCaught": "{{pokemonName}} was caught!", + "partyFull": "Your party is full.\nRelease a Pokémon to make room for {{pokemonName}}?", "pokemon": "Pokémon", "sendOutPokemon": "Go! {{pokemonName}}!", "hitResultCriticalHit": "A critical hit!", diff --git a/src/locales/es/battle.ts b/src/locales/es/battle.ts index fcf8354990a..36e6d5b4167 100644 --- a/src/locales/es/battle.ts +++ b/src/locales/es/battle.ts @@ -4,6 +4,7 @@ export const battle: SimpleTranslationEntries = { "bossAppeared": "¡{{bossName}} te corta el paso!", "trainerAppeared": "¡{{trainerName}}\nte desafía!", "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!", + "trainerSendOut": "{{trainerName}} sent out\n{{pokemonName}}!", "singleWildAppeared": "¡Un {{pokemonName}} salvaje te corta el paso!", "multiWildAppeared": "¡Un {{pokemonName1}} y un {{pokemonName2}} salvajes\nte cortan el paso!", "playerComeBack": "¡{{pokemonName}}, ven aquí!", @@ -12,7 +13,9 @@ export const battle: SimpleTranslationEntries = { "trainerGo": "¡{{trainerName}} saca a {{pokemonName}}!", "switchQuestion": "¿Quieres cambiar a\n{{pokemonName}}?", "trainerDefeated": "¡Has derrotado a\n{{trainerName}}!", + "moneyWon": "You got\n₽{{moneyAmount}} for winning!", "pokemonCaught": "¡{{pokemonName}} atrapado!", + "partyFull": "Your party is full.\nRelease a Pokémon to make room for {{pokemonName}}?", "pokemon": "Pokémon", "sendOutPokemon": "¡Adelante, {{pokemonName}}!", "hitResultCriticalHit": "!Un golpe crítico!", diff --git a/src/locales/fr/battle.ts b/src/locales/fr/battle.ts index a2ddc87993b..b1ae6f48f35 100644 --- a/src/locales/fr/battle.ts +++ b/src/locales/fr/battle.ts @@ -4,6 +4,7 @@ export const battle: SimpleTranslationEntries = { "bossAppeared": "Un {{bossName}} apparait.", "trainerAppeared": "Un combat est lancé\npar {{trainerName}} !", "trainerAppearedDouble": "Un combat est lancé\npar {{trainerName}} !", + "trainerSendOut": "{{pokemonName}} est envoyé par\n{{trainerName}} !", "singleWildAppeared": "Un {{pokemonName}} sauvage apparait !", "multiWildAppeared": "Un {{pokemonName1}} et un {{pokemonName2}}\nsauvages apparaissent !", "playerComeBack": "{{pokemonName}} !\nReviens !", @@ -12,7 +13,9 @@ export const battle: SimpleTranslationEntries = { "trainerGo": "{{pokemonName}} est envoyé par\n{{trainerName}} !", "switchQuestion": "Voulez-vous changer\nvotre {{pokemonName}} ?", "trainerDefeated": "Vous avez battu\n{{trainerName}} !", + "moneyWon": "Vous remportez\n{{moneyAmount}} ₽ !", "pokemonCaught": "Vous avez attrapé {{pokemonName}} !", + "partyFull": "Votre équipe est pleine.\nRelâcher un Pokémon pour {{pokemonName}} ?", "pokemon": "Pokémon", "sendOutPokemon": "{{pokemonName}} ! Go !", "hitResultCriticalHit": "Coup critique !", diff --git a/src/locales/it/battle.ts b/src/locales/it/battle.ts index 4cd640132c4..444e1f01bf0 100644 --- a/src/locales/it/battle.ts +++ b/src/locales/it/battle.ts @@ -4,6 +4,7 @@ export const battle: SimpleTranslationEntries = { "bossAppeared": "{{bossName}} è apparso.", "trainerAppeared": "{{trainerName}}\nvuole combattere!", "trainerAppearedDouble": "{{trainerName}}\nwould like to battle!", + "trainerSendOut": "{{trainerName}} manda in campo\n{{pokemonName}}!", "singleWildAppeared": "Appare {{pokemonName}} selvatico!", "multiWildAppeared": "Appaiono {{pokemonName1}}\ne {{pokemonName2}} salvatici!", "playerComeBack": "Rientra, {{pokemonName}}!", @@ -12,7 +13,9 @@ export const battle: SimpleTranslationEntries = { "trainerGo": "{{trainerName}} manda in campo {{pokemonName}}!", "switchQuestion": "Vuoi cambiare\n{{pokemonName}}?", "trainerDefeated": "Hai sconfitto\n{{trainerName}}!", + "moneyWon": "Hai vinto {{moneyAmount}}₽", "pokemonCaught": "Preso! {{pokemonName}} è stato catturato!", + "partyFull": "La tua squadra è al completo.\nVuoi liberare un Pokémon per far spazio a {{pokemonName}}?", "pokemon": "Pokémon", "sendOutPokemon": "Vai! {{pokemonName}}!", "hitResultCriticalHit": "Brutto colpo!", diff --git a/src/locales/pt_BR/battle.ts b/src/locales/pt_BR/battle.ts index 327b0cb51e9..b96266ac189 100644 --- a/src/locales/pt_BR/battle.ts +++ b/src/locales/pt_BR/battle.ts @@ -5,6 +5,7 @@ export const battle: SimpleTranslationEntries = { "trainerAppeared": "{{trainerName}}\nquer batalhar!", "trainerAppearedDouble": "{{trainerName}}\nquerem batalhar!", "singleWildAppeared": "Um {{pokemonName}} selvagem apareceu!", + "trainerSendOut": "{{trainerName}} sent out\n{{pokemonName}}!", "multiWildAppeared": "Um {{pokemonName1}} e um {{pokemonName2}} selvagens\napareceram!", "playerComeBack": "{{pokemonName}}, retorne!", "trainerComeBack": "{{trainerName}} retirou {{pokemonName}} da batalha!", @@ -12,7 +13,9 @@ export const battle: SimpleTranslationEntries = { "trainerGo": "{{trainerName}} escolheu {{pokemonName}}!", "switchQuestion": "Quer trocar\nde {{pokemonName}}?", "trainerDefeated": "Você derrotou\n{{trainerName}}!", + "moneyWon": "You got\n₽{{moneyAmount}} for winning!", "pokemonCaught": "{{pokemonName}} foi capturado!", + "partyFull": "Your party is full.\nRelease a Pokémon to make room for {{pokemonName}}?", "pokemon": "Pokémon", "sendOutPokemon": "{{pokemonName}}, eu escolho você!!", "hitResultCriticalHit": "Um golpe crítico!", diff --git a/src/locales/zh_CN/battle.ts b/src/locales/zh_CN/battle.ts index 5334bfe154b..3fbe95d39c4 100644 --- a/src/locales/zh_CN/battle.ts +++ b/src/locales/zh_CN/battle.ts @@ -4,6 +4,7 @@ export const battle: SimpleTranslationEntries = { "bossAppeared": "{{bossName}} 出现了。", "trainerAppeared": "{{trainerName}}\n想要和你对战!", "trainerAppearedDouble": "{{trainerName}}\n想要和你对战!", + "trainerSendOut": "{{trainerName}} sent out\n{{pokemonName}}!", "singleWildAppeared": "一只野生 {{pokemonName}} 出现了!", "multiWildAppeared": "野生的 {{pokemonName1}}\n和 {{pokemonName2}} 出现了!", "playerComeBack": "回来吧, {{pokemonName}}!", @@ -12,7 +13,9 @@ export const battle: SimpleTranslationEntries = { "trainerGo": "{{trainerName}} 派出了 {{pokemonName}}!", "switchQuestion": "要更换\n{{pokemonName}}吗?", "trainerDefeated": "你击败了\n{{trainerName}}!", + "moneyWon": "You got\n₽{{moneyAmount}} for winning!", "pokemonCaught": "{{pokemonName}} 被抓住了!", + "partyFull": "Your party is full.\nRelease a Pokémon to make room for {{pokemonName}}?", "pokemon": "宝可梦", "sendOutPokemon": "上吧! {{pokemonName}}!", "hitResultCriticalHit": "击中了要害!", diff --git a/src/phases.ts b/src/phases.ts index 58e17d4d9a8..0a7a5527545 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1311,8 +1311,12 @@ export class SummonPhase extends PartyMemberPokemonPhase { }); this.scene.time.delayedCall(750, () => this.summon()); } else { + const trainerName = this.scene.currentBattle.trainer.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER); + const pokemonName = this.getPokemon().name; + const message = i18next.t("battle:trainerSendOut", { trainerName, pokemonName }); + this.scene.pbTrayEnemy.hide(); - this.scene.ui.showText(`${this.scene.currentBattle.trainer.getName(!(this.fieldIndex % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER)} sent out\n${this.getPokemon().name}!`, null, () => this.summon()); + this.scene.ui.showText(message, null, () => this.summon()); } } @@ -3739,7 +3743,11 @@ export class MoneyRewardPhase extends BattlePhase { this.scene.addMoney(moneyAmount.value); - this.scene.ui.showText(`You got ₽${moneyAmount.value.toLocaleString("en-US")}\nfor winning!`, null, () => this.end(), null, true); + const userLocale = navigator.language || "en-US"; + const formattedMoneyAmount = moneyAmount.value.toLocaleString(userLocale); + const message = i18next.t("battle:moneyWon", { moneyAmount: formattedMoneyAmount }); + + this.scene.ui.showText(message, null, () => this.end(), null, true); } } @@ -4651,7 +4659,7 @@ export class AttemptCapturePhase extends PokemonPhase { Promise.all([ pokemon.hideInfo(), this.scene.gameData.setPokemonCaught(pokemon) ]).then(() => { if (this.scene.getParty().length === 6) { const promptRelease = () => { - this.scene.ui.showText(`Your party is full.\nRelease a Pokémon to make room for ${pokemon.name}?`, null, () => { + this.scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.name }), null, () => { this.scene.pokemonInfoContainer.makeRoomForConfirmUi(); this.scene.ui.setMode(Mode.CONFIRM, () => { this.scene.ui.setMode(Mode.PARTY, PartyUiMode.RELEASE, this.fieldIndex, (slotIndex: integer, _option: PartyOption) => {