From a13efd0c5b4832729916a747db512fed867fef81 Mon Sep 17 00:00:00 2001
From: Aktanusa <chanam.geo@yahoo.com>
Date: Sun, 20 Oct 2019 17:43:12 -0400
Subject: [PATCH 1/6] Change to Version 2.022.1 and fixed for Version 2.022 of
 Cookie Clicker (Issues #276)

---
 CookieMonster.js | 9 +++++----
 src/Main.js      | 4 ++--
 src/Sim.js       | 5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CookieMonster.js b/CookieMonster.js
index fc68285a..204ec8a1 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -3018,8 +3018,8 @@ CM.ConfigDefault = {
 };
 CM.ConfigPrefix = 'CMConfig';
 
-CM.VersionMajor = '2.021';
-CM.VersionMinor = '2';
+CM.VersionMajor = '2.022';
+CM.VersionMinor = '1';
 
 /*******
  * Sim *
@@ -3088,8 +3088,9 @@ CM.Sim.BuildingSell = function(build, basePrice, start, free, amount, emuAura) {
 }
 
 CM.Sim.Has = function(what) {
-	if (Game.ascensionMode == 1 && Game.Upgrades[what].pool == 'prestige') return 0;
-	return (CM.Sim.Upgrades[what] ? CM.Sim.Upgrades[what].bought : 0);
+	var it = CM.Sim.Upgrades[what];
+	if (Game.ascensionMode == 1 && (it.pool == 'prestige' || it.tier == 'fortune')) return 0;
+	return (it ? it.bought : 0);
 }
 
 
diff --git a/src/Main.js b/src/Main.js
index b5a582e5..55c5de34 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -299,6 +299,6 @@ CM.ConfigDefault = {
 };
 CM.ConfigPrefix = 'CMConfig';
 
-CM.VersionMajor = '2.021';
-CM.VersionMinor = '2';
+CM.VersionMajor = '2.022';
+CM.VersionMinor = '1';
 
diff --git a/src/Sim.js b/src/Sim.js
index feed0f60..d2ea864b 100644
--- a/src/Sim.js
+++ b/src/Sim.js
@@ -65,8 +65,9 @@ CM.Sim.BuildingSell = function(build, basePrice, start, free, amount, emuAura) {
 }
 
 CM.Sim.Has = function(what) {
-	if (Game.ascensionMode == 1 && Game.Upgrades[what].pool == 'prestige') return 0;
-	return (CM.Sim.Upgrades[what] ? CM.Sim.Upgrades[what].bought : 0);
+	var it = CM.Sim.Upgrades[what];
+	if (Game.ascensionMode == 1 && (it.pool == 'prestige' || it.tier == 'fortune')) return 0;
+	return (it ? it.bought : 0);
 }
 
 

From ebe7945f7d3680d77b0d1bdde7658cb0a32dbcda Mon Sep 17 00:00:00 2001
From: Michiocre <michi2806@gmail.com>
Date: Fri, 23 Oct 2020 13:43:58 +0200
Subject: [PATCH 2/6] Update to v2.029 and Added Cookie Conjure Warning

---
 CookieMonster.js | 23 ++++++++++++++++++++++-
 src/Disp.js      | 20 +++++++++++++++++++-
 src/Sim.js       |  3 +++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/CookieMonster.js b/CookieMonster.js
index fc68285a..1cc54d7a 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -2250,6 +2250,8 @@ CM.Disp.CreateTooltipWarnCaut = function() {
 	}
 	CM.Disp.TooltipWarnCaut.appendChild(create('CMDispTooltipWarn', CM.Disp.colorRed, 'Warning: ', 'Purchase of this item will put you under the number of Cookies required for "Lucky!"', 'CMDispTooltipWarnText'));
 	CM.Disp.TooltipWarnCaut.firstChild.style.marginBottom = '4px';
+	CM.Disp.TooltipWarnCaut.appendChild(create('CMDispTooltipCaut2', CM.Disp.colorPurple, 'Caution: ', 'Purchase of this item will put you under the number of Cookies required for "Conjure Baked Goods"', 'CMDispTooltipCaut2Text'));
+	CM.Disp.TooltipWarnCaut.firstChild.style.marginBottom = '4px';
 	CM.Disp.TooltipWarnCaut.appendChild(create('CMDispTooltipCaut', CM.Disp.colorYellow, 'Caution: ', 'Purchase of this item will put you under the number of Cookies required for "Lucky!" (Frenzy)', 'CMDispTooltipCautText'));
 
 	l('tooltipAnchor').appendChild(CM.Disp.TooltipWarnCaut);
@@ -2474,8 +2476,9 @@ CM.Disp.UpdateTooltip = function() {
 						warn += ((bonusNoFren * 60 * 15) / 0.15);
 					}
 					var caut = warn * 7;
+					var caut2 = warn * 2;
 					var amount = (Game.cookies + CM.Disp.GetWrinkConfigBank()) - price;
-					if ((amount < warn || amount < caut) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
+					if ((amount < warn || amount < caut2 || amount < caut) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
 						if (CM.Config.ToolWarnCautPos == 0) {
 							CM.Disp.TooltipWarnCaut.style.right = '0px';
 						}
@@ -2487,21 +2490,33 @@ CM.Disp.UpdateTooltip = function() {
 						if (amount < warn) {
 							l('CMDispTooltipWarn').style.display = '';
 							l('CMDispTooltipWarnText').textContent = Beautify(warn - amount) + ' (' + CM.Disp.FormatTime((warn - amount) / CM.Disp.GetCPS()) + ')';
+							l('CMDispTooltipCaut2').style.display = '';
+							l('CMDispTooltipCaut2Text').textContent = Beautify(caut2 - amount) + ' (' + CM.Disp.FormatTime((caut2 - amount) / CM.Disp.GetCPS()) + ')';
 							l('CMDispTooltipCaut').style.display = '';
 							l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
 						}
+						else if (amount < caut2) {
+							l('CMDispTooltipCaut2').style.display = '';
+							l('CMDispTooltipCaut2Text').textContent = Beautify(caut2 - amount) + ' (' + CM.Disp.FormatTime((caut2 - amount) / CM.Disp.GetCPS()) + ')';
+							l('CMDispTooltipCaut').style.display = '';
+							l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
+							l('CMDispTooltipWarn').style.display = 'none';
+						}
 						else if (amount < caut) {
 							l('CMDispTooltipCaut').style.display = '';
 							l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
 							l('CMDispTooltipWarn').style.display = 'none';
+							l('CMDispTooltipCaut2').style.display = 'none';
 						}
 						else {
 							l('CMDispTooltipWarn').style.display = 'none';
+							l('CMDispTooltipCaut2').style.display = 'none';
 							l('CMDispTooltipCaut').style.display = 'none';
 						}
 					}
 					else {
 						l('CMDispTooltipWarn').style.display = 'none';
+						l('CMDispTooltipCaut2').style.display = 'none';
 						l('CMDispTooltipCaut').style.display = 'none';
 					}
 				}
@@ -2512,6 +2527,7 @@ CM.Disp.UpdateTooltip = function() {
 			else { // Grimoire
 				CM.Disp.TooltipWarnCaut.style.display = 'none';
 				l('CMDispTooltipWarn').style.display = 'none';
+				l('CMDispTooltipCaut2').style.display = 'none';
 				l('CMDispTooltipCaut').style.display = 'none';
 
 				var minigame = Game.Objects['Wizard tower'].minigame;
@@ -2567,6 +2583,7 @@ CM.Disp.UpdateTooltip = function() {
 CM.Disp.DrawTooltipWarnCaut = function() {
 	if (CM.Config.ToolWarnCaut == 1) {
 		l('CMDispTooltipWarn').style.opacity = '0';
+		l('CMDispTooltipCaut2').style.opacity = '0';
 		l('CMDispTooltipCaut').style.opacity = '0';
 	}
 }
@@ -2574,6 +2591,7 @@ CM.Disp.DrawTooltipWarnCaut = function() {
 CM.Disp.UpdateTooltipWarnCaut = function() {
 	if (CM.Config.ToolWarnCaut == 1 && l('tooltipAnchor').style.display != 'none' && l('CMTooltipArea') != null) {
 		l('CMDispTooltipWarn').style.opacity = '1';
+		l('CMDispTooltipCaut2').style.opacity = '1';
 		l('CMDispTooltipCaut').style.opacity = '1';
 	}
 }
@@ -3242,6 +3260,7 @@ CM.Sim.CalculateGains = function() {
 
 	if (CM.Sim.Has('Fortune #100')) mult *= 1.01;
 	if (CM.Sim.Has('Fortune #101')) mult *= 1.07;
+	if (CM.Sim.Has('Dragon scale')) mult *= 1.03;
 
 	var buildMult = 1;
 	if (Game.hasGod) {
@@ -3425,6 +3444,7 @@ CM.Sim.CheckOtherAchiev = function() {
 	if (minAmount >= 400) CM.Sim.Win('Quadricentennial');
 	if (minAmount >= 450) CM.Sim.Win('Quadricentennial and a half');
 	if (minAmount >= 500) CM.Sim.Win('Quincentennial');
+	if (minAmount >= 550) CM.Sim.Win('Quincentennial and a half');
 
 	if (buildingsOwned >= 100) CM.Sim.Win('Builder');
 	if (buildingsOwned >= 500) CM.Sim.Win('Architect');
@@ -3480,6 +3500,7 @@ CM.Sim.BuyBuildings = function(amount, target) {
 			if (me.amount >= 400) CM.Sim.Win('Dr. T');
 			if (me.amount >= 500) CM.Sim.Win('Thumbs, phalanges, metacarpals');
 			if (me.amount >= 600) CM.Sim.Win('With her finger and her thumb');
+			if (me.amount >= 700) CM.Sim.Win('Gotta hand it to you');
 		}
 		else {
 			for (var j in Game.Objects[me.name].tieredAchievs) {
diff --git a/src/Disp.js b/src/Disp.js
index fcb1d2de..c92819e8 100644
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -1627,6 +1627,8 @@ CM.Disp.CreateTooltipWarnCaut = function() {
 	}
 	CM.Disp.TooltipWarnCaut.appendChild(create('CMDispTooltipWarn', CM.Disp.colorRed, 'Warning: ', 'Purchase of this item will put you under the number of Cookies required for "Lucky!"', 'CMDispTooltipWarnText'));
 	CM.Disp.TooltipWarnCaut.firstChild.style.marginBottom = '4px';
+	CM.Disp.TooltipWarnCaut.appendChild(create('CMDispTooltipCaut2', CM.Disp.colorPurple, 'Caution: ', 'Purchase of this item will put you under the number of Cookies required for "Conjure Baked Goods"', 'CMDispTooltipCaut2Text'));
+	CM.Disp.TooltipWarnCaut.firstChild.style.marginBottom = '4px';
 	CM.Disp.TooltipWarnCaut.appendChild(create('CMDispTooltipCaut', CM.Disp.colorYellow, 'Caution: ', 'Purchase of this item will put you under the number of Cookies required for "Lucky!" (Frenzy)', 'CMDispTooltipCautText'));
 
 	l('tooltipAnchor').appendChild(CM.Disp.TooltipWarnCaut);
@@ -1851,8 +1853,9 @@ CM.Disp.UpdateTooltip = function() {
 						warn += ((bonusNoFren * 60 * 15) / 0.15);
 					}
 					var caut = warn * 7;
+					var caut2 = warn * 2;
 					var amount = (Game.cookies + CM.Disp.GetWrinkConfigBank()) - price;
-					if ((amount < warn || amount < caut) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
+					if ((amount < warn || amount < caut2 || amount < caut) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
 						if (CM.Config.ToolWarnCautPos == 0) {
 							CM.Disp.TooltipWarnCaut.style.right = '0px';
 						}
@@ -1864,21 +1867,33 @@ CM.Disp.UpdateTooltip = function() {
 						if (amount < warn) {
 							l('CMDispTooltipWarn').style.display = '';
 							l('CMDispTooltipWarnText').textContent = Beautify(warn - amount) + ' (' + CM.Disp.FormatTime((warn - amount) / CM.Disp.GetCPS()) + ')';
+							l('CMDispTooltipCaut2').style.display = '';
+							l('CMDispTooltipCaut2Text').textContent = Beautify(caut2 - amount) + ' (' + CM.Disp.FormatTime((caut2 - amount) / CM.Disp.GetCPS()) + ')';
 							l('CMDispTooltipCaut').style.display = '';
 							l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
 						}
+						else if (amount < caut2) {
+							l('CMDispTooltipCaut2').style.display = '';
+							l('CMDispTooltipCaut2Text').textContent = Beautify(caut2 - amount) + ' (' + CM.Disp.FormatTime((caut2 - amount) / CM.Disp.GetCPS()) + ')';
+							l('CMDispTooltipCaut').style.display = '';
+							l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
+							l('CMDispTooltipWarn').style.display = 'none';
+						}
 						else if (amount < caut) {
 							l('CMDispTooltipCaut').style.display = '';
 							l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
 							l('CMDispTooltipWarn').style.display = 'none';
+							l('CMDispTooltipCaut2').style.display = 'none';
 						}
 						else {
 							l('CMDispTooltipWarn').style.display = 'none';
+							l('CMDispTooltipCaut2').style.display = 'none';
 							l('CMDispTooltipCaut').style.display = 'none';
 						}
 					}
 					else {
 						l('CMDispTooltipWarn').style.display = 'none';
+						l('CMDispTooltipCaut2').style.display = 'none';
 						l('CMDispTooltipCaut').style.display = 'none';
 					}
 				}
@@ -1889,6 +1904,7 @@ CM.Disp.UpdateTooltip = function() {
 			else { // Grimoire
 				CM.Disp.TooltipWarnCaut.style.display = 'none';
 				l('CMDispTooltipWarn').style.display = 'none';
+				l('CMDispTooltipCaut2').style.display = 'none';
 				l('CMDispTooltipCaut').style.display = 'none';
 
 				var minigame = Game.Objects['Wizard tower'].minigame;
@@ -1944,6 +1960,7 @@ CM.Disp.UpdateTooltip = function() {
 CM.Disp.DrawTooltipWarnCaut = function() {
 	if (CM.Config.ToolWarnCaut == 1) {
 		l('CMDispTooltipWarn').style.opacity = '0';
+		l('CMDispTooltipCaut2').style.opacity = '0';
 		l('CMDispTooltipCaut').style.opacity = '0';
 	}
 }
@@ -1951,6 +1968,7 @@ CM.Disp.DrawTooltipWarnCaut = function() {
 CM.Disp.UpdateTooltipWarnCaut = function() {
 	if (CM.Config.ToolWarnCaut == 1 && l('tooltipAnchor').style.display != 'none' && l('CMTooltipArea') != null) {
 		l('CMDispTooltipWarn').style.opacity = '1';
+		l('CMDispTooltipCaut2').style.opacity = '1';
 		l('CMDispTooltipCaut').style.opacity = '1';
 	}
 }
diff --git a/src/Sim.js b/src/Sim.js
index feed0f60..be640f25 100644
--- a/src/Sim.js
+++ b/src/Sim.js
@@ -219,6 +219,7 @@ CM.Sim.CalculateGains = function() {
 
 	if (CM.Sim.Has('Fortune #100')) mult *= 1.01;
 	if (CM.Sim.Has('Fortune #101')) mult *= 1.07;
+	if (CM.Sim.Has('Dragon scale')) mult *= 1.03;
 
 	var buildMult = 1;
 	if (Game.hasGod) {
@@ -402,6 +403,7 @@ CM.Sim.CheckOtherAchiev = function() {
 	if (minAmount >= 400) CM.Sim.Win('Quadricentennial');
 	if (minAmount >= 450) CM.Sim.Win('Quadricentennial and a half');
 	if (minAmount >= 500) CM.Sim.Win('Quincentennial');
+	if (minAmount >= 550) CM.Sim.Win('Quincentennial and a half');
 
 	if (buildingsOwned >= 100) CM.Sim.Win('Builder');
 	if (buildingsOwned >= 500) CM.Sim.Win('Architect');
@@ -457,6 +459,7 @@ CM.Sim.BuyBuildings = function(amount, target) {
 			if (me.amount >= 400) CM.Sim.Win('Dr. T');
 			if (me.amount >= 500) CM.Sim.Win('Thumbs, phalanges, metacarpals');
 			if (me.amount >= 600) CM.Sim.Win('With her finger and her thumb');
+			if (me.amount >= 700) CM.Sim.Win('Gotta hand it to you');
 		}
 		else {
 			for (var j in Game.Objects[me.name].tieredAchievs) {

From 4ec1ed4e049c123ac1e6ada190cb20cb805f6649 Mon Sep 17 00:00:00 2001
From: Michiocre <michi2806@gmail.com>
Date: Fri, 23 Oct 2020 14:18:13 +0200
Subject: [PATCH 3/6] Added Conjure Baked Good to Stats

---
 CookieMonster.js | 23 ++++++++++++++++++++++-
 src/Cache.js     |  4 ++++
 src/Disp.js      | 17 +++++++++++++++++
 src/Main.js      |  2 +-
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/CookieMonster.js b/CookieMonster.js
index bd7cae00..02628829 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -159,6 +159,8 @@ CM.Cache.RemakeLucky = function() {
 	CM.Cache.LuckyReward = (CM.Cache.Lucky * 0.15) + 13;
 	CM.Cache.LuckyFrenzy = CM.Cache.Lucky * 7;
 	CM.Cache.LuckyRewardFrenzy = (CM.Cache.LuckyFrenzy * 0.15) + 13;
+	CM.Cache.Conjure = CM.Cache.Lucky * 2;
+	CM.Cache.ConjureReward = CM.Cache.Conjure * 0.15;
 }
 
 CM.Cache.MaxChainMoni = function(digit, maxPayout) {
@@ -377,6 +379,8 @@ CM.Cache.Lucky = 0;
 CM.Cache.LuckyReward = 0;
 CM.Cache.LuckyFrenzy = 0;
 CM.Cache.LuckyRewardFrenzy = 0;
+CM.Cache.Conjure = 0;
+CM.Cache.ConjureReward = 0;
 CM.Cache.SeaSpec = 0;
 CM.Cache.Chain = 0;
 CM.Cache.ChainWrath = 0;
@@ -1911,6 +1915,9 @@ CM.Disp.AddMenuStats = function(title) {
 		var luckyColorFrenzy = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.LuckyFrenzy) ? CM.Disp.colorRed : CM.Disp.colorGreen;
 		var luckyTimeFrenzy = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.LuckyFrenzy) ? CM.Disp.FormatTime((CM.Cache.LuckyFrenzy - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
 		var luckyCurBase = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 15) + 13;
+		var conjureCur = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 30);
+		var conjureTime = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Conjure) ? CM.Disp.FormatTime((CM.Cache.Conjure - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
+		var conjureRewardMax = CM.Cache.ConjureReward;
 		var luckyRewardMax = CM.Cache.LuckyReward;
 		var luckyRewardMaxWrath = CM.Cache.LuckyReward;
 		var luckyRewardFrenzyMax = CM.Cache.LuckyRewardFrenzy;
@@ -1961,6 +1968,20 @@ CM.Disp.AddMenuStats = function(title) {
 		stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (MAX)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyRewardMax) + (luckySplit ? (' / ' + Beautify(luckyRewardMaxWrath)) : ''))));
 		stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (MAX) (Frenzy)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyRewardFrenzyMax) + (luckySplit ? (' / ' + Beautify(luckyRewardFrenzyMaxWrath)) : ''))));
 		stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (CUR)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyCur) + (luckySplit ? (' / ' + Beautify(luckyCurWrath)) : ''))));
+		var conjureReqFrag = document.createDocumentFragment();
+		var conjureReqSpan = document.createElement('span');
+		conjureReqSpan.style.fontWeight = 'bold';
+		conjureReqSpan.className = CM.Disp.colorTextPre + luckyColor;
+		conjureReqSpan.textContent = Beautify(CM.Cache.Conjure);
+		conjureReqFrag.appendChild(conjureReqSpan);
+		if (conjureTime != '') {
+			var conjureReqSmall = document.createElement('small');
+			conjureReqSmall.textContent = ' (' + conjureTime + ')';
+			conjureReqFrag.appendChild(conjureReqSmall);
+		}
+		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Cookies Required', 'GoldCookTooltipPlaceholder'), conjureReqFrag));
+		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (MAX)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(conjureRewardMax))));
+		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (CUR)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyCur))));
 	}
 
 	stats.appendChild(header('Chain Cookies', 'Chain'));
@@ -3036,7 +3057,7 @@ CM.ConfigDefault = {
 };
 CM.ConfigPrefix = 'CMConfig';
 
-CM.VersionMajor = '2.022';
+CM.VersionMajor = '2.029';
 CM.VersionMinor = '1';
 
 /*******
diff --git a/src/Cache.js b/src/Cache.js
index 1c317238..7c302dea 100644
--- a/src/Cache.js
+++ b/src/Cache.js
@@ -139,6 +139,8 @@ CM.Cache.RemakeLucky = function() {
 	CM.Cache.LuckyReward = (CM.Cache.Lucky * 0.15) + 13;
 	CM.Cache.LuckyFrenzy = CM.Cache.Lucky * 7;
 	CM.Cache.LuckyRewardFrenzy = (CM.Cache.LuckyFrenzy * 0.15) + 13;
+	CM.Cache.Conjure = CM.Cache.Lucky * 2;
+	CM.Cache.ConjureReward = CM.Cache.Conjure * 0.15;
 }
 
 CM.Cache.MaxChainMoni = function(digit, maxPayout) {
@@ -357,6 +359,8 @@ CM.Cache.Lucky = 0;
 CM.Cache.LuckyReward = 0;
 CM.Cache.LuckyFrenzy = 0;
 CM.Cache.LuckyRewardFrenzy = 0;
+CM.Cache.Conjure = 0;
+CM.Cache.ConjureReward = 0;
 CM.Cache.SeaSpec = 0;
 CM.Cache.Chain = 0;
 CM.Cache.ChainWrath = 0;
diff --git a/src/Disp.js b/src/Disp.js
index c92819e8..7c6d2176 100644
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -1288,6 +1288,9 @@ CM.Disp.AddMenuStats = function(title) {
 		var luckyColorFrenzy = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.LuckyFrenzy) ? CM.Disp.colorRed : CM.Disp.colorGreen;
 		var luckyTimeFrenzy = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.LuckyFrenzy) ? CM.Disp.FormatTime((CM.Cache.LuckyFrenzy - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
 		var luckyCurBase = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 15) + 13;
+		var conjureCur = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 30);
+		var conjureTime = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Conjure) ? CM.Disp.FormatTime((CM.Cache.Conjure - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
+		var conjureRewardMax = CM.Cache.ConjureReward;
 		var luckyRewardMax = CM.Cache.LuckyReward;
 		var luckyRewardMaxWrath = CM.Cache.LuckyReward;
 		var luckyRewardFrenzyMax = CM.Cache.LuckyRewardFrenzy;
@@ -1338,6 +1341,20 @@ CM.Disp.AddMenuStats = function(title) {
 		stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (MAX)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyRewardMax) + (luckySplit ? (' / ' + Beautify(luckyRewardMaxWrath)) : ''))));
 		stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (MAX) (Frenzy)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyRewardFrenzyMax) + (luckySplit ? (' / ' + Beautify(luckyRewardFrenzyMaxWrath)) : ''))));
 		stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (CUR)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyCur) + (luckySplit ? (' / ' + Beautify(luckyCurWrath)) : ''))));
+		var conjureReqFrag = document.createDocumentFragment();
+		var conjureReqSpan = document.createElement('span');
+		conjureReqSpan.style.fontWeight = 'bold';
+		conjureReqSpan.className = CM.Disp.colorTextPre + luckyColor;
+		conjureReqSpan.textContent = Beautify(CM.Cache.Conjure);
+		conjureReqFrag.appendChild(conjureReqSpan);
+		if (conjureTime != '') {
+			var conjureReqSmall = document.createElement('small');
+			conjureReqSmall.textContent = ' (' + conjureTime + ')';
+			conjureReqFrag.appendChild(conjureReqSmall);
+		}
+		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Cookies Required', 'GoldCookTooltipPlaceholder'), conjureReqFrag));
+		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (MAX)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(conjureRewardMax))));
+		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (CUR)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyCur))));
 	}
 
 	stats.appendChild(header('Chain Cookies', 'Chain'));
diff --git a/src/Main.js b/src/Main.js
index 55c5de34..4e01cc5e 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -299,6 +299,6 @@ CM.ConfigDefault = {
 };
 CM.ConfigPrefix = 'CMConfig';
 
-CM.VersionMajor = '2.022';
+CM.VersionMajor = '2.029';
 CM.VersionMinor = '1';
 

From bdcff57393bf3b4ea465c591dc20e9cc63e98afb Mon Sep 17 00:00:00 2001
From: Michiocre <michi2806@gmail.com>
Date: Fri, 23 Oct 2020 14:40:23 +0200
Subject: [PATCH 4/6] Made own category for Conjured Baked Goods

---
 CookieMonster.js | 17 +++++++++++------
 src/Disp.js      | 15 ++++++++++-----
 src/Main.js      |  2 +-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/CookieMonster.js b/CookieMonster.js
index 02628829..41efd64f 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -1915,9 +1915,6 @@ CM.Disp.AddMenuStats = function(title) {
 		var luckyColorFrenzy = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.LuckyFrenzy) ? CM.Disp.colorRed : CM.Disp.colorGreen;
 		var luckyTimeFrenzy = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.LuckyFrenzy) ? CM.Disp.FormatTime((CM.Cache.LuckyFrenzy - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
 		var luckyCurBase = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 15) + 13;
-		var conjureCur = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 30);
-		var conjureTime = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Conjure) ? CM.Disp.FormatTime((CM.Cache.Conjure - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
-		var conjureRewardMax = CM.Cache.ConjureReward;
 		var luckyRewardMax = CM.Cache.LuckyReward;
 		var luckyRewardMaxWrath = CM.Cache.LuckyReward;
 		var luckyRewardFrenzyMax = CM.Cache.LuckyRewardFrenzy;
@@ -1968,6 +1965,14 @@ CM.Disp.AddMenuStats = function(title) {
 		stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (MAX)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyRewardMax) + (luckySplit ? (' / ' + Beautify(luckyRewardMaxWrath)) : ''))));
 		stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (MAX) (Frenzy)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyRewardFrenzyMax) + (luckySplit ? (' / ' + Beautify(luckyRewardFrenzyMaxWrath)) : ''))));
 		stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (CUR)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyCur) + (luckySplit ? (' / ' + Beautify(luckyCurWrath)) : ''))));
+	}
+
+	stats.appendChild(header('Conjure Baked Goods', 'Conjure'));
+	if (CM.Config.StatsPref.Conjure) {
+		var conjureCur = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 30);
+		var conjureTime = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Conjure) ? CM.Disp.FormatTime((CM.Cache.Conjure - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
+		var conjureRewardMax = CM.Cache.ConjureReward;
+
 		var conjureReqFrag = document.createDocumentFragment();
 		var conjureReqSpan = document.createElement('span');
 		conjureReqSpan.style.fontWeight = 'bold';
@@ -1980,8 +1985,8 @@ CM.Disp.AddMenuStats = function(title) {
 			conjureReqFrag.appendChild(conjureReqSmall);
 		}
 		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Cookies Required', 'GoldCookTooltipPlaceholder'), conjureReqFrag));
-		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (MAX)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(conjureRewardMax))));
-		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (CUR)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyCur))));
+		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (MAX)', 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(conjureRewardMax))));
+		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (CUR)', 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(conjureCur))));
 	}
 
 	stats.appendChild(header('Chain Cookies', 'Chain'));
@@ -3052,7 +3057,7 @@ CM.ConfigDefault = {
 	SayTime: 1, 
 	GrimoireBar: 1, 
 	Scale: 2, 
-	StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, 
+	StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1, Conjure: 1}, 
 	Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}
 };
 CM.ConfigPrefix = 'CMConfig';
diff --git a/src/Disp.js b/src/Disp.js
index 7c6d2176..67974663 100644
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -1288,9 +1288,6 @@ CM.Disp.AddMenuStats = function(title) {
 		var luckyColorFrenzy = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.LuckyFrenzy) ? CM.Disp.colorRed : CM.Disp.colorGreen;
 		var luckyTimeFrenzy = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.LuckyFrenzy) ? CM.Disp.FormatTime((CM.Cache.LuckyFrenzy - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
 		var luckyCurBase = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 15) + 13;
-		var conjureCur = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 30);
-		var conjureTime = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Conjure) ? CM.Disp.FormatTime((CM.Cache.Conjure - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
-		var conjureRewardMax = CM.Cache.ConjureReward;
 		var luckyRewardMax = CM.Cache.LuckyReward;
 		var luckyRewardMaxWrath = CM.Cache.LuckyReward;
 		var luckyRewardFrenzyMax = CM.Cache.LuckyRewardFrenzy;
@@ -1341,6 +1338,14 @@ CM.Disp.AddMenuStats = function(title) {
 		stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (MAX)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyRewardMax) + (luckySplit ? (' / ' + Beautify(luckyRewardMaxWrath)) : ''))));
 		stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (MAX) (Frenzy)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyRewardFrenzyMax) + (luckySplit ? (' / ' + Beautify(luckyRewardFrenzyMaxWrath)) : ''))));
 		stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (CUR)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyCur) + (luckySplit ? (' / ' + Beautify(luckyCurWrath)) : ''))));
+	}
+
+	stats.appendChild(header('Conjure Baked Goods', 'Conjure'));
+	if (CM.Config.StatsPref.Conjure) {
+		var conjureCur = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 30);
+		var conjureTime = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Conjure) ? CM.Disp.FormatTime((CM.Cache.Conjure - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
+		var conjureRewardMax = CM.Cache.ConjureReward;
+
 		var conjureReqFrag = document.createDocumentFragment();
 		var conjureReqSpan = document.createElement('span');
 		conjureReqSpan.style.fontWeight = 'bold';
@@ -1353,8 +1358,8 @@ CM.Disp.AddMenuStats = function(title) {
 			conjureReqFrag.appendChild(conjureReqSmall);
 		}
 		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Cookies Required', 'GoldCookTooltipPlaceholder'), conjureReqFrag));
-		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (MAX)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(conjureRewardMax))));
-		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (CUR)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(luckyCur))));
+		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (MAX)', 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(conjureRewardMax))));
+		stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (CUR)', 'GoldCookTooltipPlaceholder'),  document.createTextNode(Beautify(conjureCur))));
 	}
 
 	stats.appendChild(header('Chain Cookies', 'Chain'));
diff --git a/src/Main.js b/src/Main.js
index 4e01cc5e..c7b73626 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -294,7 +294,7 @@ CM.ConfigDefault = {
 	SayTime: 1, 
 	GrimoireBar: 1, 
 	Scale: 2, 
-	StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, 
+	StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1, Conjure: 1}, 
 	Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}
 };
 CM.ConfigPrefix = 'CMConfig';

From e87a9bc706441c9c3860cb59063f0bf802089359 Mon Sep 17 00:00:00 2001
From: Michiocre <michi2806@gmail.com>
Date: Fri, 23 Oct 2020 14:53:45 +0200
Subject: [PATCH 5/6] Fixed Stats of Conjured

---
 CookieMonster.js | 7 ++++---
 src/Disp.js      | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CookieMonster.js b/CookieMonster.js
index 41efd64f..b513521f 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -1969,6 +1969,7 @@ CM.Disp.AddMenuStats = function(title) {
 
 	stats.appendChild(header('Conjure Baked Goods', 'Conjure'));
 	if (CM.Config.StatsPref.Conjure) {
+		var conjureColor = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Conjure) ? CM.Disp.colorRed : CM.Disp.colorGreen;
 		var conjureCur = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 30);
 		var conjureTime = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Conjure) ? CM.Disp.FormatTime((CM.Cache.Conjure - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
 		var conjureRewardMax = CM.Cache.ConjureReward;
@@ -1976,7 +1977,7 @@ CM.Disp.AddMenuStats = function(title) {
 		var conjureReqFrag = document.createDocumentFragment();
 		var conjureReqSpan = document.createElement('span');
 		conjureReqSpan.style.fontWeight = 'bold';
-		conjureReqSpan.className = CM.Disp.colorTextPre + luckyColor;
+		conjureReqSpan.className = CM.Disp.colorTextPre + conjureColor;
 		conjureReqSpan.textContent = Beautify(CM.Cache.Conjure);
 		conjureReqFrag.appendChild(conjureReqSpan);
 		if (conjureTime != '') {
@@ -2275,9 +2276,9 @@ CM.Disp.CreateTooltipWarnCaut = function() {
 		return box;
 	}
 	CM.Disp.TooltipWarnCaut.appendChild(create('CMDispTooltipWarn', CM.Disp.colorRed, 'Warning: ', 'Purchase of this item will put you under the number of Cookies required for "Lucky!"', 'CMDispTooltipWarnText'));
-	CM.Disp.TooltipWarnCaut.firstChild.style.marginBottom = '4px';
+	CM.Disp.TooltipWarnCaut.lastChild.style.marginBottom = '4px';
 	CM.Disp.TooltipWarnCaut.appendChild(create('CMDispTooltipCaut2', CM.Disp.colorPurple, 'Caution: ', 'Purchase of this item will put you under the number of Cookies required for "Conjure Baked Goods"', 'CMDispTooltipCaut2Text'));
-	CM.Disp.TooltipWarnCaut.firstChild.style.marginBottom = '4px';
+	CM.Disp.TooltipWarnCaut.lastChild.style.marginBottom = '4px';
 	CM.Disp.TooltipWarnCaut.appendChild(create('CMDispTooltipCaut', CM.Disp.colorYellow, 'Caution: ', 'Purchase of this item will put you under the number of Cookies required for "Lucky!" (Frenzy)', 'CMDispTooltipCautText'));
 
 	l('tooltipAnchor').appendChild(CM.Disp.TooltipWarnCaut);
diff --git a/src/Disp.js b/src/Disp.js
index 67974663..f5692579 100644
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -1342,6 +1342,7 @@ CM.Disp.AddMenuStats = function(title) {
 
 	stats.appendChild(header('Conjure Baked Goods', 'Conjure'));
 	if (CM.Config.StatsPref.Conjure) {
+		var conjureColor = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Conjure) ? CM.Disp.colorRed : CM.Disp.colorGreen;
 		var conjureCur = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 30);
 		var conjureTime = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Conjure) ? CM.Disp.FormatTime((CM.Cache.Conjure - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
 		var conjureRewardMax = CM.Cache.ConjureReward;
@@ -1349,7 +1350,7 @@ CM.Disp.AddMenuStats = function(title) {
 		var conjureReqFrag = document.createDocumentFragment();
 		var conjureReqSpan = document.createElement('span');
 		conjureReqSpan.style.fontWeight = 'bold';
-		conjureReqSpan.className = CM.Disp.colorTextPre + luckyColor;
+		conjureReqSpan.className = CM.Disp.colorTextPre + conjureColor;
 		conjureReqSpan.textContent = Beautify(CM.Cache.Conjure);
 		conjureReqFrag.appendChild(conjureReqSpan);
 		if (conjureTime != '') {
@@ -1648,9 +1649,9 @@ CM.Disp.CreateTooltipWarnCaut = function() {
 		return box;
 	}
 	CM.Disp.TooltipWarnCaut.appendChild(create('CMDispTooltipWarn', CM.Disp.colorRed, 'Warning: ', 'Purchase of this item will put you under the number of Cookies required for "Lucky!"', 'CMDispTooltipWarnText'));
-	CM.Disp.TooltipWarnCaut.firstChild.style.marginBottom = '4px';
+	CM.Disp.TooltipWarnCaut.lastChild.style.marginBottom = '4px';
 	CM.Disp.TooltipWarnCaut.appendChild(create('CMDispTooltipCaut2', CM.Disp.colorPurple, 'Caution: ', 'Purchase of this item will put you under the number of Cookies required for "Conjure Baked Goods"', 'CMDispTooltipCaut2Text'));
-	CM.Disp.TooltipWarnCaut.firstChild.style.marginBottom = '4px';
+	CM.Disp.TooltipWarnCaut.lastChild.style.marginBottom = '4px';
 	CM.Disp.TooltipWarnCaut.appendChild(create('CMDispTooltipCaut', CM.Disp.colorYellow, 'Caution: ', 'Purchase of this item will put you under the number of Cookies required for "Lucky!" (Frenzy)', 'CMDispTooltipCautText'));
 
 	l('tooltipAnchor').appendChild(CM.Disp.TooltipWarnCaut);

From 4d21754927df09f3ffddef06467f52892d6e0f3d Mon Sep 17 00:00:00 2001
From: Lloyd Wallis <lloyd.wallis93@gmail.com>
Date: Mon, 2 Nov 2020 18:54:47 +0000
Subject: [PATCH 6/6] Bump version Rewrite CalculateGains based on current
 source Add mising object declaration Add missing cursor upgrade Fix Century
 Egg display and Grandma CPS calculation

---
 CookieMonster.js | 427 +++++++++++++++++++++++++++--------------------
 src/Data.js      |   1 +
 src/Disp.js      |   2 +-
 src/Main.js      |   2 +-
 src/Sim.js       | 412 +++++++++++++++++++++++++--------------------
 5 files changed, 481 insertions(+), 363 deletions(-)

diff --git a/CookieMonster.js b/CookieMonster.js
index b513521f..ff4df141 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -615,6 +615,7 @@ CM.Data.Fortunes = [
 	'Fortune #015', 
 	'Fortune #016', 
 	'Fortune #017', 
+	'Fortune #018', 
 	'Fortune #100', 
 	'Fortune #101', 
 	'Fortune #102', 
@@ -2169,7 +2170,7 @@ CM.Disp.AddMenuStats = function(title) {
 				stats.appendChild(listing(listingQuest('Chocolate Egg Cookies', 'ChoEggTooltipPlaceholder'), document.createTextNode(Beautify(CM.Cache.lastChoEgg))));
 			}
 			if (centEgg) {
-				stats.appendChild(listing('Century Egg Multiplier', document.createTextNode((Math.round((CM.Cache.CentEgg - 1) * 10000) / 100) + '%')));
+				stats.appendChild(listing('Century Egg Multiplier', document.createTextNode((Math.round(CM.Cache.CentEgg * 10000) / 100) + '%')));
 			}
 		}
 	}
@@ -3063,7 +3064,7 @@ CM.ConfigDefault = {
 };
 CM.ConfigPrefix = 'CMConfig';
 
-CM.VersionMajor = '2.029';
+CM.VersionMajor = '2.031';
 CM.VersionMinor = '1';
 
 /*******
@@ -3180,14 +3181,6 @@ eval('CM.Sim.GetTieredCpsMult = ' + Game.GetTieredCpsMult.toString()
 	.split('me.fortune').join('Game.Objects[me.name].fortune')
 );
 
-CM.Sim.getCPSBuffMult = function() {
-	var mult = 1;
-	for (var i in Game.buffs) {
-		if (typeof Game.buffs[i].multCpS != 'undefined') mult *= Game.buffs[i].multCpS;
-	}
-	return mult;
-}
-
 CM.Sim.InitData = function() {
 	// Buildings
 	CM.Sim.Objects = [];
@@ -3205,6 +3198,7 @@ CM.Sim.InitData = function() {
 		// Below is needed for above eval!
 		you.baseCps = me.baseCps;
 		you.name = me.name;
+		you.id = me.id;
 	}
 
 	// Upgrades
@@ -3253,189 +3247,248 @@ CM.Sim.CopyData = function() {
 	}
 };
 
+CM.Sim.getCPSBuffMult = function() {
+	var mult = 1;
+	for (var i in Game.buffs) {
+		if (typeof Game.buffs[i].multCpS != 'undefined') mult *= Game.buffs[i].multCpS;
+	}
+	return mult;
+};
 
 CM.Sim.CalculateGains = function() {
-	CM.Sim.cookiesPs = 0;
-	var mult = 1;
+	CM.Sim.cookiesPs=0;
+	CM.Sim.cookiesPsByType={};
+	CM.Sim.cookiesMultByType={};
+	var mult=1;
+	//add up effect bonuses from building minigames
+	var effs={};
+	for (var i in Game.Objects)
+	{
+		if (Game.Objects[i].minigameLoaded && Game.Objects[i].minigame.effs)
+		{
+			var myEffs=Game.Objects[i].minigame.effs;
+			for (var ii in myEffs)
+			{
+				if (effs[ii]) effs[ii]*=myEffs[ii];
+				else effs[ii]=myEffs[ii];
+			}
+		}
+	}
+	CM.Sim.effs=effs;
 	
-	if (Game.ascensionMode != 1) mult += parseFloat(CM.Sim.prestige) * 0.01 * CM.Sim.heavenlyPower * CM.Sim.GetHeavenlyMultiplier();
+	if (Game.ascensionMode!=1) mult+=parseFloat(CM.Sim.prestige)*0.01*CM.Sim.heavenlyPower*CM.Sim.GetHeavenlyMultiplier();
 	
-	// TODO Store minigame buffs?
-	mult *= Game.eff('cps');
+	mult*=Game.eff('cps');
 	
-	if (CM.Sim.Has('Heralds') && Game.ascensionMode != 1) mult *= 1 + 0.01 * Game.heralds;
-
-	var cookieMult = 0;
-	for (var i in Game.cookieUpgrades) {
-		var me = Game.cookieUpgrades[i];
-		if (CM.Sim.Has(me.name)) {
-			mult *= (1 + (typeof(me.power) == 'function' ? me.power(me) : me.power) * 0.01);
+	if (CM.Sim.Has('Heralds') && Game.ascensionMode!=1) mult*=1+0.01*Game.heralds;
+	
+	for (var i in Game.cookieUpgrades)
+	{
+		var me=Game.cookieUpgrades[i];
+		if (CM.Sim.Has(me.name))
+		{
+			mult*=(1+(typeof(me.power)==='function'?me.power(me):me.power)*0.01);
 		}
 	}
-
-	mult *= (1 + 0.01 * cookieMult);
-	if (CM.Sim.Has('Specialized chocolate chips')) mult *= 1.01;
-	if (CM.Sim.Has('Designer cocoa beans')) mult *= 1.02;
-	if (CM.Sim.Has('Underworld ovens')) mult *= 1.03;
-	if (CM.Sim.Has('Exotic nuts')) mult *= 1.04;
-	if (CM.Sim.Has('Arcane sugar')) mult *= 1.05;
-
-	if (CM.Sim.Has('Increased merriness')) mult *= 1.15;
-	if (CM.Sim.Has('Improved jolliness')) mult *= 1.15;
-	if (CM.Sim.Has('A lump of coal')) mult *= 1.01;
-	if (CM.Sim.Has('An itchy sweater')) mult *= 1.01;
-	if (CM.Sim.Has('Santa\'s dominion')) mult *= 1.2;
-
-	if (CM.Sim.Has('Fortune #100')) mult *= 1.01;
-	if (CM.Sim.Has('Fortune #101')) mult *= 1.07;
-	if (CM.Sim.Has('Dragon scale')) mult *= 1.03;
-
-	var buildMult = 1;
-	if (Game.hasGod) {
-		var godLvl = Game.hasGod('asceticism');
-		if (godLvl == 1) mult *= 1.15;
-		else if (godLvl == 2) mult *= 1.1;
-		else if (godLvl == 3) mult *= 1.05;
-
-		var godLvl = Game.hasGod('ages');
-		if (godLvl == 1) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 3)) * Math.PI * 2);
-		else if (godLvl == 2) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 12)) * Math.PI*2);
-		else if (godLvl == 3) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 24)) * Math.PI*2);
-
-		var godLvl = Game.hasGod('decadence');
-		if (godLvl == 1) buildMult *= 0.93;
-		else if (godLvl == 2) buildMult *= 0.95;
-		else if (godLvl == 3) buildMult *= 0.98;
-
-		var godLvl = Game.hasGod('industry');
-		if (godLvl == 1) buildMult *= 1.1;
-		else if (godLvl == 2) buildMult *= 1.06;
-		else if (godLvl == 3) buildMult *= 1.03;
-
-		var godLvl = Game.hasGod('labor');
-		if (godLvl == 1) buildMult *= 0.97;
-		else if (godLvl == 2) buildMult *= 0.98;
-		else if (godLvl == 3) buildMult *= 0.99;
-	}
-
-	if (CM.Sim.Has('Santa\'s legacy')) mult *= 1 + (Game.santaLevel + 1) * 0.03;
-
-	for (var i in CM.Sim.Objects) {
-		var me = CM.Sim.Objects[i];
-		var storedCps = (typeof(me.cps) == 'function' ? me.cps(me) : me.cps);
-		if (Game.ascensionMode != 1) storedCps *= (1 + me.level * 0.01) * buildMult;
-		CM.Sim.cookiesPs += me.amount * storedCps;
+	
+	if (CM.Sim.Has('Specialized chocolate chips')) mult*=1.01;
+	if (CM.Sim.Has('Designer cocoa beans')) mult*=1.02;
+	if (CM.Sim.Has('Underworld ovens')) mult*=1.03;
+	if (CM.Sim.Has('Exotic nuts')) mult*=1.04;
+	if (CM.Sim.Has('Arcane sugar')) mult*=1.05;
+	
+	if (CM.Sim.Has('Increased merriness')) mult*=1.15;
+	if (CM.Sim.Has('Improved jolliness')) mult*=1.15;
+	if (CM.Sim.Has('A lump of coal')) mult*=1.01;
+	if (CM.Sim.Has('An itchy sweater')) mult*=1.01;
+	if (CM.Sim.Has('Santa\'s dominion')) mult*=1.2;
+	
+	if (CM.Sim.Has('Fortune #100')) mult*=1.01;
+	if (CM.Sim.Has('Fortune #101')) mult*=1.07;
+	
+	if (CM.Sim.Has('Dragon scale')) mult*=1.03;
+	
+	var buildMult=1;
+	if (Game.hasGod)
+	{
+		var godLvl=Game.hasGod('asceticism');
+		if (godLvl==1) mult*=1.15;
+		else if (godLvl==2) mult*=1.1;
+		else if (godLvl==3) mult*=1.05;
+		
+		var godLvl=Game.hasGod('ages');
+		if (godLvl==1) mult*=1+0.15*Math.sin((Date.now()/1000/(60*60*3))*Math.PI*2);
+		else if (godLvl==2) mult*=1+0.15*Math.sin((Date.now()/1000/(60*60*12))*Math.PI*2);
+		else if (godLvl==3) mult*=1+0.15*Math.sin((Date.now()/1000/(60*60*24))*Math.PI*2);
+		
+		var godLvl=Game.hasGod('decadence');
+		if (godLvl==1) buildMult*=0.93;
+		else if (godLvl==2) buildMult*=0.95;
+		else if (godLvl==3) buildMult*=0.98;
+		
+		var godLvl=Game.hasGod('industry');
+		if (godLvl==1) buildMult*=1.1;
+		else if (godLvl==2) buildMult*=1.06;
+		else if (godLvl==3) buildMult*=1.03;
+		
+		var godLvl=Game.hasGod('labor');
+		if (godLvl==1) buildMult*=0.97;
+		else if (godLvl==2) buildMult*=0.98;
+		else if (godLvl==3) buildMult*=0.99;
 	}
-
-	if (CM.Sim.Has('"egg"')) CM.Sim.cookiesPs += 9; // "egg"
-
+	
+	if (CM.Sim.Has('Santa\'s legacy')) mult*=1+(Game.santaLevel+1)*0.03;
+	
+	
+	CM.Sim.milkProgress=Game.AchievementsOwned/25;
 	var milkMult=1;
-	if (CM.Sim.Has('Santa\'s milk and cookies')) milkMult *= 1.05;
-	//if (CM.Sim.hasAura('Breath of Milk')) milkMult *= 1.05;
-	milkMult *= 1 + CM.Sim.auraMult('Breath of Milk') * 0.05;
-	if (Game.hasGod) {
-		var godLvl = Game.hasGod('mother');
-		if (godLvl == 1) milkMult *= 1.1;
-		else if (godLvl == 2) milkMult *= 1.05;
-		else if (godLvl == 3) milkMult *= 1.03;
-	}
-	// TODO Store minigame buffs?
-	milkMult *= Game.eff('milk');
-
-	var catMult = 1;
-
-	if (CM.Sim.Has('Kitten helpers')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult);
-	if (CM.Sim.Has('Kitten workers')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.125 * milkMult);
-	if (CM.Sim.Has('Kitten engineers')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.15 * milkMult);
-	if (CM.Sim.Has('Kitten overseers')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.175 * milkMult);
-	if (CM.Sim.Has('Kitten managers')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
-	if (CM.Sim.Has('Kitten accountants')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
-	if (CM.Sim.Has('Kitten specialists')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
-	if (CM.Sim.Has('Kitten experts')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
-	if (CM.Sim.Has('Kitten consultants')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
-	if (CM.Sim.Has('Kitten assistants to the regional manager')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.175 * milkMult);
-	if (CM.Sim.Has('Kitten marketeers')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.15 * milkMult);
-	if (CM.Sim.Has('Kitten analysts')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.125 * milkMult);
-	if (CM.Sim.Has('Kitten executives')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.115 * milkMult);
-	if (CM.Sim.Has('Kitten angels')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult);
-	if (CM.Sim.Has('Fortune #103')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.05 * milkMult);
-
-	mult *= catMult;
-
-	var eggMult = 1;
-	if (CM.Sim.Has('Chicken egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Duck egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Turkey egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Quail egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Robin egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Ostrich egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Cassowary egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Salmon roe')) eggMult *= 1.01;
-	if (CM.Sim.Has('Frogspawn')) eggMult *= 1.01;
-	if (CM.Sim.Has('Shark egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Turtle egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Ant larva')) eggMult *= 1.01;
-	if (CM.Sim.Has('Century egg')) {
-		// The boost increases a little every day, with diminishing returns up to +10% on the 100th day
-		var day = Math.floor((CM.Sim.DateCentury - Game.startDate) / 1000 / 10) * 10 / 60 / 60 / 24;
-		day = Math.min(day, 100);
-		CM.Cache.CentEgg = 1 + (1 - Math.pow(1 - day / 100, 3)) * 0.1;
-		eggMult *= CM.Cache.CentEgg;
-	}
-	mult *= eggMult;
-
-	// TODO Store lumps?
-	if (CM.Sim.Has('Sugar baking')) mult *= (1 + Math.min(100, Game.lumps) * 0.01);
-
-	//if (CM.Sim.hasAura('Radiant Appetite')) mult *= 2;
-	mult *= 1 + CM.Sim.auraMult('Radiant Appetite');
-
-	if (true) { // || CM.Sim.hasAura('Dragon\'s Fortune')) {
-		var n = Game.shimmerTypes['golden'].n;
-		var auraMult = CM.Sim.auraMult('Dragon\'s Fortune');
-		for (var i = 0; i < n; i++) {
-			mult *= 1 + auraMult * 1.23;
-		}
-	}
-
-	var rawCookiesPs = CM.Sim.cookiesPs * mult;
-
-	for (var i in Game.CpsAchievements) {
-		if (rawCookiesPs >= Game.CpsAchievements[i].threshold) CM.Sim.Win(Game.CpsAchievements[i].name);
-	}
-
-	mult *= CM.Sim.getCPSBuffMult();
-
-	// Pointless?
-	name = Game.bakeryName.toLowerCase();
-	if (name == 'orteil') mult *= 0.99;
-	else if (name == 'ortiel') mult *= 0.98; //or so help me
-
-	if (CM.Sim.Has('Elder Covenant')) mult *= 0.95;
-
-	if (CM.Sim.Has('Golden switch [off]')) {
-		var goldenSwitchMult = 1.5;
-		if (CM.Sim.Has('Residual luck')) {
-			var upgrades = Game.goldenCookieUpgrades;
-			for (var i in upgrades) {
-				if (CM.Sim.Has(upgrades[i])) goldenSwitchMult += 0.1;
-			}
-		}
-		mult *= goldenSwitchMult;
-	}
-	if (CM.Sim.Has('Shimmering veil [off]')) {
-		var veilMult = 0.5;
-		if (CM.Sim.Has('Reinforced membrane')) veilMult += 0.1;
-		mult *= 1 + veilMult;
-	}
-	// Removed debug upgrades
+	if (CM.Sim.Has('Santa\'s milk and cookies')) milkMult*=1.05;
+	//if (Game.hasAura('Breath of Milk')) milkMult*=1.05;
+	milkMult*=1+Game.auraMult('Breath of Milk')*0.05;
+	if (Game.hasGod)
+	{
+		var godLvl=Game.hasGod('mother');
+		if (godLvl==1) milkMult*=1.1;
+		else if (godLvl==2) milkMult*=1.05;
+		else if (godLvl==3) milkMult*=1.03;
+	}
+	milkMult*=Game.eff('milk');
 	
-	// Removed buffs
-
-	CM.Sim.cookiesPs *= mult;
+	var catMult=1;
+	
+	if (CM.Sim.Has('Kitten helpers')) catMult*=(1+CM.Sim.milkProgress*0.1*milkMult);
+	if (CM.Sim.Has('Kitten workers')) catMult*=(1+CM.Sim.milkProgress*0.125*milkMult);
+	if (CM.Sim.Has('Kitten engineers')) catMult*=(1+CM.Sim.milkProgress*0.15*milkMult);
+	if (CM.Sim.Has('Kitten overseers')) catMult*=(1+CM.Sim.milkProgress*0.175*milkMult);
+	if (CM.Sim.Has('Kitten managers')) catMult*=(1+CM.Sim.milkProgress*0.2*milkMult);
+	if (CM.Sim.Has('Kitten accountants')) catMult*=(1+CM.Sim.milkProgress*0.2*milkMult);
+	if (CM.Sim.Has('Kitten specialists')) catMult*=(1+CM.Sim.milkProgress*0.2*milkMult);
+	if (CM.Sim.Has('Kitten experts')) catMult*=(1+CM.Sim.milkProgress*0.2*milkMult);
+	if (CM.Sim.Has('Kitten consultants')) catMult*=(1+CM.Sim.milkProgress*0.2*milkMult);
+	if (CM.Sim.Has('Kitten assistants to the regional manager')) catMult*=(1+CM.Sim.milkProgress*0.175*milkMult);
+	if (CM.Sim.Has('Kitten marketeers')) catMult*=(1+CM.Sim.milkProgress*0.15*milkMult);
+	if (CM.Sim.Has('Kitten analysts')) catMult*=(1+CM.Sim.milkProgress*0.125*milkMult);
+	if (CM.Sim.Has('Kitten executives')) catMult*=(1+CM.Sim.milkProgress*0.115*milkMult);
+	if (CM.Sim.Has('Kitten angels')) catMult*=(1+CM.Sim.milkProgress*0.1*milkMult);
+	if (CM.Sim.Has('Fortune #103')) catMult*=(1+CM.Sim.milkProgress*0.05*milkMult);
+	
+	for (var i in CM.Sim.Objects)
+	{
+		var me=CM.Sim.Objects[i];
+		me.storedCps=me.cps(me);
+		if (Game.ascensionMode!=1) me.storedCps*=(1+me.level*0.01)*buildMult;
+		if (me.id==1 && CM.Sim.Has('Milkhelp&reg; lactose intolerance relief tablets')) me.storedCps*=1+0.05*CM.Sim.milkProgress*milkMult;//this used to be "me.storedCps*=1+0.1*Math.pow(catMult-1,0.5)" which was. hmm
+		me.storedTotalCps=me.amount*me.storedCps;
+		CM.Sim.cookiesPs+=me.storedTotalCps;
+		CM.Sim.cookiesPsByType[me.name]=me.storedTotalCps;
+	}
+	//cps from buildings only
+	CM.Sim.buildingCps=CM.Sim.cookiesPs;
+	
+	if (CM.Sim.Has('"egg"')) {CM.Sim.cookiesPs+=9;CM.Sim.cookiesPsByType['"egg"']=9;}//"egg"
+	
+	mult*=catMult;
+	
+	var eggMult=1;
+	if (CM.Sim.Has('Chicken egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Duck egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Turkey egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Quail egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Robin egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Ostrich egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Cassowary egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Salmon roe')) eggMult*=1.01;
+	if (CM.Sim.Has('Frogspawn')) eggMult*=1.01;
+	if (CM.Sim.Has('Shark egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Turtle egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Ant larva')) eggMult*=1.01;
+	if (CM.Sim.Has('Century egg'))
+	{
+		//the boost increases a little every day, with diminishing returns up to +10% on the 100th day
+		var day=Math.floor((Date.now()-Game.startDate)/1000/10)*10/60/60/24;
+		day=Math.min(day,100);
+		CM.Cache.CentEgg = (1-Math.pow(1-day/100,3))*0.1
+		eggMult*=1+CM.Cache.CentEgg;
+	}
+	
+	CM.Sim.cookiesMultByType['eggs']=eggMult;
+	mult*=eggMult;
+	
+	if (CM.Sim.Has('Sugar baking')) mult*=(1+Math.min(100,Game.lumps)*0.01);
+	
+	//if (Game.hasAura('Radiant Appetite')) mult*=2;
+	mult*=1+Game.auraMult('Radiant Appetite');
+	
+	var rawCookiesPs=CM.Sim.cookiesPs*mult;
+	for (var i in Game.CpsAchievements)
+	{
+		if (rawCookiesPs>=Game.CpsAchievements[i].threshold) CM.Sim.Win(Game.CpsAchievements[i].name);
+	}
+	CM.Sim.cookiesPsRaw=rawCookiesPs;
+	CM.Sim.cookiesPsRawHighest=Math.max(CM.Sim.cookiesPsRawHighest,rawCookiesPs);
+	
+	var n=Game.shimmerTypes['golden'].n;
+	var auraMult=Game.auraMult('Dragon\'s Fortune');
+	for (var i=0;i<n;i++){mult*=1+auraMult*1.23;}
+	
+	name=Game.bakeryName.toLowerCase();
+	if (name=='orteil') mult*=0.99;
+	else if (name=='ortiel') mult*=0.98;//or so help me
+	
+	var sucking=0;
+	for (var i in Game.wrinklers)
+	{
+		if (Game.wrinklers[i].phase==2)
+		{
+			sucking++;
+		}
+	}
+	var suckRate=1/20;//each wrinkler eats a twentieth of your CpS
+	suckRate*=Game.eff('wrinklerEat');
+	
+	CM.Sim.cpsSucked=sucking*suckRate;
+	
+	
+	if (Game.Has('Elder Covenant')) mult*=0.95;
+	
+	if (Game.Has('Golden switch [off]'))
+	{
+		var goldenSwitchMult=1.5;
+		if (Game.Has('Residual luck'))
+		{
+			var upgrades=Game.goldenCookieUpgrades;
+			for (var i in upgrades) {if (CM.Sim.Has(upgrades[i])) goldenSwitchMult+=0.1;}
+		}
+		mult*=goldenSwitchMult;
+	}
+	if (CM.Sim.Has('Shimmering veil [off]'))
+	{
+		var veilMult=0.5;
+		if (CM.Sim.Has('Reinforced membrane')) veilMult+=0.1;
+		mult*=1+veilMult;
+	}
+	if (CM.Sim.Has('Magic shenanigans')) mult*=1000;
+	if (CM.Sim.Has('Occult obstruction')) mult*=0;
+	
+	
+	//CM.Sim.cookiesPs=Game.runModHookOnValue('cps',CM.Sim.cookiesPs);
+	
+	
+	//cps without golden cookie effects
+	CM.Sim.unbuffedCps=CM.Sim.cookiesPs*mult;
 
-	// TODO remove?
-	// if (Game.hasBuff('Cursed finger')) Game.cookiesPs = 0;
+	mult *= CM.Sim.getCPSBuffMult()
+	
+	CM.Sim.globalCpsMult=mult;
+	CM.Sim.cookiesPs*=CM.Sim.globalCpsMult;
+	
+	//if (Game.hasBuff('Cursed finger')) Game.cookiesPs=0;
+	
+	// Game.computedMouseCps=Game.mouseCps();
+	
+	// Game.computeLumpTimes();
+	
+	// Game.recalculateGains=0;
 };
 
 CM.Sim.CheckOtherAchiev = function() {
@@ -3473,19 +3526,24 @@ CM.Sim.CheckOtherAchiev = function() {
 	if (minAmount >= 450) CM.Sim.Win('Quadricentennial and a half');
 	if (minAmount >= 500) CM.Sim.Win('Quincentennial');
 	if (minAmount >= 550) CM.Sim.Win('Quincentennial and a half');
+	if (minAmount >= 600) CM.Sim.Win('Sexcentennial');
 
 	if (buildingsOwned >= 100) CM.Sim.Win('Builder');
 	if (buildingsOwned >= 500) CM.Sim.Win('Architect');
 	if (buildingsOwned >= 1000) CM.Sim.Win('Engineer');
 	if (buildingsOwned >= 2000) CM.Sim.Win('Lord of Constructs');
+	if (buildingsOwned >= 4000) CM.Sim.Win('Grand design');
+	if (buildingsOwned >= 8000) CM.Sim.Win('Ecumenopolis');
 
 	if (CM.Sim.UpgradesOwned >= 20) CM.Sim.Win('Enhancer');
 	if (CM.Sim.UpgradesOwned >= 50) CM.Sim.Win('Augmenter');
 	if (CM.Sim.UpgradesOwned >= 100) CM.Sim.Win('Upgrader');
 	if (CM.Sim.UpgradesOwned >= 200) CM.Sim.Win('Lord of Progress');
+	if (CM.Sim.UpgradesOwned >= 300) CM.Sim.Win('The full picture');
+	if (CM.Sim.UpgradesOwned >= 400) CM.Sim.Win('When there\'s nothing left to add');
 
-	if (buildingsOwned >= 3000 && CM.Sim.UpgradesOwned >= 300) CM.Sim.Win('Polymath');
-	if (buildingsOwned >= 4000 && CM.Sim.UpgradesOwned >= 400) CM.Sim.Win('Renaissance baker');
+	if (buildingsOwned >= 4000 && CM.Sim.UpgradesOwned >= 300) CM.Sim.Win('Polymath');
+	if (buildingsOwned >= 8000 && CM.Sim.UpgradesOwned >= 400) CM.Sim.Win('Renaissance baker');
 
 	if (CM.Sim.Objects['Cursor'].amount + CM.Sim.Objects['Grandma'].amount >= 777) CM.Sim.Win('The elder scrolls');
 
@@ -3529,6 +3587,7 @@ CM.Sim.BuyBuildings = function(amount, target) {
 			if (me.amount >= 500) CM.Sim.Win('Thumbs, phalanges, metacarpals');
 			if (me.amount >= 600) CM.Sim.Win('With her finger and her thumb');
 			if (me.amount >= 700) CM.Sim.Win('Gotta hand it to you');
+			if (me.amount >= 800) CM.Sim.Win('The devil\'s workshop');
 		}
 		else {
 			for (var j in Game.Objects[me.name].tieredAchievs) {
diff --git a/src/Data.js b/src/Data.js
index 4202c893..80327572 100644
--- a/src/Data.js
+++ b/src/Data.js
@@ -20,6 +20,7 @@ CM.Data.Fortunes = [
 	'Fortune #015', 
 	'Fortune #016', 
 	'Fortune #017', 
+	'Fortune #018', 
 	'Fortune #100', 
 	'Fortune #101', 
 	'Fortune #102', 
diff --git a/src/Disp.js b/src/Disp.js
index f5692579..3b4f5670 100644
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -1542,7 +1542,7 @@ CM.Disp.AddMenuStats = function(title) {
 				stats.appendChild(listing(listingQuest('Chocolate Egg Cookies', 'ChoEggTooltipPlaceholder'), document.createTextNode(Beautify(CM.Cache.lastChoEgg))));
 			}
 			if (centEgg) {
-				stats.appendChild(listing('Century Egg Multiplier', document.createTextNode((Math.round((CM.Cache.CentEgg - 1) * 10000) / 100) + '%')));
+				stats.appendChild(listing('Century Egg Multiplier', document.createTextNode((Math.round(CM.Cache.CentEgg * 10000) / 100) + '%')));
 			}
 		}
 	}
diff --git a/src/Main.js b/src/Main.js
index c7b73626..3da39d16 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -299,6 +299,6 @@ CM.ConfigDefault = {
 };
 CM.ConfigPrefix = 'CMConfig';
 
-CM.VersionMajor = '2.029';
+CM.VersionMajor = '2.031';
 CM.VersionMinor = '1';
 
diff --git a/src/Sim.js b/src/Sim.js
index ce8ea755..3836e6e0 100644
--- a/src/Sim.js
+++ b/src/Sim.js
@@ -112,14 +112,6 @@ eval('CM.Sim.GetTieredCpsMult = ' + Game.GetTieredCpsMult.toString()
 	.split('me.fortune').join('Game.Objects[me.name].fortune')
 );
 
-CM.Sim.getCPSBuffMult = function() {
-	var mult = 1;
-	for (var i in Game.buffs) {
-		if (typeof Game.buffs[i].multCpS != 'undefined') mult *= Game.buffs[i].multCpS;
-	}
-	return mult;
-}
-
 CM.Sim.InitData = function() {
 	// Buildings
 	CM.Sim.Objects = [];
@@ -137,6 +129,7 @@ CM.Sim.InitData = function() {
 		// Below is needed for above eval!
 		you.baseCps = me.baseCps;
 		you.name = me.name;
+		you.id = me.id;
 	}
 
 	// Upgrades
@@ -185,189 +178,248 @@ CM.Sim.CopyData = function() {
 	}
 };
 
+CM.Sim.getCPSBuffMult = function() {
+	var mult = 1;
+	for (var i in Game.buffs) {
+		if (typeof Game.buffs[i].multCpS != 'undefined') mult *= Game.buffs[i].multCpS;
+	}
+	return mult;
+};
 
 CM.Sim.CalculateGains = function() {
-	CM.Sim.cookiesPs = 0;
-	var mult = 1;
+	CM.Sim.cookiesPs=0;
+	CM.Sim.cookiesPsByType={};
+	CM.Sim.cookiesMultByType={};
+	var mult=1;
+	//add up effect bonuses from building minigames
+	var effs={};
+	for (var i in Game.Objects)
+	{
+		if (Game.Objects[i].minigameLoaded && Game.Objects[i].minigame.effs)
+		{
+			var myEffs=Game.Objects[i].minigame.effs;
+			for (var ii in myEffs)
+			{
+				if (effs[ii]) effs[ii]*=myEffs[ii];
+				else effs[ii]=myEffs[ii];
+			}
+		}
+	}
+	CM.Sim.effs=effs;
 	
-	if (Game.ascensionMode != 1) mult += parseFloat(CM.Sim.prestige) * 0.01 * CM.Sim.heavenlyPower * CM.Sim.GetHeavenlyMultiplier();
+	if (Game.ascensionMode!=1) mult+=parseFloat(CM.Sim.prestige)*0.01*CM.Sim.heavenlyPower*CM.Sim.GetHeavenlyMultiplier();
 	
-	// TODO Store minigame buffs?
-	mult *= Game.eff('cps');
+	mult*=Game.eff('cps');
 	
-	if (CM.Sim.Has('Heralds') && Game.ascensionMode != 1) mult *= 1 + 0.01 * Game.heralds;
-
-	var cookieMult = 0;
-	for (var i in Game.cookieUpgrades) {
-		var me = Game.cookieUpgrades[i];
-		if (CM.Sim.Has(me.name)) {
-			mult *= (1 + (typeof(me.power) == 'function' ? me.power(me) : me.power) * 0.01);
+	if (CM.Sim.Has('Heralds') && Game.ascensionMode!=1) mult*=1+0.01*Game.heralds;
+	
+	for (var i in Game.cookieUpgrades)
+	{
+		var me=Game.cookieUpgrades[i];
+		if (CM.Sim.Has(me.name))
+		{
+			mult*=(1+(typeof(me.power)==='function'?me.power(me):me.power)*0.01);
 		}
 	}
-
-	mult *= (1 + 0.01 * cookieMult);
-	if (CM.Sim.Has('Specialized chocolate chips')) mult *= 1.01;
-	if (CM.Sim.Has('Designer cocoa beans')) mult *= 1.02;
-	if (CM.Sim.Has('Underworld ovens')) mult *= 1.03;
-	if (CM.Sim.Has('Exotic nuts')) mult *= 1.04;
-	if (CM.Sim.Has('Arcane sugar')) mult *= 1.05;
-
-	if (CM.Sim.Has('Increased merriness')) mult *= 1.15;
-	if (CM.Sim.Has('Improved jolliness')) mult *= 1.15;
-	if (CM.Sim.Has('A lump of coal')) mult *= 1.01;
-	if (CM.Sim.Has('An itchy sweater')) mult *= 1.01;
-	if (CM.Sim.Has('Santa\'s dominion')) mult *= 1.2;
-
-	if (CM.Sim.Has('Fortune #100')) mult *= 1.01;
-	if (CM.Sim.Has('Fortune #101')) mult *= 1.07;
-	if (CM.Sim.Has('Dragon scale')) mult *= 1.03;
-
-	var buildMult = 1;
-	if (Game.hasGod) {
-		var godLvl = Game.hasGod('asceticism');
-		if (godLvl == 1) mult *= 1.15;
-		else if (godLvl == 2) mult *= 1.1;
-		else if (godLvl == 3) mult *= 1.05;
-
-		var godLvl = Game.hasGod('ages');
-		if (godLvl == 1) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 3)) * Math.PI * 2);
-		else if (godLvl == 2) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 12)) * Math.PI*2);
-		else if (godLvl == 3) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 24)) * Math.PI*2);
-
-		var godLvl = Game.hasGod('decadence');
-		if (godLvl == 1) buildMult *= 0.93;
-		else if (godLvl == 2) buildMult *= 0.95;
-		else if (godLvl == 3) buildMult *= 0.98;
-
-		var godLvl = Game.hasGod('industry');
-		if (godLvl == 1) buildMult *= 1.1;
-		else if (godLvl == 2) buildMult *= 1.06;
-		else if (godLvl == 3) buildMult *= 1.03;
-
-		var godLvl = Game.hasGod('labor');
-		if (godLvl == 1) buildMult *= 0.97;
-		else if (godLvl == 2) buildMult *= 0.98;
-		else if (godLvl == 3) buildMult *= 0.99;
-	}
-
-	if (CM.Sim.Has('Santa\'s legacy')) mult *= 1 + (Game.santaLevel + 1) * 0.03;
-
-	for (var i in CM.Sim.Objects) {
-		var me = CM.Sim.Objects[i];
-		var storedCps = (typeof(me.cps) == 'function' ? me.cps(me) : me.cps);
-		if (Game.ascensionMode != 1) storedCps *= (1 + me.level * 0.01) * buildMult;
-		CM.Sim.cookiesPs += me.amount * storedCps;
+	
+	if (CM.Sim.Has('Specialized chocolate chips')) mult*=1.01;
+	if (CM.Sim.Has('Designer cocoa beans')) mult*=1.02;
+	if (CM.Sim.Has('Underworld ovens')) mult*=1.03;
+	if (CM.Sim.Has('Exotic nuts')) mult*=1.04;
+	if (CM.Sim.Has('Arcane sugar')) mult*=1.05;
+	
+	if (CM.Sim.Has('Increased merriness')) mult*=1.15;
+	if (CM.Sim.Has('Improved jolliness')) mult*=1.15;
+	if (CM.Sim.Has('A lump of coal')) mult*=1.01;
+	if (CM.Sim.Has('An itchy sweater')) mult*=1.01;
+	if (CM.Sim.Has('Santa\'s dominion')) mult*=1.2;
+	
+	if (CM.Sim.Has('Fortune #100')) mult*=1.01;
+	if (CM.Sim.Has('Fortune #101')) mult*=1.07;
+	
+	if (CM.Sim.Has('Dragon scale')) mult*=1.03;
+	
+	var buildMult=1;
+	if (Game.hasGod)
+	{
+		var godLvl=Game.hasGod('asceticism');
+		if (godLvl==1) mult*=1.15;
+		else if (godLvl==2) mult*=1.1;
+		else if (godLvl==3) mult*=1.05;
+		
+		var godLvl=Game.hasGod('ages');
+		if (godLvl==1) mult*=1+0.15*Math.sin((Date.now()/1000/(60*60*3))*Math.PI*2);
+		else if (godLvl==2) mult*=1+0.15*Math.sin((Date.now()/1000/(60*60*12))*Math.PI*2);
+		else if (godLvl==3) mult*=1+0.15*Math.sin((Date.now()/1000/(60*60*24))*Math.PI*2);
+		
+		var godLvl=Game.hasGod('decadence');
+		if (godLvl==1) buildMult*=0.93;
+		else if (godLvl==2) buildMult*=0.95;
+		else if (godLvl==3) buildMult*=0.98;
+		
+		var godLvl=Game.hasGod('industry');
+		if (godLvl==1) buildMult*=1.1;
+		else if (godLvl==2) buildMult*=1.06;
+		else if (godLvl==3) buildMult*=1.03;
+		
+		var godLvl=Game.hasGod('labor');
+		if (godLvl==1) buildMult*=0.97;
+		else if (godLvl==2) buildMult*=0.98;
+		else if (godLvl==3) buildMult*=0.99;
 	}
-
-	if (CM.Sim.Has('"egg"')) CM.Sim.cookiesPs += 9; // "egg"
-
+	
+	if (CM.Sim.Has('Santa\'s legacy')) mult*=1+(Game.santaLevel+1)*0.03;
+	
+	
+	CM.Sim.milkProgress=Game.AchievementsOwned/25;
 	var milkMult=1;
-	if (CM.Sim.Has('Santa\'s milk and cookies')) milkMult *= 1.05;
-	//if (CM.Sim.hasAura('Breath of Milk')) milkMult *= 1.05;
-	milkMult *= 1 + CM.Sim.auraMult('Breath of Milk') * 0.05;
-	if (Game.hasGod) {
-		var godLvl = Game.hasGod('mother');
-		if (godLvl == 1) milkMult *= 1.1;
-		else if (godLvl == 2) milkMult *= 1.05;
-		else if (godLvl == 3) milkMult *= 1.03;
-	}
-	// TODO Store minigame buffs?
-	milkMult *= Game.eff('milk');
-
-	var catMult = 1;
-
-	if (CM.Sim.Has('Kitten helpers')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult);
-	if (CM.Sim.Has('Kitten workers')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.125 * milkMult);
-	if (CM.Sim.Has('Kitten engineers')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.15 * milkMult);
-	if (CM.Sim.Has('Kitten overseers')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.175 * milkMult);
-	if (CM.Sim.Has('Kitten managers')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
-	if (CM.Sim.Has('Kitten accountants')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
-	if (CM.Sim.Has('Kitten specialists')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
-	if (CM.Sim.Has('Kitten experts')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
-	if (CM.Sim.Has('Kitten consultants')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
-	if (CM.Sim.Has('Kitten assistants to the regional manager')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.175 * milkMult);
-	if (CM.Sim.Has('Kitten marketeers')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.15 * milkMult);
-	if (CM.Sim.Has('Kitten analysts')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.125 * milkMult);
-	if (CM.Sim.Has('Kitten executives')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.115 * milkMult);
-	if (CM.Sim.Has('Kitten angels')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult);
-	if (CM.Sim.Has('Fortune #103')) catMult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.05 * milkMult);
-
-	mult *= catMult;
-
-	var eggMult = 1;
-	if (CM.Sim.Has('Chicken egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Duck egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Turkey egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Quail egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Robin egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Ostrich egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Cassowary egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Salmon roe')) eggMult *= 1.01;
-	if (CM.Sim.Has('Frogspawn')) eggMult *= 1.01;
-	if (CM.Sim.Has('Shark egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Turtle egg')) eggMult *= 1.01;
-	if (CM.Sim.Has('Ant larva')) eggMult *= 1.01;
-	if (CM.Sim.Has('Century egg')) {
-		// The boost increases a little every day, with diminishing returns up to +10% on the 100th day
-		var day = Math.floor((CM.Sim.DateCentury - Game.startDate) / 1000 / 10) * 10 / 60 / 60 / 24;
-		day = Math.min(day, 100);
-		CM.Cache.CentEgg = 1 + (1 - Math.pow(1 - day / 100, 3)) * 0.1;
-		eggMult *= CM.Cache.CentEgg;
-	}
-	mult *= eggMult;
-
-	// TODO Store lumps?
-	if (CM.Sim.Has('Sugar baking')) mult *= (1 + Math.min(100, Game.lumps) * 0.01);
-
-	//if (CM.Sim.hasAura('Radiant Appetite')) mult *= 2;
-	mult *= 1 + CM.Sim.auraMult('Radiant Appetite');
-
-	if (true) { // || CM.Sim.hasAura('Dragon\'s Fortune')) {
-		var n = Game.shimmerTypes['golden'].n;
-		var auraMult = CM.Sim.auraMult('Dragon\'s Fortune');
-		for (var i = 0; i < n; i++) {
-			mult *= 1 + auraMult * 1.23;
-		}
+	if (CM.Sim.Has('Santa\'s milk and cookies')) milkMult*=1.05;
+	//if (Game.hasAura('Breath of Milk')) milkMult*=1.05;
+	milkMult*=1+Game.auraMult('Breath of Milk')*0.05;
+	if (Game.hasGod)
+	{
+		var godLvl=Game.hasGod('mother');
+		if (godLvl==1) milkMult*=1.1;
+		else if (godLvl==2) milkMult*=1.05;
+		else if (godLvl==3) milkMult*=1.03;
+	}
+	milkMult*=Game.eff('milk');
+	
+	var catMult=1;
+	
+	if (CM.Sim.Has('Kitten helpers')) catMult*=(1+CM.Sim.milkProgress*0.1*milkMult);
+	if (CM.Sim.Has('Kitten workers')) catMult*=(1+CM.Sim.milkProgress*0.125*milkMult);
+	if (CM.Sim.Has('Kitten engineers')) catMult*=(1+CM.Sim.milkProgress*0.15*milkMult);
+	if (CM.Sim.Has('Kitten overseers')) catMult*=(1+CM.Sim.milkProgress*0.175*milkMult);
+	if (CM.Sim.Has('Kitten managers')) catMult*=(1+CM.Sim.milkProgress*0.2*milkMult);
+	if (CM.Sim.Has('Kitten accountants')) catMult*=(1+CM.Sim.milkProgress*0.2*milkMult);
+	if (CM.Sim.Has('Kitten specialists')) catMult*=(1+CM.Sim.milkProgress*0.2*milkMult);
+	if (CM.Sim.Has('Kitten experts')) catMult*=(1+CM.Sim.milkProgress*0.2*milkMult);
+	if (CM.Sim.Has('Kitten consultants')) catMult*=(1+CM.Sim.milkProgress*0.2*milkMult);
+	if (CM.Sim.Has('Kitten assistants to the regional manager')) catMult*=(1+CM.Sim.milkProgress*0.175*milkMult);
+	if (CM.Sim.Has('Kitten marketeers')) catMult*=(1+CM.Sim.milkProgress*0.15*milkMult);
+	if (CM.Sim.Has('Kitten analysts')) catMult*=(1+CM.Sim.milkProgress*0.125*milkMult);
+	if (CM.Sim.Has('Kitten executives')) catMult*=(1+CM.Sim.milkProgress*0.115*milkMult);
+	if (CM.Sim.Has('Kitten angels')) catMult*=(1+CM.Sim.milkProgress*0.1*milkMult);
+	if (CM.Sim.Has('Fortune #103')) catMult*=(1+CM.Sim.milkProgress*0.05*milkMult);
+	
+	for (var i in CM.Sim.Objects)
+	{
+		var me=CM.Sim.Objects[i];
+		me.storedCps=me.cps(me);
+		if (Game.ascensionMode!=1) me.storedCps*=(1+me.level*0.01)*buildMult;
+		if (me.id==1 && CM.Sim.Has('Milkhelp&reg; lactose intolerance relief tablets')) me.storedCps*=1+0.05*CM.Sim.milkProgress*milkMult;//this used to be "me.storedCps*=1+0.1*Math.pow(catMult-1,0.5)" which was. hmm
+		me.storedTotalCps=me.amount*me.storedCps;
+		CM.Sim.cookiesPs+=me.storedTotalCps;
+		CM.Sim.cookiesPsByType[me.name]=me.storedTotalCps;
+	}
+	//cps from buildings only
+	CM.Sim.buildingCps=CM.Sim.cookiesPs;
+	
+	if (CM.Sim.Has('"egg"')) {CM.Sim.cookiesPs+=9;CM.Sim.cookiesPsByType['"egg"']=9;}//"egg"
+	
+	mult*=catMult;
+	
+	var eggMult=1;
+	if (CM.Sim.Has('Chicken egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Duck egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Turkey egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Quail egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Robin egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Ostrich egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Cassowary egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Salmon roe')) eggMult*=1.01;
+	if (CM.Sim.Has('Frogspawn')) eggMult*=1.01;
+	if (CM.Sim.Has('Shark egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Turtle egg')) eggMult*=1.01;
+	if (CM.Sim.Has('Ant larva')) eggMult*=1.01;
+	if (CM.Sim.Has('Century egg'))
+	{
+		//the boost increases a little every day, with diminishing returns up to +10% on the 100th day
+		var day=Math.floor((Date.now()-Game.startDate)/1000/10)*10/60/60/24;
+		day=Math.min(day,100);
+		CM.Cache.CentEgg = (1-Math.pow(1-day/100,3))*0.1
+		eggMult*=1+CM.Cache.CentEgg;
 	}
-
-	var rawCookiesPs = CM.Sim.cookiesPs * mult;
-
-	for (var i in Game.CpsAchievements) {
-		if (rawCookiesPs >= Game.CpsAchievements[i].threshold) CM.Sim.Win(Game.CpsAchievements[i].name);
+	
+	CM.Sim.cookiesMultByType['eggs']=eggMult;
+	mult*=eggMult;
+	
+	if (CM.Sim.Has('Sugar baking')) mult*=(1+Math.min(100,Game.lumps)*0.01);
+	
+	//if (Game.hasAura('Radiant Appetite')) mult*=2;
+	mult*=1+Game.auraMult('Radiant Appetite');
+	
+	var rawCookiesPs=CM.Sim.cookiesPs*mult;
+	for (var i in Game.CpsAchievements)
+	{
+		if (rawCookiesPs>=Game.CpsAchievements[i].threshold) CM.Sim.Win(Game.CpsAchievements[i].name);
 	}
-
-	mult *= CM.Sim.getCPSBuffMult();
-
-	// Pointless?
-	name = Game.bakeryName.toLowerCase();
-	if (name == 'orteil') mult *= 0.99;
-	else if (name == 'ortiel') mult *= 0.98; //or so help me
-
-	if (CM.Sim.Has('Elder Covenant')) mult *= 0.95;
-
-	if (CM.Sim.Has('Golden switch [off]')) {
-		var goldenSwitchMult = 1.5;
-		if (CM.Sim.Has('Residual luck')) {
-			var upgrades = Game.goldenCookieUpgrades;
-			for (var i in upgrades) {
-				if (CM.Sim.Has(upgrades[i])) goldenSwitchMult += 0.1;
-			}
+	CM.Sim.cookiesPsRaw=rawCookiesPs;
+	CM.Sim.cookiesPsRawHighest=Math.max(CM.Sim.cookiesPsRawHighest,rawCookiesPs);
+	
+	var n=Game.shimmerTypes['golden'].n;
+	var auraMult=Game.auraMult('Dragon\'s Fortune');
+	for (var i=0;i<n;i++){mult*=1+auraMult*1.23;}
+	
+	name=Game.bakeryName.toLowerCase();
+	if (name=='orteil') mult*=0.99;
+	else if (name=='ortiel') mult*=0.98;//or so help me
+	
+	var sucking=0;
+	for (var i in Game.wrinklers)
+	{
+		if (Game.wrinklers[i].phase==2)
+		{
+			sucking++;
+		}
+	}
+	var suckRate=1/20;//each wrinkler eats a twentieth of your CpS
+	suckRate*=Game.eff('wrinklerEat');
+	
+	CM.Sim.cpsSucked=sucking*suckRate;
+	
+	
+	if (Game.Has('Elder Covenant')) mult*=0.95;
+	
+	if (Game.Has('Golden switch [off]'))
+	{
+		var goldenSwitchMult=1.5;
+		if (Game.Has('Residual luck'))
+		{
+			var upgrades=Game.goldenCookieUpgrades;
+			for (var i in upgrades) {if (CM.Sim.Has(upgrades[i])) goldenSwitchMult+=0.1;}
 		}
-		mult *= goldenSwitchMult;
+		mult*=goldenSwitchMult;
 	}
-	if (CM.Sim.Has('Shimmering veil [off]')) {
-		var veilMult = 0.5;
-		if (CM.Sim.Has('Reinforced membrane')) veilMult += 0.1;
-		mult *= 1 + veilMult;
+	if (CM.Sim.Has('Shimmering veil [off]'))
+	{
+		var veilMult=0.5;
+		if (CM.Sim.Has('Reinforced membrane')) veilMult+=0.1;
+		mult*=1+veilMult;
 	}
-	// Removed debug upgrades
+	if (CM.Sim.Has('Magic shenanigans')) mult*=1000;
+	if (CM.Sim.Has('Occult obstruction')) mult*=0;
 	
-	// Removed buffs
-
-	CM.Sim.cookiesPs *= mult;
+	
+	//CM.Sim.cookiesPs=Game.runModHookOnValue('cps',CM.Sim.cookiesPs);
+	
+	
+	//cps without golden cookie effects
+	CM.Sim.unbuffedCps=CM.Sim.cookiesPs*mult;
 
-	// TODO remove?
-	// if (Game.hasBuff('Cursed finger')) Game.cookiesPs = 0;
+	mult *= CM.Sim.getCPSBuffMult()
+	
+	CM.Sim.globalCpsMult=mult;
+	CM.Sim.cookiesPs*=CM.Sim.globalCpsMult;
+	
+	//if (Game.hasBuff('Cursed finger')) Game.cookiesPs=0;
+	
+	// Game.computedMouseCps=Game.mouseCps();
+	
+	// Game.computeLumpTimes();
+	
+	// Game.recalculateGains=0;
 };
 
 CM.Sim.CheckOtherAchiev = function() {
@@ -405,19 +457,24 @@ CM.Sim.CheckOtherAchiev = function() {
 	if (minAmount >= 450) CM.Sim.Win('Quadricentennial and a half');
 	if (minAmount >= 500) CM.Sim.Win('Quincentennial');
 	if (minAmount >= 550) CM.Sim.Win('Quincentennial and a half');
+	if (minAmount >= 600) CM.Sim.Win('Sexcentennial');
 
 	if (buildingsOwned >= 100) CM.Sim.Win('Builder');
 	if (buildingsOwned >= 500) CM.Sim.Win('Architect');
 	if (buildingsOwned >= 1000) CM.Sim.Win('Engineer');
 	if (buildingsOwned >= 2000) CM.Sim.Win('Lord of Constructs');
+	if (buildingsOwned >= 4000) CM.Sim.Win('Grand design');
+	if (buildingsOwned >= 8000) CM.Sim.Win('Ecumenopolis');
 
 	if (CM.Sim.UpgradesOwned >= 20) CM.Sim.Win('Enhancer');
 	if (CM.Sim.UpgradesOwned >= 50) CM.Sim.Win('Augmenter');
 	if (CM.Sim.UpgradesOwned >= 100) CM.Sim.Win('Upgrader');
 	if (CM.Sim.UpgradesOwned >= 200) CM.Sim.Win('Lord of Progress');
+	if (CM.Sim.UpgradesOwned >= 300) CM.Sim.Win('The full picture');
+	if (CM.Sim.UpgradesOwned >= 400) CM.Sim.Win('When there\'s nothing left to add');
 
-	if (buildingsOwned >= 3000 && CM.Sim.UpgradesOwned >= 300) CM.Sim.Win('Polymath');
-	if (buildingsOwned >= 4000 && CM.Sim.UpgradesOwned >= 400) CM.Sim.Win('Renaissance baker');
+	if (buildingsOwned >= 4000 && CM.Sim.UpgradesOwned >= 300) CM.Sim.Win('Polymath');
+	if (buildingsOwned >= 8000 && CM.Sim.UpgradesOwned >= 400) CM.Sim.Win('Renaissance baker');
 
 	if (CM.Sim.Objects['Cursor'].amount + CM.Sim.Objects['Grandma'].amount >= 777) CM.Sim.Win('The elder scrolls');
 
@@ -461,6 +518,7 @@ CM.Sim.BuyBuildings = function(amount, target) {
 			if (me.amount >= 500) CM.Sim.Win('Thumbs, phalanges, metacarpals');
 			if (me.amount >= 600) CM.Sim.Win('With her finger and her thumb');
 			if (me.amount >= 700) CM.Sim.Win('Gotta hand it to you');
+			if (me.amount >= 800) CM.Sim.Win('The devil\'s workshop');
 		}
 		else {
 			for (var j in Game.Objects[me.name].tieredAchievs) {