Removed HC stats as it is useless now (pending cleaning)

Updated README to reflect the same thing as the Wikia
2016-02-08 20:17:08 -05:00 · 2016-02-08 19:27:29 -05:00 · 2016-02-08 19:25:32 -05:00 · 2016-02-08 19:06:11 -05:00 · 2016-02-08 09:52:58 -05:00 · 2016-02-06 12:34:17 -05:00
12 changed files with 2277 additions and 738 deletions
--- a/CookieMonster.js
+++ b/CookieMonster.js
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Cookie Monster

-**Cookie Monster** is an addon you can load into Cookie Clicker, that offers a wide range of tools and statistics to enhance the game. It is **not** a cheat interface – although it does offer helpers for golden cookies and such, everything can be toggled off at will to only leave how much information you want.
+**Cookie Monster** is an addon you can load into Cookie Clicker, that offers a wide range of tools and statistics to enhance the game. **It is not a cheat interface** – although it does offer helpers for golden cookies and such, everything can be toggled off at will to only leave how much information you want.

 This is a helper, and it is here to help you at *whichever* degree you want, if you only need some help shortening long numbers, it does that. If you need to be accompanied by hand to pick the best buildings to buy, it does that, but **everything is an option**.

@@ -10,27 +10,27 @@ You can see the current version, and a full history of all versions and what the

 ## What it does

-At its core, Cookie Monster computes an index on both buildings and upgrades :
+At its core, Cookie Monster computes an index on both buildings and upgrades:

-* **Base Cost per Income (BCI)** : Indicates how much a building is worth by comparing how much it costs to how much income gained
+* **Base Cost per Income (BCI)**: Indicates how much a building is worth by comparing how much it costs to how much income gained

 Cookie Monster also indicates the time left before being able to buy an upgrade or building, and takes it into consideration. It will take *everything* in consideration, meaning if buying a building also unlocks an achievement which boosts your income, which unlocks an achievement, it will know and highlight that building's value.

-This index is computed for buildings and upgrades. If the relevant option is enabled, it will color-code each of them based on their value :
+This index is computed for buildings and upgrades. If the relevant option is enabled, it will color-code each of them based on their value:

-* Light Blue : (upgrades) This item has a better BCI than any building
-* Green : This item has the best BCI
-* Yellow : This item is not the best, but it is closer to best than it is to worst
-* Orange : This item is not the worst, but it is closer to worst than it is to best
-* Red : This item has the worst BCI
-* Purple : (upgrades) This item has a worse BCI than any building
-* Gray : (upgrades) This item has not been calculated and/or cannot be calculated due to no definitive worth.
+* Light Blue: (upgrades) This item has a better BCI than any building
+* Green: This item has the best BCI
+* Yellow: This item is not the best, but it is closer to best than it is to worst
+* Orange: This item is not the worst, but it is closer to worst than it is to best
+* Red: This item has the worst BCI
+* Purple: (upgrades) This item has a worse BCI than any building
+* Gray: (upgrades) This item has not been calculated and/or cannot be calculated due to no definitive worth.

-Note : For this index, **lower is better**, meaning a building with a BCI of 1 is more interesting than one with a BCI of 3.
+Note: For this index, **lower is better**, meaning a building with a BCI of 1 is more interesting than one with a BCI of 3.

 ## What it doesn't do

-Most likely you'll find items in gray like Golden Cookie upgrades, clicking upgrades – everything that doesn't earn you a direct bonus to your income will display as gray. This means the following upgrades are **not** taken into account by Cookie Monster :
+Most likely you'll find items in gray like Golden Cookie upgrades, clicking upgrades – everything that doesn't earn you a direct bonus to your income will display as gray. This means the following upgrades are **not** taken into account by Cookie Monster:

 * Plastic mouse
 * Iron mouse
@@ -60,6 +60,14 @@ javascript: (function () {

 If (for some reason) the above doesn't work, trying pasting everything after the <code>javascript:</code> bit into your browser's console.

+For beta, use the following instead:
+
+```javascript
+javascript: (function () {
+	Game.LoadMod('http://aktanusa.github.io/CookieMonster/CookieMonsterBeta.js');
+}());
+```
+
 ## Userscript

 If you'd rather use the addon as a script via per example *Greasemonkey* or *Tampermonkey*, you can use the following script, which will automatically load *Cookie Monster* every time the original game loads. You may need to specify <code>http://orteil.dashnet.org/cookieclicker/</code> when asked for a *namespace* or *includes*. For how to add an userscript to your browser, refer to your browser/plugin's documentation as the method changes for each one.
@@ -75,13 +83,33 @@ If you'd rather use the addon as a script via per example *Greasemonkey* or *Tam

 javascript:(function() {
    var checkReady = setInterval(function() {
-        if (Game.ready != undefined && Game.ready) {
+        if (typeof Game.ready !== 'undefined' && Game.ready) {
            Game.LoadMod('http://aktanusa.github.io/CookieMonster/CookieMonster.js');
            clearInterval(checkReady);
        }
    }, 1000);
 }());
 ```
+If you are using the beta, use this instead:
+
+```javascript
+// ==UserScript==
+// @name Cookie Monster Beta
+// @namespace Cookie
+// @include http://orteil.dashnet.org/cookieclicker/beta/
+// @version 1
+// @grant none
+// ==/UserScript==
+
+javascript:(function() {
+    var checkReady = setInterval(function() {
+        if (typeof Game.ready !== 'undefined' && Game.ready) {
+            Game.LoadMod('http://aktanusa.github.io/CookieMonster/CookieMonsterBeta.js');
+            clearInterval(checkReady);
+        }
+    }, 1000);
+}());
+```

 # Bugs and suggestions

@@ -101,7 +129,7 @@ All suggestions are welcome, even the smallest ones.

 #Contributors

-* **[Raving_Kumquat](http://cookieclicker.wikia.com/wiki/User:Raving_Kumquat)** : Original author
-* **[Maxime Fabre](https://github.com/Anahkiasen)** : Previous maintainer
-* **Alderi Tokori** : ROI calculations (unused now)
-* **[Aktanusa](https://github.com/Aktanusa)** : Current maintainer
+* **[Raving_Kumquat](http://cookieclicker.wikia.com/wiki/User:Raving_Kumquat)**: Original author
+* **[Maxime Fabre](https://github.com/Anahkiasen)**: Previous maintainer
+* **Alderi Tokori**: ROI calculations (unused now)
+* **[Aktanusa](https://github.com/Aktanusa)**: Current maintainer
--- a/jscolor/arrow.gif
+++ b/jscolor/arrow.gif
--- a/jscolor/cross.gif
+++ b/jscolor/cross.gif
--- a/jscolor/hs.png
+++ b/jscolor/hs.png
--- a/jscolor/hv.png
+++ b/jscolor/hv.png
--- a/jscolor/jscolor.js
+++ b/jscolor/jscolor.js
@@ -0,0 +1,997 @@
+/**
+ * jscolor, JavaScript Color Picker
+ *
+ * @version 1.4.3
+ * @license GNU Lesser General Public License, http://www.gnu.org/copyleft/lesser.html
+ * @author  Jan Odvarko, http://odvarko.cz
+ * @created 2008-06-15
+ * @updated 2014-07-16
+ * @link    http://jscolor.com
+ */
+
+
+var jscolor = {
+
+
+	dir : '', // location of jscolor directory (leave empty to autodetect)
+	bindClass : 'color', // class name
+	binding : true, // automatic binding via <input class="...">
+	preloading : true, // use image preloading?
+
+
+	install : function() {
+		jscolor.addEvent(window, 'load', jscolor.init);
+	},
+
+
+	init : function() {
+		if(jscolor.binding) {
+			jscolor.bind();
+		}
+		if(jscolor.preloading) {
+			jscolor.preload();
+		}
+	},
+
+
+	getDir : function() {
+		if(!jscolor.dir) {
+			var detected = jscolor.detectDir();
+			jscolor.dir = detected!==false ? detected : 'jscolor/';
+		}
+		return jscolor.dir;
+	},
+
+
+	detectDir : function() {
+		var base = location.href;
+
+		var e = document.getElementsByTagName('base');
+		for(var i=0; i<e.length; i+=1) {
+			if(e[i].href) { base = e[i].href; }
+		}
+
+		var e = document.getElementsByTagName('script');
+		for(var i=0; i<e.length; i+=1) {
+			if(e[i].src && /(^|\/)jscolor\.js([?#].*)?$/i.test(e[i].src)) {
+				var src = new jscolor.URI(e[i].src);
+				var srcAbs = src.toAbsolute(base);
+				srcAbs.path = srcAbs.path.replace(/[^\/]+$/, ''); // remove filename
+				srcAbs.query = null;
+				srcAbs.fragment = null;
+				return srcAbs.toString();
+			}
+		}
+		return false;
+	},
+
+
+	bind : function() {
+		var matchClass = new RegExp('(^|\\s)('+jscolor.bindClass+')(\\s*(\\{[^}]*\\})|\\s|$)', 'i');
+		var e = document.getElementsByTagName('input');
+		for(var i=0; i<e.length; i+=1) {
+			var m;
+			if(!e[i].color && e[i].className && (m = e[i].className.match(matchClass))) {
+				var prop = {};
+				if(m[4]) {
+					try {
+						prop = (new Function ('return (' + m[4] + ')'))();
+					} catch(eInvalidProp) {}
+				}
+				e[i].color = new jscolor.color(e[i], prop);
+			}
+		}
+	},
+
+
+	preload : function() {
+		for(var fn in jscolor.imgRequire) {
+			if(jscolor.imgRequire.hasOwnProperty(fn)) {
+				jscolor.loadImage(fn);
+			}
+		}
+	},
+
+
+	images : {
+		pad : [ 181, 101 ],
+		sld : [ 16, 101 ],
+		cross : [ 15, 15 ],
+		arrow : [ 7, 11 ]
+	},
+
+
+	imgRequire : {},
+	imgLoaded : {},
+
+
+	requireImage : function(filename) {
+		jscolor.imgRequire[filename] = true;
+	},
+
+
+	loadImage : function(filename) {
+		if(!jscolor.imgLoaded[filename]) {
+			jscolor.imgLoaded[filename] = new Image();
+			jscolor.imgLoaded[filename].src = jscolor.getDir()+filename;
+		}
+	},
+
+
+	fetchElement : function(mixed) {
+		return typeof mixed === 'string' ? document.getElementById(mixed) : mixed;
+	},
+
+
+	addEvent : function(el, evnt, func) {
+		if(el.addEventListener) {
+			el.addEventListener(evnt, func, false);
+		} else if(el.attachEvent) {
+			el.attachEvent('on'+evnt, func);
+		}
+	},
+
+
+	fireEvent : function(el, evnt) {
+		if(!el) {
+			return;
+		}
+		if(document.createEvent) {
+			var ev = document.createEvent('HTMLEvents');
+			ev.initEvent(evnt, true, true);
+			el.dispatchEvent(ev);
+		} else if(document.createEventObject) {
+			var ev = document.createEventObject();
+			el.fireEvent('on'+evnt, ev);
+		} else if(el['on'+evnt]) { // alternatively use the traditional event model (IE5)
+			el['on'+evnt]();
+		}
+	},
+
+
+	getElementPos : function(e) {
+		var e1=e, e2=e;
+		var x=0, y=0;
+		if(e1.offsetParent) {
+			do {
+				x += e1.offsetLeft;
+				y += e1.offsetTop;
+			} while(e1 = e1.offsetParent);
+		}
+		while((e2 = e2.parentNode) && e2.nodeName.toUpperCase() !== 'BODY') {
+			x -= e2.scrollLeft;
+			y -= e2.scrollTop;
+		}
+		return [x, y];
+	},
+
+
+	getElementSize : function(e) {
+		return [e.offsetWidth, e.offsetHeight];
+	},
+
+
+	getRelMousePos : function(e) {
+		var x = 0, y = 0;
+		if (!e) { e = window.event; }
+		if (typeof e.offsetX === 'number') {
+			x = e.offsetX;
+			y = e.offsetY;
+		} else if (typeof e.layerX === 'number') {
+			x = e.layerX;
+			y = e.layerY;
+		}
+		return { x: x, y: y };
+	},
+
+
+	getViewPos : function() {
+		if(typeof window.pageYOffset === 'number') {
+			return [window.pageXOffset, window.pageYOffset];
+		} else if(document.body && (document.body.scrollLeft || document.body.scrollTop)) {
+			return [document.body.scrollLeft, document.body.scrollTop];
+		} else if(document.documentElement && (document.documentElement.scrollLeft || document.documentElement.scrollTop)) {
+			return [document.documentElement.scrollLeft, document.documentElement.scrollTop];
+		} else {
+			return [0, 0];
+		}
+	},
+
+
+	getViewSize : function() {
+		if(typeof window.innerWidth === 'number') {
+			return [window.innerWidth, window.innerHeight];
+		} else if(document.body && (document.body.clientWidth || document.body.clientHeight)) {
+			return [document.body.clientWidth, document.body.clientHeight];
+		} else if(document.documentElement && (document.documentElement.clientWidth || document.documentElement.clientHeight)) {
+			return [document.documentElement.clientWidth, document.documentElement.clientHeight];
+		} else {
+			return [0, 0];
+		}
+	},
+
+
+	URI : function(uri) { // See RFC3986
+
+		this.scheme = null;
+		this.authority = null;
+		this.path = '';
+		this.query = null;
+		this.fragment = null;
+
+		this.parse = function(uri) {
+			var m = uri.match(/^(([A-Za-z][0-9A-Za-z+.-]*)(:))?((\/\/)([^\/?#]*))?([^?#]*)((\?)([^#]*))?((#)(.*))?/);
+			this.scheme = m[3] ? m[2] : null;
+			this.authority = m[5] ? m[6] : null;
+			this.path = m[7];
+			this.query = m[9] ? m[10] : null;
+			this.fragment = m[12] ? m[13] : null;
+			return this;
+		};
+
+		this.toString = function() {
+			var result = '';
+			if(this.scheme !== null) { result = result + this.scheme + ':'; }
+			if(this.authority !== null) { result = result + '//' + this.authority; }
+			if(this.path !== null) { result = result + this.path; }
+			if(this.query !== null) { result = result + '?' + this.query; }
+			if(this.fragment !== null) { result = result + '#' + this.fragment; }
+			return result;
+		};
+
+		this.toAbsolute = function(base) {
+			var base = new jscolor.URI(base);
+			var r = this;
+			var t = new jscolor.URI;
+
+			if(base.scheme === null) { return false; }
+
+			if(r.scheme !== null && r.scheme.toLowerCase() === base.scheme.toLowerCase()) {
+				r.scheme = null;
+			}
+
+			if(r.scheme !== null) {
+				t.scheme = r.scheme;
+				t.authority = r.authority;
+				t.path = removeDotSegments(r.path);
+				t.query = r.query;
+			} else {
+				if(r.authority !== null) {
+					t.authority = r.authority;
+					t.path = removeDotSegments(r.path);
+					t.query = r.query;
+				} else {
+					if(r.path === '') {
+						t.path = base.path;
+						if(r.query !== null) {
+							t.query = r.query;
+						} else {
+							t.query = base.query;
+						}
+					} else {
+						if(r.path.substr(0,1) === '/') {
+							t.path = removeDotSegments(r.path);
+						} else {
+							if(base.authority !== null && base.path === '') {
+								t.path = '/'+r.path;
+							} else {
+								t.path = base.path.replace(/[^\/]+$/,'')+r.path;
+							}
+							t.path = removeDotSegments(t.path);
+						}
+						t.query = r.query;
+					}
+					t.authority = base.authority;
+				}
+				t.scheme = base.scheme;
+			}
+			t.fragment = r.fragment;
+
+			return t;
+		};
+
+		function removeDotSegments(path) {
+			var out = '';
+			while(path) {
+				if(path.substr(0,3)==='../' || path.substr(0,2)==='./') {
+					path = path.replace(/^\.+/,'').substr(1);
+				} else if(path.substr(0,3)==='/./' || path==='/.') {
+					path = '/'+path.substr(3);
+				} else if(path.substr(0,4)==='/../' || path==='/..') {
+					path = '/'+path.substr(4);
+					out = out.replace(/\/?[^\/]*$/, '');
+				} else if(path==='.' || path==='..') {
+					path = '';
+				} else {
+					var rm = path.match(/^\/?[^\/]*/)[0];
+					path = path.substr(rm.length);
+					out = out + rm;
+				}
+			}
+			return out;
+		}
+
+		if(uri) {
+			this.parse(uri);
+		}
+
+	},
+
+
+	//
+	// Usage example:
+	// var myColor = new jscolor.color(myInputElement)
+	//
+
+	color : function(target, prop) {
+
+
+		this.required = true; // refuse empty values?
+		this.adjust = true; // adjust value to uniform notation?
+		this.hash = false; // prefix color with # symbol?
+		this.caps = true; // uppercase?
+		this.slider = true; // show the value/saturation slider?
+		this.valueElement = target; // value holder
+		this.styleElement = target; // where to reflect current color
+		this.onImmediateChange = null; // onchange callback (can be either string or function)
+		this.hsv = [0, 0, 1]; // read-only  0-6, 0-1, 0-1
+		this.rgb = [1, 1, 1]; // read-only  0-1, 0-1, 0-1
+		this.minH = 0; // read-only  0-6
+		this.maxH = 6; // read-only  0-6
+		this.minS = 0; // read-only  0-1
+		this.maxS = 1; // read-only  0-1
+		this.minV = 0; // read-only  0-1
+		this.maxV = 1; // read-only  0-1
+
+		this.pickerOnfocus = true; // display picker on focus?
+		this.pickerMode = 'HSV'; // HSV | HVS
+		this.pickerPosition = 'bottom'; // left | right | top | bottom
+		this.pickerSmartPosition = true; // automatically adjust picker position when necessary
+		this.pickerButtonHeight = 20; // px
+		this.pickerClosable = false;
+		this.pickerCloseText = 'Close';
+		this.pickerButtonColor = 'ButtonText'; // px
+		this.pickerFace = 10; // px
+		this.pickerFaceColor = 'ThreeDFace'; // CSS color
+		this.pickerBorder = 1; // px
+		this.pickerBorderColor = 'ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight'; // CSS color
+		this.pickerInset = 1; // px
+		this.pickerInsetColor = 'ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow'; // CSS color
+		this.pickerZIndex = 10000;
+
+
+		for(var p in prop) {
+			if(prop.hasOwnProperty(p)) {
+				this[p] = prop[p];
+			}
+		}
+
+
+		this.hidePicker = function() {
+			if(isPickerOwner()) {
+				removePicker();
+			}
+		};
+
+
+		this.showPicker = function() {
+			if(!isPickerOwner()) {
+				var tp = jscolor.getElementPos(target); // target pos
+				var ts = jscolor.getElementSize(target); // target size
+				var vp = jscolor.getViewPos(); // view pos
+				var vs = jscolor.getViewSize(); // view size
+				var ps = getPickerDims(this); // picker size
+				var a, b, c;
+				switch(this.pickerPosition.toLowerCase()) {
+					case 'left': a=1; b=0; c=-1; break;
+					case 'right':a=1; b=0; c=1; break;
+					case 'top':  a=0; b=1; c=-1; break;
+					default:     a=0; b=1; c=1; break;
+				}
+				var l = (ts[b]+ps[b])/2;
+
+				// picker pos
+				if (!this.pickerSmartPosition) {
+					var pp = [
+						tp[a],
+						tp[b]+ts[b]-l+l*c
+					];
+				} else {
+					var pp = [
+						-vp[a]+tp[a]+ps[a] > vs[a] ?
+							(-vp[a]+tp[a]+ts[a]/2 > vs[a]/2 && tp[a]+ts[a]-ps[a] >= 0 ? tp[a]+ts[a]-ps[a] : tp[a]) :
+							tp[a],
+						-vp[b]+tp[b]+ts[b]+ps[b]-l+l*c > vs[b] ?
+							(-vp[b]+tp[b]+ts[b]/2 > vs[b]/2 && tp[b]+ts[b]-l-l*c >= 0 ? tp[b]+ts[b]-l-l*c : tp[b]+ts[b]-l+l*c) :
+							(tp[b]+ts[b]-l+l*c >= 0 ? tp[b]+ts[b]-l+l*c : tp[b]+ts[b]-l-l*c)
+					];
+				}
+				drawPicker(pp[a], pp[b]);
+			}
+		};
+
+
+		this.importColor = function() {
+			if(!valueElement) {
+				this.exportColor();
+			} else {
+				if(!this.adjust) {
+					if(!this.fromString(valueElement.value, leaveValue)) {
+						styleElement.style.backgroundImage = styleElement.jscStyle.backgroundImage;
+						styleElement.style.backgroundColor = styleElement.jscStyle.backgroundColor;
+						styleElement.style.color = styleElement.jscStyle.color;
+						this.exportColor(leaveValue | leaveStyle);
+					}
+				} else if(!this.required && /^\s*$/.test(valueElement.value)) {
+					valueElement.value = '';
+					styleElement.style.backgroundImage = styleElement.jscStyle.backgroundImage;
+					styleElement.style.backgroundColor = styleElement.jscStyle.backgroundColor;
+					styleElement.style.color = styleElement.jscStyle.color;
+					this.exportColor(leaveValue | leaveStyle);
+
+				} else if(this.fromString(valueElement.value)) {
+					// OK
+				} else {
+					this.exportColor();
+				}
+			}
+		};
+
+
+		this.exportColor = function(flags) {
+			if(!(flags & leaveValue) && valueElement) {
+				var value = this.toString();
+				if(this.caps) { value = value.toUpperCase(); }
+				if(this.hash) { value = '#'+value; }
+				valueElement.value = value;
+			}
+			if(!(flags & leaveStyle) && styleElement) {
+				styleElement.style.backgroundImage = "none";
+				styleElement.style.backgroundColor =
+					'#'+this.toString();
+				styleElement.style.color =
+					0.213 * this.rgb[0] +
+					0.715 * this.rgb[1] +
+					0.072 * this.rgb[2]
+					< 0.5 ? '#FFF' : '#000';
+			}
+			if(!(flags & leavePad) && isPickerOwner()) {
+				redrawPad();
+			}
+			if(!(flags & leaveSld) && isPickerOwner()) {
+				redrawSld();
+			}
+		};
+
+
+		this.fromHSV = function(h, s, v, flags) { // null = don't change
+			if(h !== null) { h = Math.max(0.0, this.minH, Math.min(6.0, this.maxH, h)); }
+			if(s !== null) { s = Math.max(0.0, this.minS, Math.min(1.0, this.maxS, s)); }
+			if(v !== null) { v = Math.max(0.0, this.minV, Math.min(1.0, this.maxV, v)); }
+
+			this.rgb = HSV_RGB(
+				h===null ? this.hsv[0] : (this.hsv[0]=h),
+				s===null ? this.hsv[1] : (this.hsv[1]=s),
+				v===null ? this.hsv[2] : (this.hsv[2]=v)
+			);
+
+			this.exportColor(flags);
+		};
+
+
+		this.fromRGB = function(r, g, b, flags) { // null = don't change
+			if(r !== null) { r = Math.max(0.0, Math.min(1.0, r)); }
+			if(g !== null) { g = Math.max(0.0, Math.min(1.0, g)); }
+			if(b !== null) { b = Math.max(0.0, Math.min(1.0, b)); }
+
+			var hsv = RGB_HSV(
+				r===null ? this.rgb[0] : r,
+				g===null ? this.rgb[1] : g,
+				b===null ? this.rgb[2] : b
+			);
+			if(hsv[0] !== null) {
+				this.hsv[0] = Math.max(0.0, this.minH, Math.min(6.0, this.maxH, hsv[0]));
+			}
+			if(hsv[2] !== 0) {
+				this.hsv[1] = hsv[1]===null ? null : Math.max(0.0, this.minS, Math.min(1.0, this.maxS, hsv[1]));
+			}
+			this.hsv[2] = hsv[2]===null ? null : Math.max(0.0, this.minV, Math.min(1.0, this.maxV, hsv[2]));
+
+			// update RGB according to final HSV, as some values might be trimmed
+			var rgb = HSV_RGB(this.hsv[0], this.hsv[1], this.hsv[2]);
+			this.rgb[0] = rgb[0];
+			this.rgb[1] = rgb[1];
+			this.rgb[2] = rgb[2];
+
+			this.exportColor(flags);
+		};
+
+
+		this.fromString = function(hex, flags) {
+			var m = hex.match(/^\W*([0-9A-F]{3}([0-9A-F]{3})?)\W*$/i);
+			if(!m) {
+				return false;
+			} else {
+				if(m[1].length === 6) { // 6-char notation
+					this.fromRGB(
+						parseInt(m[1].substr(0,2),16) / 255,
+						parseInt(m[1].substr(2,2),16) / 255,
+						parseInt(m[1].substr(4,2),16) / 255,
+						flags
+					);
+				} else { // 3-char notation
+					this.fromRGB(
+						parseInt(m[1].charAt(0)+m[1].charAt(0),16) / 255,
+						parseInt(m[1].charAt(1)+m[1].charAt(1),16) / 255,
+						parseInt(m[1].charAt(2)+m[1].charAt(2),16) / 255,
+						flags
+					);
+				}
+				return true;
+			}
+		};
+
+
+		this.toString = function() {
+			return (
+				(0x100 | Math.round(255*this.rgb[0])).toString(16).substr(1) +
+				(0x100 | Math.round(255*this.rgb[1])).toString(16).substr(1) +
+				(0x100 | Math.round(255*this.rgb[2])).toString(16).substr(1)
+			);
+		};
+
+
+		function RGB_HSV(r, g, b) {
+			var n = Math.min(Math.min(r,g),b);
+			var v = Math.max(Math.max(r,g),b);
+			var m = v - n;
+			if(m === 0) { return [ null, 0, v ]; }
+			var h = r===n ? 3+(b-g)/m : (g===n ? 5+(r-b)/m : 1+(g-r)/m);
+			return [ h===6?0:h, m/v, v ];
+		}
+
+
+		function HSV_RGB(h, s, v) {
+			if(h === null) { return [ v, v, v ]; }
+			var i = Math.floor(h);
+			var f = i%2 ? h-i : 1-(h-i);
+			var m = v * (1 - s);
+			var n = v * (1 - s*f);
+			switch(i) {
+				case 6:
+				case 0: return [v,n,m];
+				case 1: return [n,v,m];
+				case 2: return [m,v,n];
+				case 3: return [m,n,v];
+				case 4: return [n,m,v];
+				case 5: return [v,m,n];
+			}
+		}
+
+
+		function removePicker() {
+			delete jscolor.picker.owner;
+			document.getElementsByTagName('body')[0].removeChild(jscolor.picker.boxB);
+		}
+
+
+		function drawPicker(x, y) {
+			if(!jscolor.picker) {
+				jscolor.picker = {
+					box : document.createElement('div'),
+					boxB : document.createElement('div'),
+					pad : document.createElement('div'),
+					padB : document.createElement('div'),
+					padM : document.createElement('div'),
+					sld : document.createElement('div'),
+					sldB : document.createElement('div'),
+					sldM : document.createElement('div'),
+					btn : document.createElement('div'),
+					btnS : document.createElement('span'),
+					btnT : document.createTextNode(THIS.pickerCloseText)
+				};
+				for(var i=0,segSize=4; i<jscolor.images.sld[1]; i+=segSize) {
+					var seg = document.createElement('div');
+					seg.style.height = segSize+'px';
+					seg.style.fontSize = '1px';
+					seg.style.lineHeight = '0';
+					jscolor.picker.sld.appendChild(seg);
+				}
+				jscolor.picker.sldB.appendChild(jscolor.picker.sld);
+				jscolor.picker.box.appendChild(jscolor.picker.sldB);
+				jscolor.picker.box.appendChild(jscolor.picker.sldM);
+				jscolor.picker.padB.appendChild(jscolor.picker.pad);
+				jscolor.picker.box.appendChild(jscolor.picker.padB);
+				jscolor.picker.box.appendChild(jscolor.picker.padM);
+				jscolor.picker.btnS.appendChild(jscolor.picker.btnT);
+				jscolor.picker.btn.appendChild(jscolor.picker.btnS);
+				jscolor.picker.box.appendChild(jscolor.picker.btn);
+				jscolor.picker.boxB.appendChild(jscolor.picker.box);
+			}
+
+			var p = jscolor.picker;
+
+			// controls interaction
+			p.box.onmouseup =
+			p.box.onmouseout = function() { target.focus(); };
+			p.box.onmousedown = function() { abortBlur=true; };
+			p.box.onmousemove = function(e) {
+				if (holdPad || holdSld) {
+					holdPad && setPad(e);
+					holdSld && setSld(e);
+					if (document.selection) {
+						document.selection.empty();
+					} else if (window.getSelection) {
+						window.getSelection().removeAllRanges();
+					}
+					dispatchImmediateChange();
+				}
+			};
+			if('ontouchstart' in window) { // if touch device
+				var handle_touchmove = function(e) {
+					var event={
+						'offsetX': e.touches[0].pageX-touchOffset.X,
+						'offsetY': e.touches[0].pageY-touchOffset.Y
+					};
+					if (holdPad || holdSld) {
+						holdPad && setPad(event);
+						holdSld && setSld(event);
+						dispatchImmediateChange();
+					}
+					e.stopPropagation(); // prevent move "view" on broswer
+					e.preventDefault(); // prevent Default - Android Fix (else android generated only 1-2 touchmove events)
+				};
+				p.box.removeEventListener('touchmove', handle_touchmove, false)
+				p.box.addEventListener('touchmove', handle_touchmove, false)
+			}
+			p.padM.onmouseup =
+			p.padM.onmouseout = function() { if(holdPad) { holdPad=false; jscolor.fireEvent(valueElement,'change'); } };
+			p.padM.onmousedown = function(e) {
+				// if the slider is at the bottom, move it up
+				switch(modeID) {
+					case 0: if (THIS.hsv[2] === 0) { THIS.fromHSV(null, null, 1.0); }; break;
+					case 1: if (THIS.hsv[1] === 0) { THIS.fromHSV(null, 1.0, null); }; break;
+				}
+				holdSld=false;
+				holdPad=true;
+				setPad(e);
+				dispatchImmediateChange();
+			};
+			if('ontouchstart' in window) {
+				p.padM.addEventListener('touchstart', function(e) {
+					touchOffset={
+						'X': e.target.offsetParent.offsetLeft,
+						'Y': e.target.offsetParent.offsetTop
+					};
+					this.onmousedown({
+						'offsetX':e.touches[0].pageX-touchOffset.X,
+						'offsetY':e.touches[0].pageY-touchOffset.Y
+					});
+				});
+			}
+			p.sldM.onmouseup =
+			p.sldM.onmouseout = function() { if(holdSld) { holdSld=false; jscolor.fireEvent(valueElement,'change'); } };
+			p.sldM.onmousedown = function(e) {
+				holdPad=false;
+				holdSld=true;
+				setSld(e);
+				dispatchImmediateChange();
+			};
+			if('ontouchstart' in window) {
+				p.sldM.addEventListener('touchstart', function(e) {
+					touchOffset={
+						'X': e.target.offsetParent.offsetLeft,
+						'Y': e.target.offsetParent.offsetTop
+					};
+					this.onmousedown({
+						'offsetX':e.touches[0].pageX-touchOffset.X,
+						'offsetY':e.touches[0].pageY-touchOffset.Y
+					});
+				});
+			}
+
+			// picker
+			var dims = getPickerDims(THIS);
+			p.box.style.width = dims[0] + 'px';
+			p.box.style.height = dims[1] + 'px';
+
+			// picker border
+			p.boxB.style.position = 'absolute';
+			p.boxB.style.clear = 'both';
+			p.boxB.style.left = x+'px';
+			p.boxB.style.top = y+'px';
+			p.boxB.style.zIndex = THIS.pickerZIndex;
+			p.boxB.style.border = THIS.pickerBorder+'px solid';
+			p.boxB.style.borderColor = THIS.pickerBorderColor;
+			p.boxB.style.background = THIS.pickerFaceColor;
+
+			// pad image
+			p.pad.style.width = jscolor.images.pad[0]+'px';
+			p.pad.style.height = jscolor.images.pad[1]+'px';
+
+			// pad border
+			p.padB.style.position = 'absolute';
+			p.padB.style.left = THIS.pickerFace+'px';
+			p.padB.style.top = THIS.pickerFace+'px';
+			p.padB.style.border = THIS.pickerInset+'px solid';
+			p.padB.style.borderColor = THIS.pickerInsetColor;
+
+			// pad mouse area
+			p.padM.style.position = 'absolute';
+			p.padM.style.left = '0';
+			p.padM.style.top = '0';
+			p.padM.style.width = THIS.pickerFace + 2*THIS.pickerInset + jscolor.images.pad[0] + jscolor.images.arrow[0] + 'px';
+			p.padM.style.height = p.box.style.height;
+			p.padM.style.cursor = 'crosshair';
+
+			// slider image
+			p.sld.style.overflow = 'hidden';
+			p.sld.style.width = jscolor.images.sld[0]+'px';
+			p.sld.style.height = jscolor.images.sld[1]+'px';
+
+			// slider border
+			p.sldB.style.display = THIS.slider ? 'block' : 'none';
+			p.sldB.style.position = 'absolute';
+			p.sldB.style.right = THIS.pickerFace+'px';
+			p.sldB.style.top = THIS.pickerFace+'px';
+			p.sldB.style.border = THIS.pickerInset+'px solid';
+			p.sldB.style.borderColor = THIS.pickerInsetColor;
+
+			// slider mouse area
+			p.sldM.style.display = THIS.slider ? 'block' : 'none';
+			p.sldM.style.position = 'absolute';
+			p.sldM.style.right = '0';
+			p.sldM.style.top = '0';
+			p.sldM.style.width = jscolor.images.sld[0] + jscolor.images.arrow[0] + THIS.pickerFace + 2*THIS.pickerInset + 'px';
+			p.sldM.style.height = p.box.style.height;
+			try {
+				p.sldM.style.cursor = 'pointer';
+			} catch(eOldIE) {
+				p.sldM.style.cursor = 'hand';
+			}
+
+			// "close" button
+			function setBtnBorder() {
+				var insetColors = THIS.pickerInsetColor.split(/\s+/);
+				var pickerOutsetColor = insetColors.length < 2 ? insetColors[0] : insetColors[1] + ' ' + insetColors[0] + ' ' + insetColors[0] + ' ' + insetColors[1];
+				p.btn.style.borderColor = pickerOutsetColor;
+			}
+			p.btn.style.display = THIS.pickerClosable ? 'block' : 'none';
+			p.btn.style.position = 'absolute';
+			p.btn.style.left = THIS.pickerFace + 'px';
+			p.btn.style.bottom = THIS.pickerFace + 'px';
+			p.btn.style.padding = '0 15px';
+			p.btn.style.height = '18px';
+			p.btn.style.border = THIS.pickerInset + 'px solid';
+			setBtnBorder();
+			p.btn.style.color = THIS.pickerButtonColor;
+			p.btn.style.font = '12px sans-serif';
+			p.btn.style.textAlign = 'center';
+			try {
+				p.btn.style.cursor = 'pointer';
+			} catch(eOldIE) {
+				p.btn.style.cursor = 'hand';
+			}
+			p.btn.onmousedown = function () {
+				THIS.hidePicker();
+			};
+			p.btnS.style.lineHeight = p.btn.style.height;
+
+			// load images in optimal order
+			switch(modeID) {
+				case 0: var padImg = 'hs.png'; break;
+				case 1: var padImg = 'hv.png'; break;
+			}
+			p.padM.style.backgroundImage = "url('"+jscolor.getDir()+"cross.gif')";
+			p.padM.style.backgroundRepeat = "no-repeat";
+			p.sldM.style.backgroundImage = "url('"+jscolor.getDir()+"arrow.gif')";
+			p.sldM.style.backgroundRepeat = "no-repeat";
+			p.pad.style.backgroundImage = "url('"+jscolor.getDir()+padImg+"')";
+			p.pad.style.backgroundRepeat = "no-repeat";
+			p.pad.style.backgroundPosition = "0 0";
+
+			// place pointers
+			redrawPad();
+			redrawSld();
+
+			jscolor.picker.owner = THIS;
+			document.getElementsByTagName('body')[0].appendChild(p.boxB);
+		}
+
+
+		function getPickerDims(o) {
+			var dims = [
+				2*o.pickerInset + 2*o.pickerFace + jscolor.images.pad[0] +
+					(o.slider ? 2*o.pickerInset + 2*jscolor.images.arrow[0] + jscolor.images.sld[0] : 0),
+				o.pickerClosable ?
+					4*o.pickerInset + 3*o.pickerFace + jscolor.images.pad[1] + o.pickerButtonHeight :
+					2*o.pickerInset + 2*o.pickerFace + jscolor.images.pad[1]
+			];
+			return dims;
+		}
+
+
+		function redrawPad() {
+			// redraw the pad pointer
+			switch(modeID) {
+				case 0: var yComponent = 1; break;
+				case 1: var yComponent = 2; break;
+			}
+			var x = Math.round((THIS.hsv[0]/6) * (jscolor.images.pad[0]-1));
+			var y = Math.round((1-THIS.hsv[yComponent]) * (jscolor.images.pad[1]-1));
+			jscolor.picker.padM.style.backgroundPosition =
+				(THIS.pickerFace+THIS.pickerInset+x - Math.floor(jscolor.images.cross[0]/2)) + 'px ' +
+				(THIS.pickerFace+THIS.pickerInset+y - Math.floor(jscolor.images.cross[1]/2)) + 'px';
+
+			// redraw the slider image
+			var seg = jscolor.picker.sld.childNodes;
+
+			switch(modeID) {
+				case 0:
+					var rgb = HSV_RGB(THIS.hsv[0], THIS.hsv[1], 1);
+					for(var i=0; i<seg.length; i+=1) {
+						seg[i].style.backgroundColor = 'rgb('+
+							(rgb[0]*(1-i/seg.length)*100)+'%,'+
+							(rgb[1]*(1-i/seg.length)*100)+'%,'+
+							(rgb[2]*(1-i/seg.length)*100)+'%)';
+					}
+					break;
+				case 1:
+					var rgb, s, c = [ THIS.hsv[2], 0, 0 ];
+					var i = Math.floor(THIS.hsv[0]);
+					var f = i%2 ? THIS.hsv[0]-i : 1-(THIS.hsv[0]-i);
+					switch(i) {
+						case 6:
+						case 0: rgb=[0,1,2]; break;
+						case 1: rgb=[1,0,2]; break;
+						case 2: rgb=[2,0,1]; break;
+						case 3: rgb=[2,1,0]; break;
+						case 4: rgb=[1,2,0]; break;
+						case 5: rgb=[0,2,1]; break;
+					}
+					for(var i=0; i<seg.length; i+=1) {
+						s = 1 - 1/(seg.length-1)*i;
+						c[1] = c[0] * (1 - s*f);
+						c[2] = c[0] * (1 - s);
+						seg[i].style.backgroundColor = 'rgb('+
+							(c[rgb[0]]*100)+'%,'+
+							(c[rgb[1]]*100)+'%,'+
+							(c[rgb[2]]*100)+'%)';
+					}
+					break;
+			}
+		}
+
+
+		function redrawSld() {
+			// redraw the slider pointer
+			switch(modeID) {
+				case 0: var yComponent = 2; break;
+				case 1: var yComponent = 1; break;
+			}
+			var y = Math.round((1-THIS.hsv[yComponent]) * (jscolor.images.sld[1]-1));
+			jscolor.picker.sldM.style.backgroundPosition =
+				'0 ' + (THIS.pickerFace+THIS.pickerInset+y - Math.floor(jscolor.images.arrow[1]/2)) + 'px';
+		}
+
+
+		function isPickerOwner() {
+			return jscolor.picker && jscolor.picker.owner === THIS;
+		}
+
+
+		function blurTarget() {
+			if(valueElement === target) {
+				THIS.importColor();
+			}
+			if(THIS.pickerOnfocus) {
+				THIS.hidePicker();
+			}
+		}
+
+
+		function blurValue() {
+			if(valueElement !== target) {
+				THIS.importColor();
+			}
+		}
+
+
+		function setPad(e) {
+			var mpos = jscolor.getRelMousePos(e);
+			var x = mpos.x - THIS.pickerFace - THIS.pickerInset;
+			var y = mpos.y - THIS.pickerFace - THIS.pickerInset;
+			switch(modeID) {
+				case 0: THIS.fromHSV(x*(6/(jscolor.images.pad[0]-1)), 1 - y/(jscolor.images.pad[1]-1), null, leaveSld); break;
+				case 1: THIS.fromHSV(x*(6/(jscolor.images.pad[0]-1)), null, 1 - y/(jscolor.images.pad[1]-1), leaveSld); break;
+			}
+		}
+
+
+		function setSld(e) {
+			var mpos = jscolor.getRelMousePos(e);
+			var y = mpos.y - THIS.pickerFace - THIS.pickerInset;
+			switch(modeID) {
+				case 0: THIS.fromHSV(null, null, 1 - y/(jscolor.images.sld[1]-1), leavePad); break;
+				case 1: THIS.fromHSV(null, 1 - y/(jscolor.images.sld[1]-1), null, leavePad); break;
+			}
+		}
+
+
+		function dispatchImmediateChange() {
+			if (THIS.onImmediateChange) {
+				var callback;
+				if (typeof THIS.onImmediateChange === 'string') {
+					callback = new Function (THIS.onImmediateChange);
+				} else {
+					callback = THIS.onImmediateChange;
+				}
+				callback.call(THIS);
+			}
+		}
+
+
+		var THIS = this;
+		var modeID = this.pickerMode.toLowerCase()==='hvs' ? 1 : 0;
+		var abortBlur = false;
+		var
+			valueElement = jscolor.fetchElement(this.valueElement),
+			styleElement = jscolor.fetchElement(this.styleElement);
+		var
+			holdPad = false,
+			holdSld = false,
+			touchOffset = {};
+		var
+			leaveValue = 1<<0,
+			leaveStyle = 1<<1,
+			leavePad = 1<<2,
+			leaveSld = 1<<3;
+
+		// target
+		jscolor.addEvent(target, 'focus', function() {
+			if(THIS.pickerOnfocus) { THIS.showPicker(); }
+		});
+		jscolor.addEvent(target, 'blur', function() {
+			if(!abortBlur) {
+				window.setTimeout(function(){ abortBlur || blurTarget(); abortBlur=false; }, 0);
+			} else {
+				abortBlur = false;
+			}
+		});
+
+		// valueElement
+		if(valueElement) {
+			var updateField = function() {
+				THIS.fromString(valueElement.value, leaveValue);
+				dispatchImmediateChange();
+			};
+			jscolor.addEvent(valueElement, 'keyup', updateField);
+			jscolor.addEvent(valueElement, 'input', updateField);
+			jscolor.addEvent(valueElement, 'blur', blurValue);
+			valueElement.setAttribute('autocomplete', 'off');
+		}
+
+		// styleElement
+		if(styleElement) {
+			styleElement.jscStyle = {
+				backgroundImage : styleElement.style.backgroundImage,
+				backgroundColor : styleElement.style.backgroundColor,
+				color : styleElement.style.color
+			};
+		}
+
+		// require images
+		switch(modeID) {
+			case 0: jscolor.requireImage('hs.png'); break;
+			case 1: jscolor.requireImage('hv.png'); break;
+		}
+		jscolor.requireImage('cross.gif');
+		jscolor.requireImage('arrow.gif');
+
+		this.importColor();
+	}
+
+};
+
+
+jscolor.install();
--- a/src/Cache.js
+++ b/src/Cache.js
@@ -2,6 +2,14 @@
 * Cache *
 *********/
 
+CM.Cache.NextNumber = function(base) {
+	var 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.NextNumber(count);
+	}
+	return (base + count);
+}
+
 CM.Cache.RemakeIncome = function() {
 	// Simulate Building Buys for 1 amount
 	CM.Sim.BuyBuildings(1, 'Objects');
@@ -36,6 +44,7 @@ CM.Cache.RemakeBuildingsBCI = function() {
 CM.Cache.RemakeUpgradeBCI = function() {
 	for (var i in CM.Cache.Upgrades) {
 		CM.Cache.Upgrades[i].bci = Game.Upgrades[i].getPrice() / CM.Cache.Upgrades[i].bonus;
+		if (isNaN(CM.Cache.Upgrades[i].bci)) CM.Cache.Upgrades[i].bci = 'Infinity';
 		var color = '';
 		if (CM.Cache.Upgrades[i].bci <= 0 || CM.Cache.Upgrades[i].bci == 'Infinity') color = CM.Disp.colorGray;
 		else if (CM.Cache.Upgrades[i].bci < CM.Disp.min) color = CM.Disp.colorBlue;
@@ -76,13 +85,13 @@ CM.Cache.RemakeBCI = function() {
 }

 CM.Cache.RemakeLucky = function() {
-	CM.Cache.Lucky = (Game.cookiesPs * 60 * 20) / 0.1;
+	CM.Cache.Lucky = (Game.cookiesPs * 60 * 15) / 0.15;
 	if (Game.frenzy > 0) {
 		CM.Cache.Lucky /= Game.frenzyPower;
 	}
-	CM.Cache.LuckyReward = (CM.Cache.Lucky * 0.1) + 13;
+	CM.Cache.LuckyReward = (CM.Cache.Lucky * 0.15) + 13;
 	CM.Cache.LuckyFrenzy = CM.Cache.Lucky * 7;
-	CM.Cache.LuckyRewardFrenzy = (CM.Cache.LuckyFrenzy * 0.1) + 13;
+	CM.Cache.LuckyRewardFrenzy = (CM.Cache.LuckyFrenzy * 0.15) + 13;
 }

 CM.Cache.MaxChainMoni = function(digit, maxPayout) {
@@ -98,7 +107,7 @@ CM.Cache.MaxChainMoni = function(digit, maxPayout) {
 }

 CM.Cache.RemakeChain = function() {
-	var maxPayout = Game.cookiesPs * 60 * 60 * 3;
+	var maxPayout = Game.cookiesPs * 60 * 60 * 6;
 	if (Game.frenzy > 0) {
 		maxPayout /= Game.frenzyPower;
 	}
@@ -114,16 +123,11 @@ CM.Cache.RemakeChain = function() {
 	else {
 		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.Chain = CM.Cache.NextNumber(base) / 0.25;
 	}
 	
 	CM.Cache.ChainFrenzyReward = CM.Cache.MaxChainMoni(7, maxPayout * 7);
@@ -140,11 +144,7 @@ CM.Cache.RemakeChain = function() {
 		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 = (base + count) / 0.25;
+		CM.Cache.ChainFrenzy = CM.Cache.NextNumber(base) / 0.25;
 	}
 }

@@ -155,6 +155,15 @@ CM.Cache.RemakeSeaSpec = function() {
 	}
 }

+CM.Cache.RemakeSellAllTotal = function() {
+	var sellTotal = 0;
+	for (var i in Game.Objects) {
+		var me = Game.Objects[i];
+		sellTotal += CM.Sim.BuildingSell(me.basePrice, me.amount, me.amount);
+	}
+	CM.Cache.SellAllTotal = sellTotal;
+}
+
 CM.Cache.Lucky = 0;
 CM.Cache.LuckyReward = 0;
 CM.Cache.LuckyFrenzy = 0;
@@ -166,3 +175,5 @@ CM.Cache.ChainWrathReward = 0;
 CM.Cache.ChainFrenzy = 0;
 CM.Cache.ChainFrenzyReward = 0;
 CM.Cache.ChainFrenzyWrathReward = 0;
+CM.Cache.SellAllTotal = 0;
+
--- a/src/Config.js
+++ b/src/Config.js
@@ -13,39 +13,45 @@ CM.LoadConfig = function() {
 		// Check values
 		var mod = false;
 		for (var i in CM.ConfigDefault) {
-			if (i != 'StatsPref') {
+			if (typeof CM.Config[i] === 'undefined') {
+				mod = true;
+				CM.Config[i] = CM.ConfigDefault[i];
+			}
+			else if (i != 'StatsPref' && i != 'Colors') {
 				if (i.indexOf('SoundURL') == -1) {
-					if (CM.Config[i] == undefined || !(CM.Config[i] > -1 && CM.Config[i] < CM.ConfigData[i].label.length)) {
+					if (!(CM.Config[i] > -1 && CM.Config[i] < CM.ConfigData[i].label.length)) {
 						mod = true;
 						CM.Config[i] = CM.ConfigDefault[i];
 					}
 				}
 				else {  // Sound URLs
-					if (CM.Config[i] == undefined || typeof CM.Config[i] != 'string') {
+					if (typeof CM.Config[i] != 'string') {
 						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 {
+			else if (i == 'StatsPref') {
 				for (var j in CM.ConfigDefault.StatsPref) {
-						if (CM.Config[i][j] == undefined || !(CM.Config[i][j] > -1 && CM.Config[i][j] < 2)) {
+					if (typeof 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];
 					}
 				}
 			}
+			else { // Colors
+				for (var j in CM.ConfigDefault.StatsPref) {
+					if (typeof CM.Config[i][j] === 'undefined' || typeof CM.Config[i][j] != 'string') {
+						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 (i != 'StatsPref' && CM.ConfigData[i].func != undefined) {
+			if (i != 'StatsPref' && typeof CM.ConfigData[i].func !== 'undefined') {
 				CM.ConfigData[i].func();
 			}
 		}
@@ -67,7 +73,7 @@ CM.ToggleConfigUp = function(config) {
 	if (CM.Config[config] == CM.ConfigData[config].label.length) {
 		CM.Config[config] = 0;
 	}
-	if (CM.ConfigData[config].func != undefined) {
+	if (typeof CM.ConfigData[config].func !== 'undefined') {
 		CM.ConfigData[config].func();
 	}
 	l(CM.ConfigPrefix + config).innerHTML = CM.Disp.GetConfigDisplay(config);
@@ -79,7 +85,7 @@ CM.ToggleConfigDown = function(config) {
 	if (CM.Config[config] < 0) {
 		CM.Config[config] = CM.ConfigData[config].label.length - 1;
 	}
-	if (CM.ConfigData[config].func != undefined) {
+	if (typeof CM.ConfigData[config].func !== 'undefined') {
 		CM.ConfigData[config].func();
 	}
 	l(CM.ConfigPrefix + config).innerHTML = CM.Disp.GetConfigDisplay(config);
@@ -98,8 +104,10 @@ CM.ToggleStatsConfig = function(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.TimerBarPos = {label: ['Timer Bar Position (Top Left)', 'Timer Bar Position (Bottom)'], desc: 'Placement of the Timer Bar', func: function() {CM.Disp.ToggleTimerBarPos();}};
 CM.ConfigData.BuildColor = {label: ['Building Colors OFF', 'Building Colors ON'], desc: 'Color code buildings', func: function() {CM.Disp.UpdateBuildings();}};
 CM.ConfigData.UpBarColor = {label: ['Upgrade Bar/Colors OFF', 'Upgrade Bar/Colors ON'], desc: 'Color code upgrades and add a counter', func: function() {CM.Disp.ToggleUpBarColor();}};
+CM.ConfigData.Colors = {desc: {Blue: 'Color for better than best BCI building', Green: 'Color for best BCI building', Yellow: 'Color for between best and worst BCI buildings closer to best', Orange: 'Color for between best and worst BCI buildings closer to worst', Red: 'Color for worst BCI building', Purple: 'Color for worse than worst BCI building', Gray: 'Color for negative or infinity BCI'}, func: function() {CM.Disp.UpdateColors();}};
 CM.ConfigData.Flash = {label: ['Flash OFF', 'Flash ON'], desc: 'Flash screen on Golden Cookie/Season Popup'};
 CM.ConfigData.Sound = {label: ['Sounds OFF', 'Sounds ON'], desc: 'Play a sound on Golden Cookie/Season Popup'};
 CM.ConfigData.Volume = {label: [], desc: 'Volume of the sound'};
@@ -107,15 +115,17 @@ for (var i = 0; i < 101; i++) {
 	CM.ConfigData.Volume.label[i] = i + '%';
 }
 CM.ConfigData.GCSoundURL = {label: 'Golden Cookie Sound URL:', desc: 'URL of the sound to be played when a Golden Cookie spawns'};
-CM.ConfigData.SeaSoundURL = {label: 'Season Special Sound URL:', desc: 'URL of the sound to be played when a Season Special spawns', func: function() {CM.Disp.ToggleGCTimer();}};
+CM.ConfigData.SeaSoundURL = {label: 'Season Special Sound URL:', desc: 'URL of the sound to be played when a Season Special spawns'};
 CM.ConfigData.GCTimer = {label: ['Golden Cookie Timer OFF', 'Golden Cookie Timer ON'], desc: 'A timer on the Golden Cookie when it has been spawned', func: function() {CM.Disp.ToggleGCTimer();}};
 CM.ConfigData.Title = {label: ['Title OFF', 'Title ON'], desc: 'Update title with Golden Cookie/Season Popup timers'};
 CM.ConfigData.Tooltip = {label: ['Tooltip Information OFF', 'Tooltip Information ON'], desc: 'Extra information in tooltip for buildings/upgrades'};
+CM.ConfigData.TooltipAmor = {label: ['Tooltip Amortization Information OFF', 'Tooltip Amortization Information ON'], desc: 'Add amortization information to buildings tooltip'};
 CM.ConfigData.ToolWarnCaut = {label: ['Tooltip Warning/Caution OFF', 'Tooltip Warning/Caution ON'], desc: 'A warning/caution when buying if it will put the bank under the amount needed for max "Lucky!"/"Lucky!" (Frenzy) rewards', func: function() {CM.Disp.ToggleToolWarnCaut();}};
 CM.ConfigData.ToolWarnCautPos = {label: ['Tooltip Warning/Caution Position (Left)', 'Tooltip Warning/Caution Position (Bottom)'], desc: 'Placement of the warning/caution boxes', func: function() {CM.Disp.ToggleToolWarnCautPos();}};
+CM.ConfigData.ToolWarnCautBon = {label: ['Calculate Tooltip Warning/Caution With Bonus CPS OFF', 'Calculate Tooltip Warning/Caution With Bonus CPS ON'], desc: 'Calculate the warning/caution with or without the bonus CPS you get from buying'};
 CM.ConfigData.ToolWrink = {label: ['Wrinkler Tooltip OFF', 'Wrinkler Tooltip ON'], desc: 'Shows the amount of cookies a wrinkler will give when popping it'};
 CM.ConfigData.Stats = {label: ['Statistics OFF', 'Statistics ON'], desc: 'Extra Cookie Monster statistics!'};
-CM.ConfigData.UpStats = {label: ['Statistics Update Rate (Default)', 'Statistics Update Rate (1s)'], desc: 'Default Game rate is once every 3 seconds'};
+CM.ConfigData.UpStats = {label: ['Statistics Update Rate (Default)', 'Statistics Update Rate (1s)'], desc: 'Default Game rate is once every 5 seconds'};
 CM.ConfigData.SayTime = {label: ['Format Time OFF', 'Format Time ON'], desc: 'Change how time is displayed in statistics', func: function() {CM.Disp.ToggleSayTime();}};
 CM.ConfigData.Scale = {label: ['Game\'s Setting Scale', 'Metric', 'Short Scale', 'Scientific Notation'], desc: 'Change how long numbers are handled', func: function() {CM.Disp.RefreshScale();}};

--- a/src/Disp.js
+++ b/src/Disp.js
@@ -25,15 +25,15 @@ CM.Disp.FormatTime = function(time, format) {
 	return str;
 }

-CM.Disp.GetTimeColor = function(price) {
+CM.Disp.GetTimeColor = function(price, bank, cps) {
 	var color;
 	var text;
-	if (Game.cookies >= price) {
+	if (bank >= price) {
 		color = CM.Disp.colorGreen;
 		text = 'Done!';
 	}
 	else {
-		var time = (price - Game.cookies) / (Game.cookiesPs * (1 - Game.cpsSucked));
+		var time = (price - bank) / cps;
 		text = CM.Disp.FormatTime(time);
 		if (time > 300) {
 			color =  CM.Disp.colorRed;
@@ -48,7 +48,7 @@ CM.Disp.GetTimeColor = function(price) {
 	return {text: text, color: color};
 }

-CM.Disp.Beautify = function(num) {
+CM.Disp.Beautify = function(num, frac) {
 	if (CM.Config.Scale != 0 && isFinite(num)) {
 		var answer = '';
 		var negative = false;
@@ -72,7 +72,7 @@ CM.Disp.Beautify = function(num) {
 			}
 		}
 		if (answer == '') {
-			answer = CM.Backup.Beautify(num);
+			answer = CM.Backup.Beautify(num, frac);
 		}
 		
 		if (negative) {
@@ -81,7 +81,7 @@ CM.Disp.Beautify = function(num) {
 		return answer;
 	}
 	else {
-		return CM.Backup.Beautify(num);
+		return CM.Backup.Beautify(num, frac);
 	}
 }

@@ -96,6 +96,20 @@ CM.Disp.GetConfigDisplay = function(config) {
 	return CM.ConfigData[config].label[CM.Config[config]];
 }

+CM.Disp.AddJscolor = function() {
+	CM.Disp.Jscolor = document.createElement('script');
+	CM.Disp.Jscolor.type = 'text/javascript';
+	CM.Disp.Jscolor.setAttribute('src', 'http://aktanusa.github.io/CookieMonster/jscolor/jscolor.js');
+	document.head.appendChild(CM.Disp.Jscolor);
+}
+
+CM.Disp.CreateCssArea = function() {
+	CM.Disp.Css = document.createElement('style');
+	CM.Disp.Css.type = 'text/css';
+
+	document.head.appendChild(CM.Disp.Css);
+}
+
 CM.Disp.CreateBotBar = function() {
 	CM.Disp.BotBar = document.createElement('div');
 	CM.Disp.BotBar.id = 'CMBotBar';
@@ -122,7 +136,7 @@ CM.Disp.CreateBotBar = function() {
 	var firstCol = function(text, color) {
 		var td = document.createElement('td');
 		td.style.textAlign = 'right';
-		td.style.color = color;
+		td.className = CM.Disp.colorTextPre + color;
 		td.textContent = text;
 		return td;
 	}
@@ -145,7 +159,7 @@ CM.Disp.CreateBotBar = function() {
 		var header = document.createElement('td');
 		header.appendChild(document.createTextNode((i.indexOf(' ') != -1 ? i.substring(0, i.indexOf(' ')) : i) + ' ('));
 		var span = document.createElement('span');
-		span.style.color = CM.Disp.colorBlue;
+		span.className = CM.Disp.colorTextPre + CM.Disp.colorBlue;
 		header.appendChild(span);
 		header.appendChild(document.createTextNode(')'));
 		type.appendChild(header);
@@ -179,7 +193,7 @@ CM.Disp.UpdateBotBarOther = function() {
 			count++;
 			CM.Disp.BotBar.firstChild.firstChild.childNodes[0].childNodes[count].childNodes[1].textContent = Game.Objects[i].amount;
 			CM.Disp.BotBar.firstChild.firstChild.childNodes[1].childNodes[count].textContent = Beautify(CM.Cache.Objects[i].bonus, 2);
-			CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].style.color = CM.Cache.Objects[i].color;
+			CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].className = CM.Disp.colorTextPre + CM.Cache.Objects[i].color;
 			CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].textContent = Beautify(CM.Cache.Objects[i].bci, 2);
 		}
 	}
@@ -191,8 +205,8 @@ CM.Disp.UpdateBotBarTime = function() {
 	
 		for (var i in CM.Cache.Objects) {
 			count++;
-			var timeColor = CM.Disp.GetTimeColor(Game.Objects[i].getPrice());
-			CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].style.color = timeColor.color;
+			var timeColor = CM.Disp.GetTimeColor(Game.Objects[i].getPrice(), Game.cookies, (Game.cookiesPs * (1 - Game.cpsSucked)));
+			CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].className = CM.Disp.colorTextPre + timeColor.color;
 			CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].textContent = timeColor.text;
 		}
 	}
@@ -203,9 +217,7 @@ CM.Disp.CreateTimerBar = function() {
 	CM.Disp.TimerBar.id = 'CMTimerBar';
 	CM.Disp.TimerBar.style.position = 'absolute';
 	CM.Disp.TimerBar.style.display = 'none';
-	CM.Disp.TimerBar.style.bottom = '0px';
 	CM.Disp.TimerBar.style.height = '48px';
-	CM.Disp.TimerBar.style.width = '100%';
 	CM.Disp.TimerBar.style.fontSize = '10px';
 	CM.Disp.TimerBar.style.fontWeight = 'bold';
 	CM.Disp.TimerBar.style.backgroundColor = 'black';
@@ -224,7 +236,7 @@ CM.Disp.CreateTimerBar = function() {
 		var type = document.createElement('span');
 		type.style.display = 'inline-block';
 		type.style.textAlign = 'right';
-		type.style.width = '71px';
+		type.style.width = '78px';
 		type.style.marginRight = '5px';
 		type.style.verticalAlign = 'text-top';
 		type.textContent = name;
@@ -235,8 +247,12 @@ CM.Disp.CreateTimerBar = function() {
 			colorBar.id = bars[i].id
 			colorBar.style.display = 'inline-block';
 			colorBar.style.height = '10px';
-			if (bars[i].color != undefined) {
-				colorBar.style.backgroundColor = bars[i].color;
+			if (bars.length - 1 == i) {
+				colorBar.style.borderTopRightRadius = '10px';
+				colorBar.style.borderBottomRightRadius = '10px';
+			}
+			if (typeof bars[i].color !== 'undefined') {
+				colorBar.className = CM.Disp.colorBackPre + bars[i].color;
 			}
 			div.appendChild(colorBar);
 		}
@@ -279,7 +295,8 @@ CM.Disp.CreateTimerBar = function() {
 	CM.Disp.TimerBarCF.style.height = '12px';
 	CM.Disp.TimerBarCF.style.margin = '0px 10px';
 	CM.Disp.TimerBarCF.style.position = 'relative';
-	CM.Disp.TimerBarCF.appendChild(bar('Click Frenzy', [{id: 'CMTimerBarCFBar', color: CM.Disp.colorBlue}], 'CMTimerBarCFTime'));
+	CM.Disp.TimerBarCF.appendChild(bar('', [{id: 'CMTimerBarCFBar'}], 'CMTimerBarCFTime'));
+	CM.Disp.TimerBarCF.firstChild.firstChild.id = 'CMTimerBarCFType';
 	CM.Disp.TimerBar.appendChild(CM.Disp.TimerBarCF);
 	
 	l('wrapper').appendChild(CM.Disp.TimerBar);
@@ -295,15 +312,37 @@ CM.Disp.ToggleTimerBar = function() {
 	CM.Disp.UpdateBotTimerBarDisplay();
 }

+CM.Disp.ToggleTimerBarPos = function() {
+	if (CM.Config.TimerBarPos == 0) {
+		CM.Disp.TimerBar.style.width = '30%';
+		CM.Disp.TimerBar.style.bottom = '';
+		l('game').insertBefore(CM.Disp.TimerBar, l('sectionLeft'));
+	}
+	else {
+		CM.Disp.TimerBar.style.width = '100%';
+		CM.Disp.TimerBar.style.bottom = '0px';
+		l('wrapper').appendChild(CM.Disp.TimerBar);
+	}
+	CM.Disp.UpdateBotTimerBarDisplay();
+}
+
 CM.Disp.UpdateTimerBar = function() {
 	if (CM.Config.TimerBar == 1) {
-		// label width: 76	timer width: 26 div margin: 20
-		var maxWidth = CM.Disp.TimerBar.offsetWidth - 122;
+		// label width: 83	timer width: 26 div margin: 20
+		var maxWidth = CM.Disp.TimerBar.offsetWidth - 129;
 		var count = 0;
 		
 		if (Game.goldenCookie.life <= 0 && Game.goldenCookie.toDie == 0) {
 			CM.Disp.TimerBarGC.style.display = '';
 			l('CMTimerBarGCMinBar').style.width = Math.round(Math.max(0, Game.goldenCookie.minTime - Game.goldenCookie.time) * maxWidth / Game.goldenCookie.maxTime) + 'px';
+			if (Game.goldenCookie.minTime == Game.goldenCookie.maxTime) {
+				l('CMTimerBarGCMinBar').style.borderTopRightRadius = '10px';
+				l('CMTimerBarGCMinBar').style.borderBottomRightRadius = '10px';
+			}
+			else {
+				l('CMTimerBarGCMinBar').style.borderTopRightRadius = '';
+				l('CMTimerBarGCMinBar').style.borderBottomRightRadius = '';
+			}
 			l('CMTimerBarGCBar').style.width = Math.round(Math.min(Game.goldenCookie.maxTime - Game.goldenCookie.minTime, Game.goldenCookie.maxTime - Game.goldenCookie.time) * maxWidth / Game.goldenCookie.maxTime) + 'px';
 			l('CMTimerBarGCTime').textContent = Math.ceil((Game.goldenCookie.maxTime - Game.goldenCookie.time) / Game.fps);
 			count++;
@@ -327,15 +366,19 @@ CM.Disp.UpdateTimerBar = function() {
 			CM.Disp.TimerBarFren.style.display = '';
 			if (Game.frenzyPower == 7) {
 				l('CMTimerBarFrenType').textContent = 'Frenzy';
-				l('CMTimerBarFrenBar').style.backgroundColor = CM.Disp.colorYellow;
+				l('CMTimerBarFrenBar').className = CM.Disp.colorBackPre + CM.Disp.colorYellow;
 			}
 			else if (Game.frenzyPower == 0.5) {
 				l('CMTimerBarFrenType').textContent = 'Clot';
-				l('CMTimerBarFrenBar').style.backgroundColor = CM.Disp.colorRed;
+				l('CMTimerBarFrenBar').className = CM.Disp.colorBackPre + CM.Disp.colorRed;
+			}
+			else if (Game.frenzyPower == 15) {
+				l('CMTimerBarFrenType').textContent = 'Dragon Harvest';
+				l('CMTimerBarFrenBar').className = CM.Disp.colorBackPre + CM.Disp.colorPurple;
 			}
 			else {
 				l('CMTimerBarFrenType').textContent = 'Blood Frenzy';
-				l('CMTimerBarFrenBar').style.backgroundColor = CM.Disp.colorGreen;
+				l('CMTimerBarFrenBar').className = CM.Disp.colorBackPre + CM.Disp.colorGreen;
 			}
 			l('CMTimerBarFrenBar').style.width = Math.round(Game.frenzy * maxWidth / Game.frenzyMax) + 'px';
 			l('CMTimerBarFrenTime').textContent = Math.ceil(Game.frenzy / Game.fps);
@@ -347,6 +390,14 @@ CM.Disp.UpdateTimerBar = function() {
 		
 		if (Game.clickFrenzy > 0) {
 			CM.Disp.TimerBarCF.style.display = '';
+			if (Game.clickFrenzyPower == 777) {
+				l('CMTimerBarCFType').textContent = 'Click Frenzy';
+				l('CMTimerBarCFBar').className = CM.Disp.colorBackPre + CM.Disp.colorBlue;
+			}
+			else {
+				l('CMTimerBarCFType').textContent = 'Dragonflight';
+				l('CMTimerBarCFBar').className = CM.Disp.colorBackPre + CM.Disp.colorPurple;
+			}
 			l('CMTimerBarCFBar').style.width = Math.round(Game.clickFrenzy * maxWidth / Game.clickFrenzyMax) + 'px';
 			l('CMTimerBarCFTime').textContent = Math.ceil(Game.clickFrenzy / Game.fps);
 			count++;
@@ -366,7 +417,7 @@ CM.Disp.UpdateTimerBar = function() {
 }

 CM.Disp.UpdateBotTimerBarDisplay = function() {
-	if (CM.Config.BotBar == 1 && CM.Config.TimerBar == 1) {
+	if (CM.Config.BotBar == 1 && CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 1) {
 		CM.Disp.BotBar.style.bottom = '48px';
 		l('game').style.bottom = '104px';
 	}
@@ -374,20 +425,27 @@ CM.Disp.UpdateBotTimerBarDisplay = function() {
 		CM.Disp.BotBar.style.bottom = '0px';
 		l('game').style.bottom = '56px';
 	}
-	else if (CM.Config.TimerBar == 1) {
+	else if (CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 1) {
 		l('game').style.bottom = '48px';
 	}
 	else { // No bars
 		l('game').style.bottom = '0px';
 	}
 	
+	if (CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 0) {
+		l('sectionLeft').style.top = '48px';
+	}
+	else {
+		l('sectionLeft').style.top = '';
+	}
+	
 	CM.Disp.UpdateBackground();
 }

 CM.Disp.UpdateBuildings = function() {
 	if (CM.Config.BuildColor == 1) {
 		for (var i in CM.Cache.Objects) {
-			l('productPrice' + Game.Objects[i].id).style.color = CM.Cache.Objects[i].color;
+			l('productPrice' + Game.Objects[i].id).style.color = CM.Config.Colors[CM.Cache.Objects[i].color];
 		}
 	}
 	else {
@@ -421,7 +479,7 @@ CM.Disp.CreateUpgradeBar = function() {
 		var div = document.createElement('div');
 		div.style.verticalAlign = 'middle';
 		var span = document.createElement('span');
-		span.style.backgroundColor = color;
+		span.className = CM.Disp.colorBackPre + color;
 		span.style.display = 'inline-block';
 		span.style.height = '10px';
 		span.style.width = '10px';
@@ -445,7 +503,7 @@ CM.Disp.CreateUpgradeBar = function() {
 	var upgradeNumber = function(id, color) {
 		var span = document.createElement('span');
 		span.id = id;
-		span.style.color = color;
+		span.className = CM.Disp.colorTextPre + color;
 		span.style.width = '14.28571428571429%';
 		span.style.display = 'inline-block';
 		span.textContent = '0';
@@ -474,6 +532,7 @@ CM.Disp.ToggleUpBarColor = function() {
 }

 CM.Disp.UpdateUpgrades = function() {
+	if (CM.Config.UpBarColor == 1) {
 		var blue = 0;
 		var green = 0;
 		var yellow = 0;
@@ -484,14 +543,19 @@ CM.Disp.UpdateUpgrades = function() {

 		for (var i in Game.UpgradesInStore) {
 			var me = Game.UpgradesInStore[i];
-		if (l('upgrade' + i).childNodes.length > 0) {
-			l('upgrade' + i).childNodes[0].style.backgroundColor = CM.Cache.Upgrades[me.name].color;
+			var addedColor = false;
+			for (var j = 0; j < l('upgrade' + i).childNodes.length; j++) {
+				if (l('upgrade' + i).childNodes[j].className.indexOf(CM.Disp.colorBackPre) != -1) {
+					l('upgrade' + i).childNodes[j].className = CM.Disp.colorBackPre + CM.Cache.Upgrades[me.name].color;
+					addedColor = true;
+					break;
 				}
-		else {
+			}
+			if (!addedColor) {
 				var div = document.createElement('div');
-			div.style.width = '17px';
-			div.style.height = '17px';
-			div.style.backgroundColor = CM.Cache.Upgrades[me.name].color;
+				div.style.width = '10px';
+				div.style.height = '10px';
+				div.className = CM.Disp.colorBackPre + CM.Cache.Upgrades[me.name].color;
 				l('upgrade' + i).appendChild(div);
 			}
 			if (CM.Cache.Upgrades[me.name].color == CM.Disp.colorBlue) blue++;
@@ -511,6 +575,22 @@ CM.Disp.UpdateUpgrades = function() {
 		l('CMUpgradeBarRed').textContent = red;
 		l('CMUpgradeBarPurple').textContent = purple;
 		l('CMUpgradeBarGray').textContent = gray;
+	}
+}
+
+CM.Disp.UpdateColors = function() {
+	var str = '';
+	for (var i = 0; i < CM.Disp.colors.length; i++) {
+		str += '.' + CM.Disp.colorTextPre + CM.Disp.colors[i] + ' { color: ' + CM.Config.Colors[CM.Disp.colors[i]] + '; }';
+	}
+	for (var i = 0; i < CM.Disp.colors.length; i++) {
+		str += '.' + CM.Disp.colorBackPre + CM.Disp.colors[i] + ' { background-color: ' + CM.Config.Colors[CM.Disp.colors[i]] + '; }';
+	}
+	for (var i = 0; i < CM.Disp.colors.length; i++) {
+		str += '.' + CM.Disp.colorBorderPre + CM.Disp.colors[i] + ' { border: 1px solid ' + CM.Config.Colors[CM.Disp.colors[i]] + '; }';
+	}
+	CM.Disp.Css.textContent = str;
+	CM.Disp.UpdateBuildings(); // Class has been already set
 }

 CM.Disp.CreateWhiteScreen = function() {
@@ -620,9 +700,13 @@ CM.Disp.UpdateTitle = function() {
 		var titleGC;
 		var titleSP;
 		if (l('goldenCookie').style.display != 'none') {
-			addGC = true;
+			if (Game.goldenCookie.wrath) {
+				titleGC = '[W ' +  Math.ceil(Game.goldenCookie.life / Game.fps) + ']';
+			}
+			else {
 				titleGC = '[G ' +  Math.ceil(Game.goldenCookie.life / Game.fps) + ']';
 			}
+		}
 		else {
 			titleGC = '[' +  Math.ceil((Game.goldenCookie.maxTime - Game.goldenCookie.time) / Game.fps) + ']';
 		}
@@ -657,6 +741,18 @@ CM.Disp.CreateResetTooltip = function() {
 	CM.Disp.ResetTooltipPlaceholder.appendChild(resetTitleDesc);
 }

+CM.Disp.CreateChoEggTooltip = function() {
+	CM.Disp.ChoEggTooltipPlaceholder = document.createElement('div');
+	var choEggTitleDesc = document.createElement('div');
+	choEggTitleDesc.style.minWidth = '240px';
+	choEggTitleDesc.style.marginBottom = '4px';
+	var div = document.createElement('div');
+	div.style.textAlign = 'left';
+	div.textContent = 'The amount of cookies you would get from selling all buildings, popping all wrinklers, and then buying Chocolate egg';
+	choEggTitleDesc.appendChild(div);
+	CM.Disp.ChoEggTooltipPlaceholder.appendChild(choEggTitleDesc);
+}
+
 CM.Disp.AddMenuPref = function(title) {
 	var header = function(text) {
 		var div = document.createElement('div');
@@ -717,8 +813,25 @@ CM.Disp.AddMenuPref = function(title) {
 	frag.appendChild(header('Bars/Colors'));
 	frag.appendChild(listing('BotBar'));
 	frag.appendChild(listing('TimerBar'));
+	frag.appendChild(listing('TimerBarPos'));
 	frag.appendChild(listing('BuildColor'));
 	frag.appendChild(listing('UpBarColor'));
+	for (var i = 0; i < CM.Disp.colors.length; i++) {
+		var div = document.createElement('div');
+		div.className = 'listing';
+		var input = document.createElement('input');
+		input.id = CM.ConfigPrefix + 'Color' + CM.Disp.colors[i];
+		input.className = 'option';
+		input.style.width = '65px';
+		input.value = CM.Config.Colors[CM.Disp.colors[i]];
+		div.appendChild(input);
+		eval('var change = function() {CM.Config.Colors[\'' + CM.Disp.colors[i] + '\'] = l(CM.ConfigPrefix + \'Color\' + \'' + CM.Disp.colors[i] + '\').value; CM.Disp.UpdateColors(); CM.SaveConfig(CM.Config);}');
+		var jscolorpicker = new jscolor.color(input, {hash: true, caps: false, pickerZIndex: 1000000, pickerPosition: 'right', onImmediateChange: change});
+		var label = document.createElement('label');
+		label.textContent = CM.ConfigData.Colors.desc[CM.Disp.colors[i]];
+		div.appendChild(label);
+		frag.appendChild(div);
+	}
 	
 	frag.appendChild(header('Golden Cookie/Season Popup Emphasis'));
 	frag.appendChild(listing('Flash'));
@@ -751,8 +864,10 @@ CM.Disp.AddMenuPref = function(title) {
 	
 	frag.appendChild(header('Tooltip'));
 	frag.appendChild(listing('Tooltip'));
+	frag.appendChild(listing('TooltipAmor'));
 	frag.appendChild(listing('ToolWarnCaut'));
 	frag.appendChild(listing('ToolWarnCautPos'));
+	frag.appendChild(listing('ToolWarnCautBon'));
 	frag.appendChild(listing('ToolWrink'));
 	
 	frag.appendChild(header('Statistics'));
@@ -774,7 +889,7 @@ CM.Disp.AddMenuPref = function(title) {
 	l('menu').childNodes[2].insertBefore(frag, l('menu').childNodes[2].childNodes[l('menu').childNodes[2].childNodes.length - 1]);
 		
 	CM.Disp.FormatButtonOnClickBak = l('formatButton').onclick;
-	l('formatButton').onclick = function() {Game.Toggle('format', 'formatButton', 'Short numbers OFF', 'Short numbers ON'); CM.Disp.RefreshScale();};
+	l('formatButton').onclick = function() {Game.Toggle('format', 'formatButton', 'Short numbers OFF', 'Short numbers ON', '1'); PlaySound('snd/tick.mp3'); CM.Disp.RefreshScale();};
 }

 CM.Disp.AddMenuStats = function(title) {
@@ -826,12 +941,12 @@ CM.Disp.AddMenuStats = function(title) {
 		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 luckyCur = Math.min(Game.cookies * 0.15, Game.cookiesPs * 60 * 15) + 13;
 	
 		var luckyReqFrag = document.createDocumentFragment();
 		var luckyReqSpan = document.createElement('span');
 		luckyReqSpan.style.fontWeight = 'bold';
-		luckyReqSpan.style.color = luckyColor;
+		luckyReqSpan.className = CM.Disp.colorTextPre + luckyColor;
 		luckyReqSpan.textContent = Beautify(CM.Cache.Lucky);
 		luckyReqFrag.appendChild(luckyReqSpan);
 		if (luckyTime != '') {
@@ -843,7 +958,7 @@ CM.Disp.AddMenuStats = function(title) {
 		var luckyReqFrenFrag = document.createDocumentFragment();
 		var luckyReqFrenSpan = document.createElement('span');
 		luckyReqFrenSpan.style.fontWeight = 'bold';
-		luckyReqFrenSpan.style.color = luckyColorFrenzy;
+		luckyReqFrenSpan.className = CM.Disp.colorTextPre + luckyColorFrenzy;
 		luckyReqFrenSpan.textContent = Beautify(CM.Cache.LuckyFrenzy);
 		luckyReqFrenFrag.appendChild(luckyReqFrenSpan);
 		if (luckyTimeFrenzy != '') {
@@ -863,14 +978,14 @@ CM.Disp.AddMenuStats = function(title) {
 		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;
 		var chainTimeFrenzy = (Game.cookies < CM.Cache.ChainFrenzy) ? CM.Disp.FormatTime((CM.Cache.ChainFrenzy - Game.cookies) / (Game.cookiesPs * (1 - Game.cpsSucked))) : '';
-		var chainCurMax = Math.min(Game.cookiesPs * 60 * 60 * 3, Game.cookies * 0.25);
+		var chainCurMax = Math.min(Game.cookiesPs * 60 * 60 * 6, Game.cookies * 0.25);
 		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.className = CM.Disp.colorTextPre + chainColor;
 		chainReqSpan.textContent = Beautify(CM.Cache.Chain);
 		chainReqFrag.appendChild(chainReqSpan);
 		if (chainTime != '') {
@@ -882,7 +997,7 @@ CM.Disp.AddMenuStats = function(title) {
 		var chainReqFrenFrag = document.createDocumentFragment();
 		var chainReqFrenSpan = document.createElement('span');
 		chainReqFrenSpan.style.fontWeight = 'bold';
-		chainReqFrenSpan.style.color = chainColorFrenzy;
+		chainReqFrenSpan.className = CM.Disp.colorTextPre + chainColorFrenzy;
 		chainReqFrenSpan.textContent = Beautify(CM.Cache.ChainFrenzy);
 		chainReqFrenFrag.appendChild(chainReqFrenSpan);
 		if (chainTimeFrenzy != '') {
@@ -899,25 +1014,22 @@ CM.Disp.AddMenuStats = function(title) {
 		stats.appendChild(listing('\"Chain\" Reward (CUR) (Wrath)',  document.createTextNode(Beautify(chainCurWrath))));
 	}
 	
-	stats.appendChild(header('Heavenly Chips', 'HC'));
+	// Useless for now; cleanup later
+	/*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 neededCook = Game.HowManyCookiesReset(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));
+		// Remove all chip stats?
+		//hcCurFrag.appendChild(document.createTextNode(Beautify(Game.heavenlyChipsEarned)));
+		//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))));
+		// Unneeded? 
 		var resetTitleFrag = document.createDocumentFragment();
 		resetTitleFrag.appendChild(document.createTextNode('Reset Bonus Income '))
 		var resetTitleSpan = document.createElement('span');
@@ -944,19 +1056,35 @@ CM.Disp.AddMenuStats = function(title) {
 			resetSmall.textContent = ' (' + (increase / 100) + '% of income)';
 			resetFrag.appendChild(resetSmall);
 		}
-		stats.appendChild(listing(resetTitleFrag, resetFrag));
-	}
+		//stats.appendChild(listing(resetTitleFrag, resetFrag));
+	}*/
+	
+	var choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')); // Needs to be done for the checking below
 	
 	if (Game.cpsSucked > 0) {
 		stats.appendChild(header('Wrinklers', 'Wrink'));
-		if (CM.Config.StatsPref.Wrink) {
-			var sucked = 0;
+		if (CM.Config.StatsPref.Wrink || (CM.Config.StatsPref.Sea && choEgg)) {
+			var totalSucked = 0;
 			for (var i in Game.wrinklers) {
-				sucked += Game.wrinklers[i].sucked;
-			}
-			sucked *= 1.1;
+				var sucked = Game.wrinklers[i].sucked;
+				var toSuck = 1.1;
+				if (Game.Has('Sacrilegious corruption')) toSuck *= 1.05;
+				if (Game.wrinklers[i].type==1) toSuck *= 3; //shiny wrinklers are an elusive, profitable breed
+				sucked *= toSuck;
 				if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
-			stats.appendChild(listing('Rewards of Popping',  document.createTextNode(Beautify(sucked))));
+				totalSucked += sucked;
+			}
+			
+			if (CM.Config.StatsPref.Wrink) {
+				var popAllFrag = document.createDocumentFragment();
+				popAllFrag.appendChild(document.createTextNode(Beautify(totalSucked) + ' '));
+				var popAllA = document.createElement('a');
+				popAllA.textContent = 'Pop All';
+				popAllA.className = 'option';
+				popAllA.onclick = function() {Game.CollectWrinklers();};
+				popAllFrag.appendChild(popAllA);
+				stats.appendChild(listing('Rewards of Popping',  popAllFrag));
+			}
 		}
 	}
 	
@@ -996,7 +1124,8 @@ CM.Disp.AddMenuStats = function(title) {
 			specDisp = true;
 		}
 	}
-	if (Game.season == 'christmas' || specDisp) {
+	
+	if (Game.season == 'christmas' || specDisp || choEgg) {
 		stats.appendChild(header('Season Specials', 'Sea'));
 		if (CM.Config.StatsPref.Sea) {
 			if (specDisp) {
@@ -1045,6 +1174,31 @@ CM.Disp.AddMenuStats = function(title) {
 			}

 			if (Game.season == 'christmas') stats.appendChild(listing('Reindeer Reward',  document.createTextNode(Beautify(CM.Cache.SeaSpec))));
+			if (choEgg) {
+				var choEggTitleFrag = document.createDocumentFragment();
+				choEggTitleFrag.appendChild(document.createTextNode('Chocolate Egg Cookies '))
+				var choEggTitleSpan = document.createElement('span');
+				choEggTitleSpan.onmouseout = function() { Game.tooltip.hide(); };
+				choEggTitleSpan.onmouseover = function() {Game.tooltip.draw(this, escape(CM.Disp.ChoEggTooltipPlaceholder.innerHTML));};
+				choEggTitleSpan.style.cursor = 'default';
+				choEggTitleSpan.style.display = 'inline-block';
+				choEggTitleSpan.style.height = '10px';
+				choEggTitleSpan.style.width = '10px';
+				choEggTitleSpan.style.borderRadius = '5px';
+				choEggTitleSpan.style.textAlign = 'center';
+				choEggTitleSpan.style.backgroundColor = '#C0C0C0';
+				choEggTitleSpan.style.color = 'black';
+				choEggTitleSpan.style.fontSize = '9px';
+				choEggTitleSpan.style.verticalAlign = 'bottom';
+				choEggTitleSpan.textContent = '?';
+				choEggTitleFrag.appendChild(choEggTitleSpan);
+				var choEggTotal = Game.cookies + CM.Cache.SellAllTotal;
+				if (Game.cpsSucked > 0) {
+					choEggTotal += sucked;
+				}
+				choEggTotal *= 0.05;
+				stats.appendChild(listing(choEggTitleFrag, document.createTextNode(Beautify(choEggTotal))));
+			}
 		}
 	}

@@ -1054,8 +1208,7 @@ CM.Disp.AddMenuStats = function(title) {
 CM.Disp.AddMenu = function() {
 	var title = function() {
 		var div = document.createElement('div');
-		div.className = 'title';
-		div.style.color = CM.Disp.colorBlue;
+		div.className = 'title ' + CM.Disp.colorTextPre + CM.Disp.colorBlue;
 		div.textContent = 'Cookie Monster Goodies';
 		return div;
 	}
@@ -1069,15 +1222,19 @@ CM.Disp.AddMenu = function() {
 }

 CM.Disp.RefreshMenu = function() {
-	if (CM.Config.UpStats && Game.onMenu == 'stats' && Game.drawT % (Game.fps * 3) != 0 && Game.drawT % Game.fps == 0) Game.UpdateMenu();
+	if (CM.Config.UpStats && Game.onMenu == 'stats' && Game.drawT % (Game.fps * 5) != 0 && Game.drawT % Game.fps == 0) Game.UpdateMenu();
 }

 CM.Disp.UpdateTooltipLocation = function() {
-	Game.tooltip.tta.style.top = Math.max(0, Math.min((l('game').clientHeight + l('topBar').clientHeight) - Game.tooltip.tt.clientHeight - CM.Disp.TooltipWarnCaut.clientHeight - 64, Game.mouseY - 48)) + 'px';
-	if (Game.tooltip.origin == 'wrink') {
-		Game.tooltip.tta.style.left = (Game.mouseX + l('tooltip').offsetWidth + 25) + 'px';
-		Game.tooltip.tta.style.right = 'auto';
+	if (Game.tooltip.origin == 'store') {
+		var warnCautOffset = 0;
+		if (CM.Config.ToolWarnCaut == 1 && CM.Config.ToolWarnCautPos == 1) warnCautOffset = CM.Disp.TooltipWarnCaut.clientHeight - 4;
+		Game.tooltip.tta.style.top = Math.min(parseInt(Game.tooltip.tta.style.top), (l('game').clientHeight + l('topBar').clientHeight) - Game.tooltip.tt.clientHeight - warnCautOffset - 46) + 'px';
 	}
+	// Kept for future possible use if the code changes again
+	/*else if (!Game.onCrate && !Game.OnAscend && CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 0) {
+		//Game.tooltip.tta.style.top = (parseInt(Game.tooltip.tta.style.top) + parseInt(CM.Disp.TimerBar.style.height)) + 'px';
+	}*/
 }

 CM.Disp.CreateTooltipWarnCaut = function() {
@@ -1096,13 +1253,13 @@ CM.Disp.CreateTooltipWarnCaut = function() {
 		box.style.MsTransition = 'opacity 0.1s ease-out';
 		box.style.OTransition = 'opacity 0.1s ease-out';
 		box.style.transition = 'opacity 0.1s ease-out';
-		box.style.border = '1px solid ' + color;
+		box.className = CM.Disp.colorBorderPre + color;
 		box.style.padding = '2px';
 		box.style.background = '#000 url(img/darkNoise.png)';
 		var labelDiv = document.createElement('div');
 		box.appendChild(labelDiv);
 		var labelSpan = document.createElement('span');
-		labelSpan.style.color = color;
+		labelSpan.className = CM.Disp.colorTextPre + color;
 		labelSpan.style.fontWeight = 'bold';
 		labelSpan.textContent = labelTextFront;
 		labelDiv.appendChild(labelSpan);
@@ -1133,11 +1290,13 @@ CM.Disp.ToggleToolWarnCaut = function() {

 CM.Disp.ToggleToolWarnCautPos = function() {
 	if (CM.Config.ToolWarnCautPos == 0) {
-		CM.Disp.TooltipWarnCaut.style.top = '12px';
+		CM.Disp.TooltipWarnCaut.style.top = 'auto';
+		CM.Disp.TooltipWarnCaut.style.margin = '4px -4px';
 		CM.Disp.TooltipWarnCaut.style.padding = '3px 4px';
 	}
 	else {
-		CM.Disp.TooltipWarnCaut.style.right = '12px';
+		CM.Disp.TooltipWarnCaut.style.right = 'auto';
+		CM.Disp.TooltipWarnCaut.style.margin = '4px';
 		CM.Disp.TooltipWarnCaut.style.padding = '4px 3px';
 	}
 }
@@ -1148,7 +1307,7 @@ CM.Disp.AddTooltipBuild = function() {
 		var me = Game.Objects[i];
 		if (l('product' + me.id).onmouseover != null) {
 			CM.Disp.TooltipBuildBack[i] = l('product' + me.id).onmouseover;
-			eval('l(\'product\' + me.id).onmouseover = function() {Game.tooltip.draw(this, function() {return CM.Disp.Tooltip(\'b\', \'' + i + '\');}, \'store\');}');
+			eval('l(\'product\' + me.id).onmouseover = function() {Game.tooltip.dynamic = 1; Game.tooltip.draw(this, function() {return CM.Disp.Tooltip(\'b\', \'' + i + '\');}, \'store\'); Game.tooltip.wobble();}');
 		}
 	}
 }
@@ -1159,28 +1318,46 @@ CM.Disp.AddTooltipUpgrade = function() {
 		var me = Game.UpgradesInStore[i];
 		if (l('upgrade' + i).onmouseover != null) {
 			CM.Disp.TooltipUpgradeBack[i] = l('upgrade' + i).onmouseover;
-			eval('l(\'upgrade\' + i).onmouseover = function() {CM.Disp.Tooltip(\'u\', \'' + i + '\');}');
+			eval('l(\'upgrade\' + i).onmouseover = function() {if (!Game.mouseDown) {Game.setOnCrate(this); Game.tooltip.dynamic = 1; Game.tooltip.draw(this, function() {return CM.Disp.Tooltip(\'u\', \'' + i + '\');}, \'store\'); Game.tooltip.wobble();}}');
 		}
 	}
 }

-CM.Disp.AddTooltipBuild10 = function() {
+CM.Disp.AddTooltipBuildExtra = function() {
 	for (var i in Game.Objects) {
 		var me = Game.Objects[i];
 		l('buttonBuy10-' + me.id).onmouseover = function() {CM.Disp.TooltipBuy10 = true;};
 		l('buttonBuy10-' + me.id).onmouseout = function() {CM.Disp.TooltipBuy10 = false;};
+		l('buttonSell-' + me.id).onmouseover = function() {CM.Disp.TooltipSell = true;};
+		l('buttonSell-' + me.id).onmouseout = function() {CM.Disp.TooltipSell = false;};
+		l('buttonSellAll-' + me.id).onmouseover = function() {CM.Disp.TooltipSellAll = true;};
+		l('buttonSellAll-' + me.id).onmouseout = function() {CM.Disp.TooltipSellAll = false;};
 	}
 }

 CM.Disp.Tooltip = function(type, name) {
 	if (type == 'b') {
 		l('tooltip').innerHTML = Game.Objects[name].tooltip();
+		if (CM.Config.TooltipAmor == 1) {
+			var buildPrice = CM.Sim.BuildingGetPrice(Game.Objects[name].basePrice, 0, Game.Objects[name].amount);
+			var amortizeAmount = buildPrice - Game.Objects[name].totalCookies;
+			if (amortizeAmount > 0) {
+				l('tooltip').innerHTML = l('tooltip').innerHTML.split('so far</div>').join('so far<br/>&bull; <b>' + Beautify(amortizeAmount) + '</b> ' + (Math.floor(amortizeAmount) == 1 ? 'cookie' : 'cookies') + ' left to amortize (' + CM.Disp.GetTimeColor(buildPrice, Game.Objects[name].totalCookies, (Game.Objects[name].storedTotalCps * Game.globalCpsMult)).text + ')</div>');		
+			}
+		}
 		if (CM.Disp.TooltipBuy10) {
 			l('tooltip').innerHTML = l('tooltip').innerHTML.split(Beautify(Game.Objects[name].getPrice())).join(Beautify(CM.Cache.Objects10[name].price));
 		}
+		if (CM.Disp.TooltipSell) {
+			l('tooltip').innerHTML = l('tooltip').innerHTML.split(Beautify(Game.Objects[name].getPrice())).join('-' + Beautify(CM.Sim.BuildingSell(Game.Objects[name].basePrice, Game.Objects[name].amount, 1)));
+		}
+		if (CM.Disp.TooltipSellAll) {
+			l('tooltip').innerHTML = l('tooltip').innerHTML.split(Beautify(Game.Objects[name].getPrice())).join('-' + Beautify(CM.Sim.BuildingSell(Game.Objects[name].basePrice, Game.Objects[name].amount, Game.Objects[name].amount)));
+		}
 	}
 	else { // Upgrades
-		CM.Disp.TooltipUpgradeBack[name]();
+		if (!Game.UpgradesInStore[name]) return '';
+		l('tooltip').innerHTML = Game.crate(Game.UpgradesInStore[name], 'store', undefined, undefined, 1)();
 	}
 	
 	var area = document.createElement('div');
@@ -1198,7 +1375,7 @@ CM.Disp.Tooltip = function(type, name) {
 		var header = function(text) {
 			var div = document.createElement('div');
 			div.style.fontWeight = 'bold';
-			div.style.color = CM.Disp.colorBlue;
+			div.className = CM.Disp.colorTextPre + CM.Disp.colorBlue;
 			div.textContent = text;
 			return div;
 		}
@@ -1226,9 +1403,7 @@ CM.Disp.Tooltip = function(type, name) {

 	CM.Disp.UpdateTooltip();
 	
-	if (type == 'b') {
 	return l('tooltip').innerHTML;
-	}	
 }

 CM.Disp.UpdateTooltip = function() {
@@ -1240,18 +1415,18 @@ CM.Disp.UpdateTooltip = function() {
 				bonus = CM.Cache.Objects[CM.Disp.tooltipName].bonus;
 				price = Game.Objects[CM.Disp.tooltipName].getPrice();
 				if (CM.Config.Tooltip == 1) {
-					l('CMTooltipBorder').style.color = CM.Cache.Objects[CM.Disp.tooltipName].color;
+					l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Objects[CM.Disp.tooltipName].color;
 					l('CMTooltipBCI').textContent = Beautify(CM.Cache.Objects[CM.Disp.tooltipName].bci, 2);
-					l('CMTooltipBCI').style.color = CM.Cache.Objects[CM.Disp.tooltipName].color;
+					l('CMTooltipBCI').className = CM.Disp.colorTextPre + 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('CMTooltipBorder').className = CM.Disp.colorTextPre + 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;
+					l('CMTooltipBCI').className = CM.Disp.colorTextPre + CM.Cache.Objects10[CM.Disp.tooltipName].color;
 				}
 			}
 		}
@@ -1259,9 +1434,9 @@ CM.Disp.UpdateTooltip = function() {
 			bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus;
 			price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice();
 			if (CM.Config.Tooltip == 1) {
-				l('CMTooltipBorder').style.color = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color;
+				l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color;
 				l('CMTooltipBCI').textContent = Beautify(CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bci, 2);
-				l('CMTooltipBCI').style.color = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color;
+				l('CMTooltipBCI').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color;
 			}
 		}
 		if (CM.Config.Tooltip == 1) {
@@ -1272,25 +1447,28 @@ CM.Disp.UpdateTooltip = function() {
 				l('CMTooltipIncome').textContent += ' (' + (increase / 100) + '% of income)';
 			}
 		
-			var timeColor = CM.Disp.GetTimeColor(price);
+			var timeColor = CM.Disp.GetTimeColor(price, Game.cookies, (Game.cookiesPs * (1 - Game.cpsSucked)));
 			l('CMTooltipTime').textContent = timeColor.text;
-			l('CMTooltipTime').style.color = timeColor.color;
+			l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color;
 		}
 		
 		if (CM.Config.ToolWarnCaut == 1) {
+			var warn = CM.Cache.Lucky;
+			if (CM.Config.ToolWarnCautBon == 1) {
 				var bonusNoFren = bonus;
 				if (Game.frenzy > 0) {
 					bonusNoFren /= Game.frenzyPower;
 				}
-			var warn = CM.Cache.Lucky + ((bonusNoFren * 60 * 20) / 0.1);
+				warn += ((bonusNoFren * 60 * 20) / 0.1);
+			}
 			var caut = warn * 7;
 			var amount = Game.cookies - price;
 			if (amount < warn || amount < caut) {
 				if (CM.Config.ToolWarnCautPos == 0) {
-					CM.Disp.TooltipWarnCaut.style.right = (l('tooltip').offsetWidth + 12) + 'px';
+					CM.Disp.TooltipWarnCaut.style.right = '0px';
 				}
 				else {
-					CM.Disp.TooltipWarnCaut.style.top = (l('tooltip').offsetHeight + 12) + 'px';
+					CM.Disp.TooltipWarnCaut.style.top = (l('tooltip').offsetHeight) + 'px';
 				}
 				CM.Disp.TooltipWarnCaut.style.width = (l('tooltip').offsetWidth - 6) + 'px';
 			
@@ -1371,7 +1549,7 @@ CM.Disp.CheckWrinklerTooltip = function() {
 					div.id = 'CMTooltipWrinkler';
 					wrinkler.appendChild(div);
 					placeholder.appendChild(wrinkler);
-					Game.tooltip.draw(this, escape(placeholder.innerHTML), 'wrink');
+					Game.tooltip.draw(this, escape(placeholder.innerHTML));
 					CM.Disp.TooltipWrinkler = i;
 					CM.Disp.TooltipWrinklerCache[i] = 1;
 				}
@@ -1390,12 +1568,29 @@ CM.Disp.CheckWrinklerTooltip = function() {
 CM.Disp.UpdateWrinklerTooltip = function() {
 	if (CM.Config.ToolWrink == 1 && l('CMTooltipWrinkler') != null) {
 		var sucked = Game.wrinklers[CM.Disp.TooltipWrinkler].sucked;
-		sucked *= 1.1;
+		var toSuck = 1.1;
+		if (Game.Has('Sacrilegious corruption')) toSuck *= 1.05;
+		if (Game.wrinklers[CM.Disp.TooltipWrinkler].type == 1) toSuck *= 3; //shiny wrinklers are an elusive, profitable breed
+		sucked *= toSuck;
 		if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
 		l('CMTooltipWrinkler').textContent = Beautify(sucked);
 	}
 }

+CM.Disp.UpdateAscendState = function() {
+	if (Game.OnAscend) {
+		l('game').style.bottom = '0px';
+		if (CM.Config.BotBar == 1) CM.Disp.BotBar.style.display = 'none';
+		if (CM.Config.TimerBar == 1) CM.Disp.TimerBar.style.display = 'none';
+	}
+	else {
+		CM.Disp.ToggleBotBar();
+		CM.Disp.ToggleTimerBar();
+	}
+
+	CM.Disp.UpdateBackground();
+}
+
 CM.Disp.ToggleSayTime = function() {
 	if (CM.Config.SayTime == 1) {
 		Game.sayTime = CM.Disp.sayTime;
@@ -1418,19 +1613,26 @@ CM.Disp.RefreshScale = function() {
 CM.Disp.min = -1;
 CM.Disp.max = -1;
 CM.Disp.mid = -1;
-CM.Disp.colorBlue = '#4bb8f0';
-CM.Disp.colorGreen = 'lime';
-CM.Disp.colorYellow = 'yellow';
-CM.Disp.colorOrange = '#ff7f00';
-CM.Disp.colorRed = 'red';
-CM.Disp.colorPurple = 'magenta';
-CM.Disp.colorGray = '#b3b3b3';
+CM.Disp.colorTextPre = 'CMText';
+CM.Disp.colorBackPre = 'CMBack';
+CM.Disp.colorBorderPre = 'CMBorder';
+CM.Disp.colorBlue = 'Blue';
+CM.Disp.colorGreen = 'Green';
+CM.Disp.colorYellow = 'Yellow';
+CM.Disp.colorOrange = 'Orange';
+CM.Disp.colorRed = 'Red';
+CM.Disp.colorPurple = 'Purple';
+CM.Disp.colorGray = 'Gray';
+CM.Disp.colors = [ CM.Disp.colorBlue, CM.Disp.colorGreen, CM.Disp.colorYellow, CM.Disp.colorOrange, CM.Disp.colorRed, CM.Disp.colorPurple, CM.Disp.colorGray];
 CM.Disp.lastGoldenCookieState = 'none';
+CM.Disp.lastAscendState = -1;

 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.TooltipBuy10 = false;
+CM.Disp.TooltipSell = false;
+CM.Disp.TooltipSellAll = false;

 CM.Disp.TooltipWrinklerArea = 0;
 CM.Disp.TooltipWrinkler = -1;
--- a/src/Main.js
+++ b/src/Main.js
@@ -37,17 +37,33 @@ CM.ReplaceNative = function() {
 		CM.Disp.UpdateTooltipLocation();
 	}
 	
+	CM.Backup.UpdateSpecial = Game.UpdateSpecial;
+	Game.UpdateSpecial = function() {
+		if (CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 0) {
+			var timerBarHeight = parseInt(CM.Disp.TimerBar.style.height);
+			Game.mouseY -= timerBarHeight;
+			CM.Backup.UpdateSpecial();
+			Game.mouseY += timerBarHeight;
+		}
+		else {
+			CM.Backup.UpdateSpecial();
+		}
+	}
+	
 	CM.Backup.RebuildUpgrades = Game.RebuildUpgrades;
 	Game.RebuildUpgrades = function() {
 		CM.Backup.RebuildUpgrades();
 		CM.Disp.AddTooltipUpgrade();
+		Game.recalculateGains = 1;
 	}
 	
 	CM.Backup.UpdateMenu = Game.UpdateMenu;
 	Game.UpdateMenu = function() {
+		if (typeof jscolor.picker === 'undefined' || typeof jscolor.picker.owner === 'undefined') {
 			CM.Backup.UpdateMenu();
 			CM.Disp.AddMenu();
 		}
+	}
 	
 	CM.Backup.sayTime = Game.sayTime;
 	CM.Disp.sayTime = function(time, detail) {
@@ -63,12 +79,18 @@ CM.ReplaceNative = function() {
 }

 CM.Loop = function() {
+	if (CM.Disp.lastAscendState != Game.OnAscend) {
+		CM.Disp.lastAscendState = Game.OnAscend;
+		CM.Disp.UpdateAscendState();
+	}
+	if (!Game.OnAscend && Game.AscendTimer == 0) {
 		if (CM.Sim.DoSims) {		
 			CM.Cache.RemakeIncome();
 			CM.Cache.RemakeBCI();
 			CM.Cache.RemakeLucky();
 			CM.Cache.RemakeChain();
 			CM.Cache.RemakeSeaSpec();
+			CM.Cache.RemakeSellAllTotal();

 			CM.Disp.UpdateBotBarOther();
 			CM.Disp.UpdateBuildings();
@@ -88,14 +110,15 @@ CM.Loop = function() {
 		CM.Disp.CheckWrinklerTooltip();
 		CM.Disp.UpdateWrinklerTooltip();

-	// Check Golden Cookies
-	CM.Disp.CheckGoldenCookie();
-	
 		// Update Title
 		CM.Disp.UpdateTitle();

 		// Change menu refresh interval
 		CM.Disp.RefreshMenu();
+	}
+	
+	// Check Golden Cookies
+	CM.Disp.CheckGoldenCookie();
 }

 CM.Init = function() {
@@ -104,30 +127,45 @@ CM.Init = function() {
 		proceed = confirm('Cookie Monster version ' + CM.VersionMajor + '.' + CM.VersionMinor + ' is meant for Game version ' + CM.VersionMajor + '.  Loading a different version may cause errors.  Do you still want to load Cookie Monster?');
 	}
 	if (proceed) {
+		CM.Disp.AddJscolor();
+		
+		var delay = setInterval(function() {
+			if (typeof jscolor !== 'undefined') {
+				CM.DelayInit();
+				clearInterval(delay);
+			}
+		}, 500);
+	}
+}
+
+CM.DelayInit = function() {
+	CM.Sim.InitData();
+	CM.Disp.CreateCssArea();
 	CM.Disp.CreateBotBar();
 	CM.Disp.CreateTimerBar();
 	CM.Disp.CreateUpgradeBar();
 	CM.Disp.CreateWhiteScreen();
 	CM.Disp.CreateGCTimer();
 	CM.Disp.CreateResetTooltip();
+	CM.Disp.CreateChoEggTooltip();
 	CM.Disp.CreateTooltipWarnCaut();
 	CM.Disp.AddTooltipBuild();
-		CM.Disp.AddTooltipBuild10();
+	//CM.Disp.AddTooltipBuildExtra(); // The extra per building was removed
 	CM.Disp.AddWrinklerAreaDetect();
 	CM.ReplaceNative();
 	Game.CalculateGains();
 	CM.LoadConfig(); // Must be after all things are created!
+	CM.Disp.lastAscendState = Game.OnAscend;

 	if (Game.prefs.popups) Game.Popup('Cookie Monster version ' + CM.VersionMajor + '.' + CM.VersionMinor + ' loaded!');
-		else Game.Notify('Cookie Monster version ' + CM.VersionMajor + '.' + CM.VersionMinor + ' loaded!','','',1);
+	else Game.Notify('Cookie Monster version ' + CM.VersionMajor + '.' + CM.VersionMinor + ' loaded!','','',1, 1);

 	Game.Win('Third-party');
-	}
 }

-CM.ConfigDefault = {BotBar: 1, TimerBar: 1, BuildColor: 1, UpBarColor: 1, Flash: 1, Sound: 1,  Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Tooltip: 1, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, HC: 1, Wrink: 1, Sea: 1}};
+CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBarColor: 1, Flash: 1, Sound: 1,  Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWarnCautBon: 0, ToolWrink: 1, Stats: 1, UpStats: 1, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, HC: 1, Wrink: 1, Sea: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3'}};
 CM.ConfigPrefix = 'CMConfig';

-CM.VersionMajor = '1.0465';
-CM.VersionMinor = '9';
+CM.VersionMajor = '2';
+CM.VersionMinor = '1';

--- a/src/Sim.js
+++ b/src/Sim.js
@@ -2,7 +2,7 @@
 * Sim *
 *******/

-CM.Sim.BuildingGetPrice = function (basePrice, start, increase) {
+CM.Sim.BuildingGetPrice = function(basePrice, start, increase) {
 	var totalPrice = 0;
 	var count = 0;
 	while(count < increase) {
@@ -10,60 +10,108 @@ CM.Sim.BuildingGetPrice = function (basePrice, start, increase) {
 		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;
+		if (Game.Has('Divine discount')) price *= 0.99;
+		if (Game.hasAura('Fierce Hoarder')) price *= 0.98;
 		totalPrice += Math.ceil(price);
 		count++;
 	}
 	return totalPrice;
 }

-eval('CM.Sim.Has = ' + Game.Has.toString().split('Game').join('CM.Sim'));
+CM.Sim.BuildingSell = function(basePrice, start, amount) {
+	var totalMoni = 0;
+	while (amount > 0) {
+		var giveBack = 0.5;
+		if (Game.hasAura('Earth Shatterer')) giveBack = 0.85;
+		totalMoni += Math.floor(CM.Sim.BuildingGetPrice(basePrice, start, 1) * giveBack);
+		start--;
+		amount--;
+	}
+	return totalMoni;
+}
+
+CM.Sim.Has = function(what) {
+	if (Game.ascensionMode == 1 && Game.Upgrades[what].pool == 'prestige') return 0;
+	return (CM.Sim.Upgrades[what] ? CM.Sim.Upgrades[what].bought : 0);
+}
+

 CM.Sim.Win = function(what) {
 	if (CM.Sim.Achievements[what]) {
 		if (CM.Sim.Achievements[what].won == 0) {
 			CM.Sim.Achievements[what].won = 1;
-			if (Game.Achievements[what].hide != 3) CM.Sim.AchievementsOwned++;
+			if (Game.Achievements[what].pool != 'shadow') CM.Sim.AchievementsOwned++;
 		}
 	}
 }

 eval('CM.Sim.HasAchiev = ' + Game.HasAchiev.toString().split('Game').join('CM.Sim'));

-CM.Sim.CookNeedPrest = function(prestige) {
-	return ((Math.pow(((prestige * 2) + 1), 2) - 1) / 8) * 1000000000000;
+eval('CM.Sim.GetHeavenlyMultiplier = ' + Game.GetHeavenlyMultiplier.toString().split('Game').join('CM.Sim'));
+
+CM.Sim.hasAura = function(what) {
+	if (Game.dragonAuras[CM.Sim.dragonAura].name == what || Game.dragonAuras[CM.Sim.dragonAura2].name == what) 
+		return true; 
+	else
+		return false;
 }

-CM.Sim.CopyData = function() {
-	// Other variables
-	CM.Sim.prestige = Game.prestige['Heavenly chips'];
-	CM.Sim.UpgradesOwned = Game.UpgradesOwned;
-	CM.Sim.pledges = Game.pledges;
-	CM.Sim.AchievementsOwned = Game.AchievementsOwned;
+eval('CM.Sim.GetTieredCpsMult = ' + Game.GetTieredCpsMult.toString().split('Game.Has').join('CM.Sim.Has').split('me.tieredUpgrades').join('Game.Objects[me.name].tieredUpgrades').split('me.synergies').join('Game.Objects[me.name].synergies').split('syn.buildingTie1.amount').join('CM.Sim.Objects[syn.buildingTie1.name].amount').split('syn.buildingTie2.amount').join('CM.Sim.Objects[syn.buildingTie2.name].amount'));

+eval('CM.Sim.getGrandmaSynergyUpgradeMultiplier = ' + Game.getGrandmaSynergyUpgradeMultiplier.toString().split('Game.Objects[\'Grandma\']').join('CM.Sim.Objects[\'Grandma\']'));
+
+CM.Sim.InitData = function() {
 	// Buildings
 	CM.Sim.Objects = [];
 	for (var i in Game.Objects) {
 		CM.Sim.Objects[i] = {};
 		var me = Game.Objects[i];
 		var you = CM.Sim.Objects[i];
-		you.amount = me.amount;
-		eval('you.cps = ' + me.cps.toString().split('Game.Has').join('CM.Sim.Has').split('Game.Objects').join('CM.Sim.Objects'));		
-		you.name = me.name; // Needed for above eval!
+		eval('you.cps = ' + me.cps.toString().split('Game.Has').join('CM.Sim.Has').split('Game.hasAura').join('CM.Sim.hasAura').split('Game.Objects').join('CM.Sim.Objects').split('Game.GetTieredCpsMult').join('CM.Sim.GetTieredCpsMult').split('Game.getGrandmaSynergyUpgradeMultiplier').join('CM.Sim.getGrandmaSynergyUpgradeMultiplier'));
+		// Below is needed for above eval!
+		you.baseCps = me.baseCps;
+		you.name = me.name;
 	}

 	// Upgrades
 	CM.Sim.Upgrades = [];
 	for (var i in Game.Upgrades) {
 		CM.Sim.Upgrades[i] = {};
-		var me = Game.Upgrades[i];
-		var you = CM.Sim.Upgrades[i];
-		you.bought = me.bought;
 	}

 	// Achievements
 	CM.Sim.Achievements = [];
 	for (var i in Game.Achievements) {
 		CM.Sim.Achievements[i] = {};
+	}
+}
+
+CM.Sim.CopyData = function() {
+	// Other variables
+	CM.Sim.UpgradesOwned = Game.UpgradesOwned;
+	CM.Sim.pledges = Game.pledges;
+	CM.Sim.AchievementsOwned = Game.AchievementsOwned;
+	CM.Sim.heavenlyPower = Game.heavenlyPower;
+	CM.Sim.prestige = Game.prestige;
+	CM.Sim.dragonAura = Game.dragonAura;
+	CM.Sim.dragonAura2 = Game.dragonAura2;
+	
+	// Buildings
+	for (var i in Game.Objects) {
+		var me = Game.Objects[i];
+		var you = CM.Sim.Objects[i];
+		you.amount = me.amount;
+	}
+
+	// Upgrades
+	for (var i in Game.Upgrades) {
+		var me = Game.Upgrades[i];
+		var you = CM.Sim.Upgrades[i];
+		you.bought = me.bought;
+	}
+
+	// Achievements
+	for (var i in Game.Achievements) {
 		var me = Game.Achievements[i];
 		var you = CM.Sim.Achievements[i];
 		you.won = me.won;
@@ -74,47 +122,51 @@ CM.Sim.CopyData = function() {
 CM.Sim.CalculateGains = function() {
 	CM.Sim.cookiesPs = 0;
 	var mult = 1;
+
+	if (Game.ascensionMode != 1) mult += parseFloat(CM.Sim.prestige) * 0.01 * CM.Sim.heavenlyPower * CM.Sim.GetHeavenlyMultiplier();
+
+	var cookieMult = 0;
 	for (var i in CM.Sim.Upgrades) {
 		var me = CM.Sim.Upgrades[i];
 		if (me.bought > 0) {
-			if (Game.Upgrades[i].type == 'cookie' && CM.Sim.Has(Game.Upgrades[i].name)) mult += Game.Upgrades[i].power * 0.01;
+			if (Game.Upgrades[i].pool == 'cookie' && CM.Sim.Has(Game.Upgrades[i].name)) mult *= (1 + (typeof(Game.Upgrades[i].power) == 'function' ? Game.Upgrades[i].power(Game.Upgrades[i]) : Game.Upgrades[i].power) * 0.01);
 		}
 	}
-	mult += CM.Sim.Has('Specialized chocolate chips') * 0.01;
-	mult += CM.Sim.Has('Designer cocoa beans') * 0.02;
-	mult += CM.Sim.Has('Underworld ovens') * 0.03;
-	mult += CM.Sim.Has('Exotic nuts') * 0.04;
-	mult += CM.Sim.Has('Arcane sugar') * 0.05;

-	if (CM.Sim.Has('Increased merriness')) mult += 0.15;
-	if (CM.Sim.Has('Improved jolliness')) mult += 0.15;
-	if (CM.Sim.Has('A lump of coal')) mult += 0.01;
-	if (CM.Sim.Has('An itchy sweater')) mult += 0.01;
-	if (CM.Sim.Has('Santa\'s dominion')) mult += 0.5;
+	mult *= (1 + 0.01 * cookieMult);
+	if (CM.Sim.Has('Specialized chocolate chips')) mult *= 1.01;
+	if (CM.Sim.Has('Designer cocoa beans')) mult *= 1.02;
+	if (CM.Sim.Has('Underworld ovens')) mult *= 1.03;
+	if (CM.Sim.Has('Exotic nuts')) mult *= 1.04;
+	if (CM.Sim.Has('Arcane sugar')) mult *= 1.05;

-	if (CM.Sim.Has('Santa\'s legacy')) mult += (Game.santaLevel + 1) * 0.1;
+	if (CM.Sim.Has('Increased merriness')) mult *= 1.15;
+	if (CM.Sim.Has('Improved jolliness')) mult *= 1.15;
+	if (CM.Sim.Has('A lump of coal')) mult *= 1.01;
+	if (CM.Sim.Has('An itchy sweater')) mult *= 1.01;
+	if (CM.Sim.Has('Santa\'s dominion')) mult *= 1.2;

-	var heavenlyMult = 0;
-	if (CM.Sim.Has('Heavenly chip secret')) heavenlyMult += 0.05;
-	if (CM.Sim.Has('Heavenly cookie stand')) heavenlyMult += 0.20;
-	if (CM.Sim.Has('Heavenly bakery')) heavenlyMult += 0.25;
-	if (CM.Sim.Has('Heavenly confectionery')) heavenlyMult += 0.25;
-	if (CM.Sim.Has('Heavenly key')) heavenlyMult += 0.25;
-	mult += parseFloat(CM.Sim.prestige) * 0.02 * heavenlyMult;
+	if (CM.Sim.Has('Santa\'s legacy')) mult *= 1 + (Game.santaLevel + 1) * 0.03;

 	for (var i in CM.Sim.Objects) {
 		var me = CM.Sim.Objects[i];
-		CM.Sim.cookiesPs += me.amount * (typeof(me.cps) == 'function' ? me.cps() : me.cps);
+		CM.Sim.cookiesPs += me.amount * (typeof(me.cps) == 'function' ? me.cps(me) : me.cps);
 	}

 	if (CM.Sim.Has('"egg"')) CM.Sim.cookiesPs += 9; // "egg"

-	var milkMult = CM.Sim.Has('Santa\'s milk and cookies') ? 1.05 : 1;
-	if (CM.Sim.Has('Kitten helpers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.05 * milkMult);
-	if (CM.Sim.Has('Kitten workers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult);
-	if (CM.Sim.Has('Kitten engineers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
-	if (CM.Sim.Has('Kitten overseers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
+	var milkMult=1;
+	if (CM.Sim.Has('Santa\'s milk and cookies')) milkMult *= 1.05;
+	if (CM.Sim.hasAura('Breath of Milk')) milkMult *= 1.05;
+	if (CM.Sim.Has('Kitten helpers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult);
+	if (CM.Sim.Has('Kitten workers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.125 * milkMult);
+	if (CM.Sim.Has('Kitten engineers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.15 * milkMult);
+	if (CM.Sim.Has('Kitten overseers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.175 * milkMult);
 	if (CM.Sim.Has('Kitten managers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
+	if (CM.Sim.Has('Kitten accountants')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
+	if (CM.Sim.Has('Kitten specialists')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
+	if (CM.Sim.Has('Kitten experts')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
+	if (CM.Sim.Has('Kitten angels')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult);

 	var eggMult = 0;
 	if (CM.Sim.Has('Chicken egg')) eggMult++;
@@ -137,15 +189,33 @@ CM.Sim.CalculateGains = function() {
 	}
 	mult *= (1 + 0.01 * eggMult);
 	
+	if (CM.Sim.hasAura('Radiant Appetite')) mult *= 2;
+	
 	var rawCookiesPs = CM.Sim.cookiesPs * mult;
-	for (var i = 0; i < Game.cpsAchievs.length / 2; i++) {
-		if (rawCookiesPs >= Game.cpsAchievs[i * 2 + 1]) CM.Sim.Win(Game.cpsAchievs[i * 2]);
+	for (var i in Game.CpsAchievements) {
+		if (rawCookiesPs >= Game.CpsAchievements[i].threshold) CM.Sim.Win(Game.CpsAchievements[i].name);
 	}

 	if (Game.frenzy > 0) mult *= Game.frenzyPower;
 	
+	// Pointless?
+	name = Game.bakeryName.toLowerCase();
+	if (name == 'orteil') mult *= 0.99;
+	else if (name == 'ortiel') mult *= 0.98; //or so help me
+
 	if (CM.Sim.Has('Elder Covenant')) mult *= 0.95;

+	if (CM.Sim.Has('Golden switch [off]')) {
+		var goldenSwitchMult = 1.5;
+		if (CM.Sim.Has('Residual luck')) {
+			var upgrades = ['Get lucky', 'Lucky day', 'Serendipity', 'Heavenly luck', 'Lasting fortune', 'Decisive fate'];
+			for (var i in upgrades) {
+				if (CM.Sim.Has(upgrades[i])) goldenSwitchMult += 0.1;
+			}
+		}
+		mult *= goldenSwitchMult;
+	}
+
 	CM.Sim.cookiesPs *= mult;			
 };

@@ -162,50 +232,42 @@ CM.Sim.CheckOtherAchiev = function() {
 	if (CM.Sim.Has('Rainbow grandmas')) grandmas++;
 	if (!CM.Sim.HasAchiev('Elder') && grandmas >= 7) CM.Sim.Win('Elder');

+	// Redo?
 	var buildingsOwned = 0;
-	var oneOfEach = 1;
 	var mathematician = 1;
 	var base10 = 1;
-	var centennial = 1;
-	var centennialhalf = 1;
-	var bicentennial = 1;
+	var minAmount = 100000;
 	for (var i in CM.Sim.Objects) {
 		buildingsOwned += CM.Sim.Objects[i].amount;
-		if (!CM.Sim.HasAchiev('One with everything')) {
-			if (CM.Sim.Objects[i].amount == 0) oneOfEach = 0;
-		}
+		minAmount = Math.min(CM.Sim.Objects[i].amount, minAmount);
 		if (!CM.Sim.HasAchiev('Mathematician')) {
 			if (CM.Sim.Objects[i].amount < Math.min(128, Math.pow(2, (Game.ObjectsById.length - Game.Objects[i].id) - 1))) mathematician = 0;
 		}
 		if (!CM.Sim.HasAchiev('Base 10')) {
 			if (CM.Sim.Objects[i].amount < (Game.ObjectsById.length - Game.Objects[i].id)*10) base10 = 0;
 		}
-		if (!CM.Sim.HasAchiev('Centennial')) {
-			if (CM.Sim.Objects[i].amount < 100) centennial = 0;
 	}
-		if (!CM.Sim.HasAchiev('Centennial and a half')) {
-			if (CM.Sim.Objects[i].amount < 150) centennialhalf = 0;
-		}
-		if (!CM.Sim.HasAchiev('Bicentennial')) {
-			if (CM.Sim.Objects[i].amount < 200) bicentennial = 0;
-		}
-	}
-	if (oneOfEach == 1) CM.Sim.Win('One with everything');
+	if (minAmount >= 1) CM.Sim.Win('One with everything');
 	if (mathematician == 1) CM.Sim.Win('Mathematician');
 	if (base10 == 1) CM.Sim.Win('Base 10');
-	if (centennial == 1) CM.Sim.Win('Centennial');
-	if (centennialhalf == 1) CM.Sim.Win('Centennial and a half');
-	if (bicentennial == 1) CM.Sim.Win('Bicentennial');
+	if (minAmount >= 100) CM.Sim.Win('Centennial');
+	if (minAmount >= 150) CM.Sim.Win('Centennial and a half');
+	if (minAmount >= 200) CM.Sim.Win('Bicentennial');
+	if (minAmount >= 250) CM.Sim.Win('Bicentennial and a half');

 	if (buildingsOwned >= 100) CM.Sim.Win('Builder');
-	if (buildingsOwned >= 400) CM.Sim.Win('Architect');
-	if (buildingsOwned >= 800) CM.Sim.Win('Engineer');
+	if (buildingsOwned >= 500) CM.Sim.Win('Architect');
+	if (buildingsOwned >= 1000) CM.Sim.Win('Engineer');
 	if (buildingsOwned >= 1500) CM.Sim.Win('Lord of Constructs');
 	
 	if (CM.Sim.UpgradesOwned >= 20) CM.Sim.Win('Enhancer');
 	if (CM.Sim.UpgradesOwned >= 50) CM.Sim.Win('Augmenter');
 	if (CM.Sim.UpgradesOwned >= 100) CM.Sim.Win('Upgrader');
-	if (CM.Sim.UpgradesOwned >= 150) CM.Sim.Win('Lord of Progress');
+	if (CM.Sim.UpgradesOwned >= 200) CM.Sim.Win('Lord of Progress');
+	
+	if (buildingsOwned >= 3000 && CM.Sim.UpgradesOwned >= 300) CM.Sim.Win('Polymath');
+	
+	if (CM.Sim.Objects['Cursor'].amount + CM.Sim.Objects['Grandma'].amount >= 777) CM.Sim.Win('The elder scrolls');
 	
 	var hasAllHalloCook = true;
 	for (var i in CM.Data.HalloCookies) {
@@ -235,77 +297,13 @@ CM.Sim.BuyBuildings = function(amount, target) {
 			if (me.amount >= 200) CM.Sim.Win('The Digital');
 			if (me.amount >= 300) CM.Sim.Win('Extreme polydactyly');
 			if (me.amount >= 400) CM.Sim.Win('Dr. T');
+			if (me.amount >= 500) CM.Sim.Win('Thumbs, phalanges, metacarpals');
 		}
-		else if (i == 'Grandma') {
-			if (me.amount >= 1) CM.Sim.Win('Grandma\'s cookies');
-			if (me.amount >= 50) CM.Sim.Win('Sloppy kisses');
-			if (me.amount >= 100) CM.Sim.Win('Retirement home');
-			if (me.amount >= 150) CM.Sim.Win('Friend of the ancients');
-			if (me.amount >= 200) CM.Sim.Win('Ruler of the ancients');
-			if (me.amount >= 250) CM.Sim.Win('The old never bothered me anyway');
+		else {
+			for (var j in Game.Objects[me.name].tieredAchievs) {
+				if (me.amount >= Game.Tiers[Game.Objects[me.name].tieredAchievs[j].tier].achievUnlock) 
+					CM.Sim.Win(Game.Objects[me.name].tieredAchievs[j].name);
 			}
-		else if (i == 'Farm') {
-			if (me.amount >= 1) CM.Sim.Win('My first farm');
-			if (me.amount >= 50) CM.Sim.Win('Reap what you sow');
-			if (me.amount >= 100) CM.Sim.Win('Farm ill');
-			if (me.amount >= 150) CM.Sim.Win('Perfected agriculture');
-			if (me.amount >= 200) CM.Sim.Win('Homegrown');
-		}
-		else if (i == 'Factory') {
-			if (me.amount >= 1) CM.Sim.Win('Production chain');
-			if (me.amount >= 50) CM.Sim.Win('Industrial revolution');
-			if (me.amount >= 100) CM.Sim.Win('Global warming');
-			if (me.amount >= 150) CM.Sim.Win('Ultimate automation');
-			if (me.amount >= 200) CM.Sim.Win('Technocracy');
-		}
-		else if (i == 'Mine') {
-			if (me.amount >= 1) CM.Sim.Win('You know the drill');
-			if (me.amount >= 50) CM.Sim.Win('Excavation site');
-			if (me.amount >= 100) CM.Sim.Win('Hollow the planet');
-			if (me.amount >= 150) CM.Sim.Win('Can you dig it');
-			if (me.amount >= 200) CM.Sim.Win('The center of the Earth');
-		}
-		else if (i == 'Shipment') {
-			if (me.amount >= 1) CM.Sim.Win('Expedition');
-			if (me.amount >= 50) CM.Sim.Win('Galactic highway');
-			if (me.amount >= 100) CM.Sim.Win('Far far away');
-			if (me.amount >= 150) CM.Sim.Win('Type II civilization');
-			if (me.amount >= 200) CM.Sim.Win('We come in peace');
-		}
-		else if (i == 'Alchemy lab') {
-			if (me.amount >= 1) CM.Sim.Win('Transmutation');
-			if (me.amount >= 50) CM.Sim.Win('Transmogrification');
-			if (me.amount >= 100) CM.Sim.Win('Gold member');
-			if (me.amount >= 150) CM.Sim.Win('Gild wars');
-			if (me.amount >= 200) CM.Sim.Win('The secrets of the universe');
-		}
-		else if (i == 'Portal') {
-			if (me.amount >= 1) CM.Sim.Win('A whole new world');
-			if (me.amount >= 50) CM.Sim.Win('Now you\'re thinking');
-			if (me.amount >= 100) CM.Sim.Win('Dimensional shift');
-			if (me.amount >= 150) CM.Sim.Win('Brain-split');
-			if (me.amount >= 200) CM.Sim.Win('Realm of the Mad God');
-		}
-		else if (i == 'Time machine') {
-			if (me.amount >= 1) CM.Sim.Win('Time warp');
-			if (me.amount >= 50) CM.Sim.Win('Alternate timeline');
-			if (me.amount >= 100) CM.Sim.Win('Rewriting history');
-			if (me.amount >= 150) CM.Sim.Win('Time duke');
-			if (me.amount >= 200) CM.Sim.Win('Forever and ever');
-		}
-		else if (i == 'Antimatter condenser') {
-			if (me.amount >= 1) CM.Sim.Win('Antibatter');
-			if (me.amount >= 50) CM.Sim.Win('Quirky quarks');
-			if (me.amount >= 100) CM.Sim.Win('It does matter!');
-			if (me.amount >= 150) CM.Sim.Win('Molecular maestro');
-			if (me.amount >= 200) CM.Sim.Win('Walk the planck');
-		}
-		else if (i == 'Prism') {
-			if (me.amount >= 1) CM.Sim.Win('Lone photon');
-			if (me.amount >= 50) CM.Sim.Win('Dazzling glimmer');
-			if (me.amount >= 100) CM.Sim.Win('Blinding flash');
-			if (me.amount >= 150) CM.Sim.Win('Unending glow');
-			if (me.amount >= 200) CM.Sim.Win('Rise and shine');
 		}
 		
 		var lastAchievementsOwned = CM.Sim.AchievementsOwned;
@@ -326,11 +324,11 @@ CM.Sim.BuyBuildings = function(amount, target) {
 CM.Sim.BuyUpgrades = function() {
 	CM.Cache.Upgrades = [];
 	for (var i in Game.Upgrades) {
-		if (Game.Upgrades[i].bought == 0 && Game.Upgrades[i].unlocked) {
+		if (Game.Upgrades[i].pool == 'toggle' || (Game.Upgrades[i].bought == 0 && Game.Upgrades[i].unlocked && Game.Upgrades[i].pool != 'prestige')) {
 			CM.Sim.CopyData();
 			var me = CM.Sim.Upgrades[i];
 			me.bought = 1;
-			if (Game.Upgrades[i].hide != 3) CM.Sim.UpgradesOwned++;
+			if (Game.CountsAsUpgradeOwned(Game.Upgrades[i].pool)) CM.Sim.UpgradesOwned++;

 			if (i == 'Elder Pledge') {
 				CM.Sim.pledges++;
@@ -370,14 +368,12 @@ CM.Sim.ResetBonus = function() {
 	if (Game.cookiesEarned >= 1000000000) CM.Sim.Win('Oblivion');
 	if (Game.cookiesEarned >= 1000000000000) CM.Sim.Win('From scratch');
 	if (Game.cookiesEarned >= 1000000000000000) CM.Sim.Win('Nihilism');
-	
 	if (Game.cookiesEarned >= 1000000000000000000) CM.Sim.Win('Dematerialize');
 	if (Game.cookiesEarned >= 1000000000000000000000) CM.Sim.Win('Nil zero zilch');
 	if (Game.cookiesEarned >= 1000000000000000000000000) CM.Sim.Win('Transcendence');
 	if (Game.cookiesEarned >= 1000000000000000000000000000) CM.Sim.Win('Obliterate');
 	if (Game.cookiesEarned >= 1000000000000000000000000000000) CM.Sim.Win('Negative void');
-	
-	CM.Sim.prestige = Game.HowMuchPrestige(Game.cookiesEarned + Game.cookiesReset);
+	if (Game.cookiesEarned >= 1000000000000000000000000000000000) CM.Sim.Win('To crumbs, you say?');
 	
 	var lastAchievementsOwned = CM.Sim.AchievementsOwned;
Author	SHA1	Message	Date
Aktanusa	f120f047dc	Removed HC stats as it is useless now (pending cleaning)	2016-02-08 20:17:08 -05:00
Aktanusa	13a49e3e39	Updated README to reflect the same thing as the Wikia	2016-02-08 19:27:29 -05:00
Aktanusa	762a6919e7	Updated README to reflect the same thing as the Wikia	2016-02-08 19:25:32 -05:00
Aktanusa	77ba8c4e84	Version change and merge from beta branch (Issue #50 )	2016-02-08 19:06:11 -05:00
Aktanusa	914a5e2ff3	Version change to 1.909.1	2016-02-08 09:52:58 -05:00
Aktanusa	6bced494f8	Version change to 1.907.1 and fixed it to work with 1.907 beta (mostly)	2016-02-06 12:34:17 -05:00
Aktanusa	ee35136130	Version change to 1.906	2016-02-06 11:24:39 -05:00
Aktanusa	85ed508010	Fix Current Chain reward being calculated wrong, tooltips being buggy, and needing to click a little above santa/dragon icon	2016-02-05 23:37:15 -05:00
Aktanusa	0ea31f6e94	Fixed bug with Current Lucky reward was calculated wrong	2016-02-05 00:42:04 -05:00
Aktanusa	5ceffa9d63	Fix to work with 1.903 beta (mostly)	2016-02-04 23:49:51 -05:00
Aktanusa	07b67be07e	Version change to 1.903.1	2016-02-04 18:24:54 -05:00
Aktanusa	5aa21209b9	Used a better fix on missing boxes on upgrades	2015-12-28 11:09:54 -05:00
Aktanusa	14c1afa30d	Fixed rare but bad tooltip bug and fixed some toggle upgrades graphical glitches	2015-12-27 21:44:50 -05:00
Aktanusa	f36869d528	Fixed tooltip bugs, Upgrades display bug, and timer bar bug	2015-12-27 17:07:40 -05:00
Aktanusa	da3200612b	Fixed bar display glitches related to ascend changes	2015-12-26 21:27:41 -05:00
Aktanusa	d870823c07	Fix to work with 1.9 beta mostly	2015-12-26 16:38:36 -05:00
Aktanusa	b134e3b45c	Version change to 1.9.1 (part 2)	2015-12-21 20:53:00 -05:00
Aktanusa	07944e366a	Version change to 1.9.1	2015-12-21 20:46:55 -05:00
Aktanusa	dbcec54b3d	Added same Issue #43 fix to other scales	2015-11-05 22:51:29 -05:00
Aktanusa	f1ccbf8937	Fixed a bug with Game's Setting Scale not showing fractional numbers like the original (Issue #43 )	2015-11-05 22:15:16 -05:00
Aktanusa	56903744d8	Added an indication in the title bar on the type of golden cookie spawned (Issue #39 ) and tiny cleanup of code	2015-05-27 22:03:33 -04:00
Aktanusa	2ff6ea0746	Finish version change to 1.0466.2 and updated README	2015-05-27 21:48:29 -04:00
Aktanusa	a251c5a906	Version change to 1.0466.2	2014-12-08 19:03:12 -05:00
Aktanusa	35ddafdca7	Merge branch 'master' into beta Conflicts: CookieMonster.js src/Main.js	2014-10-31 20:25:47 -04:00
Aktanusa	2063fa9db7	Version change to 1.0466.1	2014-10-31 20:21:09 -04:00
Aktanusa	b9486e9895	Fixed a bug with large numbers and chain calculations (Thanks to an anonymous wikia user)	2014-10-19 22:52:08 -04:00
Aktanusa	cd18b1a402	Added the option to calculate warn/caution with or without the bonus CPU from buying (Issue #30 )	2014-10-12 22:20:34 -04:00
Aktanusa	4118343606	Version change	2014-10-12 21:49:22 -04:00
Aktanusa	0941e33c11	Merge branch 'master' into beta Conflicts: CookieMonster.js src/Main.js	2014-09-29 22:48:53 -04:00
Aktanusa	971f08b125	Chocolate egg stat now includes popping wrinklers (Issue #27 )	2014-09-29 22:21:50 -04:00
Aktanusa	cd7376eaf6	Added sell and sell all amounts to the building tooltips	2014-09-29 21:29:23 -04:00
Aktanusa	89e8ec86db	Added a pop all button for wrinklers (Issue #24 )	2014-09-27 17:15:25 -04:00
Aktanusa	47b6d4d83f	Add amortization to tooltip config (Issue #19 )	2014-09-27 16:05:45 -04:00
Aktanusa	e5ce8e5ebd	Fixed minor bug with Chocolate Egg stat and fixed how undefined was checked (Thanks The_omniscent_pie)	2014-09-09 20:13:56 -04:00
Aktanusa	fb83f6679a	Added amortization stat to building tooltip (Issue #19 )	2014-09-08 08:56:12 -04:00
Aktanusa	6957513960	Added Chocolate egg stat (Issue #22 )	2014-09-06 18:09:38 -04:00
Aktanusa	c54ecefe4b	Hopefully fix jscolor not loading before CM.Init is called (Thanks The_omniscent_pie)	2014-09-06 16:18:06 -04:00
Aktanusa	450db504be	Version change	2014-09-06 13:50:08 -04:00
Aktanusa	da917ebc6b	Merge branch 'master' into dev	2014-08-30 01:45:21 -04:00
Aktanusa	d997ff7652	Forgot one line to load jscolor.js	2014-08-30 01:43:27 -04:00
Aktanusa	c34bcbfc3a	Merge branch 'master' into dev Conflicts: CookieMonster.js src/Disp.js src/Main.js	2014-08-30 01:31:40 -04:00
Aktanusa	3ddd1b3d23	Version change/added the option to change colors (Issue #20 )	2014-08-30 01:24:42 -04:00
Aktanusa	af05f9907c	Forgot to update compliled version (again)	2014-08-29 12:38:05 -04:00
Aktanusa	9a2d96d043	Made the color boxes on upgrades smaller	2014-08-29 12:36:45 -04:00
Aktanusa	28c5909e1f	Fixed to work with beta	2014-08-26 21:39:17 -04:00
Aktanusa	1418c17ec9	Merge branch 'master' into dev Conflicts: CookieMonster.js src/Main.js	2014-08-26 13:40:48 -04:00
Aktanusa	a8d404aca7	Version change	2014-08-26 13:27:59 -04:00
Aktanusa	989ef30f4a	Fixed upgrades still having color boxes even when it is off in preferences (Issue #21 ) and fixed graphical glitch with timer bars on a cookie chain	2014-08-26 13:27:10 -04:00
Aktanusa	e877f05a06	Version change to the new version of Cookie Clicker in beta plus some preliminary fixes	2014-08-26 13:10:56 -04:00
Aktanusa	e4bca75da1	More minor optimizations/typo fixes for the timer bar	2014-08-24 22:49:44 -04:00
Aktanusa	418b1a7d2e	Very minor optimization on timer bar creation.	2014-08-24 22:18:09 -04:00
Aktanusa	db41ada262	Added the option to move the timer bars to the top left of the screen. Also added a nice visual rounding to the right side of the bars.	2014-08-24 22:14:27 -04:00
Aktanusa	27833773c9	Forgot compile for last commit	2014-08-17 10:58:53 -04:00
Aktanusa	1742ce201c	Version change and minor cleanup	2014-08-17 10:57:36 -04:00