[UI/UX][Beta] Show all ribbon descriptions (#6685)

fix ribbon description not showing
This commit is contained in:
Fabi 2025-10-23 23:51:25 +02:00 committed by GitHub
parent 08e6bba2db
commit 4acd39d703
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 66 additions and 13 deletions

View File

@ -6,7 +6,6 @@ import { ribbonFlagToAssetKey } from "#system/ribbons/ribbon-methods";
import type { MessageUiHandler } from "#ui/message-ui-handler"; import type { MessageUiHandler } from "#ui/message-ui-handler";
import { addWindow } from "#ui/ui-theme"; import { addWindow } from "#ui/ui-theme";
import { getAvailableRibbons, getRibbonKey } from "#utils/ribbon-utils"; import { getAvailableRibbons, getRibbonKey } from "#utils/ribbon-utils";
import { toCamelCase } from "#utils/strings";
import i18next from "i18next"; import i18next from "i18next";
export class RibbonTray extends Phaser.GameObjects.Container { export class RibbonTray extends Phaser.GameObjects.Container {
@ -98,7 +97,7 @@ export class RibbonTray extends Phaser.GameObjects.Container {
this.trayCursorObj.setPosition(5 + (cursor % this.maxColumns) * 18, 4 + Math.floor(cursor / this.maxColumns) * 17); this.trayCursorObj.setPosition(5 + (cursor % this.maxColumns) * 18, 4 + Math.floor(cursor / this.maxColumns) * 17);
const ribbonDescription = i18next.t(`ribbons:${toCamelCase(getRibbonKey(this.ribbons[cursor]))}`); const ribbonDescription = i18next.t(`ribbons:${getRibbonKey(this.ribbons[cursor])}`);
this.handler.showText(ribbonDescription); this.handler.showText(ribbonDescription);

View File

@ -91,27 +91,81 @@ export function getAvailableRibbons(species: PokemonSpecies): RibbonFlag[] {
export function getRibbonKey(flag: RibbonFlag): string { export function getRibbonKey(flag: RibbonFlag): string {
switch (flag) { switch (flag) {
case RibbonData.CLASSIC: case RibbonData.CLASSIC:
return "CLASSIC"; return "classic";
case RibbonData.NUZLOCKE: case RibbonData.NUZLOCKE:
return "NUZLOCKE"; return "nuzlocke";
case RibbonData.FRIENDSHIP: case RibbonData.FRIENDSHIP:
return "FRIENDSHIP"; return "friendship";
case RibbonData.FLIP_STATS: case RibbonData.FLIP_STATS:
return "FLIP_STATS"; return "flipStats";
case RibbonData.INVERSE: case RibbonData.INVERSE:
return "INVERSE"; return "inverse";
case RibbonData.FRESH_START: case RibbonData.FRESH_START:
return "FRESH_START"; return "freshStart";
case RibbonData.HARDCORE: case RibbonData.HARDCORE:
return "HARDCORE"; return "hardcore";
case RibbonData.LIMITED_CATCH: case RibbonData.LIMITED_CATCH:
return "LIMITED_CATCH"; return "limitedCatch";
case RibbonData.NO_HEAL: case RibbonData.NO_HEAL:
return "NO_HEAL"; return "noHeal";
case RibbonData.NO_SHOP: case RibbonData.NO_SHOP:
return "NO_SHOP"; return "noShop";
case RibbonData.NO_SUPPORT: case RibbonData.NO_SUPPORT:
return "NO_SUPPORT"; return "noSupport";
case RibbonData.MONO_NORMAL:
return "monoNormal";
case RibbonData.MONO_FIGHTING:
return "monoFighting";
case RibbonData.MONO_FLYING:
return "monoFlying";
case RibbonData.MONO_POISON:
return "monoPoison";
case RibbonData.MONO_GROUND:
return "monoGround";
case RibbonData.MONO_ROCK:
return "monoRock";
case RibbonData.MONO_BUG:
return "monoBug";
case RibbonData.MONO_GHOST:
return "monoGhost";
case RibbonData.MONO_STEEL:
return "monoSteel";
case RibbonData.MONO_FIRE:
return "monoFire";
case RibbonData.MONO_WATER:
return "monoWater";
case RibbonData.MONO_GRASS:
return "monoGrass";
case RibbonData.MONO_ELECTRIC:
return "monoElectric";
case RibbonData.MONO_PSYCHIC:
return "monoPsychic";
case RibbonData.MONO_ICE:
return "monoIce";
case RibbonData.MONO_DRAGON:
return "monoDragon";
case RibbonData.MONO_DARK:
return "monoDark";
case RibbonData.MONO_FAIRY:
return "monoFairy";
case RibbonData.MONO_GEN_1:
return "monoGen1";
case RibbonData.MONO_GEN_2:
return "monoGen2";
case RibbonData.MONO_GEN_3:
return "monoGen3";
case RibbonData.MONO_GEN_4:
return "monoGen4";
case RibbonData.MONO_GEN_5:
return "monoGen5";
case RibbonData.MONO_GEN_6:
return "monoGen6";
case RibbonData.MONO_GEN_7:
return "monoGen7";
case RibbonData.MONO_GEN_8:
return "monoGen8";
case RibbonData.MONO_GEN_9:
return "monoGen9";
default: default:
return ""; return "";
} }