Use getShinyDescriptor in pokemon-info-container

This commit is contained in:
Sirz Benjie 2025-04-23 12:33:11 -05:00
parent 6be61e5414
commit 1eacc667e5
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E

View File

@ -8,7 +8,7 @@ import type Pokemon from "../field/pokemon";
import i18next from "i18next"; import i18next from "i18next";
import type { DexEntry, StarterDataEntry } from "../system/game-data"; import type { DexEntry, StarterDataEntry } from "../system/game-data";
import { DexAttr } from "../system/game-data"; import { DexAttr } from "../system/game-data";
import { fixedInt } from "#app/utils/common"; import { fixedInt, getShinyDescriptor } from "#app/utils/common";
import ConfirmUiHandler from "./confirm-ui-handler"; import ConfirmUiHandler from "./confirm-ui-handler";
import { StatsContainer } from "./stats-container"; import { StatsContainer } from "./stats-container";
import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text"; import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text";
@ -343,18 +343,19 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
this.pokemonShinyIcon.setVisible(pokemon.isShiny()); this.pokemonShinyIcon.setVisible(pokemon.isShiny());
this.pokemonShinyIcon.setTint(getVariantTint(baseVariant)); this.pokemonShinyIcon.setTint(getVariantTint(baseVariant));
if (this.pokemonShinyIcon.visible) { if (this.pokemonShinyIcon.visible) {
const shinyDescriptor = let shinyDescriptor = "";
doubleShiny || baseVariant if (doubleShiny || baseVariant) {
? `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}` shinyDescriptor = " (" + getShinyDescriptor(baseVariant);
: ""; if (doubleShiny) {
this.pokemonShinyIcon.on("pointerover", () => shinyDescriptor += "/" + getShinyDescriptor(pokemon.fusionVariant);
globalScene.ui.showTooltip( }
"", shinyDescriptor += ")";
`${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`, }
true, this.pokemonShinyIcon
), .on("pointerover", () =>
); globalScene.ui.showTooltip("", i18next.t("common:shinyOnHover") + shinyDescriptor, true),
this.pokemonShinyIcon.on("pointerout", () => globalScene.ui.hideTooltip()); )
.on("pointerout", () => globalScene.ui.hideTooltip());
const newShiny = BigInt(1 << (pokemon.shiny ? 1 : 0)); const newShiny = BigInt(1 << (pokemon.shiny ? 1 : 0));
const newVariant = BigInt(1 << (pokemon.variant + 4)); const newVariant = BigInt(1 << (pokemon.variant + 4));