diff --git a/src/components/tabs/statistics/StatisticsTab.vue b/src/components/tabs/statistics/StatisticsTab.vue index 0a8225263..bbbd60932 100644 --- a/src/components/tabs/statistics/StatisticsTab.vue +++ b/src/components/tabs/statistics/StatisticsTab.vue @@ -100,7 +100,7 @@ export default { infinity.count.copyFrom(Currency.infinities); infinity.banked.copyFrom(Currency.infinitiesBanked); infinity.projectedBanked = new Decimal(0).plusEffectsOf( - Achievement(131), + Achievement(131).effects.bankedInfinitiesGain, TimeStudy(191) ); infinity.bankRate = infinity.projectedBanked.div(Math.clampMin(33, records.thisEternity.time)).times(60000); diff --git a/src/core/celestials/pelle/pelle.js b/src/core/celestials/pelle/pelle.js index a2848cb24..36e4d2216 100644 --- a/src/core/celestials/pelle/pelle.js +++ b/src/core/celestials/pelle/pelle.js @@ -182,8 +182,8 @@ export const Pelle = { }, get disabledAchievements() { - return [164, 156, 143, 142, 141, 137, 134, 133, 132, 126, 125, 118, 117, 116, 113, 111, 104, 103, 95, 93, 92, 91, - 87, 85, 78, 76, 74, 65, 55, 54, 37]; + return [164, 156, 143, 142, 141, 137, 134, 133, 132, 131, 126, 125, 118, 117, 116, 113, 111, 104, 103, 95, 93, 92, + 91, 87, 85, 78, 76, 74, 65, 55, 54, 37]; }, get uselessInfinityUpgrades() { diff --git a/src/core/eternity.js b/src/core/eternity.js index ad180254c..60d2c357b 100644 --- a/src/core/eternity.js +++ b/src/core/eternity.js @@ -44,7 +44,7 @@ function giveEternityRewards(auto) { player.records.bestEternity.bestEPminReality.max(player.records.thisEternity.bestEPmin); Currency.infinitiesBanked.value = Currency.infinitiesBanked.value.plusEffectsOf( - Achievement(131), + Achievement(131).effects.bankedInfinitiesGain, TimeStudy(191) ); diff --git a/src/core/secret-formula/achievements/normal-achievements.js b/src/core/secret-formula/achievements/normal-achievements.js index 94774c5fe..6e7b033ad 100644 --- a/src/core/secret-formula/achievements/normal-achievements.js +++ b/src/core/secret-formula/achievements/normal-achievements.js @@ -931,9 +931,14 @@ export const normalAchievements = [ checkRequirement: () => Currency.infinitiesBanked.gt(DC.D2E9), checkEvent: [GAME_EVENT.ETERNITY_RESET_AFTER, GAME_EVENT.SAVE_CONVERTED_FROM_PREVIOUS_VERSION], get reward() { - return `After Eternity you permanently keep ${formatPercents(0.05)} of your Infinities as Banked Infinities.`; + return `You gain ${formatX(2)} times more Infinities and + after Eternity you permanently keep ${formatPercents(0.05)} of your Infinities as Banked Infinities.`; }, - effect: () => Currency.infinities.value.times(0.05).floor() + effects: { + infinitiesGain: 2, + bankedInfinitiesGain: () => Currency.infinities.value.times(0.05).floor() + } + }, { id: 132, diff --git a/src/core/secret-formula/multiplier-tab/general.js b/src/core/secret-formula/multiplier-tab/general.js index a2e58ad9b..d1fbab34f 100644 --- a/src/core/secret-formula/multiplier-tab/general.js +++ b/src/core/secret-formula/multiplier-tab/general.js @@ -10,6 +10,9 @@ export const general = { ? `Achievement ${ach} (${dim})` : `Achievement ${ach}`), multValue: (ach, dim) => { + // There is also a banked infinities gain effect, but we don't track that in the multiplier tab + if (ach === 131) return Achievement(131).canBeApplied + ? Achievement(131).effects.infinitiesGain.effectOrDefault(1) : 1; // There is also a buy10 effect, but we don't track that in the multiplier tab if (ach === 141) return Achievement(141).canBeApplied ? Achievement(141).effects.ipGain.effectOrDefault(1) : 1; if (ach === 183) return 1; diff --git a/src/core/secret-formula/multiplier-tab/infinities.js b/src/core/secret-formula/multiplier-tab/infinities.js index 244af6803..9ec5e8519 100644 --- a/src/core/secret-formula/multiplier-tab/infinities.js +++ b/src/core/secret-formula/multiplier-tab/infinities.js @@ -17,6 +17,7 @@ export const infinities = { name: "Achievements", multValue: () => DC.D1.timesEffectsOf( Achievement(87), + Achievement(131).effects.infinitiesGain, Achievement(164) ), isActive: () => Achievement(87).isUnlocked, diff --git a/src/core/secret-formula/multiplier-tab/tree.js b/src/core/secret-formula/multiplier-tab/tree.js index df1f57915..0cfe3bcd7 100644 --- a/src/core/secret-formula/multiplier-tab/tree.js +++ b/src/core/secret-formula/multiplier-tab/tree.js @@ -43,7 +43,7 @@ function getProps(resource, tier) { return newProps; } -// Everything is multiplierTabTree is associated with values in multiplierTabValues. The only explicitly +// Everything in multiplierTabTree is associated with values in multiplierTabValues. The only explicitly // initialized props here are the "root" props which are viewable on the tab with full breakdowns. After the initial // specification, all children props are dynamically added based on the arrays in the helper functions above export const multiplierTabTree = { @@ -122,7 +122,7 @@ const targetedEffects = { TD: [105, 128], IP: [85, 93, 116, 125, 141], DT: [132, 137], - infinities: [87, 164], + infinities: [87, 131, 164], }, timeStudy: { checkFn: MultiplierTabHelper.timeStudyDimCheck, diff --git a/src/game.js b/src/game.js index 791b2e092..9b213b6df 100644 --- a/src/game.js +++ b/src/game.js @@ -278,6 +278,7 @@ export function gainedInfinities() { TimeStudy(32), RealityUpgrade(5), RealityUpgrade(7), + Achievement(131).effects.infinitiesGain, Achievement(164), Ra.unlocks.continuousTTBoost.effects.infinity );