Fix some bugs (sacrifice, r143, galaxies, 2xIP, 1 Realities, contrast color not working)

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/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue

@@ -39,8 +39,8 @@ 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");
+      if (!Achievement(111).isEffectActive) reset.push("Dimensions");
+      if (!Achievement(143).isEffectActive) 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,7 +86,8 @@ 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.isFullyAutomated = Autobuyer.sacrifice.isActive && Achievement(118).isEffectActive &&
+      (Sacrifice.canSacrifice || Sacrifice.disabledText === `${formatX(1)} multiplier`);
       this.isSacrificeAffordable = Sacrifice.canSacrifice && !this.isFullyAutomated;
       this.currentSacrifice.copyFrom(Sacrifice.totalBoost);
       this.sacrificeBoost.copyFrom(Sacrifice.nextBoost);
@@ -116,10 +117,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,8 @@ 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");
+      if (!Achievement(111).isEffectActive) reset.push("Dimensions");
+      if (!Achievement(143).isEffectActive) 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/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/core/reality.js

@@ -163,6 +163,13 @@ export function startManualReality(sacrifice, glyphID) {
 export function processManualReality(sacrifice, glyphID) {
   if (!isRealityAvailable()) return;
 
+  // Get this now so we can access it
+  const realityProps = getRealityProps(false, true);
+  if (RealityUpgrade(24).isLockingMechanics && realityProps.gainedRM.lt(5000)) {
+    RealityUpgrade(24).tryShowWarningModal();
+    return;
+  }
+
   if (player.realities === 0) {
     // If this is our first Reality, lock in the initial seed and then give the companion and starting glyphs
     player.reality.seed = player.reality.initialSeed;

src/core/secret-formula/achievements/normal-achievements.js

@@ -1059,7 +1059,7 @@ export const normalAchievements = [
       return true;
     },
     checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
-    reward: "Galaxies no longer reset Dimension Boosts."
+    reward: "Antimatter Galaxies no longer reset Dimension Boosts."
   },
   {
     id: 144,

src/core/secret-formula/infinity/infinity-upgrades.js

@@ -225,7 +225,7 @@ export const infinityUpgrades = {
     description: () => `Multiply Infinity Points from all sources by ${formatX(2)}`,
     // Normally the multiplier caps at e993k or so with 3300000 purchases, but if the cost is capped then we just give
     // an extra e7k to make the multiplier look nice
-    effect: () => (player.IPMultPurchases >= 3300000 ? DC.E1E6 : DC.D2.pow(player.IPMultPurchases)),
+    effect: () => (player.IPMultPurchases >= 3299999 ? DC.E1E6 : DC.D2.pow(player.IPMultPurchases)),
     cap: () => Effarig.eternityCap ?? DC.E1E6,
     formatEffect: value => formatX(value, 2, 2),
   }