Make effects disabled in Pelle more accurate

This commit is contained in:
Phoenix51505 2023-02-08 17:33:24 -05:00
parent f7bfc90108
commit 92048e698b
9 changed files with 20 additions and 13 deletions

View File

@ -175,8 +175,8 @@ export const Pelle = {
},
get disabledAchievements() {
return [164, 156, 143, 142, 141, 137, 134, 133, 132, 126, 125, 118, 117, 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, 126, 125, 118, 117, 116, 113, 111, 104, 103, 95, 93, 92, 91,
87, 85, 78, 76, 74, 65, 55, 54, 37];
},
get uselessInfinityUpgrades() {
@ -193,7 +193,7 @@ export const Pelle = {
get uselessPerks() {
return [10, 12, 13, 14, 15, 16, 17, 30, 40, 41, 42, 43, 44, 45, 46, 51, 52,
53, 60, 61, 62, 80, 81, 82, 83, 100, 104, 105, 106, 201, 202, 203, 204];
53, 60, 61, 62, 80, 81, 82, 83, 100, 103, 104, 105, 106, 201, 202, 203, 204, 205];
},
get specialGlyphEffect() {

View File

@ -78,7 +78,7 @@ export function buyDilationUpgrade(id, bulk = 1) {
Currency.dilatedTime.subtract(cost);
player.dilation.rebuyables[id] += buying;
if (id === 2) {
if (!Perk.bypassTGReset.isBought) Currency.dilatedTime.reset();
if (!Perk.bypassTGReset.isBought || Pelle.isDoomed) Currency.dilatedTime.reset();
player.dilation.nextThreshold = DC.E3;
player.dilation.baseTachyonGalaxies = 0;
player.dilation.totalTachyonGalaxies = 0;

View File

@ -1,4 +1,5 @@
import { DC } from "./constants";
import { Pelle } from "./globals";
// Slowdown parameters for replicanti growth, interval will increase by scaleFactor for every scaleLog10
// OoM past the cap (default is 308.25 (log10 of 1.8e308), 1.2, Number.MAX_VALUE)
@ -16,7 +17,7 @@ function addReplicantiGalaxies(newGalaxies) {
if (newGalaxies > 0) {
player.replicanti.galaxies += newGalaxies;
player.requirementChecks.eternity.noRG = false;
if (!EternityMilestone.replicantiNoReset.isReached) {
if (!EternityMilestone.replicantiNoReset.isReached || Pelle.isDoomed) {
player.dimensionBoosts = 0;
softReset(0, true, true);
}
@ -28,7 +29,7 @@ export function replicantiGalaxy() {
const galaxyGain = Replicanti.galaxies.gain;
if (galaxyGain < 1) return;
player.replicanti.timer = 0;
Replicanti.amount = Achievement(126).isUnlocked
Replicanti.amount = Achievement(126).isUnlocked && !Pelle.isDoomed
? Decimal.pow10(Replicanti.amount.log10() - LOG10_MAX_VALUE * galaxyGain)
: DC.D1;
addReplicantiGalaxies(galaxyGain);

View File

@ -75,7 +75,8 @@ GameDatabase.celestials.ra = {
reward: "Unlock Altered Glyphs, which grant new effects to Glyphs based on Glyph Sacrifice",
pet: "teresa",
level: 10,
displayIcon: `<span class="fas fa-bolt"></span>`
displayIcon: `<span class="fas fa-bolt"></span>`,
disabledByPelle: true
},
effarigUnlock: {
id: 4,

View File

@ -53,7 +53,7 @@ GameDatabase.eternity.dilation = {
initialCost: 1e6,
increment: 100,
description: () =>
(Perk.bypassTGReset.isBought
(Perk.bypassTGReset.isBought && !Pelle.isDoomed
? "Reset Tachyon Galaxies, but lower their threshold"
: "Reset Dilated Time and Tachyon Galaxies, but lower their threshold"),
// The 38th purchase is at 1e80, and is the last purchase.

View File

@ -248,7 +248,8 @@ GameDatabase.reality.glyphEffects = {
formatSecondaryEffect: x => format(x, 2, 3),
formatSingleSecondaryEffect: x => format(x, 5, 5),
alteredColor: () => GlyphAlteration.getAdditionColor("replication"),
alterationType: ALTERATION_TYPE.ADDITION
alterationType: ALTERATION_TYPE.ADDITION,
enabledInDoomed: true,
},
replicationglyphlevel: {
id: "replicationglyphlevel",

View File

@ -14,6 +14,7 @@ export default {
// Numerical nerfs and disabled boosts
"Anything unlocked through a Pelle upgrade cannot be unlocked normally",
"All pre-Doomed IP and EP multipliers are disabled",
"IP generation based on fastest infinity speed is disabled",
"All pre-Doomed Replicanti speed multipliers are disabled",
"Most Eternity Challenges are harder",
`All Galaxies are only ${formatPercents(0.5)} as effective`,
@ -30,7 +31,7 @@ export default {
"Automatic Infinity and Eternity Challenges are disabled",
"All Dimension and pre-Infinity Autobuyers are disabled until reacquired through Pelle",
"The Time Theorem Autobuyer is disabled",
"All Automation related to Time Dilation or later are disabled",
"All Automation related to Time Dilation or later is disabled",
// Time studies + Dilation
"Eternity Upgrade to Time Dimensions based on days played is based on this Armageddon time",
@ -45,11 +46,14 @@ export default {
// Celestial features
"You cannot enter any other Celestial Realities",
"Music Glyphs cannot be bought",
"All rewards from Effarig are disabled",
"All features related to storing time are disabled",
"All rewards from V are disabled",
`The Teresa Level ${formatInt(1)} effect from Ra is disabled`,
"Infinity Upgrades cannot be charged",
"Triad Studies and Space Theorems are disabled",
"Imaginary Upgrades are disabled",
"Imaginary Upgrades are disabled excluding those relating to DMD's and Celestial unlocks",
"Continuum and Singularity rewards are disabled"
];
}

View File

@ -113,7 +113,7 @@ export default {
const pending = Replicanti.galaxies.gain;
let pendingTime = pending * secondsPerGalaxy.toNumber();
// If popular music is unlocked add the divide amount
if (Achievement(126).isUnlocked) {
if (Achievement(126).isUnlocked && !Pelle.isDoomed) {
const leftPercentAfterGalaxy = replicantiAmount.log10() / LOG10_MAX_VALUE - pending;
pendingTime += leftPercentAfterGalaxy * secondsPerGalaxy.toNumber();
}

View File

@ -21,7 +21,7 @@ export default {
},
computed: {
resetActionDisplay() {
return this.isDivideUnlocked
return this.isDivideUnlocked && !Pelle.isDoomed
? `Divide Replicanti by ${format(Number.MAX_VALUE, 1, 1)}`
: "Reset Replicanti amount";
},