new cool merge request

changelog.html

@@ -157,4 +157,29 @@
 		<li>Implemented Quantum Foam</li>
 		<li>Squished a few bugs</li>
 	</ul>
+	<span style="font-size: 25px;"><b>v1.9: Skyrmions Update</b></span
+	><br />
+	<ul>
+		<li>Implemented Skyrmions</li>
+		<li>Made automators/options look better</li>
+		<li>Added some more statistics stuff</li>
+		<li>Squished some more bugs</li>
+	</ul>
+	<span style="font-size: 25px;"><b>v1.91: Mode Extension Update</b></span
+	><br />
+	<ul>
+		<li>Balanced Extreme & Hiker's Dream modes to v1.9 endgame</li>
+		<li>Added a few QoL options</li>
+		<li>Fixed a few bugs</li>
+		<li>Options are now cross-save compatible</li>
+	</ul>
+	<span style="font-size: 25px;"><b>v2.0: Multiverse Update</b></span
+	><br />
+	<ul>
+		<li>Implemented Multiverses</li>
+		<li>Added a few QoL options</li>
+		<li>Fixed a few bugs</li>
+		<li>Increased save limit to 96</li>
+		<li>Added post-game stuff</li>
+	</ul>
 </body>

js/classes/Achievement.js

@@ -21,8 +21,11 @@ class Achievement {
 				txt += "boolean" + l[i+2]
 			}
 		}
-
-		if (txt.indexOf("showNum") != -1) {
+
+		if (txt.indexOf("showNup") != -1) {
+			let txt2 = txt.split("showNup")[1];
+			return txt.split("showNup")[0] + showNum(txt2.slice(1, txt2.indexOf("]"))) + txt2.split("]")[1];
+		} else if (txt.indexOf("showNum") != -1) {
 			let txt2 = txt.split("showNum")[1];
 			return txt.split("showNum")[0] + showNum(txt2.slice(1, txt2.indexOf(")"))) + txt2.split(")")[1];
 		} else if (txt.indexOf("formatDistance") != -1) {
@@ -67,4 +70,9 @@ class Achievement {
 			notifier.success("Achievement gotten: " + ACH_DATA.names[this.name]);
 		}
 	}
+
+	static hasRow(x) { 
+		for (let i=1;i<=ACH_DATA.cols;i++) if (!player.achievements.includes(x*10+i)) return false;
+		return true;
+	}
 }

js/classes/Feature.js

@@ -6,6 +6,8 @@ class Feature {
 		this.display = data.display;
 		this.r = data.reached || (function() { return false });
 		this.spec = data.spec ? data.spec : Array.isArray(data.res);
+		this.superSpec = data.superSpec || false
+		this.resName = data.resName || "???"
 		this.disp = data.displayName ? data.displayName : data.name;
 		this.progress = data.progress
 			? data.progress
@@ -18,15 +20,23 @@ class Feature {
 
 	amt(x = 1) {
 		if (this.res_amt > 1) {
-			return this.spec[x - 1] ? player[this.res[x - 1][0]][this.res[x - 1][1]] : player[this.res[x - 1]];
-		} else return this.spec ? player[this.res[0]][this.res[1]] : player[this.res];
+			if (this.superSpec?this.superSpec[x - 1]:false) return this.res[x - 1]()
+			else return this.spec[x - 1] ? player[this.res[x - 1][0]][this.res[x - 1][1]] : player[this.res[x - 1]];
+		} else {
+			if (this.superSpec) return this.res()
+			else return this.spec ? player[this.res[0]][this.res[1]] : player[this.res];
+		}
 	}
 
 	dispAmt(x = 1) {
 		if (this.specRes[x-1]) return this.specRes[x-1]
-		if (this.res_amt > 1)
-			return this.spec[x - 1] ? capitalFirst(this.res[x - 1][1]) : capitalFirst(this.res[x - 1]);
-		return this.spec ? capitalFirst(this.res[1]) : capitalFirst(this.res);
+		if (this.res_amt > 1) {
+			if (this.superSpec?this.superSpec[x - 1]:false) return capitalFirst(this.resName[x - 1])
+			else return this.spec[x - 1] ? capitalFirst(this.res[x - 1][1]) : capitalFirst(this.res[x - 1]);
+		} else {
+			if (this.superSpec) return capitalFirst(this.resName)
+			else return this.spec ? capitalFirst(this.res[1]) : capitalFirst(this.res);
+		}
 	}
 
 	get reached() {
@@ -52,7 +62,7 @@ class Feature {
 					" to unlock " + this.disp + " (" + showNum(new ExpantaNum(this.progress() || 0).times(100)) + "%)";
 				return desc;
 			} else return "";
-		} else
+		} else {
 			return this.reached
 				? ""
 				: "Reach " +
@@ -64,5 +74,6 @@ class Feature {
 						" (" +
 						showNum(new ExpantaNum(this.progress() || 0).times(100)) +
 						"%)";
+		}
 	}
 }

js/classes/Layer.js

@@ -1,15 +1,16 @@
 class Layer {
-	constructor(name, avail, type, spec, tName) {
+	constructor(name, avail, type, spec, tName, useCustomGain) {
 		this.name = name;
 		this.tName = tName || name;
 		this.avail = avail;
 		this.type = type;
 		this.spec = !!spec;
+		this.customGain = useCustomGain||type=="multi-res";
 		this.addS = this.name == "rank" || this.name == "tier";
 	}
 
 	get gain() {
-		if (this.type == "multi-res") return tmp[this.tName].gain();
+		if (this.customGain) return tmp[this.tName].gain();
 		if (this.type == "forced" || this.type == "semi-forced") return new ExpantaNum(1);
 		let req = LAYER_REQS[this.name];
 		let nr = req[1];
@@ -24,6 +25,7 @@ class Layer {
 			if (player.inf.pantheon.purge.active || HCCBA("purge")) gain = gain.plus(1).pow(gain.plus(1).times(10).slog(10).pow(-1)).min(gain)
 			if (modeActive("extreme") && !modeActive("hikers_dream")) gain = gain.sub(2).max(0)
 		}
+		if (modeActive("hikers_dream") && player.elementary.theory.depth.gte(10) && player.elementary.theory.active && gain.gt(1)) gain = gain.pow(3).root(player.elementary.theory.depth)
 		return gain.floor();
 	}
 
@@ -37,25 +39,27 @@ class Layer {
 	reset(force=false, auto=false) {
 		if (!force) {
 			if (tmp[this.tName]) if (tmp[this.tName].updateOnReset !== undefined && !auto) tmp[this.tName].updateOnReset();
-			if (!this.avail || this.gain.lt(1)) return;
+			if (!(this.avail || (!(this.name === "infinity") && player.inf.endorsements.lte(10) && infActive)) || this.gain.lt(1)) return;
 			if (!this.spec) player[this.name] = player[this.name].plus(this.gain);
 			else {
 				let gc = tmp[this.tName].doGain(auto);
 				if (gc == "NO") return;
 			}
 		}
+		if (LAYER_RESETS_NOTHING[this.name]()) return;
 		let prev = transformToEN(player, DEFAULT_START);
-		for (let i = 0; i < LAYER_RESETS[this.name].length; i++)
+		for (let i = 0; i < LAYER_RESETS[this.name].length; i++) 
 			player[LAYER_RESETS[this.name][i]] =
 				DEFAULT_START[LAYER_RESETS[this.name][i]] instanceof Object &&
 				!(DEFAULT_START[LAYER_RESETS[this.name][i]] instanceof ExpantaNum)
 					? JSON.parse(JSON.stringify(DEFAULT_START[LAYER_RESETS[this.name][i]]))
 					: DEFAULT_START[LAYER_RESETS[this.name][i]];
 		player = transformToEN(player, DEFAULT_START);
 		modeLoad(LAYER_RESETS_EXTRA[this.name]);
-		if (tmp[this.tName]) if (tmp[this.tName].onReset !== undefined) tmp[this.tName].onReset(prev)
+		if (tmp[this.tName]) if (tmp[this.tName].onReset !== undefined) tmp[this.tName].onReset(prev, auto)
 		if (this.name!="rf"&&modeActive("hikers_dream")) calcInclines();
-		needUpdate = true
+		updateBeforeTick();
+		updateAfterTick();
 	}
 
 	bulk(mag = new ExpantaNum(1)) {

js/constants/achievements.js

@@ -1,5 +1,5 @@
 const ACH_DATA = {
-	rows: 16,
+	rows: 19,
 	cols: 8,
 	names: {
 		11: "Quick Sprint",
@@ -115,10 +115,10 @@ const ACH_DATA = {
 		133: "It's Elementary, my dear Watson.",
 		134: "Why use the features I give you?",
 		135: "Never Seen Again",
-		136: "Fastest in the Metaverse",
+		136: "Fastest in the Multiverse",
 		137: "Back to the Past",
 		138: "The Fleet Flees",
-		
+
 		141: "The Impossible Happened",
 		142: "Endless Endeavours",
 		143: "Under the C",
@@ -127,7 +127,7 @@ const ACH_DATA = {
 		146: "True Infinity+",
 		147: "The Biggest Setback",
 		148: "The Impossible Task",
-		
+
 		151: "An infinity smaller than your fingertip",
 		152: "Useless Theories",
 		153: "There is a tree",
@@ -136,7 +136,7 @@ const ACH_DATA = {
 		156: "IMPOSSIBLE",
 		157: "The Principle of the Basics",
 		158: "The Repetition Continues",
-		
+
 		161: "We're kids again",
 		162: "Actually Useless Theories",
 		163: "String Clickers",
@@ -145,6 +145,33 @@ const ACH_DATA = {
 		166: "True Inflation",
 		167: "How is the Multiverse containing your power?",
 		168: "There is only one Fome",
+
+		171: "TRANSFOOOOORM!",
+		172: "This must have taken years",
+		173: "Extensionless Fome",
+		174: "The Multiverse is Doomed",
+		175: "Removing the Pillars",
+		176: "Entering Reality",
+		177: "Softcaps mean NOTHING",
+		178: "Multiverse Conquered",
+
+		181: "Two In One Deal",
+		182: "Multiverse of Madness",
+		183: "Fermionic Embassy",
+		184: "The Entropy Sublimit",
+		185: "Eternal Torture",
+		186: "King of the Damned",
+		187: "Conquering the Megaverse",
+		188: "Not So Proto Now?",
+
+		191: "Vantablack Explosion",
+		192: "The Leetest Titan",
+		193: "Conqueror of the Lands",
+		194: "Nice Beloved Quality",
+		195: "Millionaire Multipreneur",
+		196: "Hadron Manipulation",
+		197: "Billionaire X",
+		198: "Overlord of Everything",
 	},
 	descs: {
 		11: "Go at least formatDistance(100).",
@@ -251,7 +278,7 @@ const ACH_DATA = {
 		123: "Reach showNum(2.5e5) Ascension Power.",
 		124: "Reach boolean(extreme,nine,thirty) Purge Power.",
 		125: "Reach formatDistance(1e4) while in a Purge run & in Reality's Stadium challenge at Difficulty Level 6.",
-		126: "Have a magnitude of showNum(1e200) for Rankbot.",
+		126: "Have a magnitude of boolean(hard,showNup[1e75],showNup[1e200]) for Rankbot.",
 		127: "Reach showNum(1e100000) Time Cubes without any Pathogen Upgrades or Dark Cores.",
 		128: "Reach formatDistance(5.55e5555)/s^2 of Acceleration while in a Purge run.",
 
@@ -263,7 +290,7 @@ const ACH_DATA = {
 		136: "Reach showNum(1e3750000) uni/s of Velocity.",
 		137: "Do an Elementary reset without any Derivative Boosts (but you can have Derivative Shifts).",
 		138: "Reach formatDistance(4.4e7826) while having ten Endorsements or less.",
-		
+
 		141: "Get a Theory Point.",
 		142: "Reach formatDistance(4.4e136) while in a Purge run, while in Reality's Stadium challenge at Difficulty Level 6, and without Pathogen Upgrades & Dark Cores in the current Infinity.",
 		143: "Complete The Theoriverse at Depth 4.",
@@ -272,7 +299,7 @@ const ACH_DATA = {
 		146: "Reach showNum(1.8e308) Knowledge.",
 		147: "Reach Rank showNum(200) with ten Endorsements or less.",
 		148: "Reach Rank showNum(995).",
-		
+
 		151: "Unlock Hadronic Challenge.",
 		152: "Get a Hadronic Score of at least showNum(2.3).",
 		153: "Reach formatDistance(4.4e8250026) without any Theory Tree Upgrades.",
@@ -281,15 +308,42 @@ const ACH_DATA = {
 		156: "Complete The Theoriverse at Depth 8.",
 		157: "Reach formatDistance(4.4e76) of Primary String.",
 		158: "Get a Hadronic Score of at least showNum(3.75).",
-		
+
 		161: "Unlock Quantum Foam.",
 		162: "Reach formatDistance(4.4e251) of Primary String.",
 		163: "Reach formatDistance(4.4e126) of Entangled String.",
 		164: "Unlock Entropy.",
 		165: "Get a Hadronic Score of at least showNum(8).",
-		166: "Reach showNum(1e160) Inflatons.",
+		166: "Reach boolean(extreme,showNup[1e150],showNup[1e160]) Inflatons.",
 		167: "Reach showNum(1e108000000) uni.",
 		168: "Reach showNum(1e25) Quantum Foam without any Subplanck Foam.",
+
+		171: "Get a Skyrmion.",
+		172: "Elementary showNum(1e12) times.",
+		173: "Reach boolean(extreme,showNup[1e78],showNup[1e140]) Quantum Foam without any Entropy.",
+		174: "Reach formatDistance(4.4e500000026).",
+		175: "Reach formatDistance(4.4e222222248) without any Entropy, Subplanck Foam, or Photon/Gluon Upgrades.",
+		176: "Complete The Theoriverse at Depth 19.",
+		177: "Have Pathogen Upgrade Power of at least showNum(1625)%.",
+		178: "Reach formatDistance(4.4e1000000026).",
+
+		181: "Reach formatDistance(1.936e2000000053).",
+		182: "Reach formatDistance(1.7868e3500000093) without any Theoriverse completions.",
+		183: "Complete Multiverse 1.",
+		184: "Reach showNum(1e5) Entropy.",
+		185: "Reach formatDistance(3.911111e88888915) while in Multiverse 2 and Eternity's Stadium challenge at Difficulty Level 6.",
+		186: "Reach formatDistance(2.21e100000002664).",
+		187: "Complete Multiverse 5.",
+		188: "Reach showNum(1e430) Protoversal Foam.",
+
+		191: "Purchase showNum(10) Dark Expanders.",
+		192: "Get showNum(1337) Ranks in Multiverse 1 without unlocking Theories, Hadronic Challenge, Foam, or Skyrmions.",
+		193: "Reach formatDistance(4.4e800000026) in Multiverse 3 without unlocking Ascension.",
+		194: "Reach Tier showNum(69).",
+		195: "Gain showNum(1e6) Multiversal Energy in one reset.",
+		196: "Reach formatDistance(4.4e10000026) in Multiverse 5 while in a Hadronic Challenge with a Projected Score of at least boolean(extreme,12,15).",
+		197: "Gain showNum(1e9) Multiversal Energy in one reset.",
+		198: "Reach formatDistance(2.8e1000000026643).",
 	},
 	rewards: {
 		12: "Acceleration is showNum(10)% higherboolean(extreme, and Rank Cheapeners are +0.5x stronger for each achievement gotten).",
@@ -330,7 +384,7 @@ const ACH_DATA = {
 		65: "Cadaver gain is increased by showNum(40)%boolean(extreme+hikers_dream, increase the Confidence softcap by one third per Pathogen upgrade)boolean(hard, and Pathogen Upgrades softcap five later)",
 		66: "boolean(extreme+hikers_dream,Buff Thrusters III and Coal boosts Optimization.)",
 		67: "Time goes by showNum(11.11)% fasterboolean(extreme+hikers_dream, increase the Optimization softcap by 5 times and increase the Confidence softcap by 1).",
-		68: "Pathogen gain is showNum(2.5)x fasterboolean(extreme+hikers_dream, Confidence boosts Pathogen gain)boolean(extreme, and Cadaver gain is quintupled).",
+		68: "Pathogen gain is showNum(2.5)x fasterboolean(hard+hikers_dream, Confidence boosts Pathogen gain)boolean(extreme, and Cadaver gain is quintupled).",
 
 		72: "You gain Time Cubes without Reversing Time, however only at half the rateboolean(extreme, and Time Cube gain is faster based on your Coal & Dark Cores).",
 		74: "The 'Time Doesnt Exist' reward is showNum(75)% stronger.",
@@ -343,11 +397,12 @@ const ACH_DATA = {
 		84: "Dark Flow affects Pathogen gain, slows down after showNum(50)x.",
 		85: "boolean(hard+hikers_dream,You can rejuvinate whenever)boolean(extreme+hikers_dream, and square Endurance)boolean(hard+hikers_dream,.)",
 		86: "boolean(extreme+hikers_dream,Pathogens multiply time cube gain and square Confidence softcap start.)",
-		87: "boolean(extreme+hikers_dream,Remove the base motivation softcap and time cubes boost pathogens.)",
+		87: "boolean(extreme+hikers_dream,Remove the base motivation softcap)boolean(hard+hikers_dream, and time cubes boost pathogens.)",
 		88: "Buying Pathogen Upgrades does not spend your Pathogensboolean(extreme, and you unlock Furnace Challenges).",
 
 		92: "When buying Dark Cores, your Cadavers do not decrease.",
 		93: "boolean(extreme+hikers_dream,Square Confidence softcap start.)",
+		94: "boolean(hard-extreme,Generate Ascension Power even if perks are inactive.)",
 		95: "Gain showNum(100)% of Rocket gain every second.",
 		96: "Gain showNum(100)% of Cadaver gain every second.",
 		97: "Transfer showNum(100)% of Cadavers to Life Essence every secondboolean(extreme+hikers_dream, and Optimization increases Confidence softcap start).",
@@ -362,25 +417,48 @@ const ACH_DATA = {
 		116: "You gain twice as many Heavenly Chips & Demonic Soulsboolean(extreme, and Time Speed is enabled in Purge runs and Enhanced Coal gain is 40% faster for each Purge Power you have).",
 		117: "boolean(extreme+hikers_dream,Remove the Confidence softcap.)",
 
-		123: "The Universe Doesn't Exist achievement uses a slightly better formulaboolean(extreme+hikers_dream, and Confidence is ten times stronger).",
+		123: "The Universe Doesn't Exist achievement uses a slightly better formulaboolean(hard+hikers_dream, and Confidence is ten times stronger).",
 		124: "All Perks last twice as long.",
 		125: "Pathogen Upgrades are showNum(5)% stronger.",
 
-		131: "Rockets, Cadavers, & Pathogens are gained twice as fast, and Dark Flow is showNum(50)% faster.",
+		131: "Rockets, Cadavers, & Pathogens are gained twice as fast, and Dark Flow is showNum(50)% fasterboolean(extreme, and coal & enhanced coal gain is always 100x faster).",
 		132: "The Gauge Force Effect is doubled.",
 		133: "Unlock Auto-Elementaries.",
-		135: "The Purge Power effect is halved.",
-
+		135: "The Purge Power effect is halved, and boost to perk strength from Demonic Souls is based on best Demonic Souls.",
+
+		141: "boolean(hikers_dream,Keep generators and buy them automatically.)",
 		142: "Endorsements that are bought automatically do not reset anything.",
+		143: "boolean(extreme+hikers_dream,You can buy max Theory Tree Upgrades with shift+click which is slightly more efficient than normally upgrading. )boolean(hikers_dream,Gain ten million times the passive energy.)",
 		144: "All Strings are gained showNum(25)% faster.",
+		145: "boolean(hikers_dream,inf10;10 is stronged based on your ranks.)",
 		147: "You gain Cadavers while in Purge runs, but at a very reduced rate, and Pathogen Upgrades are not stuck at 0% power in Purge runs.",
-		
+
 		152: "All Theory Tree Upgrades are cheaper based on your Best Hadronic Score.",
-		154: "Purge Power gain is doubled.",
+		153: "boolean(extreme+hikers_dream,The Theory Tree Upgrade that makes Scaled Endorsements start later also makes Superscaled Endorsements start later at a reduced rate [x/10])",
+		154: "Purge Power gain is doubledboolean(hikers_dream, and unlock a 27th & 28th energy upgrade).",
 		157: "All Strings are gained twice as fast.",
-		
-		162: "Unspent Theory Points boost all Foam types, and you can buy max Theory Tree Upgrades (with shift+click, is slightly more efficient than normally upgrading).",
+
+		162: "Unspent Theory Points boost all Foam typesboolean(extreme+hikers_dream,., and you can buy max Theory Tree Upgrades with shift+click which is slightly more efficient than normally upgrading.)",
 		163: "Gain 10% of your Entangled String gain every second.",
 		166: "Unlock Auto-Photon Upgrades & Auto-Gluon Upgrades.",
+		168: "Unlock Auto-Theory Tree Upgrades.",
+
+		171: "Expanding your Foam does not spend it, and Quantum Foam is gained 10x faster, Subplanck Foam is gained 20x faster, Subspatial Foam is gained 30x faster, etc.boolean(hikers_dream, and unlock a 29th & 30th energy upgrade)",
+		172: "The Elementary Particle gain softcap is showNum(20)% weaker for every three OoMs of Elementaries done.",
+		174: "The Perk Accelerator is showNum(5)% stronger.",
+		178: 'The Infinity popup is permanently disabled if you have Auto-Endorsements unlocked, unlock the "Max Pion & Spinor Fields" buttonboolean(extreme, and the Plasma exponent is doubled when below 250).',
+
+		183: "All Entropy Upgrades are always unlocked.",
+		185: "Hyper Pathogen Upgrade scaling is showNum(10)% weakerboolean(extreme, and gain twenty percent more Multiversal Energy).",
+		186: "Unlock Auto-Multiverse Runs.",
+		188: "Gain showNum(10)% more Entropy.",
+
+		191: "boolean(extreme,White Flame is gained 5x faster.)",
+		193: "Gain showNum(5)% more Multiversal Energyboolean(hikers_dream-extreme, and 10% more Entropy).",
+		194: "Tier scaling is 0.69% weaker.",
+		195: "Gain showNum(11)% more Entropy.",
+		196: "boolean(extreme+hikers_dream,Useless Theories is boosted by Multiverse Quilt 3's 2nd effect)",
+		197: "Entropy Upgrades are showNum(5)% cheaperboolean(hikers_dream-extreme, and Thrusters V is 12.5% stronger).",
+		198: "Unlock new Hadronic Challenge Selectors, you can extend the Hadronic Challenge goal to your best-ever Distance, and you can extend the HC Theoriverse selector to your best-ever Theoriverse completed (capped at depth 100).",
 	}
-};
+};