Better messages for evolution conditions

This commit is contained in:
Wlowscha 2025-01-06 16:34:13 +01:00
parent d529bb78b2
commit 44b2cb6001
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04

View File

@ -1415,12 +1415,12 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
let label:string = ""; let label:string = "";
if (pre.level > 1) { if (pre.level > 1) {
label = `${pre.level}`; label = i18next.t("pokedexUiHandler:evolveAtLv") + ` ${pre.level}`;
} else if (pre.item) { } else if (pre.item) {
label = i18next.t(`modifierType:EvolutionItem.${EvolutionItem[pre.item].toUpperCase()}`) + label = i18next.t("pokedexUiHandler:evolveUsing") + i18next.t(`modifierType:EvolutionItem.${EvolutionItem[pre.item].toUpperCase()}`) +
" (" + (pre.item > 50 ? "Ultra" : "Great") + ")"; " (" + (pre.item > 50 ? "Ultra" : "Great") + ")";
} else { } else {
label = ""; label = i18next.t("pokedexUiHandler:evolveGeneric");
} }
options.push({ options.push({
label: label, label: label,
@ -1457,13 +1457,15 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
} }
}); });
let label:string = ""; let label:string = "";
if (evo.level > 1) { if (evo.condition) {
label = `${evo.level}`; label = i18next.t("pokedexUiHandler:evolveGeneric");
} else if (evo.level > 1) {
label = i18next.t("pokedexUiHandler:evolveAtLv") + ` ${evo.level}`;
} else if (evo.item) { } else if (evo.item) {
label = i18next.t(`modifierType:EvolutionItem.${EvolutionItem[evo.item].toUpperCase()}`) + label = i18next.t("pokedexUiHandler:evolveUsing") + i18next.t(`modifierType:EvolutionItem.${EvolutionItem[evo.item].toUpperCase()}`) +
" (" + (evo.item > 50 ? "Ultra" : "Great") + ")"; " (" + (evo.item > 50 ? "Ultra" : "Great") + ")";
} else { } else {
label = ""; label = i18next.t("pokedexUiHandler:evolveGeneric");
} }
options.push({ options.push({
label: label, label: label,