diff --git a/src/Helper.ts b/src/Helper.ts index ebad4bd65..ca3cc0b86 100644 --- a/src/Helper.ts +++ b/src/Helper.ts @@ -201,9 +201,10 @@ export const addTimers = (input: TimerInput, time = 0) => { let timeToAmbrosia = calculateRequiredBlueberryTime() - const maxAccelMultiplier = (1/2) + (3/5 - 1/2) * +(player.singularityChallenges.noAmbrosiaUpgrades.completions >= 15) - + (2/3 - 3/5) * +(player.singularityChallenges.noAmbrosiaUpgrades.completions >= 19) - + (3/4 - 2/3) * +(player.singularityChallenges.noAmbrosiaUpgrades.completions >= 20) + const maxAccelMultiplier = (1 / 2) + + (3 / 5 - 1 / 2) * +(player.singularityChallenges.noAmbrosiaUpgrades.completions >= 15) + + (2 / 3 - 3 / 5) * +(player.singularityChallenges.noAmbrosiaUpgrades.completions >= 19) + + (3 / 4 - 2 / 3) * +(player.singularityChallenges.noAmbrosiaUpgrades.completions >= 20) while (player.blueberryTime >= timeToAmbrosia) { const RNG = Math.random() @@ -219,7 +220,10 @@ export const addTimers = (input: TimerInput, time = 0) => { timeToAmbrosia = calculateRequiredBlueberryTime() const secondsToNextAmbrosia = timeToAmbrosia / G.ambrosiaCurrStats.ambrosiaGenerationSpeed - G.ambrosiaTimer += Math.min(secondsToNextAmbrosia * maxAccelMultiplier, ambrosiaToGain * 0.2 * player.shopUpgrades.shopAmbrosiaAccelerator) + G.ambrosiaTimer += Math.min( + secondsToNextAmbrosia * maxAccelMultiplier, + ambrosiaToGain * 0.2 * player.shopUpgrades.shopAmbrosiaAccelerator + ) timeToAmbrosia = calculateRequiredBlueberryTime() } diff --git a/src/Synergism.ts b/src/Synergism.ts index 5a4b9c7be..b1d45d343 100644 --- a/src/Synergism.ts +++ b/src/Synergism.ts @@ -136,7 +136,7 @@ import { import i18next from 'i18next' import localforage from 'localforage' -import { BlueberryUpgrade, blueberryUpgradeData } from './BlueberryUpgrades' +import { BlueberryUpgrade, blueberryUpgradeData, updateLoadoutHoverClasses } from './BlueberryUpgrades' import { DOMCacheGetOrSet } from './Cache/DOM' import { lastUpdated, prod, testing, version } from './Config' import { WowCubes, WowHypercubes, WowPlatonicCubes, WowTesseracts } from './CubeExperimental' @@ -1590,6 +1590,8 @@ const loadSynergy = async () => { return } + updateLoadoutHoverClasses() + player.lastExportedSave = data.lastExportedSave ?? 0 if (data.offerpromo24used !== undefined) {