Address PR comments (last-retest-feedback)

javascripts/core/celestials/pelle/pelle.js

@@ -135,7 +135,7 @@ export const Pelle = {
   },
 
   get uselessTimeStudies() {
-    return [32, 33, 41, 51, 61, 62, 121, 122, 123, 141, 142, 143, 192, 213];
+    return [32, 41, 51, 61, 62, 121, 122, 123, 141, 142, 143, 192, 213];
   },
 
   get disabledRUPGs() {

javascripts/core/celestials/pelle/strikes.js

@@ -31,11 +31,7 @@ class PelleStrikeState extends BitUpgradeState {
   }
 
   trigger() {
-    // Delay the strike if animating, else it triggers immediately before the animation starts (which looks weird)
-    const infinity = this.id === 1 && player.options.animations.bigCrunch;
-    const eternity = this.id === 3 && player.options.animations.eternity;
-    const dilation = this.id === 5 && player.options.animations.dilation;
-    setTimeout(() => this.unlock(), (infinity || eternity || dilation) ? 1000 : 1);
+    this.unlock();
   }
 
   onUnlock() {

javascripts/core/dilation.js

@@ -32,9 +32,6 @@ export function startDilatedEternityRequest() {
   } else {
     startDilatedEternity();
   }
-  if (Pelle.isDoomed && !player.options.confirmations.dilation) {
-    PelleStrikes.dilation.trigger();
-  }
 }
 
 export function startDilatedEternity(auto) {
@@ -46,6 +43,7 @@ export function startDilatedEternity(auto) {
   Achievement(136).unlock();
   eternity(false, auto, { switchingDilation: true });
   player.dilation.active = true;
+  if (Pelle.isDoomed) PelleStrikes.dilation.trigger();
   return true;
 }
 

javascripts/core/dimboost.js

@@ -146,7 +146,7 @@ export class DimBoost {
     else boostEffects = `${newUnlock} and ${formattedMultText} ${dimensionRange}`;
 
     if (boostEffects === "") return "Dimension Boosts are currently useless";
-    const areDimensionsKept = (Perk.antimatterNoReset.isBought || Achievement(111).isUnlocked) &&
+    const areDimensionsKept = (Perk.antimatterNoReset.isBought || Achievement(111).canBeApplied) &&
       (!Pelle.isDoomed || PelleUpgrade.dimBoostResetsNothing.isBought);
     if (areDimensionsKept) return boostEffects[0].toUpperCase() + boostEffects.substring(1);
     return `Reset your Dimensions to ${boostEffects}`;

public/stylesheets/styles.css

@@ -3806,16 +3806,6 @@ br {
   background-color: #a53b98;
 }
 
-.o-infinity-upgrade-btn--useless-available {
-  color: black;
-  background-color: var(--color-pelle--base);
-}
-
-.o-infinity-upgrade-btn--useless-available:hover {
-  color: black;
-  background-color: var(--color-pelle--secondary);
-}
-
 .t-dark .o-infinity-upgrade-btn--available:hover,
 .t-s6 .o-infinity-upgrade-btn--available:hover,
 .t-s10 .o-infinity-upgrade-btn--available:hover {
@@ -3888,16 +3878,6 @@ br {
   filter: grayscale(25%);
 }
 
-.o-infinity-upgrade-btn--multiplier.o-infinity-upgrade-btn--useless-available {
-  color: black;
-  background-color: var(--color-pelle--base);
-}
-
-.o-infinity-upgrade-btn--multiplier.o-infinity-upgrade-btn--useless-available:hover {
-  color: black;
-  background-color: var(--color-pelle--secondary);
-}
-
 .o-infinity-upgrade-btn--multiplier.o-infinity-upgrade-btn--available {
   color: #c93a3a;
   border-color: #17b3b5;
@@ -3946,16 +3926,6 @@ br {
 
 /* #region o-infinity-upgrade-btn--unavailable */
 
-.o-infinity-upgrade-btn--useless-unavailable {
-  color: #f7f7f7;
-  background-color: var(--color-pelle--base);
-  filter: grayscale(90%);
-}
-
-.o-infinity-upgrade-btn--useless-unavailable:hover {
-  cursor: default;
-}
-
 .o-infinity-upgrade-btn--unavailable {
   color: black;
   background-color: #f7f7f7;
@@ -4025,14 +3995,14 @@ br {
   color: black;
 }
 
-.o-infinity-upgrade-btn--useless-bought {
+.o-infinity-upgrade-btn--useless {
   color: black;
   background-color: var(--color-pelle--base);
   filter: grayscale(50%);
   cursor: default;
 }
 
-.o-infinity-upgrade-btn--useless-bought:hover {
+.o-infinity-upgrade-btn--useless:hover {
   color: black;
 }
 
@@ -9536,19 +9506,6 @@ input.o-automator-block-input {
   height: 6.2rem;
 }
 
-.c-pelle-useless--available {
-  color: var(--color-pelle--secondary);
-}
-
-.c-pelle-useless--available:hover {
-  filter: grayscale(50%);
-}
-
-.c-pelle-useless--bought {
-  background-color: var(--color-pelle--base);
-  filter: grayscale(50%);
-}
-
 .o-pelle-disabled {
   text-decoration: line-through;
 }
@@ -9588,4 +9545,3 @@ input.o-automator-block-input {
   width: 100%;
   height: 100%;
 }
-}

src/components/InfinityUpgradeButton.vue

@@ -52,9 +52,7 @@ export default {
         "o-infinity-upgrade-btn--bought": !this.isUseless && this.isBought,
         "o-infinity-upgrade-btn--available": !this.isUseless && !this.isBought && this.canBeBought,
         "o-infinity-upgrade-btn--unavailable": !this.isUseless && !this.isBought && !this.canBeBought,
-        "o-infinity-upgrade-btn--useless-bought": this.isUseless && this.isBought,
-        "o-infinity-upgrade-btn--useless-available": this.isUseless && !this.isBought && this.canBeBought,
-        "o-infinity-upgrade-btn--useless-unavailable": this.isUseless && !this.isBought && !this.canBeBought,
+        "o-infinity-upgrade-btn--useless": this.isUseless,
         "o-infinity-upgrade-btn--chargeable": !this.isCharged && this.chargePossible &&
           (this.showingCharged || this.shiftDown),
         "o-infinity-upgrade-btn--charged": this.isCharged,

src/components/modals/prestige/ArmageddonModal.vue

@@ -64,7 +64,18 @@ export default {
       player.records.realTimeDoomed = 0;
       for (const res of AlchemyResources.all) res.amount = 0;
       AutomatorBackend.stop();
-      player.options.hiddenSubtabBits = Array.repeat(0, 11);
+
+      // Force-unhide all tabs except for the shop tab, for which we retain the hide state instead
+      const shopTab = ~1 & (1 << GameDatabase.tabs.find(t => t.key === "shop").id);
+      player.options.hiddenTabBits &= shopTab;
+
+      // Force unhide MOST subtabs, although some of the tabs get ignored since they don't contain any
+      // meaningful interactable gameplay elements in Doomed
+      const tabsToIgnore = ["statistics", "achievements", "reality", "celestials"];
+      const ignoredIDs = GameDatabase.tabs.filter(t => tabsToIgnore.includes(t.key)).map(t => t.id);
+      for (let tabIndex = 0; tabIndex < GameDatabase.tabs.length; tabIndex++) {
+        player.options.hiddenSubtabBits[tabIndex] &= ignoredIDs.includes(tabIndex) ? -1 : 0;
+      }
       Pelle.quotes.initial.show();
     },
   },

src/components/modals/prestige/DimensionBoostModal.vue

@@ -17,8 +17,8 @@ export default {
       return `You are about to do a Dimension Boost Reset`;
     },
     message() {
-      const keepDimensions = Perk.antimatterNoReset.canBeApplied || Achievement(111).isUnlocked ||
-        (Pelle.isDoomed && PelleUpgrade.dimBoostResetsNothing.isBought)
+      const keepDimensions = Perk.antimatterNoReset.canBeApplied || Achievement(111).canBeApplied ||
+        PelleUpgrade.dimBoostResetsNothing.isBought
         ? `not actually reset anything due to an upgrade you have which prevents Antimatter and Antimatter Dimensions
           from being reset in this situation. You will still gain the multiplier from the Boost, as usual.`
         : `reset your Antimatter and Antimatter Dimensions. Are you sure you want to do this?`;