diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 31c74956a2a..4d63568a0d7 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -53,15 +53,34 @@ export function getPokemonSpeciesForm(species: Species, formIndex: integer): Pok export function getFusedSpeciesName(speciesA: PokemonSpecies, speciesB: PokemonSpecies): string { let firstKey = "fusionPrefix"; let secondKey = "fusionSuffix"; + + const shouldReverse = i18next.t("fusionAffixes:shouldReverse"); + console.log(`shouldReverse: ${shouldReverse}`); // logs the value of shouldReverse + if (i18next.t("fusionAffixes:shouldReverse") === "true") { + firstKey = "fusionSuffix"; secondKey = "fusionPrefix"; + + console.log(`firstKey: ${firstKey}, secondKey: ${secondKey}`); // logs the values of firstKey and secondKey } - const prefix = i18next.t(`fusionAffixes:${Species[speciesA.speciesId].toLowerCase()}.${firstKey}`); - const suffix = i18next.t(`fusionAffixes:${Species[speciesB.speciesId].toLowerCase()}.${secondKey}`); + const radKey = i18next.t(`fusionAffixes:${Species[speciesA.speciesId].toLowerCase()}.${firstKey}`); + const desKey = i18next.t(`fusionAffixes:${Species[speciesB.speciesId].toLowerCase()}.${secondKey}`); - return `${prefix}${suffix}`; + let prefix = radKey; + let suffix = desKey; + + if (i18next.t("fusionAffixes:shouldReverse") === "true") { + prefix = desKey; + suffix = radKey; + } + + console.log(`prefix: ${prefix}, suffix: ${suffix}`); // logs the values of prefix and suffix + + const fusedName =`${prefix}${suffix}`; + + return fusedName; } export type PokemonSpeciesFilter = (species: PokemonSpecies) => boolean; diff --git a/src/interfaces/locales.ts b/src/interfaces/locales.ts index 9d2d87ca848..f349c928464 100644 --- a/src/interfaces/locales.ts +++ b/src/interfaces/locales.ts @@ -10,7 +10,7 @@ export interface SimpleTranslationEntries { } export interface FusionTranslationEntries { - shouldReverse: string, + shouldReverse?: string, [key: string]: FusionTranslationEntry | string, }