From 26091976d26a087b954e12262ddb6155d7a47492 Mon Sep 17 00:00:00 2001 From: SpectralFlame <4493131+cyip92@users.noreply.github.com> Date: Wed, 7 Dec 2022 21:52:35 -0600 Subject: [PATCH] Address PR comments (mult tab adjustments) --- .../core/secret-formula/multiplier-tab/dilated-time.js | 3 ++- .../secret-formula/multiplier-tab/eternity-points.js | 4 ++-- .../core/secret-formula/multiplier-tab/infinities.js | 3 ++- .../secret-formula/multiplier-tab/infinity-dimensions.js | 6 ++++-- .../secret-formula/multiplier-tab/infinity-points.js | 4 ++-- .../secret-formula/multiplier-tab/time-dimensions.js | 4 ++-- .../tabs/statistics/MultiplierBreakdownEntry.vue | 9 +++++---- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/javascripts/core/secret-formula/multiplier-tab/dilated-time.js b/javascripts/core/secret-formula/multiplier-tab/dilated-time.js index 06c015b7b..dd868cf67 100644 --- a/javascripts/core/secret-formula/multiplier-tab/dilated-time.js +++ b/javascripts/core/secret-formula/multiplier-tab/dilated-time.js @@ -11,7 +11,8 @@ GameDatabase.multiplierTabValues.DT = { isBase: true, displayOverride: () => `${format(getDilationGainPerSecond().times(getGameSpeedupForDisplay()), 2, 2)}/sec`, multValue: () => getDilationGainPerSecond().times(getGameSpeedupForDisplay()), - isActive: () => PlayerProgress.realityUnlocked() || PlayerProgress.dilationUnlocked(), + isActive: () => PlayerProgress.realityUnlocked() || + (PlayerProgress.dilationUnlocked() && getDilationGainPerSecond().gt(0)), dilationEffect: () => (Enslaved.isRunning ? 0.85 : 1), isDilated: true, overlay: ["Ψ"], diff --git a/javascripts/core/secret-formula/multiplier-tab/eternity-points.js b/javascripts/core/secret-formula/multiplier-tab/eternity-points.js index d1d4affa7..6afb8d61c 100644 --- a/javascripts/core/secret-formula/multiplier-tab/eternity-points.js +++ b/javascripts/core/secret-formula/multiplier-tab/eternity-points.js @@ -9,8 +9,8 @@ GameDatabase.multiplierTabValues.EP = { total: { name: "Total EP Gained on Eternity", isBase: true, - multValue: () => (Player.canEternity ? gainedEternityPoints() : 0), - isActive: () => PlayerProgress.eternityUnlocked() || gainedEternityPoints().gt(0), + multValue: () => gainedEternityPoints(), + isActive: () => PlayerProgress.eternityUnlocked() || Player.canEternity, dilationEffect: () => (Laitela.isRunning ? 0.75 * Effects.product(DilationUpgrade.dilationPenalty) : 1), isDilated: true, overlay: ["Δ", ""], diff --git a/javascripts/core/secret-formula/multiplier-tab/infinities.js b/javascripts/core/secret-formula/multiplier-tab/infinities.js index aed9e31bd..94cfe3d25 100644 --- a/javascripts/core/secret-formula/multiplier-tab/infinities.js +++ b/javascripts/core/secret-formula/multiplier-tab/infinities.js @@ -9,7 +9,8 @@ GameDatabase.multiplierTabValues.infinities = { name: "Infinities gained per Crunch", isBase: true, multValue: () => gainedInfinities(), - isActive: () => (Achievement(87).isUnlocked || PlayerProgress.realityUnlocked()) && + // The earliest sources of infinity multipliers are ach87 and TS32, which may happen in either order + isActive: () => (Achievement(87).isUnlocked || PlayerProgress.eternityUnlocked()) && !EternityChallenge(4).isRunning && !Pelle.isDoomed, overlay: ["∞", ""], }, diff --git a/javascripts/core/secret-formula/multiplier-tab/infinity-dimensions.js b/javascripts/core/secret-formula/multiplier-tab/infinity-dimensions.js index 382db6ae0..6e01380a8 100644 --- a/javascripts/core/secret-formula/multiplier-tab/infinity-dimensions.js +++ b/javascripts/core/secret-formula/multiplier-tab/infinity-dimensions.js @@ -23,8 +23,10 @@ GameDatabase.multiplierTabValues.ID = { .filter(id => id.isProducing) .map(id => id.multiplier) .reduce((x, y) => x.times(y), DC.D1)), - isActive: dim => (dim ? InfinityDimension(dim).isProducing : PlayerProgress.eternityUnlocked()) && - !EternityChallenge(11).isRunning, + isActive: dim => !EternityChallenge(11).isRunning && + (dim + ? InfinityDimension(dim).isProducing + : (PlayerProgress.eternityUnlocked() || InfinityDimension(1).isProducing)), dilationEffect: () => { const baseEff = player.dilation.active ? 0.75 * Effects.product(DilationUpgrade.dilationPenalty) diff --git a/javascripts/core/secret-formula/multiplier-tab/infinity-points.js b/javascripts/core/secret-formula/multiplier-tab/infinity-points.js index 6fe3c9e64..2937ce3db 100644 --- a/javascripts/core/secret-formula/multiplier-tab/infinity-points.js +++ b/javascripts/core/secret-formula/multiplier-tab/infinity-points.js @@ -9,8 +9,8 @@ GameDatabase.multiplierTabValues.IP = { total: { name: "Total IP Gained on Infinity", isBase: true, - multValue: () => (Player.canCrunch ? gainedInfinityPoints() : 0), - isActive: () => PlayerProgress.infinityUnlocked() || gainedInfinityPoints().gt(0), + multValue: () => gainedInfinityPoints(), + isActive: () => PlayerProgress.infinityUnlocked() || Player.canCrunch, dilationEffect: () => (Laitela.isRunning ? 0.75 * Effects.product(DilationUpgrade.dilationPenalty) : 1), isDilated: true, overlay: ["∞", ""], diff --git a/javascripts/core/secret-formula/multiplier-tab/time-dimensions.js b/javascripts/core/secret-formula/multiplier-tab/time-dimensions.js index a172d1645..915c6f316 100644 --- a/javascripts/core/secret-formula/multiplier-tab/time-dimensions.js +++ b/javascripts/core/secret-formula/multiplier-tab/time-dimensions.js @@ -23,8 +23,8 @@ GameDatabase.multiplierTabValues.TD = { .filter(td => td.isProducing) .map(td => td.multiplier) .reduce((x, y) => x.times(y), DC.D1)), - isActive: dim => (dim ? TimeDimension(dim).isProducing : PlayerProgress.realityUnlocked()) && - !EternityChallenge(11).isRunning, + isActive: dim => !EternityChallenge(11).isRunning && + (dim ? TimeDimension(dim).isProducing : (PlayerProgress.realityUnlocked() || TimeDimension(1).isProducing)), dilationEffect: () => { const baseEff = player.dilation.active ? 0.75 * Effects.product(DilationUpgrade.dilationPenalty) diff --git a/src/components/tabs/statistics/MultiplierBreakdownEntry.vue b/src/components/tabs/statistics/MultiplierBreakdownEntry.vue index 12829ce71..2c5b3b368 100644 --- a/src/components/tabs/statistics/MultiplierBreakdownEntry.vue +++ b/src/components/tabs/statistics/MultiplierBreakdownEntry.vue @@ -361,10 +361,11 @@ export default {

- "Base AD Production" is the amount of Antimatter that you would be producing with your current AD upgrades, - as if you had waited 10 seconds after a Sacrifice. This is likely to underestimate your actual production - depending on how long you have been producing, but the relative mismatch will become smaller as you progress - further in the game. + "Base AD Production" is the amount of Antimatter that you would be producing with your current AD upgrades + as if you had waited a fixed amount of time ({{ formatInt(10) }}-{{ formatInt(40) }} seconds depending on + your AD count) after a Sacrifice. This is may misrepresent your actual production if your ADs have been + producing for a while, but the relative mismatch will become smaller as you progress further in the game + and numbers become larger.