From 114c13f16249b00fbd80aa72a98179a3b4affc5f Mon Sep 17 00:00:00 2001 From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com> Date: Fri, 25 Mar 2022 10:58:25 -0700 Subject: [PATCH] resolve #2403 --- .../eternity/time-studies/dilation-time-studies.js | 4 ++-- src/components/tabs/time-studies/DilationTimeStudy.vue | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js b/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js index d4dd3c342..b7f00a5d8 100644 --- a/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js +++ b/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js @@ -6,8 +6,9 @@ GameDatabase.eternity.timeStudies.dilation = [ description: "Unlock Time Dilation", cost: 5000, requirement: () => { + const ttRequirement = Currency.timeTheorems.max.gte(TimeStudy.dilation.totalTimeTheoremRequirement); if (Ra.has(RA_UNLOCKS.AUTO_DILATION_UNLOCK) && - Currency.timeTheorems.max.gte(TimeStudy.dilation.totalTimeTheoremRequirement) && + ttRequirement && !isInCelestialReality() && !Pelle.isDoomed ) { return true; @@ -15,7 +16,6 @@ GameDatabase.eternity.timeStudies.dilation = [ const tsRequirement = [231, 232, 233, 234].some(id => TimeStudy(id).isBought); if (Perk.bypassECDilation.isBought && !Pelle.isDoomed) return tsRequirement; const ecRequirement = EternityChallenge(11).isFullyCompleted && EternityChallenge(12).isFullyCompleted; - const ttRequirement = Currency.timeTheorems.max.gte(TimeStudy.dilation.totalTimeTheoremRequirement); return tsRequirement && ecRequirement && ttRequirement; } }, diff --git a/src/components/tabs/time-studies/DilationTimeStudy.vue b/src/components/tabs/time-studies/DilationTimeStudy.vue index 5d4555dd2..90bcca438 100644 --- a/src/components/tabs/time-studies/DilationTimeStudy.vue +++ b/src/components/tabs/time-studies/DilationTimeStudy.vue @@ -28,7 +28,7 @@ export default { return this.study.id; }, requirement() { - if (this.id === 1 && (Pelle.isDoomed && !PlayerProgress.dilationUnlocked())) { + if (this.id === 1) { return `Requirement: ${formatInt(5)} EC11 and EC12 completions and ${formatInt(this.maxTT)}/${formatInt(TimeStudy.dilation.totalTimeTheoremRequirement)} total Time Theorems`; @@ -44,10 +44,10 @@ export default { update() { if (this.id === 1) { this.maxTT.copyFrom(Currency.timeTheorems.max); - this.showRequirement = !this.study.isBought && !Perk.bypassECDilation.isBought || Pelle.isDoomed; + this.showRequirement = !this.study.isBought && (!Perk.bypassECDilation.isBought || Pelle.isDoomed); } - if (this.id === 6 && !Pelle.isDoomed) { - this.showRequirement = true; + if (this.id === 6) { + this.showRequirement = !Pelle.isDoomed; } } }