Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cookies V Update #635

Merged
merged 7 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Pictures/Default/CubeUpgrade71.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Default/CubeUpgrade72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Default/CubeUpgrade73.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Default/CubeUpgrade74.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Default/CubeUpgrade75.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Default/CubeUpgrade76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Default/CubeUpgrade77.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Default/CubeUpgrade78.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Default/CubeUpgrade79.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Default/CubeUpgrade80.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Legacy/CubeUpgrade71.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Legacy/CubeUpgrade72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Legacy/CubeUpgrade73.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Legacy/CubeUpgrade74.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Legacy/CubeUpgrade75.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Legacy/CubeUpgrade76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Legacy/CubeUpgrade77.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Legacy/CubeUpgrade78.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Legacy/CubeUpgrade79.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Legacy/CubeUpgrade80.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Monotonous/CubeUpgrade71.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Monotonous/CubeUpgrade72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Monotonous/CubeUpgrade73.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Monotonous/CubeUpgrade74.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Monotonous/CubeUpgrade75.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Monotonous/CubeUpgrade76.png
Binary file added Pictures/Monotonous/CubeUpgrade77.png
Binary file added Pictures/Monotonous/CubeUpgrade78.png
Binary file added Pictures/Monotonous/CubeUpgrade79.png
Binary file added Pictures/Monotonous/CubeUpgrade80.png
Binary file added Pictures/Simplified/CubeUpgrade71.png
Binary file added Pictures/Simplified/CubeUpgrade72.png
Binary file added Pictures/Simplified/CubeUpgrade73.png
Binary file added Pictures/Simplified/CubeUpgrade74.png
Binary file added Pictures/Simplified/CubeUpgrade75.png
Binary file added Pictures/Simplified/CubeUpgrade76.png
Binary file added Pictures/Simplified/CubeUpgrade77.png
Binary file added Pictures/Simplified/CubeUpgrade78.png
Binary file added Pictures/Simplified/CubeUpgrade79.png
Binary file added Pictures/Simplified/CubeUpgrade80.png
33 changes: 26 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2534,6 +2534,18 @@
<td><img id="cubeUpg69" alt="cubeUpg69" class="assortedCookies4 gridImg" src="Pictures/Default/CubeUpgrade69.png" loading="lazy"></td>
<td><img id="cubeUpg70" alt="cubeUpg70" class="assortedCookies4 gridImg" src="Pictures/Default/CubeUpgrade70.png" loading="lazy"></td>
</tr>
<tr>
<td><img id="cubeUpg71" alt="cubeUpg71" class="assortedCookies5 gridImg" src="Pictures/Default/CubeUpgrade71.png" loading="lazy"></td>
<td><img id="cubeUpg72" alt="cubeUpg72" class="assortedCookies5 gridImg" src="Pictures/Default/CubeUpgrade72.png" loading="lazy"></td>
<td><img id="cubeUpg73" alt="cubeUpg73" class="assortedCookies5 gridImg" src="Pictures/Default/CubeUpgrade73.png" loading="lazy"></td>
<td><img id="cubeUpg74" alt="cubeUpg74" class="assortedCookies5 gridImg" src="Pictures/Default/CubeUpgrade74.png" loading="lazy"></td>
<td><img id="cubeUpg75" alt="cubeUpg75" class="assortedCookies5 gridImg" src="Pictures/Default/CubeUpgrade75.png" loading="lazy"></td>
<td><img id="cubeUpg76" alt="cubeUpg76" class="assortedCookies5 gridImg" src="Pictures/Default/CubeUpgrade76.png" loading="lazy"></td>
<td><img id="cubeUpg77" alt="cubeUpg77" class="assortedCookies5 gridImg" src="Pictures/Default/CubeUpgrade77.png" loading="lazy"></td>
<td><img id="cubeUpg78" alt="cubeUpg78" class="assortedCookies5 gridImg" src="Pictures/Default/CubeUpgrade78.png" loading="lazy"></td>
<td><img id="cubeUpg79" alt="cubeUpg79" class="assortedCookies5 gridImg" src="Pictures/Default/CubeUpgrade79.png" loading="lazy"></td>
<td><img id="cubeUpg80" alt="cubeUpg80" class="assortedCookies5 gridImg" src="Pictures/Default/CubeUpgrade80.png" loading="lazy"></td>
</tr>
</table>
<div class="cubeUpgradeInfo">
<p id="cubeUpgradeName" style="text-align:center;">Wow! Hover over the upgrades you want to look at!</p>
Expand Down Expand Up @@ -3166,9 +3178,10 @@ <h1>Artists</h1>
<p id="statOff30" class="statPortion singularity">Cube Upgrade Cx4: <span id="sOff30" class="statNumber">0</span></p>
<p id="statOff31" class="statPortion singularity">Offering Electrolosis [OC]: <span id="sOff31" class="statNumber">0</span></p>
<p id="statOff32" class="statPortion singularity">RNG-Based Offering Multiplier: <span id="sOff32" class="statNumber">0</span></p>
<p id="statOff33" class="statPortion singularity">20 Ascensions X20 [EXALT ONLY]: <span id="sOff33" class="statNumber">0</span></p>
<p id="statOff34" class="statPortion singularity">Shop EX ULTIMATE: <span id="sOff34" class="statNumber">0</span></p>
<p id="statOff35" class="statPortion">Event: <span id="sOff35" class="statNumber">0</span></p>
<p id="statOff33" class="statPortion singularity">Cube Upgrade Cx22: <span id="sOff33" class="statNumber">0</span></p>
<p id="statOff34" class="statPortion singularity">20 Ascensions X20 [EXALT ONLY]: <span id="sOff34" class="statNumber">0</span></p>
<p id="statOff35" class="statPortion singularity">Shop EX ULTIMATE: <span id="sOff35" class="statNumber">0</span></p>
<p id="statOff36" class="statPortion">Event: <span id="sOff36" class="statNumber">0</span></p>
<p id="statOffT" class="statPortion statTotal" style="color: gold">TOTAL OFFERING MULTIPLIER: <span id="sOffT" class="statNumber statTotal">0</span></p>
</div>
<div id="obtainiumMultiplierStats" class="statContainer" style="display: none;">
Expand Down Expand Up @@ -3225,10 +3238,11 @@ <h1>Artists</h1>
<p id="statObt50" class="statPortion octeracts">Ambrosia Obtainium Upgrade:<span id="sObt50" class="statNumber">0</span></p>
<p id="statObt51" class="statPortion octeracts">Obtainium EX ULTRA:<span id="sObt51" class="statNumber">0</span></p>
<p id="statObt52" class="statPortion octeracts">Exalt Bonus:<span id="sObt52" class="statNumber">0</span></p>
<p id="statObt53" class="statPortion singularity">Singularity Debuff:<span id="sObt53" class="statNumber">0</span></p>
<p id="statObt54" class="statPortion octeracts">Scientific Illiteracy 15:<span id="sObt54" class="statNumber">0</span></p>
<p id="statObt55" class="statPortion octeracts">Scientific Illiteracy 16:<span id="sObt55" class="statNumber">0</span></p>
<p id="statObt56" class="statPortion chal14">Active Challenge 14:<span id="sObt56" class="statNumber">0</span></p>
<p id="statObt53" class="statPortion octeracts">Cube Upgrade Cx21:<span id="sObt53" class="statNumber">0</span></p>
<p id="statObt54" class="statPortion singularity">Singularity Debuff:<span id="sObt54" class="statNumber">0</span></p>
<p id="statObt55" class="statPortion octeracts">Scientific Illiteracy 15:<span id="sObt55" class="statNumber">0</span></p>
<p id="statObt56" class="statPortion octeracts">Scientific Illiteracy 16:<span id="sObt56" class="statNumber">0</span></p>
<p id="statObt57" class="statPortion chal14">Active Challenge 14:<span id="sObt57" class="statNumber">0</span></p>
<p id="statObtT" class="statPortion statTotal" style="color: rgb(81, 134, 219)">TOTAL OBTAINIUM MULTIPLIER: <span id="sObtT" class="statNumber statTotal">0</span></p>


Expand Down Expand Up @@ -3593,6 +3607,8 @@ <h1>Artists</h1>
<p id="statALuckM13" class="statPortion">a<span id="sALuckM13" class="statNumber">0</span></p>
<p id="statALuckM14" class="statPortion">a<span id="sALuckM14" class="statNumber">0</span></p>
<p id="statALuckM15" class="statPortion">a<span id="sALuckM15" class="statNumber">0</span></p>
<p id="statALuckM16" class="statPortion">a<span id="sALuckM16" class="statNumber">0</span></p>
<p id="statALuckM17" class="statPortion">a<span id="sALuckM17" 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>
Expand All @@ -3611,6 +3627,7 @@ <h1>Artists</h1>
<p id="statAGenM9" class="statPortion">a<span id="sAGenM9" class="statNumber">0</span></p>
<p id="statAGenM10" class="statPortion">a<span id="sAGenM10" class="statNumber">0</span></p>
<p id="statAGenM11" class="statPortion">a<span id="sAGenM11" class="statNumber">0</span></p>
<p id="statAGenM12" class="statPortion">a<span id="sAGenM12" class="statNumber">0</span></p>
<p id="statAGenMT" class="statPortion statTotal" style="color: orange">BLUEBERRY TIME /S:
<span id="sAGenMT" class="statNumber statTotal">0</span></p>
</div>
Expand Down Expand Up @@ -4560,6 +4577,8 @@ <h1>Artists</h1>
<!-- <p id="ambrosiaRNG" class="lightYellowText"></p> -->
<p id="ambrosiaRewards" class="lightYellowText"></p>
<p id="ambrosiaBlueberries" class="lightYellowText"></p>
<p id="cubeUpgradeThresholds" style="color: lightblue"></p>
<p id="cubeUpgradeRedBarFills" class="redText"></p>
</div>
<div id="ambrosiaProgressBar">
<div id="ambrosiaProgress" style="width: 70%;"></div>
Expand Down
48 changes: 35 additions & 13 deletions src/Calculate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,8 @@ export const calculateMaxRunes = (i: number) => {
}

export const calculateEffectiveIALevel = () => {
const bonus = PCoinUpgradeEffects.INSTANT_UNLOCK_2 ? 6 : 0
let bonus = PCoinUpgradeEffects.INSTANT_UNLOCK_2 ? 6 : 0
bonus += player.cubeUpgrades[73]
const totalRawLevel = player.runelevels[5] + bonus
return (
totalRawLevel
Expand Down Expand Up @@ -500,6 +501,7 @@ export function calculateOfferings (
1 + player.cubeUpgrades[54] / 100, // Cube upgrade 6x4 (Cx4)
+player.octeractUpgrades.octeractOfferings1.getEffect().bonus, // Offering Electrolosis OC Upgrade
1 + 0.001 * +player.blueberryUpgrades.ambrosiaOffering1.bonus.offeringMult, // Ambrosia!!
Math.pow(1.04, player.cubeUpgrades[72] * sumContents(player.talismanRarity)), // Cube upgrade 8x2 (Cx22)
calculateEXALTBonusMult(), // 20 Ascensions X20 Bonus [EXALT ONLY]
calculateEXUltraOfferingBonus(), // EX Ultra Shop Upgrade
1 + calculateEventBuff(BuffType.Offering) // Event
Expand Down Expand Up @@ -692,6 +694,8 @@ export const calculateObtainium = () => {
G.obtainiumGain *= calculateExalt6Penalty(comps, time)
}

G.obtainiumGain = Math.pow(1.04, player.cubeUpgrades[71] * sumContents(player.talismanRarity))

if (!isFinite(G.obtainiumGain)) {
G.obtainiumGain = 1e300
}
Expand Down Expand Up @@ -1784,7 +1788,7 @@ export const calculateAllCubeMultiplier = () => {
* Math.min(
9,
(player.shopUpgrades.shopSingularitySpeedup > 0)
? player.singularityCounter * 20 / (3600 * 24)
? player.singularityCounter * 50 / (3600 * 24)
: player.singularityCounter / (3600 * 24)
),
// Wow Pass INF
Expand Down Expand Up @@ -2134,7 +2138,7 @@ export const getOcteractValueMultipliers = () => {
* Math.min(
9,
(player.shopUpgrades.shopSingularitySpeedup > 0)
? player.singularityCounter * 20 / (3600 * 24)
? player.singularityCounter * 50 / (3600 * 24)
: player.singularityCounter / (3600 * 24)
),
// No Singulairty Upgrades
Expand Down Expand Up @@ -2776,6 +2780,7 @@ export const calculateAscensionScore = () => {
? 1
: 0
bonusLevel += +player.singularityChallenges.oneChallengeCap.rewards.freeCorruptionLevel

// Init Arrays with challenge values :)
const challengeScoreArrays1 = [0, 8, 10, 12, 15, 20, 60, 80, 120, 180, 300]
const challengeScoreArrays2 = [0, 10, 12, 15, 20, 30, 80, 120, 180, 300, 450]
Expand Down Expand Up @@ -2852,6 +2857,7 @@ export const calculateAscensionScore = () => {
? 0.33
: 0
bonusVal += +player.singularityChallenges.oneChallengeCap.rewards.corrScoreIncrease
bonusVal += 0.3 * player.cubeUpgrades[74]
for (let i = 2; i < 10; i++) {
const exponent = i === 2 && player.usedCorruptions[i] >= 10
? 1
Expand Down Expand Up @@ -3197,12 +3203,7 @@ export const calculateAmbrosiaLuckOcteractUpgrade = () => {
return sumContents(vals)
}

export const calculateRequiredBlueberryTime = () => {
let val = G.TIME_PER_AMBROSIA // Currently 600
val += Math.floor(player.lifetimeAmbrosia / 30)

const baseVal = val

export const calculateNumberOfThresholds = () => {
const timeThresholds = [
5000,
25000,
Expand All @@ -3215,14 +3216,31 @@ export const calculateRequiredBlueberryTime = () => {
1e7,
2e7,
4e7,
1e8
1e8,
2e8,
4e8,
1e9
]

const val = G.TIME_PER_AMBROSIA + Math.floor(player.lifetimeAmbrosia / 30)

let thresholds = 0
for (const threshold of timeThresholds) {
if (baseVal >= threshold) {
val *= 2
if (val >= threshold) {
thresholds++
}
}
return val

return thresholds
}

export const calculateRequiredBlueberryTime = () => {
let val = G.TIME_PER_AMBROSIA // Currently 600
val += Math.floor(player.lifetimeAmbrosia / 30)

const thresholds = calculateNumberOfThresholds()
const thresholdBase = 2
return Math.pow(thresholdBase, thresholds) * val
}

export const calculateSingularityMilestoneBlueberries = () => {
Expand Down Expand Up @@ -3342,6 +3360,7 @@ export const calculateAdditiveLuckMult = () => {
calculateDilatedFiveLeafBonus(), // Dilated Five Leaf Clover Perk
player.shopUpgrades.shopAmbrosiaLuckMultiplier4 / 100, // EXALT-unlocked shop upgrade
+player.singularityChallenges.noAmbrosiaUpgrades.rewards.luckBonus, // No Ambrosia Challenge Reward
0.001 * player.cubeUpgrades[77], // Cookie 5 (Cx27)
G.isEvent ? calculateEventBuff(BuffType.AmbrosiaLuck) : 0 // Event
]

Expand Down Expand Up @@ -3371,6 +3390,8 @@ export const calculateAmbrosiaLuck = () => {
player.highestSingularityCount >= 269 ? 269 : 0, // Singularity Perk "Two Hundred Sixty Nine!"
player.shopUpgrades.shopOcteractAmbrosiaLuck * (1 + Math.floor(Math.log10(player.totalWowOcteracts + 1))), // Octeract -> Ambrosia Shop Upgrade
+player.singularityChallenges.noAmbrosiaUpgrades.rewards.additiveLuck, // No Ambrosia Challenge Reward
2 * player.cubeUpgrades[77], // Cookie 5 (Cx27)
Math.min(100, player.cubeUpgradeRedBarFilled / 50), // Filled Red Bars with (Cx29) purchased
player.shopUpgrades.shopAmbrosiaUltra * sumOfExaltCompletions() // Ambrosia Ultra Shop Upgrade
]

Expand Down Expand Up @@ -3411,6 +3432,7 @@ export const calculateAmbrosiaGenerationSpeed = () => {
+player.blueberryUpgrades.ambrosiaPatreon.bonus.blueberryGeneration,
+player.singularityChallenges.oneChallengeCap.rewards.blueberrySpeedMult,
+player.singularityChallenges.noAmbrosiaUpgrades.rewards.blueberrySpeedMult,
1 + 0.01 * player.cubeUpgrades[76] * calculateNumberOfThresholds(),
G.isEvent ? 1 + calculateEventBuff(BuffType.BlueberryTime) : 1,
calculateCashGrabBlueberryBonus()
]
Expand Down
2 changes: 1 addition & 1 deletion src/Config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const version = '3.1.0 January 3, 2025: The PseudoCoin Update'
export const version = '3.1.1 January 13, 2025: The Bakery Update'

/**
* PSEUDO DO NOT CHANGE THIS LINE
Expand Down
8 changes: 5 additions & 3 deletions src/Cubes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ const cubeBaseCost = [
5e5, 3e5, 2e6, 4e6, 2e6, 4e6, 1e6, 2e7, 5e7, 1e7,
5e6, 1e7, 1e8, 4e7, 2e7, 4e7, 5e7, 1e8, 5e8, 1e8,
1, 1e4, 1e8, 1e12, 1e16, 10, 1e5, 1e9, 1e13, 1e17,
1e2, 1e6, 1e10, 1e14, 1e18, 1e20, 1e30, 1e40, 1e50, 1e60
1e2, 1e6, 1e10, 1e14, 1e18, 1e20, 1e30, 1e40, 1e50, 1e60,
1, 1, 1e8, 1e16, 1e30, 1e100, 1e100, 1e200, 1e250, 1e300,
]

// dprint-ignore
Expand All @@ -50,7 +51,8 @@ export const cubeMaxLevel = [
5, 1, 1, 10, 10, 10, 10, 1, 1, 10,
5, 10, 10, 10, 10, 20, 20, 1, 1, 100000,
1, 900, 100, 900, 900, 20, 1, 1, 400, 10000,
100, 1, 1, 1, 1, 1, 1, 1000, 1, 100000
100, 1, 1, 1, 1, 1, 1, 1000, 1, 100000,
1, 1, 5, 1, 30, 2, 25, 30, 1, 1
]

const getCubeCost = (i: number, buyMax: boolean): IMultiBuy => {
Expand Down Expand Up @@ -100,7 +102,7 @@ export const cubeUpgradeDesc = (i: number, buyMax = player.cubeUpgradesBuyMaxTog
const maxLevel = getCubeMax(i)

a.textContent = i18next.t(`cubes.upgradeNames.${i}`)
b.textContent = i18next.t(`cubes.upgradeDescriptions.${i}`)
b.innerHTML = i18next.t(`cubes.upgradeDescriptions.${i}`)
c.textContent = i18next.t('cubes.cubeMetadata.cost', {
value1: format(metaData.cost, 0, true),
value2: format(metaData.levelCanBuy - player.cubeUpgrades[i]!, 0, true)
Expand Down
5 changes: 4 additions & 1 deletion src/Helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export const addTimers = (input: TimerInput, time = 0) => {
const baseBlueberryTime = G.ambrosiaCurrStats.ambrosiaGenerationSpeed
player.blueberryTime += Math.floor(8 * G.ambrosiaTimer) / 8 * baseBlueberryTime
player.ultimateProgress += Math.floor(8 * G.ambrosiaTimer) / 8
* Math.min(baseBlueberryTime, Math.pow(1000 * baseBlueberryTime, 1 / 2)) * 0.02
* Math.min(baseBlueberryTime, Math.pow(1000 * baseBlueberryTime, 1 / 2))
G.ambrosiaTimer %= 0.125

let timeToAmbrosia = calculateRequiredBlueberryTime()
Expand Down Expand Up @@ -237,6 +237,9 @@ export const addTimers = (input: TimerInput, time = 0) => {

if (player.ultimateProgress > 1e6) {
player.ultimatePixels += Math.floor(player.ultimateProgress / 1e6)
if (player.cubeUpgrades[79] > 0) {
player.cubeUpgradeRedBarFilled += Math.floor(player.ultimateProgress / 1e6)
}
player.ultimateProgress -= 1e6 * Math.floor(player.ultimateProgress / 1e6)
}

Expand Down
2 changes: 1 addition & 1 deletion src/ImportExport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ export const promocodes = async (input: string | null, amount?: number) => {
* Math.min(
50,
(player.shopUpgrades.shopSingularitySpeedup)
? (100 * player.singularityCounter) / (3600 * 24)
? (250 * player.singularityCounter) / (3600 * 24)
: (5 * player.singularityCounter) / (3600 * 24)
)
rolls += +player.octeractUpgrades.octeractImprovedDaily3.getEffect().bonus
Expand Down
3 changes: 2 additions & 1 deletion src/Octeracts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ export class OcteractUpgrade extends DynamicUpgrade {
}

public computeFreeLevelSoftcap (): number {
return this.freeLevels
const freeLevelMult = 1 + 0.3 / 100 * player.cubeUpgrades[78]
return this.freeLevels * freeLevelMult
}

public actualTotalLevels (): number {
Expand Down
2 changes: 1 addition & 1 deletion src/Reset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,7 @@ export const singularity = async (setSingNumber = -1): Promise<void> => {
player.worlds.reset()
hold.worlds = Number(hold.worlds)
} else {
hold.worlds = Number(player.worlds) * 0.9
hold.worlds = Number(player.worlds)
}

// Exclude potentially non-latin1 characters from the save
Expand Down
4 changes: 2 additions & 2 deletions src/Shop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1351,15 +1351,15 @@ export const shopDescriptions = (input: ShopUpgradeNames) => {
case 'shopSingularitySpeedup': {
const obtained = player.shopUpgrades.shopSingularitySpeedup > 0
lol.innerHTML = i18next.t('shop.upgradeEffects.shopSingularitySpeedup', {
amount: obtained ? 20 : 1
amount: obtained ? 50 : 1
})
break
}
case 'shopSingularityPotency':
{
const obtained = player.shopUpgrades.shopSingularityPotency > 0
lol.innerHTML = i18next.t('shop.upgradeEffects.shopSingularityPotency', {
amount: obtained ? 7.66 : 1
amount: obtained ? 3.66 : 1
})
}
break
Expand Down
Loading
Loading