Merge branch 'master' of https://github.com/HexaVault/ADRedemption

HexaVault · May 5, 2024 · 271728c · 271728c
2 parents 7daaf19 + 6ea4a2c
commit 271728c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/src/core/format.js b/src/core/format.js
@@ -1,8 +1,7 @@
 function isEND() {
-  if (GameEnd == undefined) return false;
-  const threshold = GameEnd?.endState > END_STATE_MARKERS.END_NUMBERS
+  const threshold = GameEnd.endState > END_STATE_MARKERS.END_NUMBERS
     ? 1
-    : (GameEnd?.endState - END_STATE_MARKERS.FADE_AWAY) / 2;
+    : (GameEnd.endState - END_STATE_MARKERS.FADE_AWAY) / 2;
   // Using the Pelle.isDoomed getter here causes this to not update properly after a game restart
   return (player.celestials.pelle.doomed && Math.random() < threshold); // || player.antimatter.exponent >= 9e15;
 }

diff --git a/src/core/secret-formula/celestials/ra.js b/src/core/secret-formula/celestials/ra.js
@@ -534,7 +534,7 @@ export const ra = {
       id: 13,
       id2: 0,
       reward: () => `Maximum Glyph rarity is increased by ${formatPercents(.02)} per level past ${formatInt(90)}`,
-      effect: () => 2 * (Ra.pets.effarig.level - 90) * (corruptionUpgrades(7).effectOrDefault(0) + 1),
+      effect: () => 2 * (Ra.pets.effarig.level - 90) * (CorruptionUpgrade(7).effectOrDefault(0) + 1),
       pet: "effarig",
       level: 90,
       displayIcon: `<span class="fas fa-star"></span>`,

diff --git a/src/core/secret-formula/mending/corruption-upgrades.js b/src/core/secret-formula/mending/corruption-upgrades.js
@@ -319,7 +319,7 @@ export const corruptionUpgrades = [
     checkEvent: GAME_EVENT.MENDING_RESET_BEFORE,
     canLock: false,
     lockEvent: "Illegal lock called - Please report this with your save and what you did.",
-    description: `If Replicative Singularities corruption is 5 or higher, Infinity dimensions gain a power effect based on current Replicanti. Capped at ${formatPow(15)}.`,
+    description: () =>`If Replicative Singularities corruption is 5 or higher, Infinity dimensions gain a power effect based on current Replicanti. Capped at ${formatPow(15)}.`,
     effect: () => (player.mending.corruptionChallenge.corruptedMend && (player.mending.corruption[8] >= 5) ? Math.min(1 + (Decimal.log10(player.replicanti.amount)) / 654, 15) : 1),
     formatEffect: value => formatPow(value, 2, 2)
   },
@@ -333,7 +333,7 @@ export const corruptionUpgrades = [
     checkEvent: GAME_EVENT.MENDING_RESET_BEFORE,
     canLock: false,
     lockEvent: "Illegal lock called - Please report this with your save and what you did.",
-    description: `If Study of Forever corruption is 4 or higher, Time dimensions gain a power effect based on current Time Theorems. Capped at ${formatPow(7.5)}.`,
+    description: () => `If Study of Forever corruption is 4 or higher, Time dimensions gain a power effect based on current Time Theorems. Capped at ${formatPow(7.5)}.`,
     effect: () => (player.mending.corruptionChallenge.corruptedMend && (player.mending.corruption[9] >= 4) ? Math.min(1 + (Decimal.log10(Currency.timeTheorems.value)) / 666, 7.5) : 1),
     formatEffect: value => formatPow(value, 2, 2)
   },

diff --git a/src/core/storage/migrations.js b/src/core/storage/migrations.js
@@ -718,16 +718,17 @@ export const migrations = {
       3: 0,
       4: 0,
       5: 0,
-    },
-    51.021: player => {
+    }
+  },
+  51.021: player => {
     // Player.auto.singCap.multiplier = 0; exm why this still exist--sxy
-    },
-    51.022: player => {
-      player.isHoldingLClick = false;
-      player.celestials.laitela.holdStart = 0;
-      player.celestials.laitela.heldTier = 0;
-      player.celestials.laitela.heldType = "";
-    },
+  },
+  51.022: player => {
+    player.isHoldingLClick = false;
+    player.celestials.laitela.holdStart = 0;
+    player.celestials.laitela.heldTier = 0;
+    player.celestials.laitela.heldType = "";
+  },
     51.023: player => {
       player.celestials.ra.rebuyables = {
         weakenTeresaScaling: 0,
@@ -843,7 +844,6 @@ export const migrations = {
         boostCostBumps: 0
       }));
     },
-  },
   50.034: player =>{
     player.dimensions.matter = Array.range(0, 4).map(() => ({
       bought: 0,
@@ -869,8 +869,7 @@ export const migrations = {
   },
   53: player => {
     player.devSave = false;
-  }
-},
+  },
 
   normalizeTimespans(player) {
     player.realTimePlayed *= 100;

diff --git a/src/game.js b/src/game.js
@@ -99,7 +99,6 @@ export function gainedInfinityPoints(noSoftcap = false) {
     TimeStudy(111)
   );
   if (Pelle.isDisabled("IPMults")) {
-    const x = MendingMilestone.one.isReached ? 1e20 : 1;
     let x = (MendingMilestone.one.isReached && !Kohler.isRunning) ? 1e20 : 1;
     return Decimal.pow10(player.records.thisInfinity.maxAM.log10() / div - 0.75)
       .timesEffectsOf(PelleRifts.vacuum)