Nixyri/AntimatterDimensionsSourceCode
1
0
Fork 0
mirror of https://github.com/IvarK/AntimatterDimensionsSourceCode.git synced 2024-11-10 22:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2404 from IvarK/resolve-2403

Browse Source
This commit is contained in:
Waiting Idly 2022-03-25 11:33:29 -07:00 committed by GitHub
commit f0343fed0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js
View File

@ -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;
}
},

8
src/components/tabs/time-studies/DilationTimeStudy.vue
View File

@ -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;
}
}
}