Added buy 10 building tooltip/fixed minor bug with pref config loading

CookieMonster.js

@@ -23,11 +23,14 @@ CM.Sim = {};
  *********/
 
 CM.Cache.RemakeIncome = function() {
-	// Simulate Building Buys
-	CM.Sim.BuyBuildings();
+	// Simulate Building Buys for 1 amount
+	CM.Sim.BuyBuildings(1, 'Objects');
 
 	// Simulate Upgrade Buys
 	CM.Sim.BuyUpgrades();
+	
+	// Simulate Building Buys for 10 amount
+	CM.Sim.BuyBuildings(10, 'Objects10');
 }
 
 CM.Cache.RemakeBuildingsBCI = function() {
@@ -65,12 +68,31 @@ CM.Cache.RemakeUpgradeBCI = function() {
 	}
 }
 
+CM.Cache.RemakeBuildings10BCI = function() {
+	for (var i in CM.Cache.Objects10) {
+		CM.Cache.Objects10[i].price = CM.Sim.BuildingGetPrice(Game.Objects[i].basePrice, Game.Objects[i].amount, 10);
+		CM.Cache.Objects10[i].bci = CM.Cache.Objects10[i].price / CM.Cache.Objects10[i].bonus;
+		var color = '';
+		if (CM.Cache.Objects10[i].bci <= 0 || CM.Cache.Objects10[i].bci == 'Infinity') color = CM.Disp.colorGray;
+		else if (CM.Cache.Objects10[i].bci < CM.Disp.min) color = CM.Disp.colorBlue;
+		else if (CM.Cache.Objects10[i].bci == CM.Disp.min) color = CM.Disp.colorGreen;
+		else if (CM.Cache.Objects10[i].bci == CM.Disp.max) color = CM.Disp.colorRed;
+		else if (CM.Cache.Objects10[i].bci > CM.Disp.max) color = CM.Disp.colorPurple;
+		else if (CM.Cache.Objects10[i].bci > CM.Disp.mid) color = CM.Disp.colorOrange;
+		else color = CM.Disp.colorYellow;
+		CM.Cache.Objects10[i].color = color;
+	}
+}
+
 CM.Cache.RemakeBCI = function() {
-	// Buildings
+	// Buildings for 1 amount
 	CM.Cache.RemakeBuildingsBCI();
 	
 	// Upgrades
 	CM.Cache.RemakeUpgradeBCI();
+	
+	// Buildings for 10 amount
+	CM.Cache.RemakeBuildings10BCI();
 }
 
 CM.Cache.RemakeLucky = function() {
@@ -113,18 +135,37 @@ CM.Cache.RemakeChain = function() {
 		base = CM.Cache.ChainWrathReward;
 	}
 	var count = 1;
+	if (maxPayout < base) {
+		CM.Cache.Chain = 0;
+	}
+	else {
+		count = base > Math.pow(2, 53) ? Math.pow(2, Math.floor(Math.log(base) / Math.log(2)) - 53) : 1;
 		while (base == base + count) {
 			count++;
 		}
 		CM.Cache.Chain = (base + count) / 0.25;
+	}
 	
 	CM.Cache.ChainFrenzyReward = CM.Cache.MaxChainMoni(7, maxPayout * 7);
 	
-	count = 1;
-	while(CM.Cache.ChainFrenzyReward == CM.Cache.ChainFrenzyReward + count) {
+	CM.Cache.ChainFrenzyWrathReward = CM.Cache.MaxChainMoni(6, maxPayout * 7);
+	
+	if (CM.Cache.ChainFrenzyReward > CM.Cache.ChainFrenzyWrathReward) {
+		base = CM.Cache.ChainFrenzyReward;
+	}
+	else {
+		base = CM.Cache.ChainFrenzyWrathReward;
+	}
+	if ((maxPayout * 7) < base) {
+		CM.Cache.ChainFrenzy = 0;
+	}
+	else {
+		count = base > Math.pow(2, 53) ? Math.pow(2, Math.floor(Math.log(base) / Math.log(2)) - 53) : 1;
+		while(base == base + count) {
 			count++;
 		}
-	CM.Cache.ChainFrenzy = (CM.Cache.ChainFrenzyReward + count) / 0.25;
+		CM.Cache.ChainFrenzy = (base + count) / 0.25;
+	}
 }
 
 CM.Cache.RemakeSeaSpec = function() {
@@ -144,6 +185,7 @@ CM.Cache.ChainReward = 0;
 CM.Cache.ChainWrathReward = 0;
 CM.Cache.ChainFrenzy = 0;
 CM.Cache.ChainFrenzyReward = 0;
+CM.Cache.ChainFrenzyWrathReward = 0;
 /**********
  * Config *
  **********/
@@ -159,15 +201,31 @@ CM.LoadConfig = function() {
 		// Check values
 		var mod = false;
 		for (var i in CM.ConfigDefault) {
+			if (i != 'StatsPref') {
 				if (CM.Config[i] == undefined || !(CM.Config[i] > -1 && CM.Config[i] < CM.ConfigData[i].label.length)) {
 					mod = true;
 					CM.Config[i] = CM.ConfigDefault[i];
 				}
 			}
+			else { // Statistics Preferences
+				if (CM.Config[i] == undefined) {
+					mod = true;
+					CM.Config[i] = CM.ConfigDefault[i];
+				}
+				else {
+					for (var j in CM.ConfigDefault.StatsPref) {
+						if (CM.Config[i][j] == undefined || !(CM.Config[i][j] > -1 && CM.Config[i][j] < 2)) {
+							mod = true;
+							CM.Config[i][j] = CM.ConfigDefault[i][j];
+						}
+					}
+				}
+			}
+		}
 		if (mod) CM.SaveConfig(CM.Config);
 		CM.Loop(); // Do loop once
 		for (var i in CM.ConfigDefault) {
-			if (CM.ConfigData[i].func != undefined) {
+			if (i != 'StatsPref' && CM.ConfigData[i].func != undefined) {
 				CM.ConfigData[i].func();
 			}
 		}
@@ -208,6 +266,16 @@ CM.ToggleConfigDown = function(config) {
 	CM.SaveConfig(CM.Config);
 }
 
+CM.ToggleStatsConfig = function(config) {
+	if (CM.Config.StatsPref[config] == 0) {
+		CM.Config.StatsPref[config]++;
+	}
+	else {
+		CM.Config.StatsPref[config]--;
+	}
+	CM.SaveConfig(CM.Config);
+}
+
 CM.ConfigData.BotBar = {label: ['Bottom Bar OFF', 'Bottom Bar ON'], desc: 'Building Information', func: function() {CM.Disp.ToggleBotBar();}};
 CM.ConfigData.TimerBar = {label: ['Timer Bar OFF', 'Timer Bar ON'], desc: 'Timers of Golden Cookie, Season Popup, Frenzy (Normal, Clot, Elder), Click Frenzy', func: function() {CM.Disp.ToggleTimerBar();}};
 CM.ConfigData.BuildColor = {label: ['Building Colors OFF', 'Building Colors ON'], desc: 'Color code buildings', func: function() {CM.Disp.UpdateBuildings();}};
@@ -883,14 +951,7 @@ CM.Disp.UpdateTitle = function() {
 	}
 }
 
-CM.Disp.AddMenu = function() {
-	var title = function() {
-		var div = document.createElement('div');
-		div.className = 'title';
-		div.style.color = CM.Disp.colorBlue;
-		div.textContent = 'Cookie Monster Goodies';
-		return div;
-	}
+CM.Disp.AddMenuPref = function(title) {
 	var header = function(text) {
 		var div = document.createElement('div');
 		div.className = 'listing';
@@ -902,7 +963,6 @@ CM.Disp.AddMenu = function() {
 		return div;
 	}
 
-	if (Game.onMenu == 'prefs') {
 	var frag = document.createDocumentFragment();
 		
 	frag.appendChild(title());
@@ -927,10 +987,10 @@ CM.Disp.AddMenu = function() {
 	frag.appendChild(listing('TimerBar'));
 	frag.appendChild(listing('BuildColor'));
 	frag.appendChild(listing('UpBarColor'));
+	
 	frag.appendChild(header('Golden Cookie/Season Popup Emphasis'));
 	frag.appendChild(listing('Flash'));
 	frag.appendChild(listing('Sound'));	
-		
 	var volConfig = 'Volume';
 	var volume = document.createElement('div');
 	volume.className = 'listing';
@@ -952,20 +1012,21 @@ CM.Disp.AddMenu = function() {
 	volLabel.textContent = CM.ConfigData[volConfig].desc;
 	volume.appendChild(volLabel);
 	frag.appendChild(volume);
-		
 	frag.appendChild(listing('GCTimer'));
 	frag.appendChild(listing('Title'));
+	
 	frag.appendChild(header('Tooltip'));
 	frag.appendChild(listing('Tooltip'));
 	frag.appendChild(listing('ToolWarnCaut'));
 	frag.appendChild(listing('ToolWarnCautPos'));
+	
 	frag.appendChild(header('Statistics'));
 	frag.appendChild(listing('Stats'));
 	frag.appendChild(listing('UpStats'));
 	frag.appendChild(listing('SayTime'));
+	
 	frag.appendChild(header('Other'));
 	frag.appendChild(listing('Scale'));	
-		
 	var resDef = document.createElement('div');
 	resDef.className = 'listing';
 	var resDefBut = document.createElement('a');
@@ -979,17 +1040,88 @@ CM.Disp.AddMenu = function() {
 		
 	CM.Disp.FormatButtonOnClickBak = l('formatButton').onclick;
 	l('formatButton').onclick = function() {Game.Toggle('format', 'formatButton', 'Short numbers OFF', 'Short numbers ON'); CM.Disp.RefreshScale();};
+}
+
+CM.Disp.AddMenuStats = function(title) {
+	var header = function(text, config) {
+		var div = document.createElement('div');
+		div.className = 'listing';
+		div.style.padding = '5px 16px';
+		div.style.opacity = '0.7';
+		div.style.fontSize = '17px';
+		div.style.fontFamily = '\"Kavoon\", Georgia, serif';
+		div.appendChild(document.createTextNode(text + ' '));
+		span = document.createElement('span');
+		span.style.cursor = 'pointer';
+		span.style.display = 'inline-block';
+		span.style.height = '14px';
+		span.style.width = '14px';
+		span.style.borderRadius = '7px';
+		span.style.textAlign = 'center';
+		span.style.backgroundColor = '#C0C0C0';
+		span.style.color = 'black';
+		span.style.fontSize = '13px';
+		span.style.verticalAlign = 'middle';
+		span.textContent = CM.Config.StatsPref[config] ? '-' : '+';
+		span.onclick = function() {CM.ToggleStatsConfig(config); Game.UpdateMenu();};
+		div.appendChild(span);
+		return div;
 	}
-	else if (CM.Config.Stats == 1 && Game.onMenu == 'stats') {
+	
 	var stats = document.createElement('div');
 	stats.className = 'subsection';
 
+	stats.appendChild(title());
+	
+	var listing = function(name, text) {
+		var div = document.createElement('div');
+		div.className = 'listing';
+		var b = document.createElement('b');
+		b.textContent = name + ' : ';
+		div.appendChild(b);
+		div.appendChild(text);
+		return div;
+	}
+	
+	stats.appendChild(header('Lucky Cookies', 'Lucky'));
+	if (CM.Config.StatsPref.Lucky) {
 		var luckyColor = (Game.cookies < CM.Cache.Lucky) ? CM.Disp.colorRed : CM.Disp.colorGreen;
 		var luckyTime = (Game.cookies < CM.Cache.Lucky) ? CM.Disp.FormatTime((CM.Cache.Lucky - Game.cookies) / (Game.cookiesPs * (1 - Game.cpsSucked))) : '';
 		var luckyColorFrenzy = (Game.cookies < CM.Cache.LuckyFrenzy) ? CM.Disp.colorRed : CM.Disp.colorGreen;
 		var luckyTimeFrenzy = (Game.cookies < CM.Cache.LuckyFrenzy) ? CM.Disp.FormatTime((CM.Cache.LuckyFrenzy - Game.cookies) / (Game.cookiesPs * (1 - Game.cpsSucked))) : '';
 		var luckyCur = Math.min(Game.cookies * 0.1, Game.cookiesPs * 60 * 20) + 13;
 	
+		var luckyReqFrag = document.createDocumentFragment();
+		var luckyReqSpan = document.createElement('span');
+		luckyReqSpan.style.fontWeight = 'bold';
+		luckyReqSpan.style.color = luckyColor;
+		luckyReqSpan.textContent = Beautify(CM.Cache.Lucky);
+		luckyReqFrag.appendChild(luckyReqSpan);
+		if (luckyTime != '') {
+			var luckyReqSmall = document.createElement('small');
+			luckyReqSmall.textContent = ' (' + luckyTime + ')';
+			luckyReqFrag.appendChild(luckyReqSmall);
+		}
+		stats.appendChild(listing('\"Lucky!\" Cookies Required', luckyReqFrag));
+		var luckyReqFrenFrag = document.createDocumentFragment();
+		var luckyReqFrenSpan = document.createElement('span');
+		luckyReqFrenSpan.style.fontWeight = 'bold';
+		luckyReqFrenSpan.style.color = luckyColorFrenzy;
+		luckyReqFrenSpan.textContent = Beautify(CM.Cache.LuckyFrenzy);
+		luckyReqFrenFrag.appendChild(luckyReqFrenSpan);
+		if (luckyTimeFrenzy != '') {
+			var luckyReqFrenSmall = document.createElement('small');
+			luckyReqFrenSmall.textContent = ' (' + luckyTimeFrenzy + ')';
+			luckyReqFrenFrag.appendChild(luckyReqFrenSmall);
+		}
+		stats.appendChild(listing('\"Lucky!\" Cookies Required (Frenzy)', luckyReqFrenFrag));
+		stats.appendChild(listing('\"Lucky!\" Reward (MAX)',  document.createTextNode(Beautify(CM.Cache.LuckyReward))));
+		stats.appendChild(listing('\"Lucky!\" Reward (MAX) (Frenzy)',  document.createTextNode(Beautify(CM.Cache.LuckyRewardFrenzy))));
+		stats.appendChild(listing('\"Lucky!\" Reward (CUR)',  document.createTextNode(Beautify(luckyCur))));
+	}
+	
+	stats.appendChild(header('Chain Cookies', 'Chain'));
+	if (CM.Config.StatsPref.Chain) {
 		var chainColor = (Game.cookies < CM.Cache.Chain) ? CM.Disp.colorRed : CM.Disp.colorGreen;
 		var chainTime = (Game.cookies < CM.Cache.Chain) ? CM.Disp.FormatTime((CM.Cache.Chain - Game.cookies) / (Game.cookiesPs * (1 - Game.cpsSucked))) : '';
 		var chainColorFrenzy = (Game.cookies < CM.Cache.ChainFrenzy) ? CM.Disp.colorRed : CM.Disp.colorGreen;
@@ -998,9 +1130,73 @@ CM.Disp.AddMenu = function() {
 		var chainCur = CM.Cache.MaxChainMoni(7, chainCurMax);
 		var chainCurWrath = CM.Cache.MaxChainMoni(6, chainCurMax);
 
+		var chainReqFrag = document.createDocumentFragment();
+		var chainReqSpan = document.createElement('span');
+		chainReqSpan.style.fontWeight = 'bold';
+		chainReqSpan.style.color = chainColor;
+		chainReqSpan.textContent = Beautify(CM.Cache.Chain);
+		chainReqFrag.appendChild(chainReqSpan);
+		if (chainTime != '') {
+			var chainReqSmall = document.createElement('small');
+			chainReqSmall.textContent = ' (' + chainTime + ')';
+			chainReqFrag.appendChild(chainReqSmall);
+		}
+		stats.appendChild(listing('\"Chain\" Cookies Required', chainReqFrag));
+		var chainReqFrenFrag = document.createDocumentFragment();
+		var chainReqFrenSpan = document.createElement('span');
+		chainReqFrenSpan.style.fontWeight = 'bold';
+		chainReqFrenSpan.style.color = chainColorFrenzy;
+		chainReqFrenSpan.textContent = Beautify(CM.Cache.ChainFrenzy);
+		chainReqFrenFrag.appendChild(chainReqFrenSpan);
+		if (chainTimeFrenzy != '') {
+			var chainReqFrenSmall = document.createElement('small');
+			chainReqFrenSmall.textContent = ' (' + chainTimeFrenzy + ')';
+			chainReqFrenFrag.appendChild(chainReqFrenSmall);
+		}
+		stats.appendChild(listing('\"Chain\" Cookies Required (Frenzy)', chainReqFrenFrag));
+		stats.appendChild(listing('\"Chain\" Reward (MAX)',  document.createTextNode(Beautify(CM.Cache.ChainReward))));
+		stats.appendChild(listing('\"Chain\" Reward (MAX) (Wrath)',  document.createTextNode(Beautify(CM.Cache.ChainWrathReward))));
+		stats.appendChild(listing('\"Chain\" Reward (MAX) (Frenzy)',  document.createTextNode(Beautify(CM.Cache.ChainFrenzyReward))));
+		stats.appendChild(listing('\"Chain\" Reward (MAX) (Frenzy) (Wrath)',  document.createTextNode(Beautify(CM.Cache.ChainFrenzyWrathReward))));
+		stats.appendChild(listing('\"Chain\" Reward (CUR)',  document.createTextNode(Beautify(chainCur))));
+		stats.appendChild(listing('\"Chain\" Reward (CUR) (Wrath)',  document.createTextNode(Beautify(chainCurWrath))));
+	}
+	
+	stats.appendChild(header('Heavenly Chips', 'HC'));
+	if (CM.Config.StatsPref.HC) {
 		var possibleHC = Game.HowMuchPrestige(Game.cookiesEarned + Game.cookiesReset);
 		var neededCook = CM.Sim.CookNeedPrest(possibleHC + 1) - (Game.cookiesEarned + Game.cookiesReset);
 
+		var hcMaxFrag = document.createDocumentFragment();
+		hcMaxFrag.appendChild(document.createTextNode(Beautify(possibleHC)));
+		var hcMaxSmall = document.createElement('small');
+		hcMaxSmall.textContent = ' (' + Beautify((possibleHC * 2)) + '%)';
+		hcMaxFrag.appendChild(hcMaxSmall);
+		stats.appendChild(listing('Heavenly Chips (MAX)',  hcMaxFrag));
+		var hcCurFrag = document.createDocumentFragment();
+		hcCurFrag.appendChild(document.createTextNode(Beautify(Game.prestige['Heavenly chips'])));
+		var hcCurSmall = document.createElement('small');
+		hcCurSmall.textContent = ' (' + Beautify((Game.prestige['Heavenly chips'] * 2)) + '%)';
+		hcCurFrag.appendChild(hcCurSmall);
+		stats.appendChild(listing('Heavenly Chips (CUR)',  hcCurFrag));
+		stats.appendChild(listing('Cookies To Next Chip',  document.createTextNode(Beautify(neededCook))));
+		stats.appendChild(listing('Time To Next Chip',  document.createTextNode(CM.Disp.FormatTime(neededCook / (Game.cookiesPs * (1 - Game.cpsSucked)), 1))));
+		stats.appendChild(listing('Reset Bonus Income',  document.createTextNode(Beautify(CM.Sim.ResetBonus()))));
+	}
+	
+	if (Game.cpsSucked > 0) {
+		stats.appendChild(header('Wrinklers', 'Wrink'));
+		if (CM.Config.StatsPref.Wrink) {
+			var sucked = 0;
+			for (var i in Game.wrinklers) {
+				sucked += Game.wrinklers[i].sucked;
+			}
+			sucked *= 1.1;
+			if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
+			stats.appendChild(listing('Rewards of Popping',  document.createTextNode(Beautify(sucked))));
+		}
+	}
+	
 	var specDisp = false;
 	var halloCook = [];
 	for (var i in CM.Data.HalloCookies) {
@@ -1037,104 +1233,9 @@ CM.Disp.AddMenu = function() {
 			specDisp = true;
 		}
 	}
-		
-		var listing = function(name, text) {
-			var div = document.createElement('div');
-			div.className = 'listing';
-			var b = document.createElement('b');
-			b.textContent = name + ' : ';
-			div.appendChild(b);
-			div.appendChild(text);
-			return div;
-		}
-		stats.appendChild(title());
-		stats.appendChild(header('Lucky Cookies'));
-		var luckyReqFrag = document.createDocumentFragment();
-		var luckyReqSpan = document.createElement('span');
-		luckyReqSpan.style.fontWeight = 'bold';
-		luckyReqSpan.style.color = luckyColor;
-		luckyReqSpan.textContent = Beautify(CM.Cache.Lucky);
-		luckyReqFrag.appendChild(luckyReqSpan);
-		if (luckyTime != '') {
-			var luckyReqSmall = document.createElement('small');
-			luckyReqSmall.textContent = ' (' + luckyTime + ')';
-			luckyReqFrag.appendChild(luckyReqSmall);
-		}
-		stats.appendChild(listing('\"Lucky!\" Cookies Required', luckyReqFrag));
-		var luckyReqFrenFrag = document.createDocumentFragment();
-		var luckyReqFrenSpan = document.createElement('span');
-		luckyReqFrenSpan.style.fontWeight = 'bold';
-		luckyReqFrenSpan.style.color = luckyColorFrenzy;
-		luckyReqFrenSpan.textContent = Beautify(CM.Cache.LuckyFrenzy);
-		luckyReqFrenFrag.appendChild(luckyReqFrenSpan);
-		if (luckyTimeFrenzy != '') {
-			var luckyReqFrenSmall = document.createElement('small');
-			luckyReqFrenSmall.textContent = ' (' + luckyTimeFrenzy + ')';
-			luckyReqFrenFrag.appendChild(luckyReqFrenSmall);
-		}
-		stats.appendChild(listing('\"Lucky!\" Cookies Required (Frenzy)', luckyReqFrenFrag));
-		stats.appendChild(listing('\"Lucky!\" Reward (MAX)',  document.createTextNode(Beautify(CM.Cache.LuckyReward))));
-		stats.appendChild(listing('\"Lucky!\" Reward (MAX) (Frenzy)',  document.createTextNode(Beautify(CM.Cache.LuckyRewardFrenzy))));
-		stats.appendChild(listing('\"Lucky!\" Reward (CUR)',  document.createTextNode(Beautify(luckyCur))));
-		stats.appendChild(header('Chain Cookies'));
-		var chainReqFrag = document.createDocumentFragment();
-		var chainReqSpan = document.createElement('span');
-		chainReqSpan.style.fontWeight = 'bold';
-		chainReqSpan.style.color = chainColor;
-		chainReqSpan.textContent = Beautify(CM.Cache.Chain);
-		chainReqFrag.appendChild(chainReqSpan);
-		if (chainTime != '') {
-			var chainReqSmall = document.createElement('small');
-			chainReqSmall.textContent = ' (' + chainTime + ')';
-			chainReqFrag.appendChild(chainReqSmall);
-		}
-		stats.appendChild(listing('\"Chain\" Cookies Required', chainReqFrag));
-		var chainReqFrenFrag = document.createDocumentFragment();
-		var chainReqFrenSpan = document.createElement('span');
-		chainReqFrenSpan.style.fontWeight = 'bold';
-		chainReqFrenSpan.style.color = chainColorFrenzy;
-		chainReqFrenSpan.textContent = Beautify(CM.Cache.ChainFrenzy);
-		chainReqFrenFrag.appendChild(chainReqFrenSpan);
-		if (chainTimeFrenzy != '') {
-			var chainReqFrenSmall = document.createElement('small');
-			chainReqFrenSmall.textContent = ' (' + chainTimeFrenzy + ')';
-			chainReqFrenFrag.appendChild(chainReqFrenSmall);
-		}
-		stats.appendChild(listing('\"Chain\" Cookies Required (Frenzy)', chainReqFrenFrag));
-		stats.appendChild(listing('\"Chain\" Reward (MAX)',  document.createTextNode(Beautify(CM.Cache.ChainReward))));
-		stats.appendChild(listing('\"Chain\" Reward (MAX) (Wrath)',  document.createTextNode(Beautify(CM.Cache.ChainWrathReward))));
-		stats.appendChild(listing('\"Chain\" Reward (MAX) (Frenzy)',  document.createTextNode(Beautify(CM.Cache.ChainFrenzyReward))));
-		stats.appendChild(listing('\"Chain\" Reward (CUR)',  document.createTextNode(Beautify(chainCur))));
-		stats.appendChild(listing('\"Chain\" Reward (CUR) (Wrath)',  document.createTextNode(Beautify(chainCurWrath))));		
-		stats.appendChild(header('Heavenly Chips'));
-		var hcMaxFrag = document.createDocumentFragment();
-		hcMaxFrag.appendChild(document.createTextNode(Beautify(possibleHC)));
-		var hcMaxSmall = document.createElement('small');
-		hcMaxSmall.textContent = ' (' + Beautify((possibleHC * 2)) + '%)';
-		hcMaxFrag.appendChild(hcMaxSmall);
-		stats.appendChild(listing('Heavenly Chips (MAX)',  hcMaxFrag));
-		var hcCurFrag = document.createDocumentFragment();
-		hcCurFrag.appendChild(document.createTextNode(Beautify(Game.prestige['Heavenly chips'])));
-		var hcCurSmall = document.createElement('small');
-		hcCurSmall.textContent = ' (' + Beautify((Game.prestige['Heavenly chips'] * 2)) + '%)';
-		hcCurFrag.appendChild(hcCurSmall);
-		stats.appendChild(listing('Heavenly Chips (CUR)',  hcCurFrag));
-		stats.appendChild(listing('Cookies To Next Chip',  document.createTextNode(Beautify(neededCook))));
-		stats.appendChild(listing('Time To Next Chip',  document.createTextNode(CM.Disp.FormatTime(neededCook / (Game.cookiesPs * (1 - Game.cpsSucked)), 1))));
-		stats.appendChild(listing('Reset Bonus Income',  document.createTextNode(Beautify(CM.Sim.ResetBonus()))));
-		if (Game.cpsSucked > 0) {
-			stats.appendChild(header('Wrinklers'));
-			var sucked = 0;
-			for (var i in Game.wrinklers) {
-				sucked += Game.wrinklers[i].sucked;
-			}
-			sucked *= 1.1;
-			if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
-			stats.appendChild(listing('Rewards of Popping',  document.createTextNode(Beautify(sucked))));
-		}
 	if (Game.season == 'christmas' || specDisp) {
-			stats.appendChild(header('Season Specials'));
-			
+		stats.appendChild(header('Season Specials', 'Sea'));
+		if (CM.Config.StatsPref.Sea) {
 			if (specDisp) {
 				var createSpecDisp = function(theSpecDisp) {
 					var frag = document.createDocumentFragment();
@@ -1182,8 +1283,25 @@ CM.Disp.AddMenu = function() {
 
 			if (Game.season == 'christmas') stats.appendChild(listing('Reindeer Reward',  document.createTextNode(Beautify(CM.Cache.SeaSpec))));
 		}
+	}
 
 	l('menu').insertBefore(stats, l('menu').childNodes[2]);
+}
+
+CM.Disp.AddMenu = function() {
+	var title = function() {
+		var div = document.createElement('div');
+		div.className = 'title';
+		div.style.color = CM.Disp.colorBlue;
+		div.textContent = 'Cookie Monster Goodies';
+		return div;
+	}
+	
+	if (Game.onMenu == 'prefs') {
+		CM.Disp.AddMenuPref(title);
+	}
+	else if (CM.Config.Stats == 1 && Game.onMenu == 'stats') {
+		CM.Disp.AddMenuStats(title);
 	}
 }
 
@@ -1275,9 +1393,20 @@ CM.Disp.AddTooltipUpgrade = function() {
 	}
 }
 
+CM.Disp.AddTooltipBuild10 = function() {
+	for (var i in Game.Objects) {
+		var me = Game.Objects[i];
+		l('buttonBuy10-' + me.id).onmouseover = function() {CM.Disp.Buy10 = true;};
+		l('buttonBuy10-' + me.id).onmouseout = function() {CM.Disp.Buy10 = false;};
+	}
+}
+
 CM.Disp.Tooltip = function(type, name) {
 	if (type == 'b') {
 		l('tooltip').innerHTML = Game.Objects[name].tooltip();
+		if (CM.Disp.Buy10) {
+			l('tooltip').innerHTML = l('tooltip').innerHTML.split(Beautify(Game.Objects[name].getPrice())).join(Beautify(CM.Cache.Objects10[name].price));
+		}
 	}
 	else { // Upgrades
 		CM.Disp.TooltipUpgradeBack[name]();
@@ -1336,6 +1465,7 @@ CM.Disp.UpdateTooltip = function() {
 		var price;
 		var bonus;
 		if (CM.Disp.tooltipType == 'b') {
+			if (!CM.Disp.Buy10) {
 				bonus = CM.Cache.Objects[CM.Disp.tooltipName].bonus;
 				price = Game.Objects[CM.Disp.tooltipName].getPrice();
 				if (CM.Config.Tooltip == 1) {
@@ -1344,6 +1474,16 @@ CM.Disp.UpdateTooltip = function() {
 					l('CMTooltipBCI').style.color = CM.Cache.Objects[CM.Disp.tooltipName].color;
 				}
 			}
+			else {
+				bonus = CM.Cache.Objects10[CM.Disp.tooltipName].bonus;
+				price = CM.Cache.Objects10[CM.Disp.tooltipName].price;
+				if (CM.Config.Tooltip == 1) {
+					l('CMTooltipBorder').style.color = CM.Cache.Objects10[CM.Disp.tooltipName].color;
+					l('CMTooltipBCI').textContent = Beautify(CM.Cache.Objects10[CM.Disp.tooltipName].bci, 2);
+					l('CMTooltipBCI').style.color = CM.Cache.Objects10[CM.Disp.tooltipName].color;
+				}
+			}
+		}
 		else { // Upgrades
 			bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus;
 			price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice();
@@ -1455,6 +1595,8 @@ CM.Disp.lastGoldenCookieState = 'none';
 CM.Disp.metric = ['M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
 CM.Disp.shortScale = ['M', 'B', 'Tr', 'Quadr', 'Quint', 'Sext', 'Sept', 'Oct', 'Non', 'Dec', 'Undec', 'Duodec', 'Tredec'];
 
+CM.Disp.Buy10 = false;
+
 /********
  * Main *
  ********/
@@ -1563,6 +1705,7 @@ CM.Init = function() {
 		CM.Disp.CreateGCTimer();
 		CM.Disp.CreateTooltipWarnCaut();
 		CM.Disp.AddTooltipBuild();
+		CM.Disp.AddTooltipBuild10();
 		CM.ReplaceNative();
 		Game.CalculateGains();
 		CM.LoadConfig(); // Must be after all things are created!
@@ -1574,16 +1717,30 @@ CM.Init = function() {
 	}
 }
 
-CM.ConfigDefault = {BotBar: 1, TimerBar: 1, BuildColor: 1, UpBarColor: 1, Flash: 1, Sound: 1,  Volume: 100, GCTimer: 1, Title: 1, Tooltip: 1, ToolWarnCaut: 1, ToolWarnCautPos: 0, Stats: 1, UpStats: 1, SayTime: 1, Scale: 2};
+CM.ConfigDefault = {BotBar: 1, TimerBar: 1, BuildColor: 1, UpBarColor: 1, Flash: 1, Sound: 1,  Volume: 100, GCTimer: 1, Title: 1, Tooltip: 1, ToolWarnCaut: 1, ToolWarnCautPos: 0, Stats: 1, UpStats: 1, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, HC: 1, Wrink: 1, Sea: 1}};
 CM.ConfigPrefix = 'CMConfig';
 
 CM.VersionMajor = '1.0465';
-CM.VersionMinor = '6';
+CM.VersionMinor = '7';
 
 /*******
  * Sim *
  *******/
 
+CM.Sim.BuildingGetPrice = function (basePrice, start, increase) {
+	var totalPrice = 0;
+	var count = 0;
+	while(count < increase) {
+		var price = basePrice * Math.pow(Game.priceIncrease, start + count);
+		if (Game.Has('Season savings')) price *= 0.99;
+		if (Game.Has('Santa\'s dominion')) price *= 0.99;
+		if (Game.Has('Faberge egg')) price *= 0.99;
+		totalPrice += Math.ceil(price);
+		count++;
+	}
+	return totalPrice;
+}
+
 eval('CM.Sim.Has = ' + Game.Has.toString().split('Game').join('CM.Sim'));
 
 CM.Sim.Win = function(what) {
@@ -1788,12 +1945,12 @@ CM.Sim.CheckOtherAchiev = function() {
 	if (hasAllChristCook) CM.Sim.Win('Let it snow');
 }
 
-CM.Sim.BuyBuildings = function() {	
-	CM.Cache.Objects = [];
+CM.Sim.BuyBuildings = function(amount, target) {	
+	CM.Cache[target] = [];
 	for (var i in Game.Objects) {
 		CM.Sim.CopyData();
 		var me = CM.Sim.Objects[i];
-		me.amount++;
+		me.amount += amount;
 		
 		if (i == 'Cursor') {
 			if (me.amount >= 1) CM.Sim.Win('Click');
@@ -1886,8 +2043,8 @@ CM.Sim.BuyBuildings = function() {
 			CM.Sim.CalculateGains();
 		}
 		
-		CM.Cache.Objects[i] = {};
-		CM.Cache.Objects[i].bonus = CM.Sim.cookiesPs - Game.cookiesPs;
+		CM.Cache[target][i] = {};
+		CM.Cache[target][i].bonus = CM.Sim.cookiesPs - Game.cookiesPs;
 	}
 }
 

src/Cache.js

@@ -3,11 +3,14 @@
  *********/
 
 CM.Cache.RemakeIncome = function() {
-	// Simulate Building Buys
-	CM.Sim.BuyBuildings();
+	// Simulate Building Buys for 1 amount
+	CM.Sim.BuyBuildings(1, 'Objects');
 
 	// Simulate Upgrade Buys
 	CM.Sim.BuyUpgrades();
+	
+	// Simulate Building Buys for 10 amount
+	CM.Sim.BuyBuildings(10, 'Objects10');
 }
 
 CM.Cache.RemakeBuildingsBCI = function() {
@@ -45,12 +48,31 @@ CM.Cache.RemakeUpgradeBCI = function() {
 	}
 }
 
+CM.Cache.RemakeBuildings10BCI = function() {
+	for (var i in CM.Cache.Objects10) {
+		CM.Cache.Objects10[i].price = CM.Sim.BuildingGetPrice(Game.Objects[i].basePrice, Game.Objects[i].amount, 10);
+		CM.Cache.Objects10[i].bci = CM.Cache.Objects10[i].price / CM.Cache.Objects10[i].bonus;
+		var color = '';
+		if (CM.Cache.Objects10[i].bci <= 0 || CM.Cache.Objects10[i].bci == 'Infinity') color = CM.Disp.colorGray;
+		else if (CM.Cache.Objects10[i].bci < CM.Disp.min) color = CM.Disp.colorBlue;
+		else if (CM.Cache.Objects10[i].bci == CM.Disp.min) color = CM.Disp.colorGreen;
+		else if (CM.Cache.Objects10[i].bci == CM.Disp.max) color = CM.Disp.colorRed;
+		else if (CM.Cache.Objects10[i].bci > CM.Disp.max) color = CM.Disp.colorPurple;
+		else if (CM.Cache.Objects10[i].bci > CM.Disp.mid) color = CM.Disp.colorOrange;
+		else color = CM.Disp.colorYellow;
+		CM.Cache.Objects10[i].color = color;
+	}
+}
+
 CM.Cache.RemakeBCI = function() {
-	// Buildings
+	// Buildings for 1 amount
 	CM.Cache.RemakeBuildingsBCI();
 	
 	// Upgrades
 	CM.Cache.RemakeUpgradeBCI();
+	
+	// Buildings for 10 amount
+	CM.Cache.RemakeBuildings10BCI();
 }
 
 CM.Cache.RemakeLucky = function() {
@@ -93,18 +115,37 @@ CM.Cache.RemakeChain = function() {
 		base = CM.Cache.ChainWrathReward;
 	}
 	var count = 1;
+	if (maxPayout < base) {
+		CM.Cache.Chain = 0;
+	}
+	else {
+		count = base > Math.pow(2, 53) ? Math.pow(2, Math.floor(Math.log(base) / Math.log(2)) - 53) : 1;
 		while (base == base + count) {
 			count++;
 		}
 		CM.Cache.Chain = (base + count) / 0.25;
+	}
 	
 	CM.Cache.ChainFrenzyReward = CM.Cache.MaxChainMoni(7, maxPayout * 7);
 	
-	count = 1;
-	while(CM.Cache.ChainFrenzyReward == CM.Cache.ChainFrenzyReward + count) {
+	CM.Cache.ChainFrenzyWrathReward = CM.Cache.MaxChainMoni(6, maxPayout * 7);
+	
+	if (CM.Cache.ChainFrenzyReward > CM.Cache.ChainFrenzyWrathReward) {
+		base = CM.Cache.ChainFrenzyReward;
+	}
+	else {
+		base = CM.Cache.ChainFrenzyWrathReward;
+	}
+	if ((maxPayout * 7) < base) {
+		CM.Cache.ChainFrenzy = 0;
+	}
+	else {
+		count = base > Math.pow(2, 53) ? Math.pow(2, Math.floor(Math.log(base) / Math.log(2)) - 53) : 1;
+		while(base == base + count) {
 			count++;
 		}
-	CM.Cache.ChainFrenzy = (CM.Cache.ChainFrenzyReward + count) / 0.25;
+		CM.Cache.ChainFrenzy = (base + count) / 0.25;
+	}
 }
 
 CM.Cache.RemakeSeaSpec = function() {
@@ -124,3 +165,4 @@ CM.Cache.ChainReward = 0;
 CM.Cache.ChainWrathReward = 0;
 CM.Cache.ChainFrenzy = 0;
 CM.Cache.ChainFrenzyReward = 0;
+CM.Cache.ChainFrenzyWrathReward = 0;

src/Config.js

@@ -13,15 +13,31 @@ CM.LoadConfig = function() {
 		// Check values
 		var mod = false;
 		for (var i in CM.ConfigDefault) {
+			if (i != 'StatsPref') {
 				if (CM.Config[i] == undefined || !(CM.Config[i] > -1 && CM.Config[i] < CM.ConfigData[i].label.length)) {
 					mod = true;
 					CM.Config[i] = CM.ConfigDefault[i];
 				}
 			}
+			else { // Statistics Preferences
+				if (CM.Config[i] == undefined) {
+					mod = true;
+					CM.Config[i] = CM.ConfigDefault[i];
+				}
+				else {
+					for (var j in CM.ConfigDefault.StatsPref) {
+						if (CM.Config[i][j] == undefined || !(CM.Config[i][j] > -1 && CM.Config[i][j] < 2)) {
+							mod = true;
+							CM.Config[i][j] = CM.ConfigDefault[i][j];
+						}
+					}
+				}
+			}
+		}
 		if (mod) CM.SaveConfig(CM.Config);
 		CM.Loop(); // Do loop once
 		for (var i in CM.ConfigDefault) {
-			if (CM.ConfigData[i].func != undefined) {
+			if (i != 'StatsPref' && CM.ConfigData[i].func != undefined) {
 				CM.ConfigData[i].func();
 			}
 		}
@@ -62,6 +78,16 @@ CM.ToggleConfigDown = function(config) {
 	CM.SaveConfig(CM.Config);
 }
 
+CM.ToggleStatsConfig = function(config) {
+	if (CM.Config.StatsPref[config] == 0) {
+		CM.Config.StatsPref[config]++;
+	}
+	else {
+		CM.Config.StatsPref[config]--;
+	}
+	CM.SaveConfig(CM.Config);
+}
+
 CM.ConfigData.BotBar = {label: ['Bottom Bar OFF', 'Bottom Bar ON'], desc: 'Building Information', func: function() {CM.Disp.ToggleBotBar();}};
 CM.ConfigData.TimerBar = {label: ['Timer Bar OFF', 'Timer Bar ON'], desc: 'Timers of Golden Cookie, Season Popup, Frenzy (Normal, Clot, Elder), Click Frenzy', func: function() {CM.Disp.ToggleTimerBar();}};
 CM.ConfigData.BuildColor = {label: ['Building Colors OFF', 'Building Colors ON'], desc: 'Color code buildings', func: function() {CM.Disp.UpdateBuildings();}};

src/Disp.js

@@ -645,14 +645,7 @@ CM.Disp.UpdateTitle = function() {
 	}
 }
 
-CM.Disp.AddMenu = function() {
-	var title = function() {
-		var div = document.createElement('div');
-		div.className = 'title';
-		div.style.color = CM.Disp.colorBlue;
-		div.textContent = 'Cookie Monster Goodies';
-		return div;
-	}
+CM.Disp.AddMenuPref = function(title) {
 	var header = function(text) {
 		var div = document.createElement('div');
 		div.className = 'listing';
@@ -664,7 +657,6 @@ CM.Disp.AddMenu = function() {
 		return div;
 	}
 
-	if (Game.onMenu == 'prefs') {
 	var frag = document.createDocumentFragment();
 		
 	frag.appendChild(title());
@@ -689,10 +681,10 @@ CM.Disp.AddMenu = function() {
 	frag.appendChild(listing('TimerBar'));
 	frag.appendChild(listing('BuildColor'));
 	frag.appendChild(listing('UpBarColor'));
+	
 	frag.appendChild(header('Golden Cookie/Season Popup Emphasis'));
 	frag.appendChild(listing('Flash'));
 	frag.appendChild(listing('Sound'));	
-		
 	var volConfig = 'Volume';
 	var volume = document.createElement('div');
 	volume.className = 'listing';
@@ -714,20 +706,21 @@ CM.Disp.AddMenu = function() {
 	volLabel.textContent = CM.ConfigData[volConfig].desc;
 	volume.appendChild(volLabel);
 	frag.appendChild(volume);
-		
 	frag.appendChild(listing('GCTimer'));
 	frag.appendChild(listing('Title'));
+	
 	frag.appendChild(header('Tooltip'));
 	frag.appendChild(listing('Tooltip'));
 	frag.appendChild(listing('ToolWarnCaut'));
 	frag.appendChild(listing('ToolWarnCautPos'));
+	
 	frag.appendChild(header('Statistics'));
 	frag.appendChild(listing('Stats'));
 	frag.appendChild(listing('UpStats'));
 	frag.appendChild(listing('SayTime'));
+	
 	frag.appendChild(header('Other'));
 	frag.appendChild(listing('Scale'));	
-		
 	var resDef = document.createElement('div');
 	resDef.className = 'listing';
 	var resDefBut = document.createElement('a');
@@ -741,17 +734,88 @@ CM.Disp.AddMenu = function() {
 		
 	CM.Disp.FormatButtonOnClickBak = l('formatButton').onclick;
 	l('formatButton').onclick = function() {Game.Toggle('format', 'formatButton', 'Short numbers OFF', 'Short numbers ON'); CM.Disp.RefreshScale();};
+}
+
+CM.Disp.AddMenuStats = function(title) {
+	var header = function(text, config) {
+		var div = document.createElement('div');
+		div.className = 'listing';
+		div.style.padding = '5px 16px';
+		div.style.opacity = '0.7';
+		div.style.fontSize = '17px';
+		div.style.fontFamily = '\"Kavoon\", Georgia, serif';
+		div.appendChild(document.createTextNode(text + ' '));
+		span = document.createElement('span');
+		span.style.cursor = 'pointer';
+		span.style.display = 'inline-block';
+		span.style.height = '14px';
+		span.style.width = '14px';
+		span.style.borderRadius = '7px';
+		span.style.textAlign = 'center';
+		span.style.backgroundColor = '#C0C0C0';
+		span.style.color = 'black';
+		span.style.fontSize = '13px';
+		span.style.verticalAlign = 'middle';
+		span.textContent = CM.Config.StatsPref[config] ? '-' : '+';
+		span.onclick = function() {CM.ToggleStatsConfig(config); Game.UpdateMenu();};
+		div.appendChild(span);
+		return div;
 	}
-	else if (CM.Config.Stats == 1 && Game.onMenu == 'stats') {
+	
 	var stats = document.createElement('div');
 	stats.className = 'subsection';
 
+	stats.appendChild(title());
+	
+	var listing = function(name, text) {
+		var div = document.createElement('div');
+		div.className = 'listing';
+		var b = document.createElement('b');
+		b.textContent = name + ' : ';
+		div.appendChild(b);
+		div.appendChild(text);
+		return div;
+	}
+	
+	stats.appendChild(header('Lucky Cookies', 'Lucky'));
+	if (CM.Config.StatsPref.Lucky) {
 		var luckyColor = (Game.cookies < CM.Cache.Lucky) ? CM.Disp.colorRed : CM.Disp.colorGreen;
 		var luckyTime = (Game.cookies < CM.Cache.Lucky) ? CM.Disp.FormatTime((CM.Cache.Lucky - Game.cookies) / (Game.cookiesPs * (1 - Game.cpsSucked))) : '';
 		var luckyColorFrenzy = (Game.cookies < CM.Cache.LuckyFrenzy) ? CM.Disp.colorRed : CM.Disp.colorGreen;
 		var luckyTimeFrenzy = (Game.cookies < CM.Cache.LuckyFrenzy) ? CM.Disp.FormatTime((CM.Cache.LuckyFrenzy - Game.cookies) / (Game.cookiesPs * (1 - Game.cpsSucked))) : '';
 		var luckyCur = Math.min(Game.cookies * 0.1, Game.cookiesPs * 60 * 20) + 13;
 	
+		var luckyReqFrag = document.createDocumentFragment();
+		var luckyReqSpan = document.createElement('span');
+		luckyReqSpan.style.fontWeight = 'bold';
+		luckyReqSpan.style.color = luckyColor;
+		luckyReqSpan.textContent = Beautify(CM.Cache.Lucky);
+		luckyReqFrag.appendChild(luckyReqSpan);
+		if (luckyTime != '') {
+			var luckyReqSmall = document.createElement('small');
+			luckyReqSmall.textContent = ' (' + luckyTime + ')';
+			luckyReqFrag.appendChild(luckyReqSmall);
+		}
+		stats.appendChild(listing('\"Lucky!\" Cookies Required', luckyReqFrag));
+		var luckyReqFrenFrag = document.createDocumentFragment();
+		var luckyReqFrenSpan = document.createElement('span');
+		luckyReqFrenSpan.style.fontWeight = 'bold';
+		luckyReqFrenSpan.style.color = luckyColorFrenzy;
+		luckyReqFrenSpan.textContent = Beautify(CM.Cache.LuckyFrenzy);
+		luckyReqFrenFrag.appendChild(luckyReqFrenSpan);
+		if (luckyTimeFrenzy != '') {
+			var luckyReqFrenSmall = document.createElement('small');
+			luckyReqFrenSmall.textContent = ' (' + luckyTimeFrenzy + ')';
+			luckyReqFrenFrag.appendChild(luckyReqFrenSmall);
+		}
+		stats.appendChild(listing('\"Lucky!\" Cookies Required (Frenzy)', luckyReqFrenFrag));
+		stats.appendChild(listing('\"Lucky!\" Reward (MAX)',  document.createTextNode(Beautify(CM.Cache.LuckyReward))));
+		stats.appendChild(listing('\"Lucky!\" Reward (MAX) (Frenzy)',  document.createTextNode(Beautify(CM.Cache.LuckyRewardFrenzy))));
+		stats.appendChild(listing('\"Lucky!\" Reward (CUR)',  document.createTextNode(Beautify(luckyCur))));
+	}
+	
+	stats.appendChild(header('Chain Cookies', 'Chain'));
+	if (CM.Config.StatsPref.Chain) {
 		var chainColor = (Game.cookies < CM.Cache.Chain) ? CM.Disp.colorRed : CM.Disp.colorGreen;
 		var chainTime = (Game.cookies < CM.Cache.Chain) ? CM.Disp.FormatTime((CM.Cache.Chain - Game.cookies) / (Game.cookiesPs * (1 - Game.cpsSucked))) : '';
 		var chainColorFrenzy = (Game.cookies < CM.Cache.ChainFrenzy) ? CM.Disp.colorRed : CM.Disp.colorGreen;
@@ -760,9 +824,73 @@ CM.Disp.AddMenu = function() {
 		var chainCur = CM.Cache.MaxChainMoni(7, chainCurMax);
 		var chainCurWrath = CM.Cache.MaxChainMoni(6, chainCurMax);
 
+		var chainReqFrag = document.createDocumentFragment();
+		var chainReqSpan = document.createElement('span');
+		chainReqSpan.style.fontWeight = 'bold';
+		chainReqSpan.style.color = chainColor;
+		chainReqSpan.textContent = Beautify(CM.Cache.Chain);
+		chainReqFrag.appendChild(chainReqSpan);
+		if (chainTime != '') {
+			var chainReqSmall = document.createElement('small');
+			chainReqSmall.textContent = ' (' + chainTime + ')';
+			chainReqFrag.appendChild(chainReqSmall);
+		}
+		stats.appendChild(listing('\"Chain\" Cookies Required', chainReqFrag));
+		var chainReqFrenFrag = document.createDocumentFragment();
+		var chainReqFrenSpan = document.createElement('span');
+		chainReqFrenSpan.style.fontWeight = 'bold';
+		chainReqFrenSpan.style.color = chainColorFrenzy;
+		chainReqFrenSpan.textContent = Beautify(CM.Cache.ChainFrenzy);
+		chainReqFrenFrag.appendChild(chainReqFrenSpan);
+		if (chainTimeFrenzy != '') {
+			var chainReqFrenSmall = document.createElement('small');
+			chainReqFrenSmall.textContent = ' (' + chainTimeFrenzy + ')';
+			chainReqFrenFrag.appendChild(chainReqFrenSmall);
+		}
+		stats.appendChild(listing('\"Chain\" Cookies Required (Frenzy)', chainReqFrenFrag));
+		stats.appendChild(listing('\"Chain\" Reward (MAX)',  document.createTextNode(Beautify(CM.Cache.ChainReward))));
+		stats.appendChild(listing('\"Chain\" Reward (MAX) (Wrath)',  document.createTextNode(Beautify(CM.Cache.ChainWrathReward))));
+		stats.appendChild(listing('\"Chain\" Reward (MAX) (Frenzy)',  document.createTextNode(Beautify(CM.Cache.ChainFrenzyReward))));
+		stats.appendChild(listing('\"Chain\" Reward (MAX) (Frenzy) (Wrath)',  document.createTextNode(Beautify(CM.Cache.ChainFrenzyWrathReward))));
+		stats.appendChild(listing('\"Chain\" Reward (CUR)',  document.createTextNode(Beautify(chainCur))));
+		stats.appendChild(listing('\"Chain\" Reward (CUR) (Wrath)',  document.createTextNode(Beautify(chainCurWrath))));
+	}
+	
+	stats.appendChild(header('Heavenly Chips', 'HC'));
+	if (CM.Config.StatsPref.HC) {
 		var possibleHC = Game.HowMuchPrestige(Game.cookiesEarned + Game.cookiesReset);
 		var neededCook = CM.Sim.CookNeedPrest(possibleHC + 1) - (Game.cookiesEarned + Game.cookiesReset);
 
+		var hcMaxFrag = document.createDocumentFragment();
+		hcMaxFrag.appendChild(document.createTextNode(Beautify(possibleHC)));
+		var hcMaxSmall = document.createElement('small');
+		hcMaxSmall.textContent = ' (' + Beautify((possibleHC * 2)) + '%)';
+		hcMaxFrag.appendChild(hcMaxSmall);
+		stats.appendChild(listing('Heavenly Chips (MAX)',  hcMaxFrag));
+		var hcCurFrag = document.createDocumentFragment();
+		hcCurFrag.appendChild(document.createTextNode(Beautify(Game.prestige['Heavenly chips'])));
+		var hcCurSmall = document.createElement('small');
+		hcCurSmall.textContent = ' (' + Beautify((Game.prestige['Heavenly chips'] * 2)) + '%)';
+		hcCurFrag.appendChild(hcCurSmall);
+		stats.appendChild(listing('Heavenly Chips (CUR)',  hcCurFrag));
+		stats.appendChild(listing('Cookies To Next Chip',  document.createTextNode(Beautify(neededCook))));
+		stats.appendChild(listing('Time To Next Chip',  document.createTextNode(CM.Disp.FormatTime(neededCook / (Game.cookiesPs * (1 - Game.cpsSucked)), 1))));
+		stats.appendChild(listing('Reset Bonus Income',  document.createTextNode(Beautify(CM.Sim.ResetBonus()))));
+	}
+	
+	if (Game.cpsSucked > 0) {
+		stats.appendChild(header('Wrinklers', 'Wrink'));
+		if (CM.Config.StatsPref.Wrink) {
+			var sucked = 0;
+			for (var i in Game.wrinklers) {
+				sucked += Game.wrinklers[i].sucked;
+			}
+			sucked *= 1.1;
+			if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
+			stats.appendChild(listing('Rewards of Popping',  document.createTextNode(Beautify(sucked))));
+		}
+	}
+	
 	var specDisp = false;
 	var halloCook = [];
 	for (var i in CM.Data.HalloCookies) {
@@ -799,104 +927,9 @@ CM.Disp.AddMenu = function() {
 			specDisp = true;
 		}
 	}
-		
-		var listing = function(name, text) {
-			var div = document.createElement('div');
-			div.className = 'listing';
-			var b = document.createElement('b');
-			b.textContent = name + ' : ';
-			div.appendChild(b);
-			div.appendChild(text);
-			return div;
-		}
-		stats.appendChild(title());
-		stats.appendChild(header('Lucky Cookies'));
-		var luckyReqFrag = document.createDocumentFragment();
-		var luckyReqSpan = document.createElement('span');
-		luckyReqSpan.style.fontWeight = 'bold';
-		luckyReqSpan.style.color = luckyColor;
-		luckyReqSpan.textContent = Beautify(CM.Cache.Lucky);
-		luckyReqFrag.appendChild(luckyReqSpan);
-		if (luckyTime != '') {
-			var luckyReqSmall = document.createElement('small');
-			luckyReqSmall.textContent = ' (' + luckyTime + ')';
-			luckyReqFrag.appendChild(luckyReqSmall);
-		}
-		stats.appendChild(listing('\"Lucky!\" Cookies Required', luckyReqFrag));
-		var luckyReqFrenFrag = document.createDocumentFragment();
-		var luckyReqFrenSpan = document.createElement('span');
-		luckyReqFrenSpan.style.fontWeight = 'bold';
-		luckyReqFrenSpan.style.color = luckyColorFrenzy;
-		luckyReqFrenSpan.textContent = Beautify(CM.Cache.LuckyFrenzy);
-		luckyReqFrenFrag.appendChild(luckyReqFrenSpan);
-		if (luckyTimeFrenzy != '') {
-			var luckyReqFrenSmall = document.createElement('small');
-			luckyReqFrenSmall.textContent = ' (' + luckyTimeFrenzy + ')';
-			luckyReqFrenFrag.appendChild(luckyReqFrenSmall);
-		}
-		stats.appendChild(listing('\"Lucky!\" Cookies Required (Frenzy)', luckyReqFrenFrag));
-		stats.appendChild(listing('\"Lucky!\" Reward (MAX)',  document.createTextNode(Beautify(CM.Cache.LuckyReward))));
-		stats.appendChild(listing('\"Lucky!\" Reward (MAX) (Frenzy)',  document.createTextNode(Beautify(CM.Cache.LuckyRewardFrenzy))));
-		stats.appendChild(listing('\"Lucky!\" Reward (CUR)',  document.createTextNode(Beautify(luckyCur))));
-		stats.appendChild(header('Chain Cookies'));
-		var chainReqFrag = document.createDocumentFragment();
-		var chainReqSpan = document.createElement('span');
-		chainReqSpan.style.fontWeight = 'bold';
-		chainReqSpan.style.color = chainColor;
-		chainReqSpan.textContent = Beautify(CM.Cache.Chain);
-		chainReqFrag.appendChild(chainReqSpan);
-		if (chainTime != '') {
-			var chainReqSmall = document.createElement('small');
-			chainReqSmall.textContent = ' (' + chainTime + ')';
-			chainReqFrag.appendChild(chainReqSmall);
-		}
-		stats.appendChild(listing('\"Chain\" Cookies Required', chainReqFrag));
-		var chainReqFrenFrag = document.createDocumentFragment();
-		var chainReqFrenSpan = document.createElement('span');
-		chainReqFrenSpan.style.fontWeight = 'bold';
-		chainReqFrenSpan.style.color = chainColorFrenzy;
-		chainReqFrenSpan.textContent = Beautify(CM.Cache.ChainFrenzy);
-		chainReqFrenFrag.appendChild(chainReqFrenSpan);
-		if (chainTimeFrenzy != '') {
-			var chainReqFrenSmall = document.createElement('small');
-			chainReqFrenSmall.textContent = ' (' + chainTimeFrenzy + ')';
-			chainReqFrenFrag.appendChild(chainReqFrenSmall);
-		}
-		stats.appendChild(listing('\"Chain\" Cookies Required (Frenzy)', chainReqFrenFrag));
-		stats.appendChild(listing('\"Chain\" Reward (MAX)',  document.createTextNode(Beautify(CM.Cache.ChainReward))));
-		stats.appendChild(listing('\"Chain\" Reward (MAX) (Wrath)',  document.createTextNode(Beautify(CM.Cache.ChainWrathReward))));
-		stats.appendChild(listing('\"Chain\" Reward (MAX) (Frenzy)',  document.createTextNode(Beautify(CM.Cache.ChainFrenzyReward))));
-		stats.appendChild(listing('\"Chain\" Reward (CUR)',  document.createTextNode(Beautify(chainCur))));
-		stats.appendChild(listing('\"Chain\" Reward (CUR) (Wrath)',  document.createTextNode(Beautify(chainCurWrath))));		
-		stats.appendChild(header('Heavenly Chips'));
-		var hcMaxFrag = document.createDocumentFragment();
-		hcMaxFrag.appendChild(document.createTextNode(Beautify(possibleHC)));
-		var hcMaxSmall = document.createElement('small');
-		hcMaxSmall.textContent = ' (' + Beautify((possibleHC * 2)) + '%)';
-		hcMaxFrag.appendChild(hcMaxSmall);
-		stats.appendChild(listing('Heavenly Chips (MAX)',  hcMaxFrag));
-		var hcCurFrag = document.createDocumentFragment();
-		hcCurFrag.appendChild(document.createTextNode(Beautify(Game.prestige['Heavenly chips'])));
-		var hcCurSmall = document.createElement('small');
-		hcCurSmall.textContent = ' (' + Beautify((Game.prestige['Heavenly chips'] * 2)) + '%)';
-		hcCurFrag.appendChild(hcCurSmall);
-		stats.appendChild(listing('Heavenly Chips (CUR)',  hcCurFrag));
-		stats.appendChild(listing('Cookies To Next Chip',  document.createTextNode(Beautify(neededCook))));
-		stats.appendChild(listing('Time To Next Chip',  document.createTextNode(CM.Disp.FormatTime(neededCook / (Game.cookiesPs * (1 - Game.cpsSucked)), 1))));
-		stats.appendChild(listing('Reset Bonus Income',  document.createTextNode(Beautify(CM.Sim.ResetBonus()))));
-		if (Game.cpsSucked > 0) {
-			stats.appendChild(header('Wrinklers'));
-			var sucked = 0;
-			for (var i in Game.wrinklers) {
-				sucked += Game.wrinklers[i].sucked;
-			}
-			sucked *= 1.1;
-			if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
-			stats.appendChild(listing('Rewards of Popping',  document.createTextNode(Beautify(sucked))));
-		}
 	if (Game.season == 'christmas' || specDisp) {
-			stats.appendChild(header('Season Specials'));
-			
+		stats.appendChild(header('Season Specials', 'Sea'));
+		if (CM.Config.StatsPref.Sea) {
 			if (specDisp) {
 				var createSpecDisp = function(theSpecDisp) {
 					var frag = document.createDocumentFragment();
@@ -944,8 +977,25 @@ CM.Disp.AddMenu = function() {
 
 			if (Game.season == 'christmas') stats.appendChild(listing('Reindeer Reward',  document.createTextNode(Beautify(CM.Cache.SeaSpec))));
 		}
+	}
 
 	l('menu').insertBefore(stats, l('menu').childNodes[2]);
+}
+
+CM.Disp.AddMenu = function() {
+	var title = function() {
+		var div = document.createElement('div');
+		div.className = 'title';
+		div.style.color = CM.Disp.colorBlue;
+		div.textContent = 'Cookie Monster Goodies';
+		return div;
+	}
+	
+	if (Game.onMenu == 'prefs') {
+		CM.Disp.AddMenuPref(title);
+	}
+	else if (CM.Config.Stats == 1 && Game.onMenu == 'stats') {
+		CM.Disp.AddMenuStats(title);
 	}
 }
 
@@ -1037,9 +1087,20 @@ CM.Disp.AddTooltipUpgrade = function() {
 	}
 }
 
+CM.Disp.AddTooltipBuild10 = function() {
+	for (var i in Game.Objects) {
+		var me = Game.Objects[i];
+		l('buttonBuy10-' + me.id).onmouseover = function() {CM.Disp.Buy10 = true;};
+		l('buttonBuy10-' + me.id).onmouseout = function() {CM.Disp.Buy10 = false;};
+	}
+}
+
 CM.Disp.Tooltip = function(type, name) {
 	if (type == 'b') {
 		l('tooltip').innerHTML = Game.Objects[name].tooltip();
+		if (CM.Disp.Buy10) {
+			l('tooltip').innerHTML = l('tooltip').innerHTML.split(Beautify(Game.Objects[name].getPrice())).join(Beautify(CM.Cache.Objects10[name].price));
+		}
 	}
 	else { // Upgrades
 		CM.Disp.TooltipUpgradeBack[name]();
@@ -1098,6 +1159,7 @@ CM.Disp.UpdateTooltip = function() {
 		var price;
 		var bonus;
 		if (CM.Disp.tooltipType == 'b') {
+			if (!CM.Disp.Buy10) {
 				bonus = CM.Cache.Objects[CM.Disp.tooltipName].bonus;
 				price = Game.Objects[CM.Disp.tooltipName].getPrice();
 				if (CM.Config.Tooltip == 1) {
@@ -1106,6 +1168,16 @@ CM.Disp.UpdateTooltip = function() {
 					l('CMTooltipBCI').style.color = CM.Cache.Objects[CM.Disp.tooltipName].color;
 				}
 			}
+			else {
+				bonus = CM.Cache.Objects10[CM.Disp.tooltipName].bonus;
+				price = CM.Cache.Objects10[CM.Disp.tooltipName].price;
+				if (CM.Config.Tooltip == 1) {
+					l('CMTooltipBorder').style.color = CM.Cache.Objects10[CM.Disp.tooltipName].color;
+					l('CMTooltipBCI').textContent = Beautify(CM.Cache.Objects10[CM.Disp.tooltipName].bci, 2);
+					l('CMTooltipBCI').style.color = CM.Cache.Objects10[CM.Disp.tooltipName].color;
+				}
+			}
+		}
 		else { // Upgrades
 			bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus;
 			price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice();
@@ -1217,3 +1289,5 @@ CM.Disp.lastGoldenCookieState = 'none';
 CM.Disp.metric = ['M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
 CM.Disp.shortScale = ['M', 'B', 'Tr', 'Quadr', 'Quint', 'Sext', 'Sept', 'Oct', 'Non', 'Dec', 'Undec', 'Duodec', 'Tredec'];
 
+CM.Disp.Buy10 = false;
+

src/Main.js

@@ -106,6 +106,7 @@ CM.Init = function() {
 		CM.Disp.CreateGCTimer();
 		CM.Disp.CreateTooltipWarnCaut();
 		CM.Disp.AddTooltipBuild();
+		CM.Disp.AddTooltipBuild10();
 		CM.ReplaceNative();
 		Game.CalculateGains();
 		CM.LoadConfig(); // Must be after all things are created!
@@ -117,9 +118,9 @@ CM.Init = function() {
 	}
 }
 
-CM.ConfigDefault = {BotBar: 1, TimerBar: 1, BuildColor: 1, UpBarColor: 1, Flash: 1, Sound: 1,  Volume: 100, GCTimer: 1, Title: 1, Tooltip: 1, ToolWarnCaut: 1, ToolWarnCautPos: 0, Stats: 1, UpStats: 1, SayTime: 1, Scale: 2};
+CM.ConfigDefault = {BotBar: 1, TimerBar: 1, BuildColor: 1, UpBarColor: 1, Flash: 1, Sound: 1,  Volume: 100, GCTimer: 1, Title: 1, Tooltip: 1, ToolWarnCaut: 1, ToolWarnCautPos: 0, Stats: 1, UpStats: 1, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, HC: 1, Wrink: 1, Sea: 1}};
 CM.ConfigPrefix = 'CMConfig';
 
 CM.VersionMajor = '1.0465';
-CM.VersionMinor = '6';
+CM.VersionMinor = '7';
 

src/Sim.js

@@ -2,6 +2,20 @@
  * Sim *
  *******/
 
+CM.Sim.BuildingGetPrice = function (basePrice, start, increase) {
+	var totalPrice = 0;
+	var count = 0;
+	while(count < increase) {
+		var price = basePrice * Math.pow(Game.priceIncrease, start + count);
+		if (Game.Has('Season savings')) price *= 0.99;
+		if (Game.Has('Santa\'s dominion')) price *= 0.99;
+		if (Game.Has('Faberge egg')) price *= 0.99;
+		totalPrice += Math.ceil(price);
+		count++;
+	}
+	return totalPrice;
+}
+
 eval('CM.Sim.Has = ' + Game.Has.toString().split('Game').join('CM.Sim'));
 
 CM.Sim.Win = function(what) {
@@ -206,12 +220,12 @@ CM.Sim.CheckOtherAchiev = function() {
 	if (hasAllChristCook) CM.Sim.Win('Let it snow');
 }
 
-CM.Sim.BuyBuildings = function() {	
-	CM.Cache.Objects = [];
+CM.Sim.BuyBuildings = function(amount, target) {	
+	CM.Cache[target] = [];
 	for (var i in Game.Objects) {
 		CM.Sim.CopyData();
 		var me = CM.Sim.Objects[i];
-		me.amount++;
+		me.amount += amount;
 		
 		if (i == 'Cursor') {
 			if (me.amount >= 1) CM.Sim.Win('Click');
@@ -304,8 +318,8 @@ CM.Sim.BuyBuildings = function() {
 			CM.Sim.CalculateGains();
 		}
 		
-		CM.Cache.Objects[i] = {};
-		CM.Cache.Objects[i].bonus = CM.Sim.cookiesPs - Game.cookiesPs;
+		CM.Cache[target][i] = {};
+		CM.Cache[target][i].bonus = CM.Sim.cookiesPs - Game.cookiesPs;
 	}
 }