From 87f55a8a1adddff38b95c383e2840a0fb3f3bfec Mon Sep 17 00:00:00 2001 From: Mumble <171087428+frutescens@users.noreply.github.com> Date: Fri, 30 Aug 2024 11:06:18 -0700 Subject: [PATCH] [Bug][Beta] Double vouchers fix (#3906) * The fix. * Ordinals.... * tsdocs.. * my forgetting * Fixed issues * Update src/phases/encounter-phase.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * The actual change * actual fixes * This should fix it... maybe --------- Co-authored-by: frutescens Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --- src/loading-scene.ts | 2 +- src/system/achv.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/loading-scene.ts b/src/loading-scene.ts index f4aa12c56c6..b086b0cb002 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -342,8 +342,8 @@ export class LoadingScene extends SceneBase { this.loadLoadingScreen(); - initVouchers(); initAchievements(); + initVouchers(); initStatsKeys(); initPokemonPrevolutions(); initBiomes(); diff --git a/src/system/achv.ts b/src/system/achv.ts index 5436cce24ab..de2862c2813 100644 --- a/src/system/achv.ts +++ b/src/system/achv.ts @@ -324,7 +324,7 @@ export const achvs = { HATCH_SHINY: new Achv("HATCH_SHINY", "", "HATCH_SHINY.description", "golden_egg", 100).setSecret(), HIDDEN_ABILITY: new Achv("HIDDEN_ABILITY", "", "HIDDEN_ABILITY.description", "ability_charm", 75), PERFECT_IVS: new Achv("PERFECT_IVS", "", "PERFECT_IVS.description", "blunder_policy", 100), - CLASSIC_VICTORY: new Achv("CLASSIC_VICTORY", "", "CLASSIC_VICTORY.description", "relic_crown", 150), + CLASSIC_VICTORY: new Achv("CLASSIC_VICTORY", "", "CLASSIC_VICTORY.description", "relic_crown", 150, c => c.gameData.gameStats.sessionsWon === 0), UNEVOLVED_CLASSIC_VICTORY: new Achv("UNEVOLVED_CLASSIC_VICTORY", "", "UNEVOLVED_CLASSIC_VICTORY.description", "eviolite", 175, c => c.getParty().some(p => p.getSpeciesForm(true).speciesId in pokemonEvolutions)), MONO_GEN_ONE_VICTORY: new ChallengeAchv("MONO_GEN_ONE", "", "MONO_GEN_ONE.description", "ribbon_gen1", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 1 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)), MONO_GEN_TWO_VICTORY: new ChallengeAchv("MONO_GEN_TWO", "", "MONO_GEN_TWO.description", "ribbon_gen2", 100, (c, scene) => c instanceof SingleGenerationChallenge && c.value === 2 && !scene.gameMode.challenges.some(c => c.id === Challenges.INVERSE_BATTLE && c.value > 0)),