mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-12-16 23:05:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Bug][UI/UX] Display no heal and no shop ribbon if no support is unlocked (#6715)

Browse Source 
* New condition to display ribbons

* Added TODO comment
This commit is contained in:
Wlowscha 2025-10-30 20:04:25 +01:00 committed by GitHub
parent 24e9dcdadc
commit e5154850c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ui/containers/ribbon-tray-container.ts
View File

@ -115,10 +115,17 @@ export class RibbonTray extends Phaser.GameObjects.Container {
const availableRibbons = getAvailableRibbons(species); const availableRibbons = getAvailableRibbons(species);
const availableOrderedRibbons = orderedRibbons.filter(r => availableRibbons.includes(r)); const availableOrderedRibbons = orderedRibbons.filter(r => availableRibbons.includes(r));
const hasWonClassic = globalScene.gameData.starterData[species.speciesId]?.classicWinCount > 0; // Classic win count (always 0 for evolutions)
const classicWinCount = globalScene.gameData.starterData[species.speciesId]?.classicWinCount ?? 0;
for (const ribbon of availableOrderedRibbons) { for (const ribbon of availableOrderedRibbons) {
const hasRibbon = this.ribbonData.has(ribbon) || (ribbon === RibbonData.CLASSIC && hasWonClassic); // TODO: eventually, write a save migrator to fix the ribbon save data and get rid of these two conditions
// Display classic ribbons for starters with at least one classic win
const overrideClassicRibbon = ribbon === RibbonData.CLASSIC && classicWinCount > 0;
// Display no heal and no shop ribbons for mons that have the no support ribbon
const overrideNoSupportRibbons =
(ribbon === RibbonData.NO_HEAL || ribbon === RibbonData.NO_SHOP) && this.ribbonData.has(RibbonData.NO_SUPPORT);
const hasRibbon = this.ribbonData.has(ribbon) || overrideClassicRibbon || overrideNoSupportRibbons;
if (!hasRibbon && !globalScene.dexForDevs && !globalScene.showMissingRibbons) { if (!hasRibbon && !globalScene.dexForDevs && !globalScene.showMissingRibbons) {
continue; continue;