From 0c7719b8aaa97e838fc7bbc5a67cb91e724cbd3e Mon Sep 17 00:00:00 2001 From: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Date: Thu, 19 Sep 2024 22:56:22 +0200 Subject: [PATCH 1/3] updated name and conifg --- src/locales/de/config.ts | 4 +- ... the-expert-pokemon-breeder-dialogue.json} | 58 +++++++++---------- 2 files changed, 31 insertions(+), 31 deletions(-) rename src/locales/de/mystery-encounters/{the-expert-breeder-dialogue.json => the-expert-pokemon-breeder-dialogue.json} (95%) diff --git a/src/locales/de/config.ts b/src/locales/de/config.ts index b013ddf58f8..4d8bc3b9b8e 100644 --- a/src/locales/de/config.ts +++ b/src/locales/de/config.ts @@ -84,7 +84,7 @@ import bugTypeSuperfan from "./mystery-encounters/bug-type-superfan-dialogue.jso import funAndGames from "./mystery-encounters/fun-and-games-dialogue.json"; import uncommonBreed from "./mystery-encounters/uncommon-breed-dialogue.json"; import globalTradeSystem from "./mystery-encounters/global-trade-system-dialogue.json"; -import expertBreeder from "./mystery-encounters/the-expert-breeder-dialogue.json"; +import expertPokemonBreeder from "#app/locales/en/mystery-encounters/the-expert-pokemon-breeder-dialogue.json"; /** * Dialogue/Text token injection patterns that can be used: @@ -185,7 +185,7 @@ export const deConfig = { funAndGames, uncommonBreed, globalTradeSystem, - expertBreeder + expertPokemonBreeder }, mysteryEncounterMessages }; diff --git a/src/locales/de/mystery-encounters/the-expert-breeder-dialogue.json b/src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json similarity index 95% rename from src/locales/de/mystery-encounters/the-expert-breeder-dialogue.json rename to src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json index eb215bd2e2a..ebe3af38add 100644 --- a/src/locales/de/mystery-encounters/the-expert-breeder-dialogue.json +++ b/src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json @@ -1,30 +1,30 @@ -{ - "intro": "It's a trainer carrying tons of Pokémon Eggs!", - "intro_dialogue": "Hey there, trainer!$It looks like some of your\npartner Pokémon are feeling a little down.$Why not have a battle with me to cheer them up?", - "title": "The Expert Breeder", - "description": "You've been challenged to a battle where @[TOOLTIP_TITLE]{you can only use a single Pokémon}. It might be tough, but it would surely deepen the bond you have with the Pokémon you choose!\nThe breeder will also give you some @[TOOLTIP_TITLE]{Pokémon Eggs} if you win!", - "query": "Who will you battle with?", - "cleffa_1_nickname": "Ace", - "cleffa_2_nickname": "Clefablest", - "cleffa_3_nickname": "{{speciesName}} the Great", - "option": { - "1": { - "label": "{{pokemon1Name}}", - "tooltip_base": "(-) Tough Battle\n(+) Gain Friendship with {{pokemon1Name}}" - }, - "2": { - "label": "{{pokemon2Name}}", - "tooltip_base": "(-) Tough Battle\n(+) Gain Friendship with {{pokemon2Name}}" - }, - "3": { - "label": "{{pokemon3Name}}", - "tooltip_base": "(-) Tough Battle\n(+) Gain Friendship with {{pokemon3Name}}" - }, - "selected": "Let's do this!" - }, - "outro": "Look how happy your {{chosenPokemon}} is now!$Here, you can have these as well.", - "gained_eggs": "@s{item_fanfare}You received {{numEggs}}!", - "eggs_tooltip": "\n(+) Earn {{eggs}}", - "numEggs_one": "{{count}} {{rarity}} Egg", - "numEggs_other": "{{count}} {{rarity}} Eggs" +{ + "intro": "It's a trainer carrying tons of Pokémon Eggs!", + "intro_dialogue": "Hey there, trainer!$It looks like some of your\npartner Pokémon are feeling a little down.$Why not have a battle with me to cheer them up?", + "title": "The Expert Pokémon Breeder", + "description": "You've been challenged to a battle where @[TOOLTIP_TITLE]{you can only use a single Pokémon}. It might be tough, but it would surely deepen the bond you have with the Pokémon you choose!\nThe breeder will also give you some @[TOOLTIP_TITLE]{Pokémon Eggs} if you win!", + "query": "Who will you battle with?", + "cleffa_1_nickname": "Ace", + "cleffa_2_nickname": "Clefablest", + "cleffa_3_nickname": "{{speciesName}} the Great", + "option": { + "1": { + "label": "{{pokemon1Name}}", + "tooltip_base": "(-) Tough Battle\n(+) Gain Friendship with {{pokemon1Name}}" + }, + "2": { + "label": "{{pokemon2Name}}", + "tooltip_base": "(-) Tough Battle\n(+) Gain Friendship with {{pokemon2Name}}" + }, + "3": { + "label": "{{pokemon3Name}}", + "tooltip_base": "(-) Tough Battle\n(+) Gain Friendship with {{pokemon3Name}}" + }, + "selected": "Let's do this!" + }, + "outro": "Look how happy your {{chosenPokemon}} is now!$Here, you can have these as well.", + "gained_eggs": "@s{item_fanfare}You received {{numEggs}}!", + "eggs_tooltip": "\n(+) Earn {{eggs}}", + "numEggs_one": "{{count}} {{rarity}} Egg", + "numEggs_other": "{{count}} {{rarity}} Eggs" } \ No newline at end of file From a1dc08c2aed0ddd757792983fca1f2ccb16dadcc Mon Sep 17 00:00:00 2001 From: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Date: Thu, 19 Sep 2024 23:03:18 +0200 Subject: [PATCH 2/3] Start of dialogue --- .../the-expert-pokemon-breeder-dialogue.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json b/src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json index ebe3af38add..ef5da8b82a5 100644 --- a/src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json +++ b/src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json @@ -1,7 +1,7 @@ { - "intro": "It's a trainer carrying tons of Pokémon Eggs!", - "intro_dialogue": "Hey there, trainer!$It looks like some of your\npartner Pokémon are feeling a little down.$Why not have a battle with me to cheer them up?", - "title": "The Expert Pokémon Breeder", + "intro": "Ein Trainer mit vielen Pokémon-Eiern!", + "intro_dialogue": "Hey Trainer!$Es sieht so aus, als ob einige deiner Pokémon sich ein wenig niedergeschlagen fühlen.$Warum kämpfst du nicht gegen mich, um sie aufzumuntern?", + "title": "Der Pokémon-Züchter Experte", "description": "You've been challenged to a battle where @[TOOLTIP_TITLE]{you can only use a single Pokémon}. It might be tough, but it would surely deepen the bond you have with the Pokémon you choose!\nThe breeder will also give you some @[TOOLTIP_TITLE]{Pokémon Eggs} if you win!", "query": "Who will you battle with?", "cleffa_1_nickname": "Ace", From a27d18ccac14a83623d61cc2cf2abf2f927fc06b Mon Sep 17 00:00:00 2001 From: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Date: Thu, 19 Sep 2024 23:41:35 +0200 Subject: [PATCH 3/3] Added the option to have the species name for all 3, made the name of the breeder localizable --- .../the-expert-pokemon-breeder-encounter.ts | 4 +-- src/data/trainer-config.ts | 4 +-- .../the-expert-pokemon-breeder-dialogue.json | 30 +++++++++---------- src/locales/de/trainer-names.json | 4 ++- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts index 104ddd3d663..d4795c90453 100644 --- a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts @@ -379,7 +379,7 @@ function getPartyConfig(scene: BattleScene): EnemyPartyConfig { trainerType: TrainerType.EXPERT_POKEMON_BREEDER, pokemonConfigs: [ { - nickname: i18next.t(`${namespace}.cleffa_1_nickname`), + nickname: i18next.t(`${namespace}.cleffa_1_nickname`, { speciesName: getPokemonSpecies(cleffaSpecies).getName() }), species: getPokemonSpecies(cleffaSpecies), isBoss: false, abilityIndex: 1, // Magic Guard @@ -407,7 +407,7 @@ function getPartyConfig(scene: BattleScene): EnemyPartyConfig { if (scene.arena.biomeType === Biome.SPACE) { // All 3 members always Cleffa line, but different configs baseConfig.pokemonConfigs!.push({ - nickname: i18next.t(`${namespace}.cleffa_2_nickname`), + nickname: i18next.t(`${namespace}.cleffa_2_nickname`, { speciesName: getPokemonSpecies(cleffaSpecies).getName() }), species: getPokemonSpecies(cleffaSpecies), isBoss: false, abilityIndex: 1, // Magic Guard diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index dca7b31a862..dc9a0657513 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -911,7 +911,7 @@ export class TrainerConfig { if (!getIsInitialized()) { initI18n(); } - this.name = i18next.t(`trainerNames:${name.toLowerCase()}`); + this.name = i18next.t(`trainerNames:${name.toLowerCase().replace(/\s/g, "_")}`); return this; } @@ -2311,7 +2311,7 @@ export const trainerConfigs: TrainerConfigs = { .setPartyTemplates(new TrainerPartyCompoundTemplate(new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(2, PartyMemberStrength.STRONG))), [TrainerType.BUG_TYPE_SUPERFAN]: new TrainerConfig(++t).setMoneyMultiplier(2.25).setEncounterBgm(TrainerType.ACE_TRAINER) .setPartyTemplates(new TrainerPartyTemplate(2, PartyMemberStrength.AVERAGE)), - [TrainerType.EXPERT_POKEMON_BREEDER]: new TrainerConfig(++t).setMoneyMultiplier(3).setEncounterBgm(TrainerType.ACE_TRAINER) + [TrainerType.EXPERT_POKEMON_BREEDER]: new TrainerConfig(++t).setMoneyMultiplier(3).setEncounterBgm(TrainerType.ACE_TRAINER).setLocalizedName("Expert Pokemon Breeder") .setPartyTemplates(new TrainerPartyTemplate(3, PartyMemberStrength.STRONG)) }; diff --git a/src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json b/src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json index a662a559abb..24b33c9362e 100644 --- a/src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json +++ b/src/locales/de/mystery-encounters/the-expert-pokemon-breeder-dialogue.json @@ -1,30 +1,30 @@ { "intro": "Ein Trainer mit vielen Pokémon-Eiern!", "intro_dialogue": "Hey Trainer!$Es sieht so aus, als ob einige deiner Pokémon sich ein wenig niedergeschlagen fühlen.$Warum kämpfst du nicht gegen mich, um sie aufzumuntern?", - "title": "Der Pokémon-Züchter Experte", - "description": "You've been challenged to a battle where @[TOOLTIP_TITLE]{you can only use a single Pokémon}. It might be tough, but it would surely deepen the bond you have with the Pokémon you choose!\nThe breeder will also give you some @[TOOLTIP_TITLE]{Pokémon Eggs} if you win!", - "query": "Who will you battle with?", - "cleffa_1_nickname": "Ace", - "cleffa_2_nickname": "Clefablest", - "cleffa_3_nickname": "{{speciesName}} the Great", + "title": "Triff den Pokémon-Züchter-Experten!", + "description": "Du wurdest zu einem Kampf herausgefordert, bei dem du nur @[TOOLTIP_TITLE]{ein einziges Pokémon verwenden darfst}. Es könnte schwierig werden, aber es würde sicherlich die Bindung vertiefen, die du mit dem Pokémon hast, das du wählst!$Wenn du gewinnst, wird der Züchter dir einige @[TOOLTIP_TITLE]{Pokémon-Eier} geben!", + "query": "Wer wird für dich kämpfen?", + "cleffa_1_nickname": "Ass-Pii-Rin", + "cleffa_2_nickname": "Pi-mal-Daumen", + "cleffa_3_nickname": "Pii-cknick", "option": { "1": { "label": "{{pokemon1Name}}", - "tooltip_base": "(-) Tough Battle\n(+) Gain Friendship with {{pokemon1Name}}" + "tooltip_base": "(-) Harter Kampf\n(+) Erhöhe Freundschaft mit {{pokemon1Name}}" }, "2": { "label": "{{pokemon2Name}}", - "tooltip_base": "(-) Tough Battle\n(+) Gain Friendship with {{pokemon2Name}}" + "tooltip_base": "(-) Harter Kampf\n(+) Erhöhe Freundschaft mit {{pokemon2Name}}" }, "3": { "label": "{{pokemon3Name}}", - "tooltip_base": "(-) Tough Battle\n(+) Gain Friendship with {{pokemon3Name}}" + "tooltip_base": "(-) Harter Kampf\n(+) Erhöhe Freundschaft mit {{pokemon3Name}}" }, - "selected": "Let's do this!" + "selected": "Lass uns beginnen!" }, - "outro": "Look how happy your {{chosenPokemon}} is now!$Here, you can have these as well.", - "gained_eggs": "@s{item_fanfare}You received {{numEggs}}!", - "eggs_tooltip": "\n(+) Earn {{eggs}}", - "numEggs_one": "{{count}} {{rarity}} Egg", - "numEggs_other": "{{count}} {{rarity}} Eggs" + "outro": "Schau wie glücklich dein {{chosenPokemon}} nun ist!$Hier, diese Pokémon-Eier kannst du auch haben.", + "gained_eggs": "@s{item_fanfare}Du erhählst {{numEggs}}!", + "eggs_tooltip": "\n(+) Erhalte {{eggs}}", + "numEggs_one": "{{count}} Ei der Stufe {{rarity}}", + "numEggs_other": "{{count}} Eier der Stufe {{rarity}}" } diff --git a/src/locales/de/trainer-names.json b/src/locales/de/trainer-names.json index 2a6ecf91324..57814fb735b 100644 --- a/src/locales/de/trainer-names.json +++ b/src/locales/de/trainer-names.json @@ -173,5 +173,7 @@ "vivi": "Sieglinde", "vicky": "Vicky", "vito": "Paul", - "bug_type_superfan": "Käfersammler-Superfan" + "bug_type_superfan": "Käfersammler-Superfan", + "expert_pokemon_breeder": "Pokémon-Züchter-Experte" + }