Skip to content

Commit

Permalink
fixup! hover ambrosia highlights
Browse files Browse the repository at this point in the history
  • Loading branch information
KhafraDev committed Jun 21, 2024
1 parent 5b2e46a commit 80a8533
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
12 changes: 8 additions & 4 deletions src/Helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
}

Expand Down
4 changes: 3 additions & 1 deletion src/Synergism.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -1590,6 +1590,8 @@ const loadSynergy = async () => {
return
}

updateLoadoutHoverClasses()

player.lastExportedSave = data.lastExportedSave ?? 0

if (data.offerpromo24used !== undefined) {
Expand Down

0 comments on commit 80a8533

Please sign in to comment.