From ec30c8c9a0faffea3fe11d5132606b8f0cf4f387 Mon Sep 17 00:00:00 2001 From: shayebeadlingkl Date: Mon, 6 May 2024 14:53:23 -0400 Subject: [PATCH] some cleanup --- src/phases.ts | 1 - src/system/game-data.ts | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/phases.ts b/src/phases.ts index b45dfff60e5..7e5d72a2312 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -3543,7 +3543,6 @@ export class GameOverPhase extends BattlePhase { const speciesRibbonCount = this.scene.gameData.incrementRibbonCount(speciesId, forStarter); // first time classic win, award voucher if (speciesRibbonCount === 1) { - const rootSpeciesId = species.getRootSpeciesId(true); this.scene.pushPhase(new ModifierRewardPhase(this.scene, modifierTypes.VOUCHER)); } } diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 933f4259da1..98bd6bc3fa4 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -1086,20 +1086,20 @@ export class GameData { 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++; const ribbonsInStats: integer = this.scene.gameData.gameStats.ribbonsOwned; - if(ribbonsInStats >= 100) + if (ribbonsInStats >= 100) this.scene.validateAchv(achvs._100_RIBBONS); - if(ribbonsInStats >= 75) + if (ribbonsInStats >= 75) this.scene.validateAchv(achvs._75_RIBBONS); - if(ribbonsInStats >= 50) + if (ribbonsInStats >= 50) this.scene.validateAchv(achvs._50_RIBBONS); - if(ribbonsInStats >= 25) + if (ribbonsInStats >= 25) this.scene.validateAchv(achvs._25_RIBBONS); - if(ribbonsInStats >= 10) + if (ribbonsInStats >= 10) this.scene.validateAchv(achvs._10_RIBBONS); return ++this.starterData[speciesIdToIncrement].winCount;