EXALT Upgrades, more perks!

index.html

@@ -3453,6 +3453,9 @@ <h1>Artists</h1>
                 <p id="statALuckM7" class="statPortion">a<span id="sALuckM7" class="statNumber">0</span></p>
                 <p id="statALuckM8" class="statPortion">a<span id="sALuckM8" class="statNumber">0</span></p>
                 <p id="statALuckM9" class="statPortion">a<span id="sALuckM9" class="statNumber">0</span></p>
+                <p id="statALuckM10" class="statPortion">a<span id="sALuckM10" class="statNumber">0</span></p>
+                <p id="statALuckM11" class="statPortion">a<span id="sALuckM11" class="statNumber">0</span></p>
+                <p id="statALuckMult" class="statPortion">Multipliers (Additive)<span id="sALuckMult" class="statNumber">0</span></p>
                 <p id="statALuckMT" class="statPortion statTotal" style="color: orange">TOTAL AMBROSIA LUCK:
                     <span id="sALuckMT" class="statNumber statTotal">0</span></p>
             </div>
@@ -3852,6 +3855,21 @@ <h1>Artists</h1>
                             <p id="shopSingularityPenaltyDebuffLevel"></p>
                             <button class="permshopbutton" id="shopSingularityPenaltyDebuffButton" style="border: 2px solid pink"></button>
                         </div>
+                        <div class="exalt2Unlock" id="shopAmbrosiaLuckMultiplier4Hide">
+                            <img id="shopAmbrosiaLuckMultiplier4" alt="Ambrosia Luck Multiplier 4" src="Pictures/Default/ShopAmbrosiaLuckMultiplier4.png" loading="lazy">
+                            <p id="shopAmbrosiaLuckMultiplier4Level"></p>
+                            <button class="permshopbutton" id="shopAmbrosiaLuckMultiplier4Button" style="border: 2px solid pink"></button>
+                        </div>
+                        <div class="exalt3Unlock" id="calculator7Hide">
+                            <img id="calculator7" alt="Calculator 7" src="Pictures/Default/ShopCalculator7.png" loading="lazy">
+                            <p id="calculator7Level"></p>
+                            <button class="permshopbutton" id="calculator7Button" style="border: 2px solid pink"></button>
+                        </div>
+                        <div class="exalt4Unlock" id="shopOcteractAmbrosiaLuckHide">
+                            <img id="shopOcteractAmbrosiaLuck" alt="Octeract-Based Ambrosia Luck" src="Pictures/Default/ShopOcteractAmbrosiaLuck.png" loading="lazy">
+                            <p id="shopOcteractAmbrosiaLuckLevel"></p>
+                            <button class="permshopbutton" id="shopOcteractAmbrosiaLuckButton" style="border: 2px solid pink"></button>
+                        </div>
                         <div class="singularityShopUnlock2" id="shopAmbrosiaGeneration1Hide">
                             <img id="shopAmbrosiaGeneration1" alt="Ambrosia Generation Improvement 1" src="Pictures/Default/ShopAmbrosiaGeneration1.png" loading="lazy">
                             <p id="shopAmbrosiaGeneration1Level"></p>

src/BlueberryUpgrades.ts

@@ -412,7 +412,7 @@ export const blueberryUpgradeData: Record<
     },
     rewards: (n: number) => {
       const baseVal = 0.0002 * n;
-      const val = 1 + baseVal * player.caches.ambrosiaLuck.totalVal;
+      const val = 1 + baseVal * player.caches.ambrosiaLuck.usedTotal;
       return {
         cubes: val,
         desc: String(
@@ -470,8 +470,9 @@ export const blueberryUpgradeData: Record<
     rewards: (n: number) => {
       const baseVal = 0.0001 * n;
       const effectiveLuck = Math.min(
-        player.caches.ambrosiaLuck.totalVal,
-        Math.pow(1000, 0.5) * Math.pow(player.caches.ambrosiaLuck.totalVal, 0.5)
+        player.caches.ambrosiaLuck.usedTotal,
+        Math.pow(1000, 0.5) *
+          Math.pow(player.caches.ambrosiaLuck.usedTotal, 0.5)
       );
       const val = 1 + baseVal * effectiveLuck;
       return {
@@ -667,7 +668,7 @@ export const blueberryUpgradeData: Record<
       return baseCost + 0 * level;
     },
     rewards: (n: number) => {
-      const luck = player.caches.ambrosiaLuck.totalVal;
+      const luck = player.caches.ambrosiaLuck.usedTotal;
       return {
         luckMult: n,
         obtainiumMult: n * luck,
@@ -687,7 +688,7 @@ export const blueberryUpgradeData: Record<
       return baseCost + 0 * level;
     },
     rewards: (n: number) => {
-      const luck = player.caches.ambrosiaLuck.totalVal;
+      const luck = player.caches.ambrosiaLuck.usedTotal;
       return {
         luckMult: n,
         offeringMult: n * luck,

src/Calculate.ts

@@ -2408,9 +2408,9 @@ export const calculateSingularityQuarkMilestoneMultiplier = () => {
   let multiplier = 1;
   // dprint-ignore
   const singThresholds = [
-    5, 20, 35, 50, 65, 80, 90, 100, 121, 144, 150, 160, 166, 169, 170, 175, 180,
-    190, 196, 200, 200, 201, 202, 203, 204, 205, 210, 212, 214, 216, 218, 220,
-    225, 250,
+    5, 7, 10, 20, 35, 50, 65, 80, 90, 100, 121, 144, 150, 160, 166, 169, 170,
+    175, 180, 190, 196, 200, 201, 202, 203, 204, 205, 210, 212, 214, 216, 218,
+    220, 225, 250, 255, 260, 261, 262,
   ];
   for (const sing of singThresholds) {
     if (player.highestSingularityCount >= sing) {
@@ -3242,7 +3242,7 @@ export const calculateRequiredBlueberryTime = () => {
 
 export const calculateSingularityMilestoneBlueberries = () => {
   let val = 0;
-  if (player.highestSingularityCount >= 254) val = 4;
+  if (player.highestSingularityCount >= 264) val = 4;
   else if (player.highestSingularityCount >= 198) val = 3;
   else if (player.highestSingularityCount >= 132) val = 2;
   else if (player.highestSingularityCount >= 66) val = 1;
@@ -3282,6 +3282,15 @@ export const calculateAmbrosiaQuarkMult = () => {
   return multiplier;
 };
 
+export const calculateDilatedFiveLeafBonus = () => {
+  const singThresholds = [100, 200, 250, 260, 266];
+  for (let i = 0; i < singThresholds.length; i++) {
+    if (player.highestSingularityCount <= singThresholds[i]) return i / 100;
+  }
+
+  return singThresholds.length / 100;
+};
+
 export const dailyResetCheck = () => {
   if (!player.dayCheck) {
     return;

src/CheckVariables.ts

@@ -37,6 +37,7 @@ import {
 } from "./SingularityChallenges";
 import {
   AmbrosiaGenerationCache,
+  AmbrosiaLuckAdditiveMultCache,
   AmbrosiaLuckCache,
   BlueberryInventoryCache,
   cacheReinitialize,
@@ -1009,6 +1010,7 @@ export const checkVariablesOnLoad = (data: PlayerSave) => {
       calculator4: 0,
       calculator5: 0,
       calculator6: 0,
+      calculator7: 0,
       constantEX: 0,
       powderEX: 0,
       chronometer2: 0,
@@ -1041,6 +1043,8 @@ export const checkVariablesOnLoad = (data: PlayerSave) => {
       seasonPassInfinity: 0,
       chronometerInfinity: 0,
       shopSingularityPenaltyDebuff: 0,
+      shopAmbrosiaLuckMultiplier4: 0,
+      shopOcteractAmbrosiaLuck: 0,
       shopAmbrosiaGeneration1: 0,
       shopAmbrosiaGeneration2: 0,
       shopAmbrosiaGeneration3: 0,
@@ -1436,6 +1440,7 @@ export const checkVariablesOnLoad = (data: PlayerSave) => {
           singularityRequirement:
             singularityChallengeData[k].singularityRequirement,
           effect: singularityChallengeData[k].effect,
+          cacheUpdates: singularityChallengeData[k].cacheUpdates,
         };
         player.singularityChallenges[k] = new SingularityChallenge(
           updatedData,
@@ -1634,6 +1639,7 @@ export const checkVariablesOnLoad = (data: PlayerSave) => {
   }
 
   player.caches = {
+    ambrosiaLuckAdditiveMult: new AmbrosiaLuckAdditiveMultCache(),
     ambrosiaLuck: new AmbrosiaLuckCache(),
     ambrosiaGeneration: new AmbrosiaGenerationCache(),
     blueberryInventory: new BlueberryInventoryCache(),

src/Config.ts

@@ -1,4 +1,4 @@
-export const version = '3.0.0 pt 3: December 13, 2023: Quarks'
+export const version = "3.0.0 pt 4: March 9, 2024: EXALTed Upgrades";
 
 /**
  * PSEUDO DO NOT CHANGE THIS LINE
@@ -8,9 +8,9 @@ export const version = '3.0.0 pt 3: December 13, 2023: Quarks'
  * PSEUDO DO NOT CHANGE THIS LINE
  * PSEUDO DO NOT CHANGE THIS LINE
  */
-export const testing: boolean = false
-export const lastUpdated = new Date('##LAST_UPDATED##')
+export const testing: boolean = false;
+export const lastUpdated = new Date("##LAST_UPDATED##");
 /**
  * CHANGE THIS ONE INSTEAD
  */
-export const prod: boolean = false
+export const prod: boolean = false;