mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-12 03:12:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup

Browse Source
This commit is contained in:
shayebeadlingkl 2024-05-06 14:53:23 -04:00
parent efccef9f1c
commit ec30c8c9a0
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/phases.ts
View File

@ -3543,7 +3543,6 @@ export class GameOverPhase extends BattlePhase {
const speciesRibbonCount = this.scene.gameData.incrementRibbonCount(speciesId, forStarter); const speciesRibbonCount = this.scene.gameData.incrementRibbonCount(speciesId, forStarter);
// first time classic win, award voucher // first time classic win, award voucher
if (speciesRibbonCount === 1) { if (speciesRibbonCount === 1) {
const rootSpeciesId = species.getRootSpeciesId(true);
this.scene.pushPhase(new ModifierRewardPhase(this.scene, modifierTypes.VOUCHER)); this.scene.pushPhase(new ModifierRewardPhase(this.scene, modifierTypes.VOUCHER));
} }
} }

12
src/system/game-data.ts
View File

@ -1086,20 +1086,20 @@ export class GameData {
this.starterData[speciesIdToIncrement].winCount = 0; this.starterData[speciesIdToIncrement].winCount = 0;
} }
if(this.starterData[speciesIdToIncrement].winCount === 0 || !this.starterData[speciesIdToIncrement].winCount) if (!this.starterData[speciesIdToIncrement].winCount)
this.scene.gameData.gameStats.ribbonsOwned++; this.scene.gameData.gameStats.ribbonsOwned++;
const ribbonsInStats: integer = this.scene.gameData.gameStats.ribbonsOwned; const ribbonsInStats: integer = this.scene.gameData.gameStats.ribbonsOwned;
if(ribbonsInStats >= 100) if (ribbonsInStats >= 100)
this.scene.validateAchv(achvs._100_RIBBONS); this.scene.validateAchv(achvs._100_RIBBONS);
if(ribbonsInStats >= 75) if (ribbonsInStats >= 75)
this.scene.validateAchv(achvs._75_RIBBONS); this.scene.validateAchv(achvs._75_RIBBONS);
if(ribbonsInStats >= 50) if (ribbonsInStats >= 50)
this.scene.validateAchv(achvs._50_RIBBONS); this.scene.validateAchv(achvs._50_RIBBONS);
if(ribbonsInStats >= 25) if (ribbonsInStats >= 25)
this.scene.validateAchv(achvs._25_RIBBONS); this.scene.validateAchv(achvs._25_RIBBONS);
if(ribbonsInStats >= 10) if (ribbonsInStats >= 10)
this.scene.validateAchv(achvs._10_RIBBONS); this.scene.validateAchv(achvs._10_RIBBONS);
return ++this.starterData[speciesIdToIncrement].winCount; return ++this.starterData[speciesIdToIncrement].winCount;