Last Major Bugfix

.eslintrc.json

@@ -189,7 +189,7 @@
     "max-len": [
       "warn",
       {
-        "code": 120
+        "code": 140
       }
     ],
     "max-params": "warn",

public/stylesheets/styles.css

@@ -18,7 +18,7 @@
 }
 
 ::-webkit-scrollbar-corner {
   -webkit-appearance: none;
   appearance: none;
 }
 
@@ -72,7 +72,7 @@
   --color-bad: #b84b5f;
   --color-gh-purple: #8957e5;
   --color-notification: red;
   --color-overlay: rgba(30, 30, 50, 70%);
 
   --color-antimatter: #2196f3;
   --color-infinity: #b67f33;
@@ -132,7 +132,7 @@
   --color-disabled: #37474f;
   --color-accent: #1256a3;
   --color-notification: yellow;
   --color-overlay: rgba(60, 60, 100, 50%);
 
   --color-infinity: #ff9800;
   --color-reality-dark: #0ba00e;
@@ -154,7 +154,7 @@
   --color-good-dark: #2e7d32;
   --color-bad: #e53935;
   --color-notification: yellow;
   --color-overlay: rgba(60, 60, 100, 50%);
 
   --color-infinity: #ff9800;
   --color-eternity: #673ab7;
@@ -176,7 +176,7 @@
   --color-disabled: #2d2421;
   --color-accent: #2fa6f7;
   --color-notification: yellow;
   --color-overlay: rgba(60, 60, 100, 50%);
 
   --color-reality-dark: #0ba00e;
   --color-prestige--accent: black;
@@ -194,7 +194,7 @@
   --color-disabled: #2d2421;
   --color-accent: #2fa6f7;
   --color-notification: yellow;
   --color-overlay: rgba(60, 60, 100, 50%);
 
   --color-infinity: #ff9800;
   --color-eternity: #673ab7;
@@ -248,7 +248,7 @@
   --color-good: #2f9e35;
   --color-good-dark: #08510b;
   --color-notification: yellow;
   --color-overlay: rgba(60, 60, 100, 50%);
 
   --color-prestige--accent: black;
 
@@ -264,7 +264,7 @@
   --color-base: black;
   --color-accent: #fbc21b;
   --color-notification: yellow;
   --color-overlay: rgba(60, 60, 100, 50%);
 
   --color-prestige--accent: black;
 
@@ -691,7 +691,7 @@
   border: var(--var-border-width, 0.2rem) solid var(--color-accent);
   border-radius: var(--var-border-radius, 0.4rem);
   transition-duration: 0.2s;
   -webkit-user-select: none;
   user-select: none;
   cursor: pointer;
 }
@@ -916,7 +916,7 @@
   background-color: #fdd3b0;
   border: var(--var-border-width, 0.2rem) solid sandybrown;
   border-radius: var(--var-border-radius, 0.5rem);
   box-shadow: 0 0 2rem inset rgba(244, 164, 96, 50%);
   margin-right: 0.5rem;
   transition-duration: 0.2s;
 }
@@ -926,7 +926,7 @@
 }
 
 [draggable] {
   -webkit-user-select: none;
   user-select: none;
 
   /* Required to make elements draggable in old WebKit */
@@ -1253,7 +1253,7 @@
 @media print,
   screen and (max-width: 720px) {
   body {
     word-wrap: break-word;
   }
 
   header {
@@ -1542,7 +1542,7 @@
  *******/
 
 .c-game-ui {
   overflow-x: hidden;
   overflow-y: auto;
   width: 100%;
   /* stylelint-disable-next-line unit-allowed-list */
@@ -2515,7 +2515,7 @@
   font-size: 1.6rem;
   color: black;
   pointer-events: all;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -2649,7 +2649,7 @@
 
 .t-metro .c-infinity-dim-description__accent,
 .t-s8 .c-infinity-dim-description__accent {
   text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem black;
 }
 
 .t-dark .c-infinity-dim-description__accent,
@@ -2694,7 +2694,7 @@
 
 .t-metro .c-time-dim-description__accent,
 .t-s8 .c-time-dim-description__accent {
   text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem black;
 }
 
 .t-dark .c-time-dim-description__accent,
@@ -2781,7 +2781,7 @@
 }
 
 .c-options-grid__notations {
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -2902,7 +2902,7 @@
   flex-direction: row;
   justify-content: center;
   align-items: baseline;
   -webkit-user-select: none;
   user-select: none;
   cursor: pointer;
 }
@@ -3004,7 +3004,7 @@
   border: var(--var-border-width, 0.2rem) solid;
   border-radius: var(--var-border-radius, 0.8rem);
   margin: 0 auto;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -3264,7 +3264,7 @@
   justify-content: center;
   font-size: 1.5rem;
   margin-top: 0.6rem;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -3353,7 +3353,7 @@
   justify-content: flex-start;
   align-items: center;
   margin: 0 1rem;
   -webkit-user-select: none;
   user-select: none;
   cursor: pointer;
 }
@@ -4101,7 +4101,7 @@
   flex-direction: row;
   justify-content: center;
   align-items: center;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -4119,7 +4119,7 @@
   border-top-right-radius: var(--var-border-radius, 0.3rem);
   border-bottom-left-radius: var(--var-border-radius, 1rem);
   transition-duration: 0.2s;
   -webkit-user-select: none;
   user-select: none;
   cursor: pointer;
 }
@@ -4597,7 +4597,7 @@
 
 .t-metro .c-replicanti-description__accent,
 .t-s8 .c-replicanti-description__accent {
   text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem black;
 }
 
 .t-dark .c-replicanti-description__accent,
@@ -4963,7 +4963,7 @@
 .t-s8 .c-dilation-tab__dilated-time-income,
 .t-s8 .c-dilation-tab__galaxy-threshold,
 .t-s8 .c-dilation-tab__galaxies {
   text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem black;
 }
 
 .t-metro .c-dilation-tab__dilated-time,
@@ -5141,7 +5141,7 @@
 /* #region Modals */
 
 @keyframes a-modal-overlay-fadein {
   from { background-color: rgba(0, 0, 0, 0%); }
   to { background-color: var(--color-overlay); }
 }
 
@@ -5239,7 +5239,7 @@
   border: var(--var-border-width, 0.3rem) solid black;
   border-radius: var(--var-border-radius, 0.3rem);
   transition-duration: 0.2s;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -5345,7 +5345,7 @@
 .t-dark h3,
 .t-dark-metro h3 {
   color: #999999;
   text-shadow: -0.1rem 0.1rem 0 rgba(0, 0, 0, 50%);
 }
 
 /* #endregion t-dark t-dark-metro */
@@ -5900,7 +5900,7 @@
   margin: 0 10rem 1rem;
   padding: 1rem;
   transition-duration: 0.15s;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -6069,7 +6069,7 @@
   color: black;
   background-color: var(--color-effarig--base);
   border: var(--var-border-width, 0.2rem) solid black;
   box-shadow: 0.1rem 0.1rem 0.3rem rgba(0, 0, 0, 70%);
   cursor: default;
 }
 
@@ -6102,7 +6102,7 @@
   font-size: 10rem;
   font-weight: bold;
   transition-duration: 0.2s;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -6161,12 +6161,12 @@
 
 .c-effarig-run-button__inner--running {
   position: relative;
   -webkit-background-clip: text;
   background-clip: text;
   background-image: url("../images/noise.png");
   animation: a-effarig-run-button--running-noise 15s infinite alternate;
 
   -webkit-text-fill-color: rgba(255, 0, 0, 50%);
 }
 
 .c-effarig-run-button__inner--running::after {
@@ -6181,83 +6181,83 @@
 
 @keyframes a-effarig-run-button--running-noise {
   0% {
     -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   20% {
     background-position: -50px 0;
 
     -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   22% {
     background-position: 100px -10px;
 
     -webkit-text-fill-color: rgba(255, 0, 0, 50%);
   }
 
   24% {
     background-position: 0 -150px;
 
     -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   50% {
     background-position: -50px 0;
 
     -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   51% {
     background-position: 100px -10px;
 
     -webkit-text-fill-color: rgba(255, 0, 0, 50%);
   }
 
   52% {
     background-position: 0 -150px;
 
     -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   54% {
     background-position: 50px 0;
 
     -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   56% {
     background-position: -100px 10px;
 
     -webkit-text-fill-color: rgba(255, 0, 0, 50%);
   }
 
   58% {
     background-position: 0 50px;
 
     -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   90% {
     background-position: 50px 50px;
 
     -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   91% {
     background-position: 100px -110px;
 
     -webkit-text-fill-color: rgba(255, 0, 0, 50%);
   }
 
   92% {
     background-position: 0 70px;
 
     -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   100% {
     -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 }
 
@@ -6303,7 +6303,7 @@
 
 .l-effarig-run-button__fg {
   position: relative;
   background-color: rgba(0, 0, 0, 0%);
 }
 
 .l-effarig-shop {
@@ -6426,7 +6426,7 @@
   background-color: #fdd3b0;
   border: var(--var-border-width, 0.2rem) solid sandybrown;
   border-radius: var(--var-border-radius, 0.5rem);
   box-shadow: 0 0 2rem inset rgba(244, 164, 96, 50%);
   margin: 1rem 0.5rem;
   padding: 0.5rem;
   padding-top: 1rem;
@@ -6504,7 +6504,7 @@
   margin-top: 1rem;
   margin-bottom: 3rem;
   padding: 2rem 1rem;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -6545,7 +6545,7 @@
 .c-enslaved-run-button__icon__sigil {
   position: absolute;
   top: -3.7rem;
-  right: -0.2rem;
+  right: -0.45rem;
   font-size: 14.8rem;
   transform: rotate(45deg);
 }
@@ -6555,16 +6555,16 @@
   position: absolute;
   background-image:
     linear-gradient(
       rgba(0, 0, 0, 0%) 0%,
       var(--color-enslaved--base) 20%,
       var(--color-enslaved--base) 80%,
       rgba(0, 0, 0, 0%) 100%
     );
   border: none;
 }
 
 .c-enslaved-run-button__icon:hover .c-enslaved-run-button__icon__glitch {
   background-image: linear-gradient(rgba(0, 0, 0, 0%) 0%, black 20%, black 80%, rgba(0, 0, 0, 0%) 100%);
 }
 
 @keyframes a-enslaved-run-button--spin {
@@ -6710,7 +6710,7 @@
   border-radius: var(--var-border-radius, 0.5rem);
   margin: 0 0.5rem;
   padding: 1rem;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -6734,7 +6734,7 @@
   justify-content: center;
   align-items: center;
   transform: skewY(-30deg) rotate(60deg);
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -6925,7 +6925,7 @@
   color: white;
   border-left: 0.1rem solid white;
   padding: 0 0.2rem;
   -webkit-user-select: none;
   user-select: none;
   cursor: default;
 }
@@ -7024,9 +7024,9 @@
   background: #222222;
   border: 0.1rem solid #111111;
   border-radius: var(--var-border-radius, 50%);
   box-shadow: 0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 70%);
   margin: 0 0.3rem;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -7288,7 +7288,7 @@
   background: #222222;
   border: 0.1rem solid black;
   border-radius: var(--var-border-radius, 0.8rem);
   box-shadow: 0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 70%);
   margin-left: 0;
   padding: 0.4rem;
   transition-duration: 0.3s;
@@ -7614,7 +7614,7 @@
   margin-top: -1.5rem;
   margin-left: -1.5rem;
   transition: all 0.2s, z-index 0s;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -7709,7 +7709,7 @@
   color: black;
   border: var(--var-border-width, 0.2rem) solid #292929;
   margin-left: -0.2rem;
   -webkit-user-select: none;
   user-select: none;
   cursor: pointer;
 }
@@ -8008,7 +8008,7 @@
 }
 
 .l-singularity-milestone-modal-container-outer {
   overflow-x: hidden;
   overflow-y: scroll;
   height: 50rem;
 }
@@ -8281,7 +8281,7 @@
 .l-glyph-levels-and-weights__adjust-outline::after {
   content: "";
   position: absolute;
   top: -0.5rem;
   right: -0.5rem;
   bottom: -0.5rem;
   left: -0.5rem;
@@ -8422,7 +8422,7 @@
   font-size: 1rem;
   border: 0.1rem solid;
   border-radius: var(--var-border-radius, 50%);
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -8703,7 +8703,7 @@
   border: 0.1rem solid var(--color-blockmator-block-border);
   border-radius: var(--var-border-radius, 0.5rem);
   padding: 0 1rem;
   -webkit-user-select: none;
   user-select: none;
   cursor: grab;
 }
@@ -8849,10 +8849,10 @@
   position: relative;
   border: var(--var-border-width, 0.2rem) solid black;
   border-radius: var(--var-border-radius, 0.4rem);
   -webkit-user-select: none;
   user-select: none;
 
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
   touch-action: pan-y;
   -webkit-user-drag: none;
 }
@@ -8861,10 +8861,10 @@
   width: 100%;
   height: 100%;
   position: relative;
   -webkit-user-select: none;
   user-select: none;
 
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
   touch-action: none;
   -webkit-user-drag: none;
 }
@@ -8908,7 +8908,7 @@
 
 .c-h2p-title {
   font-size: 3rem;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -9208,13 +9208,13 @@
 
 .o-no-mouse {
   pointer-events: none;
   -webkit-user-select: none;
   user-select: none;
 }
 
 .tooltiptext {
   pointer-events: none;
   -webkit-user-select: none;
   user-select: none;
 }
 
@@ -9282,7 +9282,7 @@
   border-radius: var(--var-border-radius, 0.5rem);
   margin: 1rem;
   padding: 1rem;
   -webkit-user-select: none;
   user-select: none;
 }
 

src/components/DescriptionDisplay.vue

@@ -26,6 +26,11 @@ export default {
       type: String,
       required: false,
       default: ""
+    },
+    numberPrefixed: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data() {
@@ -56,7 +61,7 @@ export default {
         const description = config?.description;
         // Descriptions in config entries are occasionally used both as standalone statements and mid-sentence,
         // so we explicitly capitalize them here because this only shows up in standalone places
-        const capitalize = str => str.charAt(0).toUpperCase() + str.slice(1);
+        const capitalize = str => (this.numberPrefixed ? str : str.charAt(0).toUpperCase() + str.slice(1));
         this.isVisible = description !== undefined;
         if (!this.isVisible) return;
 

src/components/EffectDisplay.vue

@@ -32,7 +32,8 @@ export default {
       // Number.MAX_VALUE doesn't really matter here, but we need it because
       // undefined values are not allowed for data properties
       cap: Number.MAX_VALUE,
-      hasCap: false
+      hasCap: false,
+      effect: ""
     };
   },
   computed: {
@@ -46,7 +47,10 @@ export default {
       return `${this.reachedCap && !this.ignoreCapped ? "Capped" : this.label}: `;
     },
     effectDisplay() {
-      return this.formatEffect(this.reachedCap ? this.cap : this.effectValue);
+      if (this.effectValue || this.reachedCap)
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.effect = this.formatEffect(this.reachedCap ? this.cap : this.effectValue);
+      return this.effect;
     }
   },
   watch: {
@@ -60,6 +64,7 @@ export default {
         this.isVisible = effect !== undefined && formatEffect !== undefined;
         if (!this.isVisible) return;
         this.formatEffect = formatEffect;
+        this.effectValue = undefined;
 
         if (isNumber(effect)) {
           this.effectValue = effect;

src/components/modals/GlyphShowcasePanelEntry.vue

@@ -80,10 +80,10 @@ export default {
       };
     },
     rarityStyle() {
-      // Rarity is handled differently here than usual because this is in contrast with the theme BG, not the glyph BG
+      // Glyph colors were dealt to contrast the background, but that should never be an issue
       const color = CosmeticGlyphTypes[this.glyph.type].ignoreRarityColor
         ? GlyphAppearanceHandler.getBorderColor(this.type)
-        : getRarity(this.glyph.strength)[Theme.current().isDark() ? "darkColor" : "lightColor"];
+        : GlyphAppearanceHandler.getRarityColor(this.glyph.strength, this.type);
       return {
         color,
         "font-weight": "bold"

src/components/modals/challenges/EternityChallengeStartModal.vue

@@ -42,6 +42,11 @@ export default {
       if (typeof conditionOfChallenge === "function") {
         conditionOfChallenge = conditionOfChallenge();
       }
+      if (this.challenge._config.scrambleText) {
+        conditionOfChallenge = conditionOfChallenge
+          .replace("*", this.challenge._config.scrambleText[1]);
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+      }
       return `Inside this Eternity Challenge, ${conditionOfChallenge}`;
     }
   },

src/components/modals/prestige/BigCrunchModal.vue

@@ -17,7 +17,7 @@ export default {
   },
   computed: {
     isFirstInfinity() {
-      return !PlayerProgress.infinityUnlocked();
+      return !PlayerProgress.infinityUnlocked() && player.records.fullGameCompletions === 0;
     },
     message() {
       const info = this.isFirstInfinity ? this.firstInfinityInfo : ``;

src/components/modals/time-study-modal-preview/PseudoTimeStudyButton.vue

@@ -86,7 +86,8 @@
   methods: {
     update() {
       const study = this.study;
-      this.isUseless = Pelle.uselessTimeStudies.includes(this.study.id) && Pelle.isDoomed;
+      const isCurrentlyUseless = this.study.id === 192 && Pelle.isDoomed && PelleRifts.vacuum.milestones[1];
+      this.isUseless = Pelle.isDoomed && (isCurrentlyUseless || Pelle.uselessTimeStudies.includes(this.study.id));
       this.isBought = ForceBoughtState.getState(this.forceIsBought, study.isBought);
       this.doomedRealityStudy = study.type === TIME_STUDY_TYPE.DILATION && study.id === 6 && Pelle.isDoomed;
     },
@@ -133,7 +134,7 @@
   position: absolute;
   top: 0;
   left: 0;
-  background: rgba(255, 214, 11, 0.8);
+  background: rgb(255, 214, 11, 0.8);
   border-radius: var(--var-border-radius, inherit);
   animation: a-new-import 3s infinite;
 }

src/components/tabs/antimatter-dimensions/AntimatterDimensionProgressBar.vue

@@ -34,8 +34,8 @@ export default {
       // than normal and therefore default filling won't be meaningful. Since challenges get completed or abandoned from
       // the inside outwards, we show the goals in that priority as well. It only makes sense to check cel6 and not the
       // others because pre-cel3 completion it'll default to e4000 and cel4/5 don't have meaningful single goals
-      const inSpecialRun = Player.isInAntimatterChallenge || EternityChallenge.isRunning || player.dilation.active ||
-        Laitela.isRunning;
+      const inSpecialRun = Player.isInAntimatterChallenge || EternityChallenge.isRunning ||
+      (player.dilation.active && !Pelle.isDoomed) || Laitela.isRunning;
       if (inSpecialRun) {
         if (Player.isInAntimatterChallenge) {
           setProgress(Currency.antimatter.value, Player.antimatterChallenge.goal, "Percentage to Challenge goal");

src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue

@@ -39,8 +39,10 @@ export default {
     buttonText() {
       if (this.lockText !== null) return this.lockText;
       const reset = [];
-      if (!Achievement(111).isUnlocked) reset.push("Dimensions");
-      if (!Achievement(143).isUnlocked) reset.push("Dimension Boosts");
+      // eslint-disable-next-line max-len
+      if (!Achievement(111).isEffectActive && !PelleUpgrade.dimBoostResetsNothing.canBeApplied) reset.push("Dimensions");
+      // eslint-disable-next-line max-len
+      if (!Achievement(143).isEffectActive && !PelleUpgrade.galaxyNoResetDimboost.canBeApplied) reset.push("Dimension Boosts");
       return reset.length === 0
         ? `Increase the power of Tickspeed upgrades`
         : `Reset your ${makeEnumeration(reset)} to increase the power of Tickspeed upgrades`;

src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue

@@ -86,11 +86,13 @@ export default {
 
       this.multiplierText = `Buy 10 Dimension purchase multiplier: ${formatX(this.buy10Mult, 2, 2)}`;
       if (!isSacrificeUnlocked) return;
-      this.isFullyAutomated = Autobuyer.sacrifice.isActive && Achievement(118).isUnlocked;
-      this.isSacrificeAffordable = Sacrifice.canSacrifice && !this.isFullyAutomated;
+      this.isFullyAutomated = Autobuyer.sacrifice.isActive && Achievement(118).isEffectActive &&
+      Sacrifice.meetsNonBoostConditions;
+      this.isSacrificeAffordable = this.isFullyAutomated || Sacrifice.canSacrifice;
       this.currentSacrifice.copyFrom(Sacrifice.totalBoost);
       this.sacrificeBoost.copyFrom(Sacrifice.nextBoost);
-      this.disabledCondition = Sacrifice.disabledCondition;
+      this.disabledCondition = this.isFullyAutomated ? Sacrifice.nonBoostDisabledCondition
+        : Sacrifice.disabledCondition;
       const sacText = this.isSacrificeUnlocked
         ? ` | Dimensional Sacrifice multiplier: ${formatX(this.currentSacrifice, 2, 2)}`
         : "";
@@ -116,10 +118,10 @@ export default {
         class="o-primary-btn--sacrifice"
         @click="sacrifice"
       >
-        <span v-if="isSacrificeAffordable">Dimensional Sacrifice ({{ formatX(sacrificeBoost, 2, 2) }})</span>
-        <span v-else-if="isFullyAutomated && disabledCondition !== ''">
+        <span v-if="isFullyAutomated">
           Dimensional Sacrifice is Automated (Achievement 118)
         </span>
+        <span v-else-if="isSacrificeAffordable">Dimensional Sacrifice ({{ formatX(sacrificeBoost, 2, 2) }})</span>
         <span v-else>Dimensional Sacrifice Disabled ({{ disabledCondition }})</span>
       </PrimaryButton>
       <button

src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue

@@ -34,8 +34,10 @@ export default {
     buttonText() {
       if (this.lockText !== null) return this.lockText;
       const reset = [];
-      if (!Achievement(111).isUnlocked) reset.push("Dimensions");
-      if (!Achievement(143).isUnlocked) reset.push("Dimension Boosts");
+      // eslint-disable-next-line max-len
+      if (!Achievement(111).isEffectActive && !PelleUpgrade.dimBoostResetsNothing.canBeApplied) reset.push("Dimensions");
+      // eslint-disable-next-line max-len
+      if (!Achievement(143).isEffectActive && !PelleUpgrade.galaxyNoResetDimboost.canBeApplied) reset.push("Dimension Boosts");
       return reset.length === 0
         ? `Increase the power of Tickspeed upgrades`
         : `Reset your ${makeEnumeration(reset)} to increase the power of Tickspeed upgrades`;

src/components/tabs/celestial-pelle/PelleUpgrade.vue

@@ -96,7 +96,7 @@ export default {
       this.galaxyCap = GalaxyGenerator.generationCap;
       const genDB = GameDatabase.celestials.pelle.galaxyGeneratorUpgrades;
       this.notAffordable = (this.config === genDB.additive || this.config === genDB.multiplicative) &&
-        (Decimal.gt(this.upgrade.cost, this.galaxyCap - GalaxyGenerator.generatedGalaxies + player.galaxies));
+        (Decimal.gt(this.upgrade.cost, this.galaxyCap - GalaxyGenerator.spentGalaxies + player.galaxies));
     },
     secondsUntilCost(rate) {
       const value = this.galaxyGenerator ? player.galaxies + GalaxyGenerator.galaxies : Currency.realityShards.value;

src/components/tabs/imaginary-upgrades/ImaginaryUpgradeButton.vue

@@ -38,6 +38,9 @@ export default {
     config() {
       return this.upgrade.config;
     },
+    prefixedWithNumber() {
+      return Boolean(this.config.prefixedNumber);
+    },
     classObject() {
       return {
         "c-reality-upgrade-btn--useless": this.upgrade.pelleDisabled,
@@ -113,6 +116,7 @@ export default {
           <br>
           <DescriptionDisplay
             :config="requirementConfig"
+            :number-prefixed="prefixedWithNumber"
             label="Requirement:"
             class="c-reality-upgrade-btn__requirement"
           />

src/components/tabs/past-prestige-runs/PastPrestigeRunsContainer.vue

@@ -169,7 +169,7 @@ export default {
       return `${format(run[2], 2)} ${this.points}`;
     },
     prestigeCountGain(run) {
-      return quantify(this.singular, run[3]);
+      return quantify(this.singular, run[3], 2, 1);
     },
     prestigeCurrencyRate(run) {
       if (this.hasIM && this.layer.name === "Reality") return "N/A";
@@ -302,4 +302,4 @@ export default {
 .l-no-records {
   height: 5.4rem;
 }
-</style>
+</style>

src/components/tabs/reality-upgrades/RealityUpgradeButton.vue

@@ -38,6 +38,9 @@ export default {
     config() {
       return this.upgrade.config;
     },
+    prefixedWithNumber() {
+      return Boolean(this.config.prefixedNumber);
+    },
     classObject() {
       return {
         "c-reality-upgrade-btn--useless": this.isUseless,
@@ -106,6 +109,7 @@ export default {
           <br>
           <DescriptionDisplay
             :config="requirementConfig"
+            :number-prefixed="prefixedWithNumber"
             label="Requirement:"
             class="c-reality-upgrade-btn__requirement"
           />

src/components/tabs/replicanti/ReplicantiTab.vue

@@ -150,7 +150,7 @@ export default {
       this.hasIPMult = AlchemyResource.exponential.amount > 0 && !this.isDoomed;
       this.multIP = Replicanti.amount.powEffectOf(AlchemyResource.exponential);
       this.isUncapped = PelleRifts.vacuum.milestones[1].canBeApplied;
-      this.hasRaisedCap = EffarigUnlock.infinity.isUnlocked && !this.isUncapped;
+      this.hasRaisedCap = EffarigUnlock.infinity.isUnlocked && !this.isDoomed;
       this.replicantiCap.copyFrom(replicantiCap());
       if (this.hasRaisedCap) {
         const mult = this.replicantiCap.div(Decimal.NUMBER_MAX_VALUE);
@@ -201,7 +201,7 @@ export default {
     </PrimaryButton>
     <template v-else>
       <div
-        v-if="isDoomed"
+        v-if="isUncapped"
         class="modified-cap"
       >
         Your Replicanti cap has been removed due to the second {{ scrambledText }} milestone.

src/components/ui-modes/modern/ModernSidebarCurrency.vue

@@ -5,7 +5,9 @@
     return {
       sidebarID: 0,
       resourceName: "",
-      resourceValue: new Decimal(0)
+      resourceValue: new Decimal(0),
+      fullGameCompletions: 0,
+      hasInit: false
     };
   },
   computed: {
@@ -26,6 +28,14 @@
   },
   methods: {
     update() {
+      if (!this.hasInit) {
+        this.fullGameCompletions = player.records.fullGameCompletions;
+        this.hasInit = true;
+      }
+      if (this.fullGameCompletions !== player.records.fullGameCompletions) {
+        player.options.sidebarResourceID = 2;
+        this.fullGameCompletions = player.records.fullGameCompletions;
+      }
       this.sidebarID = player.options.sidebarResourceID;
       this.resourceName = this.resource.resourceName ?? this.resource.optionName;
       this.resourceValue.copyFrom(this.resource.value());
@@ -94,7 +104,7 @@
 
 .c-sidebar-resource:last-child {
   border-bottom-right-radius: var(--var-border-radius, 0.5rem);
 }
 
 .c-sidebar-resource h2 {
   z-index: 1;

src/core/automator/automator-backend.js

@@ -799,6 +799,7 @@ export const AutomatorBackend = {
     // program flow to do something else other than simply advancing to the next line
     switch (this.runCurrentCommand()) {
       case AUTOMATOR_COMMAND_STATUS.NEXT_TICK_SAME_INSTRUCTION:
+      case AUTOMATOR_COMMAND_STATUS.SAME_INSTRUCTION:
         break;
       case AUTOMATOR_COMMAND_STATUS.HALT:
         this.stop();
@@ -964,6 +965,7 @@ export const AutomatorBackend = {
     this.state.mode = AUTOMATOR_MODE.PAUSE;
   },
 
+  // eslint-disable-next-line no-shadow
   start(scriptID = this.state.topLevelScript, initialMode = AUTOMATOR_MODE.RUN, compile = true) {
     // Automator execution behaves oddly across new games, so we explicitly stop it from running if not unlocked
     if (!Player.automatorUnlocked) return;
@@ -1030,6 +1032,9 @@ export const AutomatorBackend = {
       this._data = [];
       player.reality.automator.state.stack.length = 0;
     },
+    forEach(fn) {
+      this._data.forEach(fn);
+    },
     initializeFromSave(commands) {
       this._data = [];
       const playerStack = player.reality.automator.state.stack;

src/core/automator/automator-commands.js

@@ -9,10 +9,14 @@
 
 function prestigeNotify(flag) {
   if (!AutomatorBackend.isOn) return;
-  const state = AutomatorBackend.stack.top.commandState;
-  if (state && state.prestigeLevel !== undefined) {
-    state.prestigeLevel = Math.max(state.prestigeLevel, flag);
-  }
+
+  // Any frame in the stack may be waiting for a prestige event, so update all of them.
+  AutomatorBackend.stack.forEach(frame => {
+    const state = frame.commandState;
+    if (state && state.prestigeLevel !== undefined) {
+      state.prestigeLevel = Math.max(state.prestigeLevel, flag);
+    }
+  });
 }
 
 EventHub.logic.on(GAME_EVENT.BIG_CRUNCH_AFTER, () => prestigeNotify(T.Infinity.$prestigeLevel));
@@ -459,15 +463,15 @@
       const prestigeToken = ctx.PrestigeEvent[0].tokenType;
       return () => {
         const available = prestigeToken.$prestigeAvailable();
+        const prestigeName = ctx.PrestigeEvent[0].image.toUpperCase();
         if (!available) {
           if (!nowait) return AUTOMATOR_COMMAND_STATUS.NEXT_TICK_SAME_INSTRUCTION;
-          AutomatorData.logCommandEvent(`${ctx.PrestigeEvent.image} attempted, but skipped due to NOWAIT`,
+          AutomatorData.logCommandEvent(`${prestigeName} attempted, but skipped due to NOWAIT`,
             ctx.startLine);
           return AUTOMATOR_COMMAND_STATUS.NEXT_INSTRUCTION;
         }
         if (respec) prestigeToken.$respec();
         prestigeToken.$prestige();
-        const prestigeName = ctx.PrestigeEvent[0].image.toUpperCase();
         AutomatorData.logCommandEvent(`${prestigeName} triggered (${findLastPrestigeRecord(prestigeName)})`,
           ctx.startLine);
         // In the prestigeToken.$prestige() line above, performing a reality reset has code internal to the call
@@ -619,49 +623,49 @@
     },
     compile: ctx => {
       const studies = ctx.$studies;
       if (ctx.Nowait === undefined) return () => {
         let prePurchasedStudies = 0;
         let purchasedStudies = 0;
         let finalPurchasedTS;
         for (const tsNumber of studies.normal) {
           if (TimeStudy(tsNumber).isBought) prePurchasedStudies++;
           else if (TimeStudy(tsNumber).purchase(true)) purchasedStudies++;
           else finalPurchasedTS = finalPurchasedTS ?? tsNumber;
         }
         if (prePurchasedStudies + purchasedStudies < studies.normal.length) {
           if (prePurchasedStudies + purchasedStudies === 0) {
             AutomatorData.logCommandEvent(`Could not purchase any of the specified Time Studies`, ctx.startLine);
           }
           if (purchasedStudies > 0 && finalPurchasedTS) {
             AutomatorData.logCommandEvent(`Purchased ${quantifyInt("Time Study", purchasedStudies)} and stopped at
             Time Study ${finalPurchasedTS}, waiting to attempt to purchase more Time Studies`, ctx.startLine);
           }
           return AUTOMATOR_COMMAND_STATUS.NEXT_TICK_SAME_INSTRUCTION;
         }
         const hasEC = studies.ec ? TimeStudy.eternityChallenge(studies.ec).isBought : false;
         if (!studies.ec || (hasEC && !studies.startEC)) {
           AutomatorData.logCommandEvent(`Purchased all specified Time Studies`, ctx.startLine);
           return AUTOMATOR_COMMAND_STATUS.NEXT_INSTRUCTION;
         }
         const unlockedEC = TimeStudy.eternityChallenge(studies.ec).purchase(true);
         if (hasEC || unlockedEC) {
           if (studies.startEC) {
             EternityChallenge(studies.ec).start(true);
             if (EternityChallenge(studies.ec).isRunning) {
               AutomatorData.logCommandEvent(`Purchased all specified Time Studies, then unlocked and started running
                 Eternity Challenge ${studies.ec}`, ctx.startLine);
             } else {
               AutomatorData.logCommandEvent(`Purchased all specified Time Studies and unlocked Eternity Challenge
                 ${studies.ec}, but failed to start it`, ctx.startLine);
             }
           } else {
             AutomatorData.logCommandEvent(`Purchased all specified Time Studies and unlocked Eternity Challenge
               ${studies.ec}`, ctx.startLine);
           }
           return AUTOMATOR_COMMAND_STATUS.NEXT_INSTRUCTION;
         }
         return AUTOMATOR_COMMAND_STATUS.NEXT_TICK_SAME_INSTRUCTION;
       };
       return () => {
         for (const tsNumber of studies.normal) TimeStudy(tsNumber).purchase(true);
         if (!studies.ec || TimeStudy.eternityChallenge(studies.ec).isBought) {

src/core/celestials/celestials.js

@@ -46,7 +46,8 @@ GameDatabase.celestials.descriptions = [
       Tachyon Particle production and Dilated Time production are severely reduced.
       Time Theorem generation from Dilation Glyphs is disabled.
       Certain challenge goals are increased.
-      Stored game time is discharged at a reduced effectiveness (exponent^${format(0.55, 2, 2)}).`;
+      Stored game time is discharged at a reduced effectiveness (exponent^${format(0.55, 2, 2)}).
+      Dimensional Sacrifice is disabled.`;
     }
   },
   {