From e40123fa3da95f95d3dab61cfc359005a4b83de2 Mon Sep 17 00:00:00 2001 From: Amatsune Date: Sun, 23 Jun 2024 22:27:05 +0200 Subject: [PATCH] incomplete (cherry picked from commit 47620d76bdb9183152e1cc92e798db26d91dcb90) --- src/data/pokemon-species.ts | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 8356ed26a24..ffbd8210300 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -14,7 +14,7 @@ import { GameMode } from "../game-mode"; import { QuantizerCelebi, argbFromRgba, rgbaFromArgb } from "@material/material-color-utilities"; import { VariantSet } from "./variant"; import i18next from "i18next"; -import { FusionTranslationEntry, Localizable } from "#app/interfaces/locales"; +import { Localizable } from "#app/interfaces/locales"; import { Stat } from "./pokemon-stat"; import { Abilities } from "#enums/abilities"; import { PartyMemberStrength } from "#enums/party-member-strength"; @@ -51,15 +51,8 @@ export function getPokemonSpeciesForm(species: Species, formIndex: integer): Pok } export function getFusedSpeciesName(speciesAName: string, speciesBName: string): string { - const speciesA = i18next.t(`fusionAffixes:${speciesAName}`) as FusionTranslationEntry; - const speciesB = i18next.t(`fusionAffixes:${speciesBName}`) as FusionTranslationEntry; - - if (!speciesA || !speciesB) { - throw new Error(`One or both species not found: ${speciesAName}, ${speciesBName}`); - } - - // Combine the fusionPrefix of speciesA with the fusionSuffix of speciesB using template literals - return `${speciesA.fusionPrefix}${speciesB.fusionSuffix}`; +//I WAS HERE, DON'T KNOW HOW TO MAKE THIS WORK + return `${speciesAPrefix}${speciesBSuffix}`; } export type PokemonSpeciesFilter = (species: PokemonSpecies) => boolean;