Added 1 extra stat in chain/added expand/collape config to stats/reorganize menu code

CookieMonster.js

@@ -113,18 +113,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;
+	CM.Cache.ChainFrenzyWrathReward = CM.Cache.MaxChainMoni(6, maxPayout * 7);
-	while(CM.Cache.ChainFrenzyReward == CM.Cache.ChainFrenzyReward + count) {
+	
+	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 +163,7 @@ CM.Cache.ChainReward = 0;
 CM.Cache.ChainWrathReward = 0;
 CM.Cache.ChainFrenzy = 0;
 CM.Cache.ChainFrenzyReward = 0;
+CM.Cache.ChainFrenzyWrathReward = 0;
 /**********
  * Config *
  **********/
@@ -159,11 +179,27 @@ 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) {
@@ -208,6 +244,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 +929,7 @@ CM.Disp.UpdateTitle = function() {
 	}
 }
 
-CM.Disp.AddMenu = function() {
+CM.Disp.AddMenuPref = function(title) {
-	var title = function() {
-		var div = document.createElement('div');
-		div.className = 'title';
-		div.style.color = CM.Disp.colorBlue;
-		div.textContent = 'Cookie Monster Goodies';
-		return div;
-	}
 	var header = function(text) {
 		var div = document.createElement('div');
 		div.className = 'listing';
@@ -902,7 +941,6 @@ CM.Disp.AddMenu = function() {
 		return div;
 	}
 
-	if (Game.onMenu == 'prefs') {
 	var frag = document.createDocumentFragment();
 		
 	frag.appendChild(title());
@@ -927,10 +965,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 +990,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');
@@ -980,16 +1019,87 @@ 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();};
 }
-	else if (CM.Config.Stats == 1 && Game.onMenu == 'stats') {
+
+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;
+	}
+	
 	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 +1108,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 +1211,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,9 +1261,26 @@ 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);
+	}
 }
 
 CM.Disp.RefreshMenu = function() {
@@ -1574,11 +1670,11 @@ 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 *

src/Cache.js

@@ -106,15 +106,23 @@ CM.Cache.RemakeChain = function() {
 	
 	CM.Cache.ChainFrenzyReward = CM.Cache.MaxChainMoni(7, maxPayout * 7);
 	
-	if ((maxPayout * 7) < CM.Cache.ChainFrenzyReward) {
+	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 = CM.Cache.ChainFrenzyReward > Math.pow(2, 53) ? Math.pow(2, Math.floor(Math.log(CM.Cache.ChainFrenzyReward) / Math.log(2)) - 53) : 1;
+		count = base > Math.pow(2, 53) ? Math.pow(2, Math.floor(Math.log(base) / Math.log(2)) - 53) : 1;
-		while(CM.Cache.ChainFrenzyReward == CM.Cache.ChainFrenzyReward + count) {
+		while(base == base + count) {
 			count++;
 		}
-		CM.Cache.ChainFrenzy = (CM.Cache.ChainFrenzyReward + count) / 0.25;
+		CM.Cache.ChainFrenzy = (base + count) / 0.25;
 	}
 }
 
@@ -135,3 +143,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,11 +13,27 @@ 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) {
@@ -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() {
+CM.Disp.AddMenuPref = function(title) {
-	var title = function() {
-		var div = document.createElement('div');
-		div.className = 'title';
-		div.style.color = CM.Disp.colorBlue;
-		div.textContent = 'Cookie Monster Goodies';
-		return div;
-	}
 	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');
@@ -742,16 +735,87 @@ 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();};
 }
-	else if (CM.Config.Stats == 1 && Game.onMenu == 'stats') {
+
+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;
+	}
+	
 	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,9 +977,26 @@ 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);
+	}
 }
 
 CM.Disp.RefreshMenu = function() {

src/Main.js

@@ -117,7 +117,7 @@ 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';