Address other PR comments (last-feature-patch)

src/components/modals/StudyStringModal.vue

@@ -57,6 +57,7 @@ export default {
         firstPaths: makeEnumeration(importedTree.dimensionPaths),
         secondPaths: makeEnumeration(importedTree.pacePaths),
         ec: importedTree.ec,
+        startEC: importedTree.startEC,
         hasInfo: makeEnumeration(importedTree.dimensionPaths) || importedTree.ec > 0,
       };
     },
@@ -68,6 +69,12 @@ export default {
       const combinedTree = this.combinedTreeObject;
       const newStudiesArray = combinedTree.purchasedStudies
         .filter(s => !currentStudyTree.purchasedStudies.includes(s)).map(s => this.studyString(s));
+      // We can only immediately enter the imported EC if we aren't already in one, or are able to unlock it first.
+      // It's unlockable in two cases - none are currently unlocked, or it happens to already be unlocked. We check
+      // for no imported EC as well because this otherwise also evaluates to true if the imported tree has no EC
+      const ecData = player.challenge.eternity;
+      const canStartEC = ecData.current === 0 && [0, ecData.unlocked].includes(this.importedTree.ec) &&
+        this.importedTree.ec !== 0;
       return {
         timeTheorems: combinedTree.spentTheorems[0] - currentStudyTree.spentTheorems[0],
         spaceTheorems: combinedTree.spentTheorems[1] - currentStudyTree.spentTheorems[1],
@@ -76,6 +83,7 @@ export default {
         firstPaths: makeEnumeration(combinedTree.dimensionPaths),
         secondPaths: makeEnumeration(combinedTree.pacePaths),
         ec: combinedTree.ec,
+        startEC: combinedTree.startEC && canStartEC,
         hasInfo: makeEnumeration(combinedTree.dimensionPaths) || combinedTree.ec > 0,
       };
     },

src/components/modals/StudyTreeInfo.vue

@@ -36,7 +36,7 @@ export default {
       v-if="treeStatus.ec > 0"
       class="l-modal-import-tree__tree-info-line"
     >
-      Eternity Challenge: {{ treeStatus.ec }}
+      Eternity Challenge: {{ treeStatus.ec }} {{ treeStatus.startEC ? "(will start)" : "" }}
     </div>
   </div>
 </template>

src/components/modals/prestige/RealityModal.vue

@@ -76,7 +76,7 @@ export default {
       return ConfirmationTypes.glyphSelection.isUnlocked() ? "glyphSelection" : undefined;
     },
     canConfirm() {
-      return this.selectedGlyph !== undefined || this.hasFilter;
+      return this.firstReality || this.selectedGlyph !== undefined || this.hasFilter;
     }
   },
   created() {

src/components/tabs/eternity-challenges/EternityChallengeBoxWrapper.vue

@@ -70,6 +70,9 @@ export default {
         height: "3rem",
         background: "var(--color-good)",
         opacity: this.completionCount >= 5 ? 0 : 0.3,
+        "border-top-left-radius": "var(--var-border-radius, 1rem)",
+        "border-bottom-left-radius": "var(--var-border-radius, 1rem)",
+        "pointer-events": "none",
       };
     },
     buttonText() {

src/components/tabs/normal-achievements/NormalAchievement.vue

@@ -74,6 +74,14 @@ export default {
         "o-achievement__indicator--waiting": !this.isUnlocked && this.isPreRealityAchievement && !this.isDisabled,
       };
     },
+    rewardClassObject() {
+      return {
+        "o-achievement__reward": true,
+        "o-achievement__reward--disabled": this.isDisabled,
+        "o-achievement__reward--locked": !this.isUnlocked && !this.isPreRealityAchievement && !this.isDisabled,
+        "o-achievement__reward--waiting": !this.isUnlocked && this.isPreRealityAchievement && !this.isDisabled,
+      };
+    },
     isPreRealityAchievement() {
       return this.realityUnlocked && this.achievement.row <= 13;
     },
@@ -219,7 +227,7 @@ export default {
     </div>
     <div
       v-if="hasReward"
-      class="o-achievement__reward"
+      :class="rewardClassObject"
     >
       <i class="fas fa-star" />
     </div>
@@ -302,10 +310,25 @@ export default {
   bottom: 0;
   font-size: 1rem;
   color: black;
-  background: var(--color-accent);
-  border-top: var(--var-border-width, 0.2rem) solid var(--color-accent);
-  border-right: var(--var-border-width, 0.2rem) solid var(--color-accent);
+  background: #5ac467;
+  border-top: var(--var-border-width, 0.2rem) solid #127a20;
+  border-right: var(--var-border-width, 0.2rem) solid #127a20;
   border-top-right-radius: var(--var-border-radius, 0.8rem);
   border-bottom-left-radius: var(--var-border-radius, 0.6rem);
 }
+
+.o-achievement__reward--locked {
+  background: #a3a3a3;
+  border-color: var(--color-bad);
+}
+
+.o-achievement__reward--waiting {
+  background: #d1d161;
+  border-color: #acac39;
+}
+
+.o-achievement__reward--disabled {
+  background: var(--color-pelle--base);
+  border-color: var(--color-bad);
+}
 </style>

src/core/secret-formula/celestials/navigation.js

@@ -1770,10 +1770,10 @@ export const celestialNavigation = {
       legend: {
         text: complete => {
           if (complete < 1) return [
-            "Destabalize Lai'tela's Reality",
+            "Destabilize Lai'tela's Reality",
             "To the point where you cannot",
             "use any Dimensions",
-            `${format(Laitela.difficultyTier)} / ${format(8)}`
+            `${format(Laitela.difficultyTier)} / ${format(8)} Dimensions disabled`
           ];
           return [
             "Completely destabilized",

src/core/time-studies/time-study-tree.js

@@ -307,11 +307,11 @@ export class TimeStudyTree {
     return ecStudies ? ecStudies.id : 0;
   }
 
-  // Creates an export string based on all currently purchased studies
+  // Creates an export string based on all currently purchased studies; gives an ! at the end if currently in an EC
   get exportString() {
     return `${this.purchasedStudies
       .filter(s => s instanceof NormalTimeStudyState)
       .map(s => s.id)
-      .join(",")}|${this.ec}`;
+      .join(",")}|${this.ec}${player.challenge.eternity.current === 0 ? "" : "!"}`;
   }
 }

src/game.js

@@ -1106,7 +1106,7 @@ function animateTweens(time) {
   let delta = time - lastFrame;
   lastFrame = time;
   if (player.dilation.active) {
-    delta /= 10;
+    delta /= Pelle.isDoomed ? 1.5 : 10;
   }
   tweenTime += delta;
   TWEEN.update(tweenTime);