move mem&bh to AwayProgress, fix formatting errors

javascripts/components/modals/modal-away-progress.js

@@ -34,7 +34,7 @@ Vue.component("modal-away-progress", {
             : after > before;
         },
         show() {
-          const show = this.showOption && this.increased;
+          const show = this.showOption && this.increased && this.config.isUnlocked;
           if (show) this.$emit("something-happened");
           return show;
         },
@@ -105,6 +105,7 @@ Vue.component("modal-away-progress", {
     getObjectForAway(item) {
       const objectName = item.name;
       const name = item.formatName;
+      const isUnlocked = item.isUnlocked();
       const before = item.navigateTo(this.before);
       const after = item.navigateTo(this.after);
       const awayProgress = item.option;
@@ -113,6 +114,7 @@ Vue.component("modal-away-progress", {
       return {
         [`${objectName}`]: {
           name,
+          isUnlocked,
           before,
           after,
           awayProgress,

javascripts/components/modals/options/modal-away-progress-options.js

@@ -38,28 +38,11 @@ Vue.component("modal-away-progress-options", {
   data() {
     return {
       all: Array,
-      celestialMemories: false,
-      blackHole: false
     };
   },
-  watch: {
-    celestialMemories(newValue) {
-      player.options.awayProgress.celestialMemories = newValue;
-    },
-    blackHole(newValue) {
-      player.options.awayProgress.blackHole = newValue;
-    },
-  },
   methods: {
     update() {
       this.all = AwayProgressTypes.all.filter(type => type.showOption && type.isUnlocked());
-
-      this.raUnlocked = V.has(V_UNLOCKS.RA_UNLOCK);
-      this.blackHoleUnlocked = BlackHoles.list[0].isUnlocked;
-
-      const options = player.options.awayProgress;
-      this.celestialMemories = options.celestialMemories;
-      this.blackHole = options.blackHole;
     }
   },
   template: `
@@ -70,8 +53,6 @@ Vue.component("modal-away-progress-options", {
           :key="id"
           :option="entry.name"
         />
-        <wide-on-off-button v-if="raUnlocked" v-model="celestialMemories" text="Celestial Memories:" />
-        <wide-on-off-button v-if="blackHoleUnlocked" v-model="blackHole" text="Black Hole:" />
       </div>
       Note: Selected resources will only show if they've increased.
     </modal-options>`

javascripts/core/away-progress.js

@@ -122,28 +122,36 @@ const AwayProgressTypes = {
     reference: ["celestials", "effarig", "relicShards"],
     isUnlocked: () => Teresa.has(TERESA_UNLOCKS.EFFARIG),
   }),
+  celestialMemories: new AwayProgress({
+    name: "celestialMemories",
+    isUnlocked: () => V.has(V_UNLOCKS.RA_UNLOCK),
+  }),
   teresaMemories: new AwayProgress({
     name: "teresaMemories",
+    awayOption: "celestialMemories",
     reference: ["celestials", "ra", "pets", "teresa", "memories"],
-    isUnlocked: () => V.has(V_UNLOCKS.RA_UNLOCK),
+    isUnlocked: () => Ra.pets.teresa.isUnlocked && !Ra.pets.teresa.isCapped,
     showOption: false,
   }),
   effarigMemories: new AwayProgress({
     name: "effarigMemories",
+    awayOption: "celestialMemories",
     reference: ["celestials", "ra", "pets", "effarig", "memories"],
-    isUnlocked: () => V.has(V_UNLOCKS.RA_UNLOCK),
+    isUnlocked: () => Ra.pets.effarig.isUnlocked && !Ra.pets.effarig.isCapped,
     showOption: false,
   }),
   enslavedMemories: new AwayProgress({
     name: "enslavedMemories",
+    awayOption: "celestialMemories",
     reference: ["celestials", "ra", "pets", "enslaved", "memories"],
-    isUnlocked: () => V.has(V_UNLOCKS.RA_UNLOCK),
+    isUnlocked: () => Ra.pets.enslaved.isUnlocked && !Ra.pets.enslaved.isCapped,
     showOption: false,
   }),
   vMemories: new AwayProgress({
     name: "vMemories",
+    awayOption: "celestialMemories",
     reference: ["celestials", "ra", "pets", "v", "memories"],
-    isUnlocked: () => V.has(V_UNLOCKS.RA_UNLOCK),
+    isUnlocked: () => Ra.pets.v.isUnlocked && !Ra.pets.v.isCapped,
     showOption: false,
   }),
   darkMatter: new AwayProgress({
@@ -161,14 +169,19 @@ const AwayProgressTypes = {
     reference: ["celestials", "laitela", "singularities"],
     isUnlocked: () => Laitela.isUnlocked,
   }),
-  blackHole1: new AwayProgress({
-    name: "firstBlackHole",
+  blackHole: new AwayProgress({
+    name: "blackHole",
+    isUnlocked: () => BlackHole(1).isUnlocked,
+  }),
+  firstblackHole: new AwayProgress({
+    name: "firstblackHole",
     awayOption: "blackHole",
     reference: ["blackHole", "0", "activations"],
     isUnlocked: () => BlackHole(1).isUnlocked,
     classObjectReference: "black-hole",
+    showOption: false,
   }),
-  blackHole2: new AwayProgress({
+  secondBlackHole: new AwayProgress({
     name: "secondBlackHole",
     awayOption: "blackHole",
     reference: ["blackHole", "1", "activations"],

javascripts/core/celestials/ra/ra.js

@@ -30,6 +30,10 @@ class RaPetState {
     return this.requiredUnlock === undefined || Ra.has(this.requiredUnlock);
   }
 
+  get isCapped() {
+    return this.level >= Ra.levelCap;
+  }
+
   get level() {
     return this.data.level;
   }

stylesheets/styles.css

@@ -5283,20 +5283,20 @@ screen and (max-width: 480px) {
   color: #03a9f4;
 }
 
-.c-modal-away-progress__teresa {
+.c-modal-away-progress__teresa-memories {
   color: var(--color-ra-pet-teresa);
 }
 
 .c-modal-away-progress__relic-shards,
-.c-modal-away-progress__effarig {
+.c-modal-away-progress__effarig-memories {
   color: var(--color-ra-pet-effarig);
 }
 
-.c-modal-away-progress__enslaved {
+.c-modal-away-progress__enslaved-memories {
   color: var(--color-ra-pet-enslaved);
 }
 
-.c-modal-away-progress__v {
+.c-modal-away-progress__v-memories {
   color: var(--color-ra-pet-v);
 }