From 65e9131c259a0df77e7b8a271e7600e7026cb198 Mon Sep 17 00:00:00 2001 From: HypertextEye <140896972+HypertextEye@users.noreply.github.com> Date: Tue, 3 Oct 2023 10:54:17 -0500 Subject: [PATCH 1/4] offerings --- src/Calculate.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Calculate.ts b/src/Calculate.ts index 8dc0a961d..ed2fc8489 100644 --- a/src/Calculate.ts +++ b/src/Calculate.ts @@ -289,6 +289,7 @@ export function calculateOfferings(input: resetNames, calcMult = true, statistic if (player.reincarnationcounter >= 5) { a *= Math.max(1, player.reincarnationcounter / 10) } + a = Math.max(a, 3) } if (input === 'transcension' || input === 'transcensionChallenge' || input === 'reincarnation' || @@ -311,6 +312,7 @@ export function calculateOfferings(input: resetNames, calcMult = true, statistic if (player.transcendCount >= 5) { b *= Math.max(1, player.transcendcounter / 10) } + b = Math.max(b, 2) } // This will always be calculated if '0' is not already returned c += 1 @@ -334,6 +336,7 @@ export function calculateOfferings(input: resetNames, calcMult = true, statistic if (player.prestigeCount >= 5) { c *= Math.max(1, player.prestigecounter / 10) } + c = Math.max(c, 1) q = a + b + c const arr = [ From 852ad149a09cfd486fb213f3079b13eed6cb6c05 Mon Sep 17 00:00:00 2001 From: HypertextEye <140896972+HypertextEye@users.noreply.github.com> Date: Wed, 4 Oct 2023 11:54:47 -0500 Subject: [PATCH 2/4] Update Calculate.ts --- src/Calculate.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Calculate.ts b/src/Calculate.ts index ed2fc8489..2b9697bb0 100644 --- a/src/Calculate.ts +++ b/src/Calculate.ts @@ -285,11 +285,10 @@ export function calculateOfferings(input: resetNames, calcMult = true, statistic } a += 1 / 200 * G.rune5level * G.effectiveLevelMult * (1 + player.researches[85] / 200) a *= (1 + Math.pow(Decimal.log(player.reincarnationShards.add(1), 10), 2 / 3) / 4) - a *= Math.min(Math.pow(player.reincarnationcounter / 10, 2), 1) + a *= Math.max(Math.min(Math.pow(player.reincarnationcounter / 10, 2), 1), 1e-14) if (player.reincarnationcounter >= 5) { a *= Math.max(1, player.reincarnationcounter / 10) } - a = Math.max(a, 3) } if (input === 'transcension' || input === 'transcensionChallenge' || input === 'reincarnation' || @@ -308,11 +307,10 @@ export function calculateOfferings(input: resetNames, calcMult = true, statistic b += 1 / 200 * G.rune5level * G.effectiveLevelMult * (1 + player.researches[85] / 200) b *= (1 + Math.pow(Decimal.log(player.transcendShards.add(1), 10), 1 / 2) / 5) b *= (1 + CalcECC('reincarnation', player.challengecompletions[8]) / 25) - b *= Math.min(Math.pow(player.transcendcounter / 10, 2), 1) + b *= Math.max(Math.min(Math.pow(player.transcendcounter / 10, 2), 1), 1e-14) if (player.transcendCount >= 5) { b *= Math.max(1, player.transcendcounter / 10) } - b = Math.max(b, 2) } // This will always be calculated if '0' is not already returned c += 1 @@ -332,11 +330,10 @@ export function calculateOfferings(input: resetNames, calcMult = true, statistic c += 1 / 200 * G.rune5level * G.effectiveLevelMult * (1 + player.researches[85] / 200) c *= (1 + Math.pow(Decimal.log(player.prestigeShards.add(1), 10), 1 / 2) / 5) c *= (1 + CalcECC('reincarnation', player.challengecompletions[6]) / 50) - c *= Math.min(Math.pow(player.prestigecounter / 10, 2), 1) + c *= Math.max(Math.min(Math.pow(player.prestigecounter / 10, 2), 1), 1e-14) if (player.prestigeCount >= 5) { c *= Math.max(1, player.prestigecounter / 10) } - c = Math.max(c, 1) q = a + b + c const arr = [ From 4bdd2876f6b97fae6994febb60b16e5b52476bfd Mon Sep 17 00:00:00 2001 From: HypertextEye <140896972+HypertextEye@users.noreply.github.com> Date: Thu, 5 Oct 2023 20:21:06 -0500 Subject: [PATCH 3/4] Update Calculate.ts --- src/Calculate.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Calculate.ts b/src/Calculate.ts index 2b9697bb0..120ca4240 100644 --- a/src/Calculate.ts +++ b/src/Calculate.ts @@ -285,7 +285,7 @@ export function calculateOfferings(input: resetNames, calcMult = true, statistic } a += 1 / 200 * G.rune5level * G.effectiveLevelMult * (1 + player.researches[85] / 200) a *= (1 + Math.pow(Decimal.log(player.reincarnationShards.add(1), 10), 2 / 3) / 4) - a *= Math.max(Math.min(Math.pow(player.reincarnationcounter / 10, 2), 1), 1e-14) + a *= Math.min(Math.pow(player.reincarnationcounter / 10, 2), 1) if (player.reincarnationcounter >= 5) { a *= Math.max(1, player.reincarnationcounter / 10) } @@ -307,7 +307,7 @@ export function calculateOfferings(input: resetNames, calcMult = true, statistic b += 1 / 200 * G.rune5level * G.effectiveLevelMult * (1 + player.researches[85] / 200) b *= (1 + Math.pow(Decimal.log(player.transcendShards.add(1), 10), 1 / 2) / 5) b *= (1 + CalcECC('reincarnation', player.challengecompletions[8]) / 25) - b *= Math.max(Math.min(Math.pow(player.transcendcounter / 10, 2), 1), 1e-14) + b *= Math.min(Math.pow(player.transcendcounter / 10, 2), 1) if (player.transcendCount >= 5) { b *= Math.max(1, player.transcendcounter / 10) } @@ -330,11 +330,11 @@ export function calculateOfferings(input: resetNames, calcMult = true, statistic c += 1 / 200 * G.rune5level * G.effectiveLevelMult * (1 + player.researches[85] / 200) c *= (1 + Math.pow(Decimal.log(player.prestigeShards.add(1), 10), 1 / 2) / 5) c *= (1 + CalcECC('reincarnation', player.challengecompletions[6]) / 50) - c *= Math.max(Math.min(Math.pow(player.prestigecounter / 10, 2), 1), 1e-14) + c *= Math.min(Math.pow(player.prestigecounter / 10, 2), 1) if (player.prestigeCount >= 5) { c *= Math.max(1, player.prestigecounter / 10) } - q = a + b + c + q = Math.max(a + b + c, 1) const arr = [ 1 + 10 * player.achievements[33] / 100, // Alchemy Achievement 5 From aa8030659017ad6b06f8cd9aa86007b0593524ba Mon Sep 17 00:00:00 2001 From: HypertextEye <140896972+HypertextEye@users.noreply.github.com> Date: Sat, 7 Oct 2023 14:50:55 -0500 Subject: [PATCH 4/4] Update Calculate.ts --- src/Calculate.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Calculate.ts b/src/Calculate.ts index 120ca4240..f3301daa0 100644 --- a/src/Calculate.ts +++ b/src/Calculate.ts @@ -285,7 +285,7 @@ export function calculateOfferings(input: resetNames, calcMult = true, statistic } a += 1 / 200 * G.rune5level * G.effectiveLevelMult * (1 + player.researches[85] / 200) a *= (1 + Math.pow(Decimal.log(player.reincarnationShards.add(1), 10), 2 / 3) / 4) - a *= Math.min(Math.pow(player.reincarnationcounter / 10, 2), 1) + a *= Math.min(Math.pow(player.reincarnationcounter / 10 + 1, 2), 1) if (player.reincarnationcounter >= 5) { a *= Math.max(1, player.reincarnationcounter / 10) } @@ -334,7 +334,7 @@ export function calculateOfferings(input: resetNames, calcMult = true, statistic if (player.prestigeCount >= 5) { c *= Math.max(1, player.prestigecounter / 10) } - q = Math.max(a + b + c, 1) + q = a + b + c const arr = [ 1 + 10 * player.achievements[33] / 100, // Alchemy Achievement 5