From 5a445e36331cb72011baa4876a5a76074500166b Mon Sep 17 00:00:00 2001 From: fabske0 <192151969+fabske0@users.noreply.github.com> Date: Sat, 9 Aug 2025 20:28:35 +0200 Subject: [PATCH] chnaged MEs part 4 --- .../the-expert-pokemon-breeder-encounter.ts | 38 +++++++++---------- .../the-pokemon-salesman-encounter.ts | 4 +- .../the-winstrate-challenge-encounter.ts | 2 +- .../encounters/weird-dream-encounter.ts | 2 +- 4 files changed, 23 insertions(+), 23 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 e0975c773df..6d0ff11f07a 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 @@ -189,13 +189,13 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncount // Dialogue and egg calcs for Pokemon 1 const [pokemon1CommonEggs, pokemon1RareEggs] = calculateEggRewardsForPokemon(pokemon1); - let pokemon1Tooltip = getEncounterText(`${namespace}:option.1.tooltip_base`)!; + let pokemon1Tooltip = getEncounterText(`${namespace}:option.1.tooltipBase`)!; if (pokemon1RareEggs > 0) { const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon1RareEggs, rarity: i18next.t("egg:greatTier"), }); - pokemon1Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { + pokemon1Tooltip += i18next.t(`${namespace}:eggsTooltip`, { eggs: eggsText, }); encounter.setDialogueToken("pokemon1RareEggs", eggsText); @@ -205,7 +205,7 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncount count: pokemon1CommonEggs, rarity: i18next.t("egg:defaultTier"), }); - pokemon1Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { + pokemon1Tooltip += i18next.t(`${namespace}:eggsTooltip`, { eggs: eggsText, }); encounter.setDialogueToken("pokemon1CommonEggs", eggsText); @@ -214,13 +214,13 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncount // Dialogue and egg calcs for Pokemon 2 const [pokemon2CommonEggs, pokemon2RareEggs] = calculateEggRewardsForPokemon(pokemon2); - let pokemon2Tooltip = getEncounterText(`${namespace}:option.2.tooltip_base`)!; + let pokemon2Tooltip = getEncounterText(`${namespace}:option.2.tooltipBase`)!; if (pokemon2RareEggs > 0) { const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon2RareEggs, rarity: i18next.t("egg:greatTier"), }); - pokemon2Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { + pokemon2Tooltip += i18next.t(`${namespace}:eggsTooltip`, { eggs: eggsText, }); encounter.setDialogueToken("pokemon2RareEggs", eggsText); @@ -230,7 +230,7 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncount count: pokemon2CommonEggs, rarity: i18next.t("egg:defaultTier"), }); - pokemon2Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { + pokemon2Tooltip += i18next.t(`${namespace}:eggsTooltip`, { eggs: eggsText, }); encounter.setDialogueToken("pokemon2CommonEggs", eggsText); @@ -239,13 +239,13 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncount // Dialogue and egg calcs for Pokemon 3 const [pokemon3CommonEggs, pokemon3RareEggs] = calculateEggRewardsForPokemon(pokemon3); - let pokemon3Tooltip = getEncounterText(`${namespace}:option.3.tooltip_base`)!; + let pokemon3Tooltip = getEncounterText(`${namespace}:option.3.tooltipBase`)!; if (pokemon3RareEggs > 0) { const eggsText = i18next.t(`${namespace}:numEggs`, { count: pokemon3RareEggs, rarity: i18next.t("egg:greatTier"), }); - pokemon3Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { + pokemon3Tooltip += i18next.t(`${namespace}:eggsTooltip`, { eggs: eggsText, }); encounter.setDialogueToken("pokemon3RareEggs", eggsText); @@ -255,7 +255,7 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncount count: pokemon3CommonEggs, rarity: i18next.t("egg:defaultTier"), }); - pokemon3Tooltip += i18next.t(`${namespace}:eggs_tooltip`, { + pokemon3Tooltip += i18next.t(`${namespace}:eggsTooltip`, { eggs: eggsText, }); encounter.setDialogueToken("pokemon3CommonEggs", eggsText); @@ -321,14 +321,14 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncount ]; if (encounter.dialogueTokens.hasOwnProperty("pokemon1CommonEggs")) { encounter.dialogue.outro.push({ - text: i18next.t(`${namespace}:gained_eggs`, { + text: i18next.t(`${namespace}:gainedEggs`, { numEggs: encounter.dialogueTokens["pokemon1CommonEggs"], }), }); } if (encounter.dialogueTokens.hasOwnProperty("pokemon1RareEggs")) { encounter.dialogue.outro.push({ - text: i18next.t(`${namespace}:gained_eggs`, { + text: i18next.t(`${namespace}:gainedEggs`, { numEggs: encounter.dialogueTokens["pokemon1RareEggs"], }), }); @@ -380,14 +380,14 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncount ]; if (encounter.dialogueTokens.hasOwnProperty("pokemon2CommonEggs")) { encounter.dialogue.outro.push({ - text: i18next.t(`${namespace}:gained_eggs`, { + text: i18next.t(`${namespace}:gainedEggs`, { numEggs: encounter.dialogueTokens["pokemon2CommonEggs"], }), }); } if (encounter.dialogueTokens.hasOwnProperty("pokemon2RareEggs")) { encounter.dialogue.outro.push({ - text: i18next.t(`${namespace}:gained_eggs`, { + text: i18next.t(`${namespace}:gainedEggs`, { numEggs: encounter.dialogueTokens["pokemon2RareEggs"], }), }); @@ -439,14 +439,14 @@ export const TheExpertPokemonBreederEncounter: MysteryEncounter = MysteryEncount ]; if (encounter.dialogueTokens.hasOwnProperty("pokemon3CommonEggs")) { encounter.dialogue.outro.push({ - text: i18next.t(`${namespace}:gained_eggs`, { + text: i18next.t(`${namespace}:gainedEggs`, { numEggs: encounter.dialogueTokens["pokemon3CommonEggs"], }), }); } if (encounter.dialogueTokens.hasOwnProperty("pokemon3RareEggs")) { encounter.dialogue.outro.push({ - text: i18next.t(`${namespace}:gained_eggs`, { + text: i18next.t(`${namespace}:gainedEggs`, { numEggs: encounter.dialogueTokens["pokemon3RareEggs"], }), }); @@ -482,7 +482,7 @@ function getPartyConfig(): EnemyPartyConfig { trainerType: TrainerType.EXPERT_POKEMON_BREEDER, pokemonConfigs: [ { - nickname: i18next.t(`${namespace}:cleffa_1_nickname`, { + nickname: i18next.t(`${namespace}:cleffa1Nickname`, { speciesName: getPokemonSpecies(cleffaSpecies).getName(), }), species: getPokemonSpecies(cleffaSpecies), @@ -501,7 +501,7 @@ function getPartyConfig(): EnemyPartyConfig { // All 3 members always Cleffa line, but different configs baseConfig.pokemonConfigs!.push( { - nickname: i18next.t(`${namespace}:cleffa_2_nickname`, { + nickname: i18next.t(`${namespace}:cleffa2Nickname`, { speciesName: getPokemonSpecies(cleffaSpecies).getName(), }), species: getPokemonSpecies(cleffaSpecies), @@ -514,7 +514,7 @@ function getPartyConfig(): EnemyPartyConfig { ivs: [31, 31, 31, 31, 31, 31], }, { - nickname: i18next.t(`${namespace}:cleffa_3_nickname`, { + nickname: i18next.t(`${namespace}:cleffa3Nickname`, { speciesName: getPokemonSpecies(cleffaSpecies).getName(), }), species: getPokemonSpecies(cleffaSpecies), @@ -647,7 +647,7 @@ function onGameOver() { encounter.dialogue.outro = [ { speaker: trainerNameKey, - text: `${namespace}:outro_failed`, + text: `${namespace}:outroFailed`, }, ]; diff --git a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts index cc6617c0977..99f6e671052 100644 --- a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts @@ -178,8 +178,8 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui // Always max price for shiny (flip HA back to normal), and add special messaging priceMultiplier = MAX_POKEMON_PRICE_MULTIPLIER; pokemon.abilityIndex = 0; - encounter.dialogue.encounterOptionsDialogue!.description = `${namespace}:description_shiny`; - encounter.options[0].dialogue!.buttonTooltip = `${namespace}:option.1.tooltip_shiny`; + encounter.dialogue.encounterOptionsDialogue!.description = `${namespace}:descriptionShiny`; + encounter.options[0].dialogue!.buttonTooltip = `${namespace}:option.1.tooltipShiny`; } const price = globalScene.getWaveMoneyAmount(priceMultiplier); encounter.setDialogueToken("purchasePokemon", pokemon.getNameToRender()); diff --git a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts index 1279d8e7176..71fe961f053 100644 --- a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts @@ -163,7 +163,7 @@ async function spawnNextTrainerOrEndEncounter() { globalScene.playSound("item_fanfare"); await showEncounterText(i18next.t("battle:rewardGain", { modifierName: newModifier?.type.name })); - await showEncounterDialogue(`${namespace}:victory_2`, `${namespace}:speaker`); + await showEncounterDialogue(`${namespace}:victory2`, `${namespace}:speaker`); globalScene.ui.clearText(); // Clears "Winstrate" title from screen as rewards get animated in const machoBrace = generateModifierTypeOption(modifierTypes.MYSTERY_ENCOUNTER_MACHO_BRACE)!; machoBrace.type.tier = ModifierTier.MASTER; diff --git a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts index 0ba8f2ae18a..790bdf0dbef 100644 --- a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts +++ b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts @@ -216,7 +216,7 @@ export const WeirdDreamEncounter: MysteryEncounter = MysteryEncounterBuilder.wit await cutsceneDialoguePromise; doHideDreamBackground(); - await showEncounterText(`${namespace}:option.1.dream_complete`); + await showEncounterText(`${namespace}:option.1.dreamComplete`); await doNewTeamPostProcess(transformations); setEncounterRewards({