Merge pull request #787 from DanielNoord/newrepo

New repository

.eslintrc.json

@@ -0,0 +1,48 @@
+{
+  "env": {
+    "browser": true,
+    "es2021": true
+  },
+  "globals": {
+    "Game": "writable",
+    "l": "readonly",
+    "b64_to_utf8": "readonly",
+    "utf8_to_b64": "readonly",
+    "BeautifyAll": "readonly",
+    "PlaySound": "readonly"
+  },
+  "extends": ["airbnb-base", "prettier"],
+  "parserOptions": {
+    "ecmaVersion": 12
+  },
+  "plugins": ["@typescript-eslint"],
+  "overrides": [
+    {
+      "files": ["src/**/*.{ts,tsx}"],
+      "extends": ["plugin:@typescript-eslint/recommended"],
+      "parser": "@typescript-eslint/parser",
+      "rules": {
+        "import/extensions": "off", // To allow importing .ts without errors
+        "import/no-unresolved": "off" // To allow importing .ts without errors
+      }
+    }
+  ],
+  "ignorePatterns": ["*CookieMonster*.js", "dist/*", "node_modules/*"],
+  "rules": {
+    "import/no-mutable-exports": "off", // We need to this throughout Cookie Monster
+    "no-plusplus": [
+      "error",
+      {
+        "allowForLoopAfterthoughts": true
+      }
+    ],
+    "func-names": "off", // To allow unnamed arrow functions
+    "prefer-destructuring": [
+      "error",
+      {
+        "object": true,
+        "array": false
+      }
+    ] // Importing arrays and then destructuring them seems to fail
+  }
+}

.github/CONTRIBUTING.md

@@ -0,0 +1,18 @@
+Cookie Monster is written to modify Cookie Clicker as little as possible. This means the data is copied to simulate instead of actually modifying the current values and reverting later. The benefit is that CM should never mess up any data. The downside is that there is an extra overhead to copy and store the copied data.
+
+The following is a short description of the various `src` directories and their contents:
+
+JS | Description
+-- | -
+Cache | Functions related to creating and storing data cache
+Config | Functions related to manipulating CM configuration
+Data | Hard coded values
+Disp | Functions related to displaying CM's UI
+InitSaveLoad | Functions related to registering the CM object with the Game's Modding API
+Main | Functions related to the main loop and initializing CM
+Sim | Functions related to simulate something
+
+These are some additional guidelines:
+- Try to use DOM as much as possible instead of using string manipulation to modify HTML.
+- Please be descriptive of your commits. If the commit is related to an issue or PR, please add the issue/PR number to the commit message.
+- PR's should target the `dev` branch

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,26 @@
+---
+name: Bug report
+about: Please use this template to report bugs you might have found
+title: ''
+labels: Bug
+assignees: ''
+
+---
+
+**Describe the bug**
+Please describe the bug and what you would have expected the mod to do
+
+**To Reproduce**
+The steps needed to reproduce the behavior:
+1. ...
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Save file**
+```
+Please add a save file here.
+This makes debugging much easier as we do not always have a good test save to debug the issue
+```
+**Browser**
+Please specify your current browser. This can help find/fix the bug!

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for CookieMonster
+title: ''
+labels: Enhancement
+assignees: ''
+
+---
+
+**Describe the function you'd like to see added to CookieMonster**
+A clear and concise description of what you want to happen.
+
+**Additional files**
+Add any other files such as save files or screenshots about the feature request here.

.github/workflows/CI.yml

@@ -0,0 +1,32 @@
+name: CI
+on: pull_request
+jobs:
+  Check_linting_test_and_build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out repository code
+      uses: actions/checkout@v2
+    - name: Install dependencies
+      run: npm ci
+    - name: Run ESLint
+      run: npx eslint src
+    - name: Run Mocha tests
+      run: npx mocha
+    - name: Check if CookieMonsterDev.js is built correctly
+      run: |
+        npx webpack -o ./tmp --env production
+        if cmp <(head -n 2 dist/CookieMonsterDev.js) <(head -n 2 tmp/CookieMonsterDev.js); then
+            echo '### SUCCESS: CookieMonsterDev is correctly built! ###'
+        else
+            echo '### WARNING: CookieMonsterDev.js does not seem to be correct. Make sure to run "npm run build" after saving all your changes! ###'
+            exit 1
+        fi
+    - name: Check if CookieMonster.js is built correctly
+      if: github.ref == 'refs/heads/master'
+      run: |
+       if cmp <(head -n 2 dist/CookieMonsterDev.js) <(head -n 2 dist/CookieMonster.js); then
+            echo '### SUCCESS: CookieMonster is correctly built! ###'
+        else
+            echo '### WARNING: CookieMonster.js does not seem to be correct. Make sure to copy CookieMonsterDev.js into CookieMonster.js before merging to master! ###'
+            exit 1
+        fi

.gitignore

@@ -0,0 +1 @@
+node_modules

.mocharc.json

@@ -0,0 +1,5 @@
+{
+  "recursive": true,
+  "require": ["esm", "ts-node/register"],
+  "reporter": "min"
+}

.prettierrc.json

@@ -0,0 +1,5 @@
+{
+  "printWidth": 100,
+  "singleQuote": true,
+  "trailingComma": "all"
+}

Combine.bat

@@ -1,2 +0,0 @@
-@ECHO OFF
-COPY /B /Y .\src\Header.js + .\src\Cache.js + .\src\Config.js + .\src\Data.js + .\src\Disp.js + .\src\Main.js + .\src\Sim.js + .\src\Footer.js CookieMonster.js

Combine.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-cat src/*.js > CookieMonster.js

CookieMonster.user.js

@@ -0,0 +1,13 @@
+// ==UserScript==
+// @name Cookie Monster
+// @include /https?://orteil.dashnet.org/cookieclicker/
+// ==/UserScript==
+
+const readyCheck = setInterval(() => {
+  const Game = unsafeWindow.Game;
+
+  if (typeof Game !== 'undefined' && typeof Game.ready !== 'undefined' && Game.ready) {
+    Game.LoadMod('https://cookiemonsterteam.github.io/CookieMonster/dist/CookieMonster.js');
+    clearInterval(readyCheck);
+  }
+}, 1000);

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Aktanusa
+Copyright (c) 2021 CookieMonsterTeam
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,138 +1,76 @@
-# Cookie Monster
+![ESLint](https://github.com/Aktanusa/CookieMonster/workflows/ESLint/badge.svg?event=push)
+## 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.
+The mod helps you to *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**.
 
-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**.
+### Current version
+The `gh-pages` branch hosts the latest version intended for general users. All development and pull requests should target the `dev` branch.
 
-## Current version
+### What it does
 
-You can see the current version, and a full history of all versions and what they changed by consulting the [releases page](https://github.com/Aktanusa/CookieMonster/releases).
-
-## What it does
-
-At its core, Cookie Monster computes an index on both buildings and upgrades:
-
-* **Payback Period (PP)**: Indicates how much a building is worth by using the formula max(cost - cookies in bank, 0)/cps + cost/Δ cps
+At its core, Cookie Monster computes an index for both buildings and upgrades: the **Payback Period (PP)**. This indicates how much a building is worth by using the following formula: 
+```
+max(cost - cookies in bank, 0)/cps + cost/Δ cps
+```
 
 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. It compares the PP across all possible buy options: if a buy 10 option is better than any of the buy 1 options Cookie Monster will colour them accordingly.
+Cookie Monster uses the following standard colours:
 
-* Light Blue: (upgrades) This item has a better PP than any building
-* Green: This item has the best PP
-* 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 PP
-* Purple: (upgrades) This item has a worse PP 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 PP than the best building to buy
+* Green: This building has the best PP
+* Yellow: This building is within the top 10 of best PP's
+* Orange: This building is within the top 20 of best PP's
+* Red: This building is within the top 30 of best PP's
+* Purple: This building is worse than the top 10 of best PP's
+* Gray: This item does not have a PP, often this means that there is no change to CPS
 
 Note: For this index, **lower is better**, meaning a building with a PP of 1 is more interesting than one with a PP of 3.
 
-## What it doesn't do
+## Using
 
-Most likely you'll find items in gray like Golden Cookie upgrades, clicking upgrades, season 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
-* Titanium mouse
-* Adamantium mouse
-* Unobtainium mouse
-* Lucky day
-* Serendipity
-* Get lucky
-* Elder Pledge
-* Sacrificial rolling pins
-* **etc.**
-
-Do note though that, although these upgrades have no direct value, if buying them earns you an achievement of some sort which in return gives you milk and income, Cookie Monster **will** display that value.
-
-# Using
-
-## Bookmarklet
+### Bookmarklet
 
 Copy this code and save it as a bookmark. Paste it in the URL section. To activate, click the bookmark when the game's open.
 
 ```javascript
 javascript: (function () {
-	Game.LoadMod('http://aktanusa.github.io/CookieMonster/CookieMonster.js');
+	Game.LoadMod('https://aktanusa.github.io/CookieMonster/CookieMonster.js');
 }());
 ```
 
 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:
+### Userscript
 
-```javascript
-javascript: (function () {
-	Game.LoadMod('http://aktanusa.github.io/CookieMonster/CookieMonsterBeta.js');
-}());
-```
+If you'd rather use the addon as a [userscript](https://en.wikipedia.org/wiki/Userscript) to automatically load _Cookie Monster_ every time the original game loads, install the `CookieMonster.user.js` file. You can do this by clicking on the file in the file-list and clicking "raw".
 
-## Userscript
+**Note that to avoid conflicts Cookie Monster should ideally be loaded after any other content mods have been loaded**
 
-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.
+## Bugs and suggestions
 
-```javascript
-// ==UserScript==
-// @name Cookie Monster
-// @namespace Cookie
-// @include http://orteil.dashnet.org/cookieclicker/
-// @version 1
-// @grant none
-// ==/UserScript==
+Any bug or suggestion should be **opened as an issue** [in the repository](https://github.com/Aktanusa/CookieMonster/issues) for easier tracking. This allows us to close issues once they're fixed.
 
-(function() {
-    var checkReady = setInterval(function() {
-        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==
-
-(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
-
-Any bug or suggestion should be **opened as an issue** [in the repository](https://github.com/Aktanusa/CookieMonster/issues) for easier tracking. This allows me to close issues once they're fixed.
-
-Before submitting a bug, make sure to give a shot at the latest version of the addon on the <code>dev</code> branch. For this, use the following bookmarklet:
-
-```javascript
-javascript: (function () {
-	Game.LoadMod('https://cdn.rawgit.com/Aktanusa/CookieMonster/dev/CookieMonster.js');
-}());
-```
-
-If the bug is still here, you can submit an issue for it.
+Before submitting a bug, make sure to give a shot at the latest version of the addon on the `dev` branch. This version can be tested by copying the `CookieMonster.js` file of the dev branch into your console. If the bug is still here, you can submit an issue for it. Please do so by using the bug report template.
 
 All suggestions are welcome, even the smallest ones.
 
-# Contributors
+## Contributing
 
-* **[Raving_Kumquat](http://cookieclicker.wikia.com/wiki/User:Raving_Kumquat)**: Original author
+To contribute you can fork and clone the repository and run `npm install`.
+
+Please also remember to run `npm run build` after saving all your changes to build the final `CookieMonster.js` file.
+
+## Contributors
+
+* **[Raving_Kumquat](https://cookieclicker.wikia.com/wiki/User:Raving_Kumquat)**: Original author
 * **[Maxime Fabre](https://github.com/Anahkiasen)**: Previous maintainer
 * **[Alderi Tokori](http://forum.dashnet.org/profile/Alderi)**: ROI calculations (unused now)
 * **[Alhifar](https://github.com/Alhifar)**: Missed Golden Cookie Stat
 * **[BlackenedGem](https://github.com/BlackenedGem)**: Golden/Wrath Cookie Favicons
 * **[Sandworm](https://github.com/svschouw)**: Modified PP calculation
-* **[Aktanusa](https://github.com/Aktanusa)**: Current maintainer
+* **[Aktanusa](https://github.com/Aktanusa)**: Current maintainer
+* **[DanielNoord](https://github.com/DanielNoord)**: Current maintainer
+* **[bitsandbytes1708](https://github.com/bitsandbytes1708)**: Current maintainer

dist/CookieMonster.js.LICENSE.txt

@@ -0,0 +1,10 @@
+/**
+ * jscolor - JavaScript Color Picker
+ *
+ * @link    http://jscolor.com
+ * @license For open source use: GPLv3
+ *          For commercial use: JSColor Commercial License
+ * @author  Jan Odvarko - East Desire
+ *
+ * See usage examples at http://jscolor.com/examples/
+ */

dist/CookieMonsterDev.js.LICENSE copy.txt

@@ -0,0 +1,10 @@
+/**
+ * jscolor - JavaScript Color Picker
+ *
+ * @link    http://jscolor.com
+ * @license For open source use: GPLv3
+ *          For commercial use: JSColor Commercial License
+ * @author  Jan Odvarko - East Desire
+ *
+ * See usage examples at http://jscolor.com/examples/
+ */

jscolor/jscolor.js

@@ -1,997 +0,0 @@
-/**
- * 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();

package.json

@@ -0,0 +1,75 @@
+{
+  "name": "cookiemonster-mod",
+  "version": "2.031.7",
+  "description": "Cookie Monster is an add-on that you can load into Cookie Clicker which 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 everything is an option.",
+  "main": "CookieMonster.js",
+  "keywords": [
+    "Cookie Clicker",
+    "javascript",
+    "mod",
+    "Dashnet",
+    "Orteil"
+  ],
+  "scripts": {
+    "eslint-src": "eslint src test",
+    "build": "run-s eslint-src pack-prod test",
+    "build-test": "run-s pack-dev",
+    "pack-prod": "webpack --env production",
+    "pack-dev": "webpack",
+    "test": "mocha"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Aktanusa/CookieMonster.git"
+  },
+  "license": "MIT",
+  "author": {
+    "name": "Aktanusa",
+    "email": "chanam.geo@yahoo.com"
+  },
+  "contributors": [
+    {
+      "name": "Daniël van Noord",
+      "email": "13665637+DanielNoord@users.noreply.github.com"
+    },
+    {
+      "name": "Aran Leite",
+      "email": "hyoretsu@gmail.com",
+      "url": "https://www.linkedin.com/in/aranleite"
+    }
+  ],
+  "bugs": {
+    "url": "https://github.com/Aktanusa/CookieMonster/issues"
+  },
+  "homepage": "https://github.com/Aktanusa/CookieMonster#readme",
+  "devDependencies": {
+    "@types/chai": "^4.2.16",
+    "@types/mocha": "^8.2.2",
+    "@typescript-eslint/eslint-plugin": "^4.22.0",
+    "@typescript-eslint/parser": "^4.21.0",
+    "chai": "^4.3.4",
+    "eslint": "^7.23.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-import": "^2.22.1",
+    "esm": "^3.2.25",
+    "mocha": "^8.3.2",
+    "npm-run-all": "^4.1.5",
+    "prettier": "2.2.1",
+    "ts-loader": "^8.1.0",
+    "ts-node": "^9.1.1",
+    "typescript": "^4.2.3",
+    "webpack": "^5.24.4",
+    "webpack-cli": "^4.5.0"
+  },
+  "ccrepo": {
+    "icon": [
+      10,
+      0
+    ],
+    "name": "Cookie Monster"
+  },
+  "dependencies": {
+    "@eastdesire/jscolor": "^2.4.5"
+  }
+}

queue/queue.js

@@ -1,82 +0,0 @@
-/*
-
-Queue.js
-
-A function to represent a queue
-
-Created by Stephen Morley - http://code.stephenmorley.org/ - and released under
-the terms of the CC0 1.0 Universal legal code:
-
-http://creativecommons.org/publicdomain/zero/1.0/legalcode
-
-*/
-
-/* Creates a new queue. A queue is a first-in-first-out (FIFO) data structure -
- * items are added to the end of the queue and removed from the front.
- */
-function Queue(){
-
-  // initialise the queue and offset
-  var queue  = [];
-  var offset = 0;
-
-  // Returns the length of the queue.
-  this.getLength = function(){
-    return (queue.length - offset);
-  }
-
-  // Returns true if the queue is empty, and false otherwise.
-  this.isEmpty = function(){
-    return (queue.length == 0);
-  }
-
-  /* Enqueues the specified item. The parameter is:
-   *
-   * item - the item to enqueue
-   */
-  this.enqueue = function(item){
-    queue.push(item);
-  }
-
-  /* Dequeues an item and returns it. If the queue is empty, the value
-   * 'undefined' is returned.
-   */
-  this.dequeue = function(){
-
-    // if the queue is empty, return immediately
-    if (queue.length == 0) return undefined;
-
-    // store the item at the front of the queue
-    var item = queue[offset];
-
-    // increment the offset and remove the free space if necessary
-    if (++ offset * 2 >= queue.length){
-      queue  = queue.slice(offset);
-      offset = 0;
-    }
-
-    // return the dequeued item
-    return item;
-
-  }
-
-  /* Returns the item at the front of the queue (without dequeuing it). If the
-   * queue is empty then undefined is returned.
-   */
-  this.peek = function(){
-    return (queue.length > 0 ? queue[offset] : undefined);
-  }
-  
-  /* Returns the item at the spot specified by place in the queue (without 
-   * dequeuing it). If the queue is emprty or the requested place is outside 
-   * the queue then undefined is returned.
-   */
-  this.get = function(place){
-    var item = undefined;
-	if (queue.length > 0 && place < (queue.length - offset) && place >= 0) {
-	  item = queue[(offset + place)];
-	}
-    return item;
-  }
-
-}

src/Cache.js

@@ -1,336 +0,0 @@
-/*********
- * Cache *
- *********/
- 
-CM.Cache.AddQueue = function() {
-	CM.Cache.Queue = document.createElement('script');
-	CM.Cache.Queue.type = 'text/javascript';
-	CM.Cache.Queue.setAttribute('src', 'http://aktanusa.github.io/CookieMonster/queue/queue.js');
-	document.head.appendChild(CM.Cache.Queue);
-}
-
-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.RemakeBuildingsPrices = function() {
-	for (var i in Game.Objects) {
-		CM.Cache.Objects10[i].price = CM.Sim.BuildingGetPrice(Game.Objects[i].basePrice, Game.Objects[i].amount, Game.Objects[i].free, 10);
-		CM.Cache.Objects100[i].price = CM.Sim.BuildingGetPrice(Game.Objects[i].basePrice, Game.Objects[i].amount, Game.Objects[i].free, 100);
-	}
-}
-
-CM.Cache.RemakeIncome = function() {
-	// Simulate Building Buys for 1 amount
-	CM.Sim.BuyBuildings(1, 'Objects');
-
-	// Simulate Upgrade Buys
-	CM.Sim.BuyUpgrades();
-	
-	// Simulate Building Buys for 10 amount
-	CM.Sim.BuyBuildings(10, 'Objects10');
-	
-	// Simulate Building Buys for 100 amount
-	CM.Sim.BuyBuildings(100, 'Objects100');
-}
-
-CM.Cache.RemakeWrinkBank = function() {
-	var totalSucked = 0;
-	for (var i in Game.wrinklers) {
-		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
-		sucked *= toSuck;
-		if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
-		if (Game.hasGod) {
-			var godLvl = Game.hasGod('scorn');
-			if (godLvl == 1) sucked *= 1.15;
-			else if (godLvl == 2) sucked *= 1.1;
-			else if (godLvl == 3) sucked *= 1.05;
-		}
-		totalSucked += sucked;
-	}
-	CM.Cache.WrinkBank = totalSucked;
-}
-
-CM.Cache.RemakeBuildingsPP = function() {
-	CM.Cache.min = -1;
-	CM.Cache.max = -1;
-	CM.Cache.mid = -1;
-	for (var i in CM.Cache.Objects) {
-		//CM.Cache.Objects[i].pp = Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus;
-		CM.Cache.Objects[i].pp = (Math.max(Game.Objects[i].getPrice() - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus);
-		if (CM.Cache.min == -1 || CM.Cache.Objects[i].pp < CM.Cache.min) CM.Cache.min = CM.Cache.Objects[i].pp;
-		if (CM.Cache.max == -1 || CM.Cache.Objects[i].pp > CM.Cache.max) CM.Cache.max = CM.Cache.Objects[i].pp;
-	}
-	CM.Cache.mid = ((CM.Cache.max - CM.Cache.min) / 2) + CM.Cache.min;
-	for (var i in CM.Cache.Objects) {
-		var color = '';
-		if (CM.Cache.Objects[i].pp == CM.Cache.min) color = CM.Disp.colorGreen;
-		else if (CM.Cache.Objects[i].pp == CM.Cache.max) color = CM.Disp.colorRed;
-		else if (CM.Cache.Objects[i].pp > CM.Cache.mid) color = CM.Disp.colorOrange;
-		else color = CM.Disp.colorYellow;
-		CM.Cache.Objects[i].color = color;
-	}
-}
-
-CM.Cache.RemakeUpgradePP = function() {
-	for (var i in CM.Cache.Upgrades) {
-		//CM.Cache.Upgrades[i].pp = Game.Upgrades[i].getPrice() / CM.Cache.Upgrades[i].bonus;
-		CM.Cache.Upgrades[i].pp = (Math.max(Game.Upgrades[i].getPrice() - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (Game.Upgrades[i].getPrice() / CM.Cache.Upgrades[i].bonus);
-		if (isNaN(CM.Cache.Upgrades[i].pp)) CM.Cache.Upgrades[i].pp = Infinity;
-		var color = '';
-		if (CM.Cache.Upgrades[i].pp <= 0 || CM.Cache.Upgrades[i].pp == Infinity) color = CM.Disp.colorGray;
-		else if (CM.Cache.Upgrades[i].pp < CM.Cache.min) color = CM.Disp.colorBlue;
-		else if (CM.Cache.Upgrades[i].pp == CM.Cache.min) color = CM.Disp.colorGreen;
-		else if (CM.Cache.Upgrades[i].pp == CM.Cache.max) color = CM.Disp.colorRed;
-		else if (CM.Cache.Upgrades[i].pp > CM.Cache.max) color = CM.Disp.colorPurple;
-		else if (CM.Cache.Upgrades[i].pp > CM.Cache.mid) color = CM.Disp.colorOrange;
-		else color = CM.Disp.colorYellow;
-		CM.Cache.Upgrades[i].color = color;
-	}
-}
-
-CM.Cache.RemakeBuildingsOtherPP = function(amount, target) {
-	for (var i in CM.Cache[target]) {
-		//CM.Cache[target][i].pp = CM.Cache[target][i].price / CM.Cache[target][i].bonus;
-		CM.Cache[target][i].pp = (Math.max(CM.Cache[target][i].price - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (CM.Cache[target][i].price / CM.Cache[target][i].bonus);
-		var color = '';
-		if (CM.Cache[target][i].pp <= 0 || CM.Cache[target][i].pp == Infinity) color = CM.Disp.colorGray;
-		else if (CM.Cache[target][i].pp < CM.Cache.min) color = CM.Disp.colorBlue;
-		else if (CM.Cache[target][i].pp == CM.Cache.min) color = CM.Disp.colorGreen;
-		else if (CM.Cache[target][i].pp == CM.Cache.max) color = CM.Disp.colorRed;
-		else if (CM.Cache[target][i].pp > CM.Cache.max) color = CM.Disp.colorPurple;
-		else if (CM.Cache[target][i].pp > CM.Cache.mid) color = CM.Disp.colorOrange;
-		else color = CM.Disp.colorYellow;
-		CM.Cache[target][i].color = color;
-	}
-}
-
-CM.Cache.RemakePP = function() {
-	// Buildings for 1 amount
-	CM.Cache.RemakeBuildingsPP();
-	
-	// Upgrades
-	CM.Cache.RemakeUpgradePP();
-	
-	// Buildings for 10 amount
-	CM.Cache.RemakeBuildingsOtherPP(10, 'Objects10');
-
-	// Buildings for 100 amount
-	CM.Cache.RemakeBuildingsOtherPP(100, 'Objects100');	
-}
-
-CM.Cache.RemakeLucky = function() {
-	CM.Cache.Lucky = (CM.Cache.NoGoldSwitchCookiesPS * 60 * 15) / 0.15;
-	CM.Cache.Lucky /= CM.Sim.getCPSBuffMult();
-	CM.Cache.LuckyReward = (CM.Cache.Lucky * 0.15) + 13;
-	CM.Cache.LuckyFrenzy = CM.Cache.Lucky * 7;
-	CM.Cache.LuckyRewardFrenzy = (CM.Cache.LuckyFrenzy * 0.15) + 13;
-}
-
-CM.Cache.MaxChainMoni = function(digit, maxPayout) {
-	var chain = 1 + Math.max(0, Math.ceil(Math.log(Game.cookies) / Math.LN10) - 10);
-	var moni = Math.max(digit, Math.min(Math.floor(1 / 9 * Math.pow(10, chain) * digit), maxPayout));
-	var nextMoni = Math.max(digit, Math.min(Math.floor(1 / 9 * Math.pow(10, chain + 1) * digit), maxPayout));
-	while (nextMoni < maxPayout) {
-		chain++;
-		moni = Math.max(digit, Math.min(Math.floor(1 / 9 * Math.pow(10, chain) * digit), maxPayout));
-		nextMoni = Math.max(digit, Math.min(Math.floor(1 / 9 * Math.pow(10, chain + 1) * digit), maxPayout));
-	}
-	return moni;
-}
-
-CM.Cache.RemakeChain = function() {
-	var maxPayout = CM.Cache.NoGoldSwitchCookiesPS * 60 * 60 * 6;
-	maxPayout /= CM.Sim.getCPSBuffMult();
-	
-	CM.Cache.ChainReward = CM.Cache.MaxChainMoni(7, maxPayout);
-	
-	CM.Cache.ChainWrathReward = CM.Cache.MaxChainMoni(6, maxPayout);
-	
-	if (maxPayout < CM.Cache.ChainReward) {
-		CM.Cache.Chain = 0;
-	}
-	else {
-		CM.Cache.Chain = CM.Cache.NextNumber(CM.Cache.ChainReward) / 0.25;
-	}
-	if (maxPayout < CM.Cache.ChainWrathReward) {
-		CM.Cache.ChainWrath = 0;
-	}
-	else {
-		CM.Cache.ChainWrath = CM.Cache.NextNumber(CM.Cache.ChainWrathReward) / 0.25;
-	}
-	
-	CM.Cache.ChainFrenzyReward = CM.Cache.MaxChainMoni(7, maxPayout * 7);
-	
-	CM.Cache.ChainFrenzyWrathReward = CM.Cache.MaxChainMoni(6, maxPayout * 7);
-	
-	if ((maxPayout * 7) < CM.Cache.ChainFrenzyReward) {
-		CM.Cache.ChainFrenzy = 0;
-	}
-	else {
-		CM.Cache.ChainFrenzy = CM.Cache.NextNumber(CM.Cache.ChainFrenzyReward) / 0.25;
-	}
-	if ((maxPayout * 7) < CM.Cache.ChainFrenzyWrathReward) {
-		CM.Cache.ChainFrenzyWrath = 0;
-	}
-	else {
-		CM.Cache.ChainFrenzyWrath = CM.Cache.NextNumber(CM.Cache.ChainFrenzyWrathReward) / 0.25;
-	}
-}
-
-CM.Cache.RemakeSeaSpec = function() {
-	if (Game.season == 'christmas') {
-		var val = Game.cookiesPs * 60;
-		if (Game.hasBuff('Elder frenzy')) val *= 0.5; // very sorry
-		if (Game.hasBuff('Frenzy')) val *= 0.75; // I sincerely apologize		
-		CM.Cache.SeaSpec = Math.max(25, val);
-		if (Game.Has('Ho ho ho-flavored frosting')) CM.Cache.SeaSpec *= 2;
-	}
-}
-
-CM.Cache.RemakeSellForChoEgg = function() {
-	if (Game.hasAura('Earth Shatterer') || Game.dragonLevel < 9) {
-		var sellTotal = 0;
-		for (var i in Game.Objects) {
-			var me = Game.Objects[i];
-			sellTotal += CM.Sim.BuildingSell(me.basePrice, me.amount, me.free, me.amount, 0);
-		}
-	}
-	else {
-		var highestBuilding = '';
-		for (var i in Game.Objects) {
-			if (Game.Objects[i].amount > 0) highestBuilding = i;
-		}
-		var sellTotal = 0;
-		for (var i in Game.Objects) {
-			var me = Game.Objects[i];
-			var amount = 0;
-			if (i == highestBuilding) {
-				amount = me.amount - 1;
-			}
-			else {
-				amount = me.amount;
-			}
-			sellTotal += CM.Sim.BuildingSell(me.basePrice, amount, me.free, amount, 1);
-		}
-	}
-	CM.Cache.SellForChoEgg = sellTotal;
-}
-
-CM.Cache.InitCookiesDiff = function() {
-	CM.Cache.CookiesDiff = new Queue();
-	CM.Cache.WrinkDiff = new Queue();
-	CM.Cache.ChoEggDiff = new Queue();
-	CM.Cache.ClicksDiff = new Queue();
-}
-
-CM.Cache.UpdateAvgCPS = function() {
-	var currDate = Math.floor(Date.now() / 1000);
-	if (CM.Cache.lastDate != currDate) {	
-		var choEggTotal = Game.cookies + CM.Cache.SellForChoEgg;
-		if (Game.cpsSucked > 0) {
-			choEggTotal += CM.Cache.WrinkBank;
-		}
-		choEggTotal *= 0.05;
-
-		if (CM.Cache.lastDate != -1) {
-			var timeDiff = currDate - CM.Cache.lastDate
-			var bankDiffAvg = Math.max(0, (Game.cookies - CM.Cache.lastCookies)) / timeDiff;
-			var wrinkDiffAvg = Math.max(0, (CM.Cache.WrinkBank - CM.Cache.lastWrinkCookies)) / timeDiff;
-			var choEggDiffAvg = Math.max(0,(choEggTotal - CM.Cache.lastChoEgg)) / timeDiff;
-			var clicksDiffAvg = (Game.cookieClicks - CM.Cache.lastClicks) / timeDiff;
-			for (var i = 0; i < timeDiff; i++) {
-				CM.Cache.CookiesDiff.enqueue(bankDiffAvg);
-				CM.Cache.WrinkDiff.enqueue(wrinkDiffAvg);
-				CM.Cache.ChoEggDiff.enqueue(choEggDiffAvg);
-				CM.Cache.ClicksDiff.enqueue(clicksDiffAvg);		
-			}
-			// Assumes the queues are the same length
-			while (CM.Cache.CookiesDiff.getLength() > 1800) {
-				CM.Cache.CookiesDiff.dequeue();
-				CM.Cache.WrinkDiff.dequeue();
-				CM.Cache.ClicksDiff.dequeue();
-			}
-			
-			while (CM.Cache.ClicksDiff.getLength() > 30) {
-				CM.Cache.ClicksDiff.dequeue();
-			}
-		}
-		CM.Cache.lastDate = currDate;
-		CM.Cache.lastCookies = Game.cookies;
-		CM.Cache.lastWrinkCookies = CM.Cache.WrinkBank;
-		CM.Cache.lastChoEgg = choEggTotal;
-		CM.Cache.lastClicks = Game.cookieClicks;
-		
-		var totalGainBank = 0;
-		var totalGainWrink = 0;
-		var totalGainChoEgg = 0;
-		var cpsLength = Math.min(CM.Cache.CookiesDiff.getLength(), CM.Disp.times[CM.Config.AvgCPSHist] * 60);
-		// Assumes the queues are the same length 
-		for (var i = CM.Cache.CookiesDiff.getLength() - cpsLength; i < CM.Cache.CookiesDiff.getLength(); i++) {
-			totalGainBank += CM.Cache.CookiesDiff.get(i);
-			totalGainWrink += CM.Cache.WrinkDiff.get(i);
-			totalGainChoEgg += CM.Cache.ChoEggDiff.get(i);
-		}
-		CM.Cache.AvgCPS = (totalGainBank + (CM.Config.CalcWrink ? totalGainWrink : 0)) / cpsLength;
-		
-		var choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg'));
-		
-		if (choEgg || CM.Config.CalcWrink == 0) {
-			CM.Cache.AvgCPSChoEgg = (totalGainBank + totalGainWrink + (choEgg ? totalGainChoEgg : 0)) / cpsLength;
-		}
-		else {
-			CM.Cache.AvgCPSChoEgg = CM.Cache.AvgCPS;
-		}
-
-		var totalClicks = 0;
-		var clicksLength = Math.min(CM.Cache.ClicksDiff.getLength(), CM.Disp.times[CM.Config.AvgClicksHist]);
-		for (var i = CM.Cache.ClicksDiff.getLength() - clicksLength; i < CM.Cache.ClicksDiff.getLength(); i++) {
-			totalClicks += CM.Cache.ClicksDiff.get(i);
-		}
-		CM.Cache.AvgClicks = totalClicks / clicksLength;
-	}
-}
-
-CM.Cache.min = -1;
-CM.Cache.max = -1;
-CM.Cache.mid = -1;
-CM.Cache.WrinkBank = -1;
-CM.Cache.NoGoldSwitchCookiesPS = 0;
-CM.Cache.Lucky = 0;
-CM.Cache.LuckyReward = 0;
-CM.Cache.LuckyFrenzy = 0;
-CM.Cache.LuckyRewardFrenzy = 0;
-CM.Cache.SeaSpec = 0;
-CM.Cache.Chain = 0;
-CM.Cache.ChainWrath = 0;
-CM.Cache.ChainReward = 0;
-CM.Cache.ChainWrathReward = 0;
-CM.Cache.ChainFrenzy = 0;
-CM.Cache.ChainFrenzyWrath = 0;
-CM.Cache.ChainFrenzyReward = 0;
-CM.Cache.ChainFrenzyWrathReward = 0;
-CM.Cache.CentEgg = 0;
-CM.Cache.SellForChoEgg = 0;
-CM.Cache.Title = '';
-CM.Cache.HadFierHoard = false;
-CM.Cache.lastDate = -1;
-CM.Cache.lastCookies = -1;
-CM.Cache.lastWrinkCookies = -1;
-CM.Cache.lastChoEgg = -1;
-CM.Cache.lastClicks = -1;
-CM.Cache.CookiesDiff;
-CM.Cache.WrinkDiff;
-CM.Cache.ChoEggDiff;
-CM.Cache.ClicksDiff;
-CM.Cache.AvgCPS = -1;
-CM.Cache.AvgCPSChoEgg = -1;
-CM.Cache.AvgClicks = -1;
-

src/Cache/CPS/AverageQueue.js

@@ -0,0 +1,68 @@
+import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData';
+import {
+  ChoEggDiff,
+  ClicksDiff,
+  CookiesDiff,
+  WrinkDiff,
+  WrinkFattestDiff,
+} from '../VariablesAndData';
+
+/**
+ * @class
+ * @classdesc 	This is a class used to store values used to calculate average over time (mostly cps)
+ * @var			{number}				maxLength	The maximum length of the value-storage
+ * @var			{[]}					queue		The values stored
+ * @method		addLatest(newValue)		Appends newValue to the value storage
+ * @method		calcAverage(timePeriod)	Returns the average over the specified timeperiod
+ */
+export class CMAvgQueue {
+  constructor(maxLength) {
+    this.maxLength = maxLength;
+    this.queue = [];
+  }
+
+  addLatest(newValue) {
+    if (this.queue.push(newValue) > this.maxLength) {
+      this.queue.shift();
+    }
+  }
+
+  /**
+   * This functions returns the average of the values in the queue
+   * @param 	{number}	timePeriod	The period in seconds to computer average over
+   * @returns {number}	ret			The average
+   */
+  calcAverage(timePeriod) {
+    let time = timePeriod;
+    if (time > this.maxLength) time = this.maxLength;
+    if (time > this.queue.length) time = this.queue.length;
+    let ret = 0;
+    for (let i = this.queue.length - 1; i >= 0 && i > this.queue.length - 1 - time; i--) {
+      ret += this.queue[i];
+    }
+    if (ret === 0) {
+      return 0;
+    }
+    return ret / time;
+  }
+
+  calcSum(timePeriod) {
+    let time = timePeriod;
+    if (time > this.maxLength) time = this.maxLength;
+    if (time > this.queue.length) time = this.queue.length;
+    if (time === 0) return 0;
+    return this.queue.slice(-time).reduce((a, b) => a + b, 0);
+  }
+}
+
+/**
+ * This functions caches creates the CMAvgQueue used by CM.Cache.CacheAvgCPS() to calculate CPS
+ * Called by CM.Cache.InitCache()
+ */
+export function InitCookiesDiff() {
+  CookiesDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars
+  WrinkDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars
+  WrinkFattestDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars
+  ChoEggDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars
+  ClicksDiff = new CMAvgQueue(ClickTimes[ClickTimes.length - 1]); // eslint-disable-line no-unused-vars
+}

src/Cache/CPS/CPS.js

@@ -0,0 +1,89 @@
+import { CMOptions } from '../../Config/VariablesAndData';
+import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData';
+import {
+  CacheAverageClicks,
+  CacheAverageCPS,
+  CacheAverageGainBank,
+  CacheAverageGainChoEgg,
+  CacheAverageGainWrink,
+  CacheAverageGainWrinkFattest,
+  CacheAvgCPSWithChoEgg,
+  CacheLastChoEgg,
+  CacheLastClicks,
+  CacheLastCookies,
+  CacheLastCPSCheck,
+  CacheLastWrinkCookies,
+  CacheLastWrinkFattestCookies,
+  CacheRealCookiesEarned,
+  CacheSellForChoEgg,
+  CacheWrinklersFattest,
+  CacheWrinklersTotal,
+  ChoEggDiff,
+  ClicksDiff,
+  CookiesDiff,
+  WrinkDiff,
+  WrinkFattestDiff,
+} from '../VariablesAndData';
+
+/**
+ * This functions caches two variables related average CPS and Clicks
+ * It is called by CM.Cache.LoopCache()
+ * @global	{number}	CM.Cache.RealCookiesEarned	Cookies earned including the Chocolate Egg
+ * @global	{number}	CM.Cache.AvgCPS				Average cookies over time-period as defined by AvgCPSHist
+ * @global	{number}	CM.Cache.AverageClicks		Average cookies from clicking over time-period as defined by AvgClicksHist
+ * @global	{number}	CM.Cache.AvgCPSChoEgg		Average cookies from combination of normal CPS and average Chocolate Cookie CPS
+ */
+export default function CacheAvgCPS() {
+  const currDate = Math.floor(Date.now() / 1000);
+  // Only calculate every new second
+  if ((Game.T / Game.fps) % 1 === 0) {
+    let choEggTotal = Game.cookies + CacheSellForChoEgg;
+    if (Game.cpsSucked > 0) choEggTotal += CacheWrinklersTotal;
+    CacheRealCookiesEarned = Math.max(Game.cookiesEarned, choEggTotal); // eslint-disable-line no-unused-vars
+    choEggTotal *= 0.05;
+
+    // Add recent gains to AvgQueue's
+    const timeDiff = currDate - CacheLastCPSCheck;
+    const bankDiffAvg = Math.max(0, Game.cookies - CacheLastCookies) / timeDiff;
+    const wrinkDiffAvg = Math.max(0, CacheWrinklersTotal - CacheLastWrinkCookies) / timeDiff;
+    const wrinkFattestDiffAvg =
+      Math.max(0, CacheWrinklersFattest[0] - CacheLastWrinkFattestCookies) / timeDiff;
+    const choEggDiffAvg = Math.max(0, choEggTotal - CacheLastChoEgg) / timeDiff;
+    const clicksDiffAvg = (Game.cookieClicks - CacheLastClicks) / timeDiff;
+    for (let i = 0; i < timeDiff; i++) {
+      CookiesDiff.addLatest(bankDiffAvg);
+      WrinkDiff.addLatest(wrinkDiffAvg);
+      WrinkFattestDiff.addLatest(wrinkFattestDiffAvg);
+      ChoEggDiff.addLatest(choEggDiffAvg);
+      ClicksDiff.addLatest(clicksDiffAvg);
+    }
+
+    // Store current data for next loop
+    CacheLastCPSCheck = currDate;
+    CacheLastCookies = Game.cookies;
+    CacheLastWrinkCookies = CacheWrinklersTotal;
+    CacheLastWrinkFattestCookies = CacheWrinklersFattest[0];
+    CacheLastChoEgg = choEggTotal;
+    CacheLastClicks = Game.cookieClicks;
+
+    // Get average gain over period of cpsLength seconds
+    const cpsLength = CookieTimes[CMOptions.AvgCPSHist];
+    CacheAverageGainBank = CookiesDiff.calcAverage(cpsLength);
+    CacheAverageGainWrink = WrinkDiff.calcAverage(cpsLength);
+    CacheAverageGainWrinkFattest = WrinkFattestDiff.calcAverage(cpsLength);
+    CacheAverageGainChoEgg = ChoEggDiff.calcAverage(cpsLength);
+    CacheAverageCPS = CacheAverageGainBank;
+    if (CMOptions.CalcWrink === 1) CacheAverageCPS += CacheAverageGainWrink;
+    if (CMOptions.CalcWrink === 2) CacheAverageCPS += CacheAverageGainWrinkFattest;
+
+    const choEgg = Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg');
+
+    if (choEgg || CMOptions.CalcWrink === 0) {
+      CacheAvgCPSWithChoEgg =
+        CacheAverageGainBank + CacheAverageGainWrink + (choEgg ? CacheAverageGainChoEgg : 0);
+    } else CacheAvgCPSWithChoEgg = CacheAverageCPS; // eslint-disable-line no-unused-vars
+
+    // eslint-disable-next-line no-unused-vars
+    CacheAverageClicks = ClicksDiff.calcAverage(ClickTimes[CMOptions.AvgClicksHist]);
+  }
+}

src/Cache/CPS/CurrWrinklerCPS.js

@@ -0,0 +1,29 @@
+import { SimObjects } from '../../Sim/VariablesAndData';
+import { CacheCurrWrinklerCount, CacheCurrWrinklerCPSMult } from '../VariablesAndData';
+
+/**
+ * This functions caches the current Wrinkler CPS multiplier
+ * @global	{number}	CM.Cache.CurrWrinklerCount		Current number of wrinklers
+ * @global	{number}	CM.Cache.CurrWrinklerCPSMult	Current multiplier of CPS because of wrinklers (excluding their negative sucking effect)
+ */
+export default function CacheCurrWrinklerCPS() {
+  CacheCurrWrinklerCPSMult = 0;
+  let count = 0;
+  Object.keys(Game.wrinklers).forEach((i) => {
+    if (Game.wrinklers[i].phase === 2) count += 1;
+  });
+  let godMult = 1;
+  if (SimObjects.Temple.minigameLoaded) {
+    const godLvl = Game.hasGod('scorn');
+    if (godLvl === 1) godMult *= 1.15;
+    else if (godLvl === 2) godMult *= 1.1;
+    else if (godLvl === 3) godMult *= 1.05;
+  }
+  CacheCurrWrinklerCount = count; // eslint-disable-line no-unused-vars
+  CacheCurrWrinklerCPSMult = // eslint-disable-line no-unused-vars
+    count *
+    (count * 0.05 * 1.1) *
+    (Game.Has('Sacrilegious corruption') * 0.05 + 1) *
+    (Game.Has('Wrinklerspawn') * 0.05 + 1) *
+    godMult;
+}

src/Cache/CPS/GetCPSBuffMult.js

@@ -0,0 +1,11 @@
+/**
+ * This function returns the current CPS buff
+ * @returns {number}	mult	The multiplier
+ */
+export default function GetCPSBuffMult() {
+  let mult = 1;
+  Object.keys(Game.buffs).forEach((i) => {
+    if (typeof Game.buffs[i].multCpS !== 'undefined') mult *= Game.buffs[i].multCpS;
+  });
+  return mult;
+}

src/Cache/CPS/NoGoldSwitchCPS.js

@@ -0,0 +1,13 @@
+import CalcNoGoldSwitchCPS from '../../Sim/Calculations/NoGoldenSwitchCalc';
+import { CacheNoGoldSwitchCookiesPS } from '../VariablesAndData';
+
+/**
+ * This function calculates CPS without the Golden Switch as it might be needed in other functions
+ * If so it CM.Sim.Win()'s them and the caller function will know to recall CM.Sim.CalculateGains()
+ * It is called at the end of any functions that simulates certain behaviour
+ */
+export default function CacheNoGoldSwitchCPS() {
+  if (Game.Has('Golden switch [off]')) {
+    CacheNoGoldSwitchCookiesPS = CalcNoGoldSwitchCPS();
+  } else CacheNoGoldSwitchCookiesPS = Game.cookiesPs; // eslint-disable-line no-unused-vars
+}

src/Cache/CPS/SellChoEgg.js

@@ -0,0 +1,24 @@
+import SellBuildingsForChoEgg from '../../Sim/SimulationEvents/SellBuildingForChoEgg';
+import { CacheSellForChoEgg } from '../VariablesAndData';
+
+/**
+ * This functions caches the reward for selling the Chocolate egg
+ * It is called by CM.Main.Loop()
+ * @global	{number}	CM.Cache.SellForChoEgg	Total cookies to be gained from selling Chocolate egg
+ */
+export default function CacheSellAllForChoEgg() {
+  let sellTotal = 0;
+  // Compute cookies earned by selling stock market goods
+  if (Game.Objects.Bank.minigameLoaded) {
+    const marketGoods = Game.Objects.Bank.minigame.goods;
+    let goodsVal = 0;
+    Object.keys(marketGoods).forEach((i) => {
+      const marketGood = marketGoods[i];
+      goodsVal += marketGood.stock * marketGood.val;
+    });
+    sellTotal += goodsVal * Game.cookiesPsRawHighest;
+  }
+  // Compute cookies earned by selling all buildings with optimal auras (ES + RB)
+  sellTotal += SellBuildingsForChoEgg();
+  CacheSellForChoEgg = sellTotal; // eslint-disable-line no-unused-vars
+}

src/Cache/CacheInit.js

@@ -0,0 +1,37 @@
+import { ClickTimes } from '../Disp/VariablesAndData';
+import { CMAvgQueue, InitCookiesDiff } from './CPS/AverageQueue';
+import CacheAvgCPS from './CPS/CPS';
+import CacheDragonAuras from './Dragon/CacheDragonAuras';
+import CachePP from './PP/PP';
+import { CacheBuildingsPrices, CacheIncome } from './PriceAndIncome/PriceAndIncome';
+import { CacheChain } from './Stats/ChainCookies';
+import CacheHeavenlyChipsPS from './Stats/HeavenlyChips';
+import CacheAllMissingUpgrades from './Stats/MissingUpgrades';
+import CacheSeasonSpec from './Stats/Reindeer';
+import { CacheGoldenAndWrathCookiesMults, CacheStatsCookies } from './Stats/Stats';
+import AllAmountTillNextAchievement from './TillNextAchievement/AllAmountTillNextAchievement';
+import { CacheAverageCookiesFromClicks, HeavenlyChipsDiff } from './VariablesAndData';
+import CacheWrinklers from './Wrinklers/Wrinklers';
+
+/**
+ * This functions runs all cache-functions to generate all "full" cache
+ */
+export default function InitCache() {
+  CacheDragonAuras();
+  CacheWrinklers();
+  CacheStatsCookies();
+  CacheGoldenAndWrathCookiesMults();
+  CacheChain();
+  CacheAllMissingUpgrades();
+  CacheSeasonSpec();
+  InitCookiesDiff();
+  /** Used by CM.Cache.CacheHeavenlyChipsPS() */
+  HeavenlyChipsDiff = new CMAvgQueue(5); // eslint-disable-line no-unused-vars
+  CacheAverageCookiesFromClicks = new CMAvgQueue(ClickTimes[ClickTimes.length - 1] * 20); // eslint-disable-line no-unused-vars
+  CacheHeavenlyChipsPS();
+  AllAmountTillNextAchievement();
+  CacheAvgCPS();
+  CacheIncome();
+  CacheBuildingsPrices();
+  CachePP();
+}

src/Cache/CacheLoop.js

@@ -0,0 +1,29 @@
+import FormatTime from '../Disp/BeautifyAndFormatting/FormatTime';
+import GetCPS from '../Disp/HelperFunctions/GetCPS';
+import CacheAvgCPS from './CPS/CPS';
+import CacheCurrWrinklerCPS from './CPS/CurrWrinklerCPS';
+import CachePP from './PP/PP';
+import CacheHeavenlyChipsPS from './Stats/HeavenlyChips';
+import { CacheTimeTillNextPrestige } from './VariablesAndData';
+import CacheWrinklers from './Wrinklers/Wrinklers';
+
+/**
+ * This functions caches variables that are needed every loop
+ * @global	{string}	CM.Cache.TimeTillNextPrestige	Time requried till next prestige level
+ */
+export default function LoopCache() {
+  // Update Wrinkler Bank
+  CacheWrinklers();
+
+  CachePP();
+  CacheCurrWrinklerCPS();
+  CacheAvgCPS();
+  CacheHeavenlyChipsPS();
+
+  const cookiesToNext =
+    Game.HowManyCookiesReset(
+      Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) + 1,
+    ) -
+    (Game.cookiesEarned + Game.cookiesReset);
+  CacheTimeTillNextPrestige = FormatTime(cookiesToNext / GetCPS()); // eslint-disable-line no-unused-vars
+}

src/Cache/Dragon/CacheDragonAuras.js

@@ -0,0 +1,9 @@
+import { CacheDragonAura, CacheDragonAura2 } from '../VariablesAndData';
+
+/**
+ * This functions caches the currently selected Dragon Auras
+ */
+export default function CacheDragonAuras() {
+  CacheDragonAura = Game.dragonAura; // eslint-disable-line no-unused-vars
+  CacheDragonAura2 = Game.dragonAura2; // eslint-disable-line no-unused-vars
+}

src/Cache/Dragon/Dragon.js

@@ -0,0 +1,65 @@
+/** Functions related to the Dragon */
+
+import Beautify from '../../Disp/BeautifyAndFormatting/Beautify';
+import CopyData from '../../Sim/SimulationData/CopyData';
+import { SimDoSims, SimObjects } from '../../Sim/VariablesAndData';
+import { CacheCostDragonUpgrade, CacheLastDragonLevel } from '../VariablesAndData';
+
+/**
+ * This functions caches the current cost of upgrading the dragon level so it can be displayed in the tooltip
+ */
+export default function CacheDragonCost() {
+  if (CacheLastDragonLevel !== Game.dragonLevel || SimDoSims) {
+    if (
+      Game.dragonLevel < 25 &&
+      Game.dragonLevels[Game.dragonLevel].buy.toString().includes('sacrifice')
+    ) {
+      let target = Game.dragonLevels[Game.dragonLevel].buy.toString().match(/Objects\[(.*)\]/)[1];
+      const amount = Game.dragonLevels[Game.dragonLevel].buy
+        .toString()
+        .match(/sacrifice\((.*?)\)/)[1];
+      if (target !== 'i') {
+        target = target.replaceAll("'", '');
+        if (Game.Objects[target].amount < amount) {
+          CacheCostDragonUpgrade = 'Not enough buildings to sell';
+        } else {
+          let cost = 0;
+          CopyData();
+          for (let i = 0; i < amount; i++) {
+            let price =
+              SimObjects[target].basePrice *
+              Game.priceIncrease **
+                Math.max(0, SimObjects[target].amount - 1 - SimObjects[target].free);
+            price = Game.modifyBuildingPrice(SimObjects[target], price);
+            price = Math.ceil(price);
+            cost += price;
+            SimObjects[target].amount -= 1;
+          }
+          CacheCostDragonUpgrade = `Cost to rebuy: ${Beautify(cost)}`;
+        }
+      } else {
+        let cost = 0;
+        CopyData();
+        Object.keys(Game.Objects).forEach((j) => {
+          target = j;
+          if (Game.Objects[target].amount < amount) {
+            CacheCostDragonUpgrade = 'Not enough buildings to sell';
+            return;
+          }
+          for (let i = 0; i < amount; i++) {
+            let price =
+              SimObjects[target].basePrice *
+              Game.priceIncrease **
+                Math.max(0, SimObjects[target].amount - 1 - SimObjects[target].free);
+            price = Game.modifyBuildingPrice(SimObjects[target], price);
+            price = Math.ceil(price);
+            cost += price;
+            SimObjects[target].amount -= 1;
+          }
+          CacheCostDragonUpgrade = `Cost to rebuy: ${Beautify(cost)}`; // eslint-disable-line no-unused-vars
+        });
+      }
+    }
+    CacheLastDragonLevel = Game.dragonLevel;
+  }
+}

src/Cache/PP/Building.js

@@ -0,0 +1,75 @@
+import { CMOptions } from '../../Config/VariablesAndData';
+import GetWrinkConfigBank from '../../Disp/HelperFunctions/GetWrinkConfigBank';
+import { ColourGray } from '../../Disp/VariablesAndData';
+import {
+  CacheMinPP,
+  CacheObjects1,
+  CacheObjects10,
+  CacheObjects100,
+  CachePPArray,
+} from '../VariablesAndData';
+import ColourOfPP from './ColourOfPP';
+
+/**
+ * This functions caches the buildings of bulk-buy mode when PP is compared against optimal single-purchase building
+ * It saves all date in CM.Cache.Objects...
+ * It is called by CM.Cache.CacheBuildingsPP()
+ */
+function CacheColour(target, amount) {
+  Object.keys(target).forEach((i) => {
+    if (CMOptions.PPRigidelMode && amount === 1) {
+      target[i].color = ColourGray; // eslint-disable-line no-param-reassign
+      return;
+    }
+    // eslint-disable-next-line no-param-reassign
+    target[i].color = ColourOfPP(target[i], Game.Objects[i].getSumPrice(amount));
+    // Colour based on excluding certain top-buildings
+    for (let j = 0; j < CMOptions.PPExcludeTop; j++) {
+      if (target[i].pp === CachePPArray[j][0]) target[i].color = ColourGray; // eslint-disable-line no-param-reassign
+    }
+  });
+}
+
+function CachePP(target, amount) {
+  Object.keys(target).forEach((i) => {
+    const price = Game.Objects[i].getSumPrice(amount);
+    if (Game.cookiesPs) {
+      target[i].pp = // eslint-disable-line no-param-reassign
+        Math.max(price - (Game.cookies + GetWrinkConfigBank()), 0) / Game.cookiesPs +
+        price / target[i].bonus;
+    } else target[i].pp = price / target[i].bonus; // eslint-disable-line no-param-reassign
+    if (!(CMOptions.PPRigidelMode && amount === 1)) CachePPArray.push([target[i].pp, amount]);
+  });
+}
+
+/**
+ * This functions caches the PP of each building it saves all date in CM.Cache.Objects...
+ * It is called by CM.Cache.CachePP()
+ */
+export default function CacheBuildingsPP() {
+  CacheMinPP = Infinity;
+  CachePPArray = [];
+  if (typeof CMOptions.PPExcludeTop === 'undefined') CMOptions.PPExcludeTop = 0; // Otherwise breaks during initialization
+
+  // Calculate PP and colors
+  CachePP(CacheObjects1, 1);
+  CachePP(CacheObjects10, 10);
+  CachePP(CacheObjects100, 100);
+
+  // Set CM.Cache.min to best non-excluded buidliung
+  CachePPArray.sort((a, b) => a[0] - b[0]);
+  let indexOfMin = 0;
+  if (CMOptions.PPOnlyConsiderBuyable) {
+    while (CachePPArray[indexOfMin][1] > Game.cookies) {
+      indexOfMin += 1;
+      if (CachePPArray.length === indexOfMin + 1) {
+        break;
+      }
+    }
+  }
+  CacheMinPP = CachePPArray[CMOptions.PPExcludeTop][indexOfMin]; // eslint-disable-line no-unused-vars
+
+  CacheColour(CacheObjects1, 1);
+  CacheColour(CacheObjects10, 10);
+  CacheColour(CacheObjects100, 100);
+}

src/Cache/PP/ColourOfPP.js

@@ -0,0 +1,41 @@
+import { CMOptions } from '../../Config/VariablesAndData';
+import GetCPS from '../../Disp/HelperFunctions/GetCPS';
+import {
+  ColourBlue,
+  ColourGray,
+  ColourGreen,
+  ColourOrange,
+  ColourPurple,
+  ColourRed,
+  ColourYellow,
+} from '../../Disp/VariablesAndData';
+import { CacheMinPP, CachePPArray } from '../VariablesAndData';
+
+/**
+ * This functions return the colour assosciated with the given pp value
+ * It is called by CM.Cache.CacheBuildingsPP(), CM.Cache.CacheBuildingsBulkPP() and CM.Cache.CacheUpgradePP()
+ * @params	{object}	obj		The obj of which the pp value should be checked
+ * @params	{number}	price	The price of the object
+ * @returns {string}	color	The colour assosciated with the pp value
+ */
+export default function ColourOfPP(me, price) {
+  let color = '';
+  // Colour based on PP
+  if (me.pp <= 0 || me.pp === Infinity) color = ColourGray;
+  else if (me.pp < CacheMinPP) color = ColourBlue;
+  else if (me.pp === CacheMinPP) color = ColourGreen;
+  else if (me.pp < CachePPArray[10][0]) color = ColourYellow;
+  else if (me.pp < CachePPArray[20][0]) color = ColourOrange;
+  else if (me.pp < CachePPArray[30][0]) color = ColourRed;
+  else color = ColourPurple;
+
+  // Colour based on price in terms of CPS
+  if (Number(CMOptions.PPSecondsLowerLimit) !== 0) {
+    if (price / GetCPS() < Number(CMOptions.PPSecondsLowerLimit)) color = ColourBlue;
+  }
+  // Colour based on being able to purchase
+  if (CMOptions.PPOnlyConsiderBuyable) {
+    if (price - Game.cookies > 0) color = ColourRed;
+  }
+  return color;
+}

src/Cache/PP/PP.js

@@ -0,0 +1,14 @@
+/**
+ * Section: Functions related to caching PP */
+
+import CacheBuildingsPP from './Building';
+import CacheUpgradePP from './Upgrade';
+
+/**
+ * This functions caches the PP of each building and upgrade and stores it in the cache
+ * It is called by CM.Cache.LoopCache() and CM.Cache.InitCache()
+ */
+export default function CachePP() {
+  CacheBuildingsPP();
+  CacheUpgradePP();
+}

src/Cache/PP/Upgrade.js

@@ -0,0 +1,21 @@
+import GetWrinkConfigBank from '../../Disp/HelperFunctions/GetWrinkConfigBank';
+import { CacheUpgrades } from '../VariablesAndData';
+import ColourOfPP from './ColourOfPP';
+
+/**
+ * This functions caches the PP of each building it saves all date in CM.Cache.Upgrades
+ * It is called by CM.Cache.CachePP()
+ */
+export default function CacheUpgradePP() {
+  Object.keys(CacheUpgrades).forEach((i) => {
+    if (Game.cookiesPs) {
+      CacheUpgrades[i].pp =
+        Math.max(Game.Upgrades[i].getPrice() - (Game.cookies + GetWrinkConfigBank()), 0) /
+          Game.cookiesPs +
+        Game.Upgrades[i].getPrice() / CacheUpgrades[i].bonus;
+    } else CacheUpgrades[i].pp = Game.Upgrades[i].getPrice() / CacheUpgrades[i].bonus;
+    if (Number.isNaN(CacheUpgrades[i].pp)) CacheUpgrades[i].pp = Infinity;
+
+    CacheUpgrades[i].color = ColourOfPP(CacheUpgrades[i], Game.Upgrades[i].getPrice());
+  });
+}

src/Cache/PantheonGods/CacheGods.js

@@ -0,0 +1,13 @@
+import CalculateChangeGod from '../../Sim/SimulationEvents/GodChange';
+import { CacheGods } from '../VariablesAndData';
+
+/**
+ * This functions caches the cps effect of each God in slot 1, 2 or 3
+ */
+export default function CachePantheonGods() {
+  for (let god = 0; god < 11; god += 1) {
+    for (let slot = 0; slot < 3; slot += 1) {
+      CacheGods[god][slot] = CalculateChangeGod(god, slot);
+    }
+  }
+}

src/Cache/PriceAndIncome/PriceAndIncome.js

@@ -0,0 +1,106 @@
+/** Section: Functions related to caching income */
+
+import { CMOptions } from '../../Config/VariablesAndData';
+import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
+import BuyBuildingsBonusIncome from '../../Sim/SimulationEvents/BuyBuildingBonusIncome';
+import BuyUpgradesBonusIncome from '../../Sim/SimulationEvents/BuyUpgrades';
+import {
+  CacheAverageGainBank,
+  CacheAverageGainWrink,
+  CacheAverageGainWrinkFattest,
+  CacheDoRemakeBuildPrices,
+  CacheObjects1,
+  CacheObjects10,
+  CacheObjects100,
+  CacheObjectsNextAchievement,
+  CacheUpgrades,
+} from '../VariablesAndData';
+
+/**
+ * This functions starts the calculation/simulation of the bonus income of buildings
+ * It is called by CM.Cache.CacheIncome()
+ * @param	{amount}	amount	Amount to be bought
+ * @parem	{string}	target	The target Cache object ("Objects1", "Objects10" or "Objects100")
+ */
+function CacheBuildingIncome(amount) {
+  const result = {};
+  Object.keys(Game.Objects).forEach((i) => {
+    result[i] = {};
+    result[i].bonus = BuyBuildingsBonusIncome(i, amount);
+    if (amount !== 1) {
+      CacheDoRemakeBuildPrices = 1; // eslint-disable-line no-unused-vars
+    }
+  });
+  return result;
+}
+
+/**
+ * This functions starts the calculation/simulation of the bonus income of upgrades
+ * It is called by CM.Cache.CacheIncome()
+ */
+function CacheUpgradeIncome() {
+  CacheUpgrades = [];
+  Object.keys(Game.Upgrades).forEach((i) => {
+    const bonusIncome = BuyUpgradesBonusIncome(i);
+    if (i === 'Elder Pledge') {
+      CacheUpgrades[i] = { bonus: Game.cookiesPs - CacheAverageGainBank };
+      if (CMOptions.CalcWrink === 1) CacheUpgrades[i].bonus -= CacheAverageGainWrink;
+      else if (CMOptions.CalcWrink === 2) CacheUpgrades[i].bonus -= CacheAverageGainWrinkFattest;
+      if (!Number.isFinite(CacheUpgrades[i].bonus)) CacheUpgrades[i].bonus = 0;
+    } else {
+      CacheUpgrades[i] = {};
+      if (bonusIncome[0]) CacheUpgrades[i].bonus = bonusIncome[0];
+      if (bonusIncome[1]) CacheUpgrades[i].bonusMouse = bonusIncome[1];
+    }
+  });
+}
+
+/**
+ * This functions caches the price of each building and stores it in the cache
+ */
+export function CacheBuildingsPrices() {
+  Object.keys(Game.Objects).forEach((i) => {
+    CacheObjects1[i].price = BuildingGetPrice(
+      Game.Objects[i],
+      Game.Objects[i].basePrice,
+      Game.Objects[i].amount,
+      Game.Objects[i].free,
+      1,
+    );
+    CacheObjects10[i].price = BuildingGetPrice(
+      Game.Objects[i],
+      Game.Objects[i].basePrice,
+      Game.Objects[i].amount,
+      Game.Objects[i].free,
+      10,
+    );
+    CacheObjects100[i].price = BuildingGetPrice(
+      Game.Objects[i],
+      Game.Objects[i].basePrice,
+      Game.Objects[i].amount,
+      Game.Objects[i].free,
+      100,
+    );
+    CacheObjectsNextAchievement[i].price = BuildingGetPrice(
+      Game.Objects[i],
+      Game.Objects[i].basePrice,
+      Game.Objects[i].amount,
+      Game.Objects[i].free,
+      CacheObjectsNextAchievement[i].AmountNeeded,
+    );
+  });
+}
+
+/**
+ * This functions caches the income gain of each building and upgrade and stores it in the cache
+ * It is called by CM.Main.Loop() and CM.Cache.InitCache()
+ */
+export function CacheIncome() {
+  // Simulate Building Buys for 1, 10 and 100 amount
+  CacheObjects1 = CacheBuildingIncome(1);
+  CacheObjects10 = CacheBuildingIncome(10);
+  CacheObjects100 = CacheBuildingIncome(100);
+
+  // Simulate Upgrade Buys
+  CacheUpgradeIncome();
+}

src/Cache/Stats/ChainCookies.js

@@ -0,0 +1,92 @@
+import GetCPSBuffMult from '../CPS/GetCPSBuffMult';
+import {
+  CacheChainFrenzyMaxReward,
+  CacheChainFrenzyRequired,
+  CacheChainFrenzyRequiredNext,
+  CacheChainFrenzyWrathMaxReward,
+  CacheChainFrenzyWrathRequired,
+  CacheChainFrenzyWrathRequiredNext,
+  CacheChainMaxReward,
+  CacheChainRequired,
+  CacheChainRequiredNext,
+  CacheChainWrathMaxReward,
+  CacheChainWrathRequired,
+  CacheChainWrathRequiredNext,
+  CacheDragonsFortuneMultAdjustment,
+  CacheGoldenCookiesMult,
+  CacheNoGoldSwitchCookiesPS,
+  CacheWrathCookiesMult,
+} from '../VariablesAndData';
+
+/**
+ * This functions calculates the max possible payout given a set of variables
+ * It is called by CM.Disp.CreateStatsChainSection() and CM.Cache.CacheChain()
+ * @param	{number}					digit		Number of Golden Cookies in chain
+ * @param	{number}					maxPayout	Maximum payout
+ * @param	{number}					mult		Multiplier
+ * @returns	[{number, number, number}]				Total cookies earned, cookie needed for this and next level
+ */
+export function MaxChainCookieReward(digit, maxPayout, mult) {
+  let totalFromChain = 0;
+  let moni = 0;
+  let nextMoni = 0;
+  let nextRequired = 0;
+  let chain = 1 + Math.max(0, Math.ceil(Math.log(Game.cookies) / Math.LN10) - 10);
+  while (nextMoni < maxPayout * mult) {
+    moni = Math.max(
+      digit,
+      Math.min(Math.floor((1 / 9) * 10 ** chain * digit * mult), maxPayout * mult),
+    );
+    nextMoni = Math.max(
+      digit,
+      Math.min(Math.floor((1 / 9) * 10 ** (chain + 1) * digit * mult), maxPayout * mult),
+    );
+    nextRequired = Math.floor((1 / 9) * 10 ** (chain + 1) * digit * mult);
+    totalFromChain += moni;
+    chain += 1;
+  }
+  return [totalFromChain, moni, nextRequired];
+}
+
+/**
+ * This functions caches data related to Chain Cookies reward from Golden Cookioes
+ * It is called by CM.Main.Loop() upon changes to cps and CM.Cache.InitCache()
+ * @global	[{number, number}]	CM.Cache.ChainMaxReward			Total cookies earned, and cookies needed for next level for normal chain
+ * @global	{number}			CM.Cache.ChainRequired			Cookies needed for maximum reward for normal chain
+ * @global	{number}			CM.Cache.ChainRequiredNext		Total cookies needed for next level for normal chain
+ * @global	[{number, number}]	CM.Cache.ChainMaxWrathReward			Total cookies earned, and cookies needed for next level for wrath chain
+ * @global	{number}			CM.Cache.ChainWrathRequired			Cookies needed for maximum reward for wrath chain
+ * @global	{number}			CM.Cache.ChainWrathRequiredNext		Total cookies needed for next level for wrath chain
+ * @global	[{number, number}]	CM.Cache.ChainFrenzyMaxReward			Total cookies earned, and cookies needed for next level for normal frenzy chain
+ * @global	{number}			CM.Cache.ChainFrenzyRequired			Cookies needed for maximum reward for normal frenzy chain
+ * @global	{number}			CM.Cache.ChainFrenzyRequiredNext		Total cookies needed for next level for normal frenzy chain
+ * @global	[{number, number}]	CM.Cache.ChainFrenzyWrathMaxReward			Total cookies earned, and cookies needed for next level for wrath frenzy chain
+ * @global	{number}			CM.Cache.ChainFrenzyWrathRequired			Cookies needed for maximum reward for wrath frenzy chain
+ * @global	{number}			CM.Cache.ChainFrenzyWrathRequiredNext		Total cookies needed for next level for wrath frenzy chain
+ */
+export function CacheChain() {
+  let maxPayout = CacheNoGoldSwitchCookiesPS * 60 * 60 * 6 * CacheDragonsFortuneMultAdjustment;
+  // Removes effect of Frenzy etc.
+  const cpsBuffMult = GetCPSBuffMult();
+  if (cpsBuffMult > 0) maxPayout /= cpsBuffMult;
+  else maxPayout = 0;
+
+  CacheChainMaxReward = MaxChainCookieReward(7, maxPayout, CacheGoldenCookiesMult);
+  CacheChainRequired = (CacheChainMaxReward[1] * 2) / CacheGoldenCookiesMult; // eslint-disable-line no-unused-vars
+  CacheChainRequiredNext = CacheChainMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment; // eslint-disable-line no-unused-vars
+
+  CacheChainWrathMaxReward = MaxChainCookieReward(6, maxPayout, CacheWrathCookiesMult);
+  CacheChainWrathRequired = (CacheChainWrathMaxReward[1] * 2) / CacheWrathCookiesMult; // eslint-disable-line no-unused-vars
+  CacheChainWrathRequiredNext = // eslint-disable-line no-unused-vars
+    CacheChainWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
+
+  CacheChainFrenzyMaxReward = MaxChainCookieReward(7, maxPayout * 7, CacheGoldenCookiesMult);
+  CacheChainFrenzyRequired = (CacheChainFrenzyMaxReward[1] * 2) / CacheGoldenCookiesMult; // eslint-disable-line no-unused-vars
+  CacheChainFrenzyRequiredNext = // eslint-disable-line no-unused-vars
+    CacheChainFrenzyMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
+
+  CacheChainFrenzyWrathMaxReward = MaxChainCookieReward(6, maxPayout * 7, CacheWrathCookiesMult);
+  CacheChainFrenzyWrathRequired = (CacheChainFrenzyWrathMaxReward[1] * 2) / CacheWrathCookiesMult; // eslint-disable-line no-unused-vars
+  CacheChainFrenzyWrathRequiredNext = // eslint-disable-line no-unused-vars
+    CacheChainFrenzyWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
+}

src/Cache/Stats/HeavenlyChips.js

@@ -0,0 +1,35 @@
+import {
+  CacheHCPerSecond,
+  CacheLastHeavenlyCheck,
+  CacheLastHeavenlyChips,
+  HeavenlyChipsDiff,
+} from '../VariablesAndData';
+
+/**
+ * This functions caches the heavenly chips per second in the last five seconds
+ * It is called by CM.Cache.LoopCache()
+ * @global	{number}	CM.Cache.HCPerSecond	The Heavenly Chips per second in the last five seconds
+ */
+export default function CacheHeavenlyChipsPS() {
+  const currDate = Math.floor(Date.now() / 1000);
+  // Only calculate every new second
+  if ((Game.T / Game.fps) % 1 === 0) {
+    const chipsOwned = Game.HowMuchPrestige(Game.cookiesReset);
+    const ascendNowToOwn = Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned));
+    const ascendNowToGet = ascendNowToOwn - Math.floor(chipsOwned);
+
+    // Add recent gains to AvgQueue's
+    const timeDiff = currDate - CacheLastHeavenlyCheck;
+    const heavenlyChipsDiffAvg = Math.max(0, ascendNowToGet - CacheLastHeavenlyChips) / timeDiff;
+    for (let i = 0; i < timeDiff; i++) {
+      HeavenlyChipsDiff.addLatest(heavenlyChipsDiffAvg);
+    }
+
+    // Store current data for next loop
+    CacheLastHeavenlyCheck = currDate;
+    CacheLastHeavenlyChips = ascendNowToGet;
+
+    // Get average gain over period of 5 seconds
+    CacheHCPerSecond = HeavenlyChipsDiff.calcAverage(5); // eslint-disable-line no-unused-vars
+  }
+}

src/Cache/Stats/MissingUpgrades.js

@@ -0,0 +1,46 @@
+import { crateMissing } from '../../Disp/MenuSections/Statistics/CreateMissingUpgrades';
+import {
+  CacheMissingUpgrades,
+  CacheMissingUpgradesCookies,
+  CacheMissingUpgradesPrestige,
+} from '../VariablesAndData';
+
+/**
+ * This functions caches variables related to missing upgrades
+ * It is called by CM.Main.Loop() and CM.Cache.InitCache()
+ * @global	{string}	CM.Cache.MissingUpgrades			String containig the HTML to create the "crates" for missing normal upgrades
+ * @global	{string}	CM.Cache.MissingUpgradesCookies		String containig the HTML to create the "crates" for missing cookie upgrades
+ * @global	{string}	CM.Cache.MissingUpgradesPrestige	String containig the HTML to create the "crates" for missing prestige upgrades
+ */
+export default function CacheAllMissingUpgrades() {
+  CacheMissingUpgrades = '';
+  CacheMissingUpgradesCookies = '';
+  CacheMissingUpgradesPrestige = '';
+  const list = [];
+  // sort the upgrades
+  Object.keys(Game.Upgrades).forEach((i) => {
+    list.push(Game.Upgrades[i]);
+  });
+  const sortMap = function (a, b) {
+    if (a.order > b.order) return 1;
+    if (a.order < b.order) return -1;
+    return 0;
+  };
+  list.sort(sortMap);
+
+  Object.keys(list).forEach((i) => {
+    const me = list[i];
+
+    if (me.bought === 0) {
+      let str = '';
+
+      str += crateMissing(me);
+      /* eslint-disable no-unused-vars */
+      if (me.pool === 'prestige') CacheMissingUpgradesPrestige += str;
+      else if (me.pool === 'cookie') CacheMissingUpgradesCookies += str;
+      else if (me.pool !== 'toggle' && me.pool !== 'unused' && me.pool !== 'debug')
+        CacheMissingUpgrades += str;
+      /* eslint-enable no-unused-vars */
+    }
+  });
+}

src/Cache/Stats/Reindeer.js

@@ -0,0 +1,16 @@
+import { CacheSeaSpec } from '../VariablesAndData';
+
+/**
+ * This functions caches the reward of popping a reindeer
+ * It is called by CM.Main.Loop() and CM.Cache.InitCache()
+ * @global	{number}	CM.Cache.SeaSpec	The reward for popping a reindeer
+ */
+export default function CacheSeasonSpec() {
+  if (Game.season === 'christmas') {
+    let val = Game.cookiesPs * 60;
+    if (Game.hasBuff('Elder frenzy')) val *= 0.5;
+    if (Game.hasBuff('Frenzy')) val *= 0.75;
+    CacheSeaSpec = Math.max(25, val);
+    if (Game.Has('Ho ho ho-flavored frosting')) CacheSeaSpec *= 2; // eslint-disable-line no-unused-vars
+  }
+}

src/Cache/Stats/Stats.js

@@ -0,0 +1,87 @@
+/** Functions related to Caching stats */
+
+import SimHas from '../../Sim/ReplacedGameFunctions/SimHas';
+import GetCPSBuffMult from '../CPS/GetCPSBuffMult';
+import {
+  CacheConjure,
+  CacheConjureReward,
+  CacheDragonsFortuneMultAdjustment,
+  CacheEdifice,
+  CacheEdificeBuilding,
+  CacheGoldenCookiesMult,
+  CacheLucky,
+  CacheLuckyFrenzy,
+  CacheLuckyReward,
+  CacheLuckyRewardFrenzy,
+  CacheLuckyWrathReward,
+  CacheLuckyWrathRewardFrenzy,
+  CacheNoGoldSwitchCookiesPS,
+  CacheWrathCookiesMult,
+} from '../VariablesAndData';
+
+/**
+ * This functions caches variables related to the stats page
+ */
+export function CacheStatsCookies() {
+  CacheLucky = (CacheNoGoldSwitchCookiesPS * 900) / 0.15;
+  CacheLucky *= CacheDragonsFortuneMultAdjustment;
+  const cpsBuffMult = GetCPSBuffMult();
+  if (cpsBuffMult > 0) CacheLucky /= cpsBuffMult;
+  else CacheLucky = 0;
+  CacheLuckyReward = CacheGoldenCookiesMult * (CacheLucky * 0.15) + 13; // eslint-disable-line no-unused-vars
+  CacheLuckyWrathReward = CacheWrathCookiesMult * (CacheLucky * 0.15) + 13; // eslint-disable-line no-unused-vars
+  CacheLuckyFrenzy = CacheLucky * 7;
+  CacheLuckyRewardFrenzy = CacheGoldenCookiesMult * (CacheLuckyFrenzy * 0.15) + 13; // eslint-disable-line no-unused-vars
+  CacheLuckyWrathRewardFrenzy = CacheWrathCookiesMult * (CacheLuckyFrenzy * 0.15) + 13; // eslint-disable-line no-unused-vars
+  CacheConjure = CacheLucky * 2;
+  CacheConjureReward = CacheConjure * 0.15; // eslint-disable-line no-unused-vars
+
+  CacheEdifice = 0;
+  let max = 0;
+  let n = 0;
+  Object.keys(Game.Objects).forEach((i) => {
+    if (Game.Objects[i].amount > max) max = Game.Objects[i].amount;
+    if (Game.Objects[i].amount > 0) n += 1;
+  });
+  Object.keys(Game.Objects).forEach((i) => {
+    if (
+      (Game.Objects[i].amount < max || n === 1) &&
+      Game.Objects[i].amount < 400 &&
+      Game.Objects[i].price * 2 > CacheEdifice
+    ) {
+      CacheEdifice = Game.Objects[i].price * 2;
+      CacheEdificeBuilding = i; // eslint-disable-line no-unused-vars
+    }
+  });
+}
+
+/**
+ * This functions calculates the multipliers of Golden and Wrath cookie rewards
+ */
+export function CacheGoldenAndWrathCookiesMults() {
+  let goldenMult = 1;
+  let wrathMult = 1;
+  let mult = 1;
+
+  // Factor auras and upgrade in mults
+  if (SimHas('Green yeast digestives')) mult *= 1.01;
+  if (SimHas('Dragon fang')) mult *= 1.03;
+
+  goldenMult *= 1 + Game.auraMult('Ancestral Metamorphosis') * 0.1;
+  goldenMult *= Game.eff('goldenCookieGain');
+  wrathMult *= 1 + Game.auraMult('Unholy Dominion') * 0.1;
+  wrathMult *= Game.eff('wrathCookieGain');
+
+  // Calculate final golden and wrath multipliers
+  CacheGoldenCookiesMult = mult * goldenMult;
+  CacheWrathCookiesMult = mult * wrathMult;
+
+  // Calculate Dragon's Fortune multiplier adjustment:
+  // If Dragon's Fortune (or Reality Bending) aura is active and there are currently no golden cookies,
+  // compute a multiplier adjustment to apply on the current CPS to simulate 1 golden cookie on screen.
+  // Otherwise, the aura effect will be factored in the base CPS making the multiplier not requiring adjustment.
+  CacheDragonsFortuneMultAdjustment = 1;
+  if (Game.shimmerTypes.golden.n === 0) {
+    CacheDragonsFortuneMultAdjustment *= 1 + Game.auraMult("Dragon's Fortune") * 1.23;
+  }
+}

src/Cache/TillNextAchievement/AllAmountTillNextAchievement.js

@@ -0,0 +1,25 @@
+import { CacheObjectsNextAchievement } from '../VariablesAndData';
+import IndividualAmountTillNextAchievement from './IndividualAmountTillNextAchievement';
+
+export default function AllAmountTillNextAchievement() {
+  const result = {};
+
+  Object.keys(Game.Objects).forEach((i) => {
+    if (
+      Object.keys(CacheObjectsNextAchievement).length !== 0 &&
+      CacheObjectsNextAchievement[i].TotalNeeded > Game.Objects[i].amount
+    ) {
+      result[i] = {
+        AmountNeeded: CacheObjectsNextAchievement[i].TotalNeeded - Game.Objects[i].amount,
+        TotalNeeded: CacheObjectsNextAchievement[i].TotalNeeded,
+      };
+    } else {
+      const tillNext = IndividualAmountTillNextAchievement(i);
+      result[i] = {
+        AmountNeeded: tillNext,
+        TotalNeeded: Game.Objects[i].amount + tillNext,
+      };
+    }
+  });
+  CacheObjectsNextAchievement = result; // eslint-disable-line no-unused-vars
+}

src/Cache/TillNextAchievement/IndividualAmountTillNextAchievement.js

@@ -0,0 +1,13 @@
+import BuyBuildingsBonusIncome from '../../Sim/SimulationEvents/BuyBuildingBonusIncome';
+import { SimAchievementsOwned } from '../../Sim/VariablesAndData';
+
+export default function IndividualAmountTillNextAchievement(building) {
+  const AchievementsAtStart = Game.AchievementsOwned;
+  for (let index = 0; index < 101; index++) {
+    BuyBuildingsBonusIncome(building, index);
+    if (SimAchievementsOwned > AchievementsAtStart) {
+      return index;
+    }
+  }
+  return 101;
+}

src/Cache/VariablesAndData.js

@@ -0,0 +1,118 @@
+/* eslint-disable prefer-const */
+
+export let CacheDragonAura = 0;
+export let CacheDragonAura2 = 0;
+export let CacheLastDragonLevel = 0;
+export let CacheCostDragonUpgrade = 0;
+export let CacheLucky = 0;
+export let CacheLuckyReward = 0;
+export let CacheLuckyWrathReward = 0;
+export let CacheLuckyFrenzy = 0;
+export let CacheLuckyRewardFrenzy = 0;
+export let CacheLuckyWrathRewardFrenzy = 0;
+export let CacheConjure = 0;
+export let CacheConjureReward = 0;
+export let CacheEdifice = 0;
+export let CacheEdificeBuilding = 0;
+export let CacheNoGoldSwitchCookiesPS = 0;
+export let CacheDragonsFortuneMultAdjustment = 1;
+export let CacheGoldenCookiesMult = 1;
+export let CacheWrathCookiesMult = 1;
+
+export let CacheHCPerSecond = 0;
+
+export let CacheCentEgg = 0;
+export let CacheSeaSpec = 0;
+export let CacheLastChoEgg = 0;
+
+export let CacheObjects1 = {};
+export let CacheObjects10 = {};
+export let CacheObjects100 = {};
+export let CacheObjectsNextAchievement = {};
+
+export let CacheWrinklersTotal = 0;
+export let CacheWrinklersNormal = 0;
+export let CacheWrinklersFattest = [0, null];
+
+export let CacheCurrWrinklerCPSMult = 0;
+export let CacheCurrWrinklerCount = 0;
+
+export let CacheUpgrades = {};
+
+export let CacheAverageClicks = {};
+export let CacheAverageCookiesFromClicks;
+
+export let CacheMissingUpgrades = {};
+export let CacheMissingUpgradesPrestige = {};
+export let CacheMissingUpgradesCookies = {};
+
+export let CacheChainRequired = 0;
+export let CacheChainRequiredNext = 0;
+export let CacheChainMaxReward = [];
+export let CacheChainWrathRequired = 0;
+export let CacheChainWrathRequiredNext = 0;
+export let CacheChainWrathMaxReward = [];
+export let CacheChainFrenzyRequired = 0;
+export let CacheChainFrenzyRequiredNext = 0;
+export let CacheChainFrenzyMaxReward = [];
+export let CacheChainFrenzyWrathRequired = 0;
+export let CacheChainFrenzyWrathRequiredNext = 0;
+export let CacheChainFrenzyWrathMaxReward = [];
+
+export let CacheRealCookiesEarned = 0;
+export let CacheAvgCPSWithChoEgg = 0;
+
+export let CacheSpawnedGoldenShimmer = {};
+export let CacheSeasonPopShimmer = {};
+
+export let CacheTimeTillNextPrestige = 0;
+
+/** Stores lowest PP value */
+export let CacheMinPP = 0;
+/** Stores all PP values of all buildings for all buy settings (1, 10, 100) */
+export let CachePPArray = [];
+
+export let CacheGoldenShimmersByID = {};
+
+export let CacheSellForChoEgg = 0;
+
+export let CookiesDiff;
+export let WrinkDiff;
+export let WrinkFattestDiff;
+export let ChoEggDiff;
+export let ClicksDiff;
+export let HeavenlyChipsDiff;
+
+export let CacheLastCPSCheck;
+export let CacheLastCookies;
+export let CacheLastWrinkCookies;
+export let CacheLastWrinkFattestCookies;
+export let CacheLastClicks;
+
+export let CacheAverageGainBank;
+export let CacheAverageGainWrink;
+export let CacheAverageGainWrinkFattest;
+export let CacheAverageGainChoEgg;
+export let CacheAverageCPS;
+
+export let CacheLastHeavenlyCheck;
+export let CacheLastHeavenlyChips;
+
+export let CacheDoRemakeBuildPrices;
+
+export let CacheHadBuildAura;
+
+/** Store the CPS effect of each god if it was put into each slot */
+export let CacheGods = {
+  0: [0, 0, 0],
+  1: [0, 0, 0],
+  2: [0, 0, 0],
+  3: [0, 0, 0],
+  4: [0, 0, 0],
+  5: [0, 0, 0],
+  6: [0, 0, 0],
+  7: [0, 0, 0],
+  8: [0, 0, 0],
+  9: [0, 0, 0],
+  10: [0, 0, 0],
+};

src/Cache/Wrinklers/Wrinklers.js

@@ -0,0 +1,40 @@
+/** Caches data related to Wrinklers */
+
+import { SimObjects } from '../../Sim/VariablesAndData';
+import {
+  CacheWrinklersFattest,
+  CacheWrinklersNormal,
+  CacheWrinklersTotal,
+} from '../VariablesAndData';
+
+/**
+ * This functions caches data related to Wrinklers
+ * It is called by CM.Cache.LoopCache() and CM.Cache.InitCache()
+ * @global	{number}				CM.Cache.WrinklersTotal		The cookies of all wrinklers
+ * @global	{number}				CM.Cache.WrinklersNormal	The cookies of all normal wrinklers
+ * @global	{[{number}, {number}]}	CM.Cache.WrinklersFattest	A list containing the cookies and the id of the fattest non-shiny wrinkler
+ */
+export default function CacheWrinklers() {
+  CacheWrinklersTotal = 0;
+  CacheWrinklersNormal = 0;
+  CacheWrinklersFattest = [0, null];
+  for (let i = 0; i < Game.wrinklers.length; i++) {
+    let { sucked } = Game.wrinklers[i];
+    let toSuck = 1.1;
+    if (Game.Has('Sacrilegious corruption')) toSuck *= 1.05;
+    if (Game.wrinklers[i].type === 1) toSuck *= 3; // Shiny wrinklers
+    sucked *= toSuck;
+    if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
+    if (SimObjects.Temple.minigameLoaded) {
+      const godLvl = Game.hasGod('scorn');
+      if (godLvl === 1) sucked *= 1.15;
+      else if (godLvl === 2) sucked *= 1.1;
+      else if (godLvl === 3) sucked *= 1.05;
+    }
+    CacheWrinklersTotal += sucked; // eslint-disable-line no-unused-vars
+    if (Game.wrinklers[i].type === 0) {
+      CacheWrinklersNormal += sucked; // eslint-disable-line no-unused-vars
+      if (sucked > CacheWrinklersFattest[0]) CacheWrinklersFattest = [sucked, i];
+    }
+  }
+}

src/Config.js

@@ -1,150 +0,0 @@
-/**********
- * Config *
- **********/
-
-CM.SaveConfig = function(config) {
-	localStorage.setItem(CM.ConfigPrefix, JSON.stringify(config));
-}
-
-CM.LoadConfig = function() {
-	if (localStorage.getItem(CM.ConfigPrefix) != null) {
-		CM.Config = JSON.parse(localStorage.getItem(CM.ConfigPrefix));
-		
-		// Check values
-		var mod = false;
-		for (var i in CM.ConfigDefault) {
-			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] > -1 && CM.Config[i] < CM.ConfigData[i].label.length)) {
-						mod = true;
-						CM.Config[i] = CM.ConfigDefault[i];
-					}
-				}
-				else {  // Sound URLs
-					if (typeof CM.Config[i] != 'string') {
-						mod = true;
-						CM.Config[i] = CM.ConfigDefault[i];
-					}
-				}
-			}
-			else if (i == 'StatsPref') {
-				for (var j in CM.ConfigDefault.StatsPref) {
-					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.Colors) {
-					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' && typeof CM.ConfigData[i].func !== 'undefined') {
-				CM.ConfigData[i].func();
-			}
-		}
-	}
-	else { // Default values		
-		CM.RestoreDefault();	
-	}
-}
-
-CM.RestoreDefault = function() {
-	CM.Config = {};
-	CM.SaveConfig(CM.ConfigDefault);
-	CM.LoadConfig();
-	Game.UpdateMenu();
-}
-
-CM.ToggleConfig = function(config) {
-	CM.ToggleConfigUp(config);
-	if (CM.ConfigData[config].toggle) {
-		if (CM.Config[config] == 0) {
-			l(CM.ConfigPrefix + config).className = 'option off';
-		}
-		else {
-			l(CM.ConfigPrefix + config).className = 'option';
-		}
-	}
-}
-
-CM.ToggleConfigUp = function(config) {
-	CM.Config[config]++;
-	if (CM.Config[config] == CM.ConfigData[config].label.length) {
-		CM.Config[config] = 0;
-	}
-	if (typeof CM.ConfigData[config].func !== 'undefined') {
-		CM.ConfigData[config].func();
-	}
-	l(CM.ConfigPrefix + config).innerHTML = CM.Disp.GetConfigDisplay(config);
-	CM.SaveConfig(CM.Config);
-}
-
-CM.ToggleConfigDown = function(config) {
-	CM.Config[config]--;
-	if (CM.Config[config] < 0) {
-		CM.Config[config] = CM.ConfigData[config].label.length - 1;
-	}
-	if (typeof CM.ConfigData[config].func !== 'undefined') {
-		CM.ConfigData[config].func();
-	}
-	l(CM.ConfigPrefix + config).innerHTML = CM.Disp.GetConfigDisplay(config);
-	CM.SaveConfig(CM.Config);
-}
-
-CM.ToggleStatsConfig = function(config) {
-	if (CM.Config.StatsPref[config] == 0) {
-		CM.Config.StatsPref[config]++;
-	}
-	else {
-		CM.Config.StatsPref[config]--;
-	}
-	CM.SaveConfig(CM.Config);
-}
-
-CM.ConfigData.BotBar = {label: ['Bottom Bar OFF', 'Bottom Bar ON'], desc: 'Building Information', toggle: true, 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', toggle: true, func: function() {CM.Disp.ToggleTimerBar();}};
-CM.ConfigData.TimerBarPos = {label: ['Timer Bar Position (Top Left)', 'Timer Bar Position (Bottom)'], desc: 'Placement of the Timer Bar', toggle: false, func: function() {CM.Disp.ToggleTimerBarPos();}};
-CM.ConfigData.BuildColor = {label: ['Building Colors OFF', 'Building Colors ON'], desc: 'Color code buildings', toggle: true, func: function() {CM.Disp.UpdateBuildings();}};
-CM.ConfigData.BulkBuildColor = {label: ['Bulk Building Colors (Single Buildings Color)', 'Bulk Building Colors (Calculated Color)'], desc: 'Color code bulk buildings based on single buildings color or calculated bulk value color', toggle: false, 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', toggle: true, func: function() {CM.Disp.ToggleUpBarColor();}};
-CM.ConfigData.Colors = {desc: {Blue: 'Color Blue.  Used to show better than best PP building, for Click Frenzy bar, and for various labels', Green: 'Color Green.  Used to show best PP building, for Blood Frenzy bar, and for various labels', Yellow: 'Color Yellow.  Used to show between best and worst PP buildings closer to best, for Frenzy bar, and for various labels', Orange: 'Color Orange.  Used to show between best and worst PP buildings closer to worst, for Next Reindeer bar, and for various labels', Red: 'Color Red.  Used to show worst PP building, for Clot bar, and for various labels', Purple: 'Color Purple.  Used to show worse than worst PP building, for Next Cookie bar, and for various labels', Gray: 'Color Gray.  Used to show negative or infinity PP, and for Next Cookie/Next Reindeer bar', Pink: 'Color Pink.  Used for Dragonflight bar', Brown: 'Color Brown.  Used for Dragon Harvest bar'}, func: function() {CM.Disp.UpdateColors();}};
-CM.ConfigData.CalcWrink = {label: ['Calculate with Wrinklers OFF', 'Calculate with Wrinklers ON'], desc: 'Calculate times and average Cookies Per Second with Wrinkers', toggle: true};
-CM.ConfigData.CPSMode = {label: ['Current Cookies Per Second', 'Average Cookies Per Second'], desc: 'Calculate times using current Cookies Per Second or average Cookies Per Second', toggle: false};
-CM.ConfigData.AvgCPSHist = {label: ['Average CPS for past 1m', 'Average CPS for past 5m', 'Average CPS for past 10m', 'Average CPS for past 15m', 'Average CPS for past 30m'], desc: 'How much time average Cookies Per Second should consider', toggle: false};
-CM.ConfigData.AvgClicksHist = {label: ['Average Cookie Clicks for past 1s', 'Average Cookie Clicks for past 5s', 'Average Cookie Clicks for past 10s', 'Average Cookie Clicks for past 15s', 'Average Cookie Clicks for past 30s'], desc: 'How much time average Cookie Clicks should consider', toggle: false};
-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', toggle: true};
-CM.ConfigData.Flash = {label: ['Flash OFF', 'Flash ON'], desc: 'Flash screen on Golden Cookie/Season Popup', toggle: true};
-CM.ConfigData.Sound = {label: ['Sounds OFF', 'Sounds ON'], desc: 'Play a sound on Golden Cookie/Season Popup', toggle: true};
-CM.ConfigData.Volume = {label: [], desc: 'Volume of the sound'};
-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'};
-CM.ConfigData.GCTimer = {label: ['Golden Cookie Timer OFF', 'Golden Cookie Timer ON'], desc: 'A timer on the Golden Cookie when it has been spawned', toggle: true, func: function() {CM.Disp.ToggleGCTimer();}};
-CM.ConfigData.Title = {label: ['Title OFF', 'Title ON', 'Title Pinned Tab Highlight'], desc: 'Update title with Golden Cookie/Season Popup timers; pinned tab highlight only changes the title when a Golden Cookie/Season Popup spawns', toggle: true};
-CM.ConfigData.Favicon = {label: ['Favicon OFF', 'Favicon ON'], desc: 'Update favicon with Golden/Wrath Cookie', toggle: true, func: function() {CM.Disp.UpdateFavicon();}};
-CM.ConfigData.Tooltip = {label: ['Tooltip Information OFF', 'Tooltip Information ON'], desc: 'Extra information in tooltip for buildings/upgrades', toggle: true};
-CM.ConfigData.TooltipAmor = {label: ['Tooltip Amortization Information OFF', 'Tooltip Amortization Information ON'], desc: 'Add amortization information to buildings tooltip', toggle: true};
-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', toggle: true, 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', toggle: false, func: function() {CM.Disp.ToggleToolWarnCautPos();}};
-CM.ConfigData.ToolWrink = {label: ['Wrinkler Tooltip OFF', 'Wrinkler Tooltip ON'], desc: 'Shows the amount of cookies a wrinkler will give when popping it', toggle: true};
-CM.ConfigData.Stats = {label: ['Statistics OFF', 'Statistics ON'], desc: 'Extra Cookie Monster statistics!', toggle: true};
-CM.ConfigData.UpStats = {label: ['Statistics Update Rate (Default)', 'Statistics Update Rate (1s)'], desc: 'Default Game rate is once every 5 seconds', toggle: false};
-CM.ConfigData.TimeFormat = {label: ['Time XXd, XXh, XXm, XXs', 'Time XX:XX:XX:XX:XX'], desc: 'Change the time format', toggle: false};
-CM.ConfigData.SayTime = {label: ['Format Time OFF', 'Format Time ON'], desc: 'Change how time is displayed in statistics', toggle: true, 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', toggle: false, func: function() {CM.Disp.RefreshScale();}};
-

src/Config/CheckNotificationPermissions.js

@@ -0,0 +1,30 @@
+/**
+ * This function checks if the user has given permissions for notifications
+ * It is called by a change in any of the notification options
+ * Note that most browsers will stop asking if the user has ignored the prompt around 6 times
+ * @param 	{number}	ToggleOnOff		A number indicating whether the option has been turned off (0) or on (1)
+ */
+function CheckNotificationPermissions(ToggleOnOff) {
+  if (ToggleOnOff === 1) {
+    // Check if browser support Promise version of Notification Permissions
+    const checkNotificationPromise = function () {
+      try {
+        Notification.requestPermission().then();
+      } catch (e) {
+        return false;
+      }
+      return true;
+    };
+
+    // Check if the browser supports notifications and which type
+    if (!('Notification' in window)) {
+      console.log('This browser does not support notifications.'); // eslint-disable-line no-console
+    } else if (checkNotificationPromise()) {
+      Notification.requestPermission().then();
+    } else {
+      Notification.requestPermission();
+    }
+  }
+}
+
+export default CheckNotificationPermissions;

src/Config/SaveLoadReload/SaveLoadReloadSettings.js

@@ -0,0 +1,77 @@
+import ConfigDefault from '../../Data/SettingsDefault.ts';
+import ConfigData from '../../Data/SettingsData';
+import { CMOptions } from '../VariablesAndData';
+import save from '../../InitSaveLoad/save';
+import CMLoopHook from '../../Main/LoopHook';
+import UpdateColours from '../../Disp/HelperFunctions/UpdateColours';
+
+/** Functions related to saving, loading and restoring all settings */
+
+/**
+ * This function saves the config of CookieMonster without saving any of the other save-data
+ * This allows saving in between the autosave intervals
+ * It is called by CM.Config.LoadConfig(), CM.Config.RestoreDefault(), CM.Config.ToggleConfig(),
+ * CM.ToggleConfigVolume() and changes in options with type "url", "color" or "numscale"
+ */
+export function SaveConfig() {
+  const saveString = b64_to_utf8(
+    unescape(localStorage.getItem('CookieClickerGame')).split('!END!')[0],
+  );
+  const CookieMonsterSave = saveString.match(/CookieMonster.*(;|$)/);
+  if (CookieMonsterSave !== null) {
+    const newSaveString = saveString.replace(CookieMonsterSave[0], `CookieMonster:${save()}`);
+    localStorage.setItem('CookieClickerGame', escape(`${utf8_to_b64(newSaveString)}!END!`));
+  }
+}
+
+/**
+ * This function loads the config of CookieMonster saved in localStorage and loads it into CMOptions
+ * It is called by CM.Main.DelayInit() and CM.Config.RestoreDefault()
+ */
+export function LoadConfig(settings) {
+  // This removes cookies left from earlier versions of CookieMonster
+  if (typeof localStorage.CMConfig !== 'undefined') {
+    delete localStorage.CMConfig;
+  }
+  if (settings !== undefined) {
+    CMOptions = settings;
+
+    if (typeof CMOptions.Colors !== 'undefined') {
+      delete CMOptions.Colors;
+    }
+    if (typeof CMOptions.Colours !== 'undefined') {
+      delete CMOptions.Colours;
+    }
+
+    // Check values
+    let mod = false;
+    Object.keys(ConfigDefault).forEach((i) => {
+      if (typeof CMOptions[i] === 'undefined') {
+        mod = true;
+        CMOptions[i] = ConfigDefault[i];
+      } else if (i === 'Header') {
+        Object.keys(ConfigDefault.Header).forEach((j) => {
+          if (
+            typeof CMOptions[i][j] === 'undefined' ||
+            !(CMOptions[i][j] > -1 && CMOptions[i][j] < 2)
+          ) {
+            mod = true;
+            CMOptions[i][j] = ConfigDefault[i][j];
+          }
+        });
+      }
+    });
+    if (mod) SaveConfig();
+    CMLoopHook(); // Do loop once
+    Object.keys(ConfigDefault).forEach((i) => {
+      if (i !== 'Header' && typeof ConfigData[i].func !== 'undefined') {
+        ConfigData[i].func();
+      }
+    });
+  } else {
+    // Default values
+    LoadConfig(ConfigDefault);
+  }
+  Game.UpdateMenu();
+  UpdateColours();
+}

src/Config/SpecificToggles.js

@@ -0,0 +1,55 @@
+/** Called by the "func" of individual settings */
+
+import UpdateBackground from '../Disp/HelperFunctions/UpdateBackground';
+import { CMOptions } from './VariablesAndData';
+
+/**
+ * This function changes the position of both the bottom and timer bar
+ */
+export function UpdateBotTimerBarPosition() {
+  if (CMOptions.BotBar === 1 && CMOptions.TimerBar === 1 && CMOptions.TimerBarPos === 1) {
+    l('CMBotBar').style.bottom = l('CMTimerBar').style.height;
+    l('game').style.bottom = `${Number(l('CMTimerBar').style.height.replace('px', '')) + 70}px`;
+  } else if (CMOptions.BotBar === 1) {
+    l('CMBotBar').style.bottom = '0px';
+    l('game').style.bottom = '70px';
+  } else if (CMOptions.TimerBar === 1 && CMOptions.TimerBarPos === 1) {
+    l('game').style.bottom = l('CMTimerBar').style.height;
+  } else {
+    // No bars
+    l('game').style.bottom = '0px';
+  }
+
+  if (CMOptions.TimerBar === 1 && CMOptions.TimerBarPos === 0) {
+    l('sectionLeft').style.top = l('CMTimerBar').style.height;
+  } else {
+    l('sectionLeft').style.top = '';
+  }
+
+  UpdateBackground();
+}
+
+/**
+ * This function changes the visibility of the timer bar
+ */
+export function ToggleTimerBar() {
+  if (CMOptions.TimerBar === 1) l('CMTimerBar').style.display = '';
+  else l('CMTimerBar').style.display = 'none';
+  UpdateBotTimerBarPosition();
+}
+
+/**
+ * This function changes the position of the timer bar
+ */
+export function ToggleTimerBarPos() {
+  if (CMOptions.TimerBarPos === 0) {
+    l('CMTimerBar').style.width = '30%';
+    l('CMTimerBar').style.bottom = '';
+    l('game').insertBefore(l('CMTimerBar'), l('sectionLeft'));
+  } else {
+    l('CMTimerBar').style.width = '100%';
+    l('CMTimerBar').style.bottom = '0px';
+    l('wrapper').appendChild(l('CMTimerBar'));
+  }
+  UpdateBotTimerBarPosition();
+}

src/Config/ToggleSetting.js

@@ -0,0 +1,52 @@
+import ConfigData from '../Data/SettingsData';
+import { SaveConfig } from './SaveLoadReload/SaveLoadReloadSettings';
+import { CMOptions } from './VariablesAndData';
+
+/** Functions related to toggling or changing an individual setting */
+
+/** Used to name certain DOM or outside facing elements and refer to them */
+export const ConfigPrefix = 'CMConfig';
+
+/**
+ * This function toggles options by incrementing them with 1 and handling changes
+ * It is called by the onclick event of options of the "bool" type
+ * @param 	{string}	config	The name of the option
+ */
+export function ToggleConfig(config) {
+  CMOptions[config] += 1;
+
+  if (CMOptions[config] === ConfigData[config].label.length) {
+    CMOptions[config] = 0;
+    if (ConfigData[config].toggle) l(ConfigPrefix + config).className = 'option off';
+  } else l(ConfigPrefix + config).className = 'option';
+
+  if (typeof ConfigData[config].func !== 'undefined') {
+    ConfigData[config].func();
+  }
+
+  SaveConfig();
+}
+
+/**
+ * This function sets the value of the specified volume-option and updates the display in the options menu
+ * It is called by the oninput and onchange event of "vol" type options
+ * @param 	{string}	config	The name of the option
+ */
+export function ToggleConfigVolume(config) {
+  if (l(`slider${config}`) !== null) {
+    l(`slider${config}right`).innerHTML = `${l(`slider${config}`).value}%`;
+    CMOptions[config] = Math.round(l(`slider${config}`).value);
+  }
+  SaveConfig();
+}
+
+/**
+ * This function toggles header options by incrementing them with 1 and handling changes
+ * It is called by the onclick event of the +/- next to headers
+ * @param 	{string}	config	The name of the header
+ */
+export function ToggleHeader(config) {
+  CMOptions.Header[config] += 1;
+  if (CMOptions.Header[config] > 1) CMOptions.Header[config] = 0;
+  SaveConfig();
+}

src/Config/Toggles/ToggleBotBar.js

@@ -0,0 +1,17 @@
+import { UpdateBotBar } from '../../Disp/InfoBars/BottomBar';
+import { UpdateBotTimerBarPosition } from '../SpecificToggles';
+import { CMOptions } from '../VariablesAndData';
+
+/**
+ * This function toggle the bottom bar
+ * It is called by CM.Disp.UpdateAscendState() and a change in CMOptions.BotBar
+ */
+export default function ToggleBotBar() {
+  if (CMOptions.BotBar === 1) {
+    l('CMBotBar').style.display = '';
+    UpdateBotBar();
+  } else {
+    l('CMBotBar').style.display = 'none';
+  }
+  UpdateBotTimerBarPosition();
+}

src/Config/Toggles/ToggleDetailedTime.js

@@ -0,0 +1,12 @@
+import { CMSayTime } from '../../Disp/VariablesAndData';
+import { BackupFunctions } from '../../Main/VariablesAndData';
+import { CMOptions } from '../VariablesAndData';
+
+/**
+ * This function changes some of the time-displays in the game to be more detailed
+ * It is called by a change in CM.Options.DetailedTime
+ */
+export default function ToggleDetailedTime() {
+  if (CMOptions.DetailedTime === 1) Game.sayTime = CMSayTime;
+  else Game.sayTime = BackupFunctions.sayTime;
+}

src/Config/Toggles/ToggleFavourites.js

@@ -0,0 +1,11 @@
+import { FavouriteSettings } from '../../Disp/VariablesAndData';
+
+/**
+ * This function toggles whether a setting is part of the favourites section in setting or not
+ * @param {string} config	The name of the toggleable config option
+ */
+export default function ToggleFavouriteSetting(config) {
+  if (FavouriteSettings.includes(config))
+    FavouriteSettings = FavouriteSettings.filter((ele) => ele !== config);
+  else FavouriteSettings.push(config);
+}

src/Config/Toggles/ToggleGCTimer.js

@@ -0,0 +1,20 @@
+import { CacheGoldenShimmersByID } from '../../Cache/VariablesAndData';
+import { GCTimers } from '../../Disp/VariablesAndData';
+import { CMOptions } from '../VariablesAndData';
+
+/**
+ * This function toggles GC Timers are visible
+ * It is called by a change in CM.Options.GCTimer
+ */
+export default function ToggleGCTimer() {
+  if (CMOptions.GCTimer === 1) {
+    Object.keys(GCTimers).forEach((i) => {
+      GCTimers[i].style.display = 'block';
+      GCTimers[i].style.left = CacheGoldenShimmersByID[i].l.style.left;
+      GCTimers[i].style.top = CacheGoldenShimmersByID[i].l.style.top;
+    });
+  } else {
+    // eslint-disable-next-line no-return-assign
+    Object.keys(GCTimers).forEach((i) => (GCTimers[i].style.display = 'none'));
+  }
+}

src/Config/Toggles/ToggleSectionHideButtons.js

@@ -0,0 +1,13 @@
+import { CMOptions } from '../VariablesAndData';
+
+/**
+ * This function updates the display setting of the two objects created by CM.Disp.CreateWrinklerButtons()
+ * It is called by changes in CM.Options.WrinklerButtons
+ */
+export default function ToggleSectionHideButtons() {
+  if (CMOptions.HideSectionsButtons) {
+    l('CMSectionHidButtons').style.display = '';
+  } else {
+    l('CMSectionHidButtons').style.display = 'none';
+  }
+}

src/Config/Toggles/ToggleToolWarnPos.js

@@ -0,0 +1,20 @@
+import { CMOptions } from '../VariablesAndData';
+
+/**
+ * This function toggles the position of the warnings created by CM.Disp.TooltipCreateWarningSection()
+ * It is called by a change in CM.Options.ToolWarnPos
+ * and upon creation of the warning tooltip by CM.Disp.UpdateTooltipWarnings()
+ */
+export default function ToggleToolWarnPos() {
+  if (l('CMDispTooltipWarningParent') !== null) {
+    if (CMOptions.ToolWarnPos === 0) {
+      l('CMDispTooltipWarningParent').style.top = 'auto';
+      l('CMDispTooltipWarningParent').style.margin = '4px -4px';
+      l('CMDispTooltipWarningParent').style.padding = '3px 4px';
+    } else {
+      l('CMDispTooltipWarningParent').style.right = 'auto';
+      l('CMDispTooltipWarningParent').style.margin = '4px';
+      l('CMDispTooltipWarningParent').style.padding = '4px 3px';
+    }
+  }
+}

src/Config/Toggles/ToggleUpgradeBarAndColour.js

@@ -0,0 +1,22 @@
+import UpdateUpgrades from '../../Disp/BuildingsUpgrades/Upgrades';
+import { CMOptions } from '../VariablesAndData';
+
+/**
+ * This function toggles the upgrade bar and the colours of upgrades
+ * It is called by a change in CM.Options.UpBarColor
+ */
+export default function ToggleUpgradeBarAndColor() {
+  if (CMOptions.UpBarColor === 1) {
+    // Colours and bar on
+    l('CMUpgradeBar').style.display = '';
+    UpdateUpgrades();
+  } else if (CMOptions.UpBarColor === 2) {
+    // Colours on and bar off
+    l('CMUpgradeBar').style.display = 'none';
+    UpdateUpgrades();
+  } else {
+    // Colours and bar off
+    l('CMUpgradeBar').style.display = 'none';
+    Game.RebuildUpgrades();
+  }
+}

src/Config/Toggles/ToggleUpgradeBarFixedPos.js

@@ -0,0 +1,15 @@
+import { CMOptions } from '../VariablesAndData';
+
+/**
+ * This function toggles the position of the upgrade bar from fixed or non-fixed mode
+ * It is called by a change in CM.Options.UpgradeBarFixedPos
+ */
+export default function ToggleUpgradeBarFixedPos() {
+  if (CMOptions.UpgradeBarFixedPos === 1) {
+    // Fix to top of screen when scrolling
+    l('CMUpgradeBar').style.position = 'sticky';
+    l('CMUpgradeBar').style.top = '0px';
+  } else {
+    l('CMUpgradeBar').style.position = ''; // Possible to scroll offscreen
+  }
+}

src/Config/Toggles/ToggleWrinklerButtons.js

@@ -0,0 +1,15 @@
+import { CMOptions } from '../VariablesAndData';
+
+/**
+ * This function updates the display setting of the two objects created by CM.Disp.CreateWrinklerButtons()
+ * It is called by changes in CM.Options.WrinklerButtons
+ */
+export default function ToggleWrinklerButtons() {
+  if (CMOptions.WrinklerButtons && Game.elderWrath) {
+    l('PopAllNormalWrinklerButton').style.display = '';
+    l('PopFattestWrinklerButton').style.display = '';
+  } else {
+    l('PopAllNormalWrinklerButton').style.display = 'none';
+    l('PopFattestWrinklerButton').style.display = 'none';
+  }
+}

src/Config/VariablesAndData.js

@@ -0,0 +1,2 @@
+export let CMOptions = {}; // eslint-disable-line prefer-const
+export const ConfigPrefix = 'CMConfig';

src/CookieMonster.js

@@ -0,0 +1,11 @@
+import init from './InitSaveLoad/init';
+import load from './InitSaveLoad/load';
+import save from './InitSaveLoad/save';
+
+const CM = {
+  init,
+  load,
+  save,
+};
+
+Game.registerMod('CookieMonster', CM);

src/Data.js

@@ -1,8 +0,0 @@
-/********
- * Data *
- ********/
-
-CM.Data.HalloCookies = ['Skull cookies', 'Ghost cookies', 'Bat cookies', 'Slime cookies', 'Pumpkin cookies', 'Eyeball cookies', 'Spider cookies'];
-CM.Data.ChristCookies = ['Christmas tree biscuits', 'Snowflake biscuits', 'Snowman biscuits', 'Holly biscuits', 'Candy cane biscuits', 'Bell biscuits', 'Present biscuits'];
-CM.Data.ValCookies = ['Pure heart biscuits', 'Ardent heart biscuits', 'Sour heart biscuits', 'Weeping heart biscuits', 'Golden heart biscuits', 'Eternal heart biscuits'];
-

src/Data/Gamedata.ts

@@ -0,0 +1,97 @@
+/** Data copied directly from the game */
+
+/** Array of the names of all fortune cookies obtainable from the ticker */
+export const Fortunes: string[] = [
+  'Fortune #001',
+  'Fortune #002',
+  'Fortune #003',
+  'Fortune #004',
+  'Fortune #005',
+  'Fortune #006',
+  'Fortune #007',
+  'Fortune #008',
+  'Fortune #009',
+  'Fortune #010',
+  'Fortune #011',
+  'Fortune #012',
+  'Fortune #013',
+  'Fortune #014',
+  'Fortune #015',
+  'Fortune #016',
+  'Fortune #017',
+  'Fortune #018',
+  'Fortune #100',
+  'Fortune #101',
+  'Fortune #102',
+  'Fortune #103',
+  'Fortune #104',
+];
+
+/** Array of the names of all Halloween cookies */
+export const HalloCookies: string[] = [
+  'Skull cookies',
+  'Ghost cookies',
+  'Bat cookies',
+  'Slime cookies',
+  'Pumpkin cookies',
+  'Eyeball cookies',
+  'Spider cookies',
+];
+
+/** Array of the names of all Christmas cookies */
+export const ChristCookies: string[] = [
+  'Christmas tree biscuits',
+  'Snowflake biscuits',
+  'Snowman biscuits',
+  'Holly biscuits',
+  'Candy cane biscuits',
+  'Bell biscuits',
+  'Present biscuits',
+];
+
+/** Array of the names of all Valentine cookies */
+export const ValCookies: string[] = [
+  'Pure heart biscuits',
+  'Ardent heart biscuits',
+  'Sour heart biscuits',
+  'Weeping heart biscuits',
+  'Golden heart biscuits',
+  'Eternal heart biscuits',
+  'Prism heart biscuits',
+];
+
+/** Array of the names of all plant drops */
+export const PlantDrops: string[] = [
+  'Elderwort biscuits',
+  'Bakeberry cookies',
+  'Duketater cookies',
+  'Green yeast digestives',
+  'Wheat slims',
+  'Fern tea',
+  'Ichor syrup',
+];
+
+/** All possible effects plants and other items can have with a display-title */
+export const Effects: { [index: string]: string } = {
+  buildingCost: 'Building prices',
+  click: 'Cookies per click',
+  cps: 'Total CPS',
+  cursorCps: 'Cursor CPS',
+  goldenCookieDur: 'Golden cookie duration',
+  goldenCookieEffDur: 'Golden cookie effect duration',
+  goldenCookieFreq: 'Golden cookie frequency',
+  goldenCookieGain: 'Golden cookie gains',
+  grandmaCps: 'Grandma CPS',
+  itemDrops: 'Random item drop chance',
+  milk: 'Effect from milk',
+  reindeerDur: 'Reindeer duration',
+  reindeerFreq: 'Reindeer frequency',
+  reindeerGain: 'Reindeer gains',
+  upgradeCost: 'Upgrade prices',
+  wrathCookieDur: 'Wrath cookie duration',
+  wrathCookieEffDur: 'Wrath cookie effect duration',
+  wrathCookieFreq: 'Wrath cookie frequency',
+  wrathCookieGain: 'Wrath cookie gains',
+  wrinklerEat: 'Wrinkler ',
+  wrinklerSpawn: 'Wrinkler spawn frequency',
+};

src/Data/Moddata.ts

@@ -0,0 +1,31 @@
+/** Data related directly to Cookie Monster */
+
+export const VersionMajor = '2.031';
+export const VersionMinor = '8';
+
+/** Information about Cookie Monster to be displayed in the info section */
+export const ModDescription = `<div class="listing">
+ <a href="https://github.com/CookieMonsterTeam/CookieMonster" target="blank">Cookie Monster</a>
+ offers a wide range of tools and statistics to enhance your game experience.
+ 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.</br>
+ Progess on new updates and all previous release notes can be found on the GitHub page linked above!</br>
+ Please also report any bugs you may find over there!</br>
+ </div>
+ `;
+
+/** Latest releasenotes of Cookie Monster to be displayed in the info section */
+export const LatestReleaseNotes = `<div class="listing">
+<b>We have moved Cookie Monster to a new location!</b></br>
+Please update the link you are using to load Cookie Monster to https://cookiemonsterteam.github.io/CookieMonster/dist/CookieMonster.js and let everybody know this is the new place to find Cookie Monster!</br>
+These are the release notes for the latest update (v 2.031.8).</br>
+</br>
+This update implements the following functions:</br>
+- The tooltip of buildings now shows how many buildings need to be bought before a new achievement is reached and the cost and PP of this</br>
+- New setting to force the upgrades sections to always show all available upgrades, stopping them from collapsing and expanding</br>
+</br>
+This update fixes the following bugs:</br>
+- Settings menu now correctly updates after changing a setting</br>
+- Fixed incorrect calculation of dates in rare cases</br>
+- Remove golden cookie timers when you ascend</br>
+</div>
+`;

src/Data/Scales.ts

@@ -0,0 +1,141 @@
+/** Data related directly to the scales used by Cookie Monster */
+
+/** Array of abbreviations used in the "Metric" scale */
+export const metric: string[] = ['', '', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
+
+/** Array of abbreviations used in the "Short" scale */
+export const shortScale: string[] = [
+  '',
+  '',
+  'M',
+  'B',
+  'Tr',
+  'Quadr',
+  'Quint',
+  'Sext',
+  'Sept',
+  'Oct',
+  'Non',
+  'Dec',
+  'Undec',
+  'Duodec',
+  'Tredec',
+  'Quattuordec',
+  'Quindec',
+  'Sexdec',
+  'Septendec',
+  'Octodec',
+  'Novemdec',
+  'Vigint',
+  'Unvigint',
+  'Duovigint',
+  'Trevigint',
+  'Quattuorvigint',
+];
+
+/** Array of abbreviations used in the "Abbreviated Short" scale */
+export const shortScaleAbbreviated: string[] = [
+  '',
+  'K',
+  'M',
+  'B',
+  'T',
+  'Qa',
+  'Qi',
+  'Sx',
+  'Sp',
+  'Oc',
+  'No',
+  'De',
+  'UDe',
+  'DDe',
+  'TDe',
+  'QaDe',
+  'QiDe',
+  'SxDe',
+  'SpDe',
+  'ODe',
+  'NDe',
+  'Vi',
+  'UVi',
+  'DVi',
+  'TVi',
+  'QaVi',
+  'QiVi',
+  'SxVi',
+  'SpVi',
+  'OVi',
+  'NVi',
+  'Tr',
+  'UTr',
+  'DTr',
+  'TTr',
+  'QaTr',
+  'QiTr',
+  'SxTr',
+  'SpTr',
+  'OTr',
+  'NTr',
+  'Qaa',
+  'UQa',
+  'DQa',
+  'TQa',
+  'QaQa',
+  'QiQa',
+  'SxQa',
+  'SpQa',
+  'OQa',
+  'NQa',
+  'Qia',
+  'UQi',
+  'DQi',
+  'TQi',
+  'QaQi',
+  'QiQi',
+  'SxQi',
+  'SpQi',
+  'OQi',
+  'NQi',
+  'Sxa',
+  'USx',
+  'DSx',
+  'TSx',
+  'QaSx',
+  'QiSx',
+  'SxSx',
+  'SpSx',
+  'OSx',
+  'NSx',
+  'Spa',
+  'USp',
+  'DSp',
+  'TSp',
+  'QaSp',
+  'QiSp',
+  'SxSp',
+  'SpSp',
+  'OSp',
+  'NSp',
+  'Oco',
+  'UOc',
+  'DOc',
+  'TOc',
+  'QaOc',
+  'QiOc',
+  'SxOc',
+  'SpOc',
+  'OOc',
+  'NOc',
+  'Noa',
+  'UNo',
+  'DNo',
+  'TNo',
+  'QaNo',
+  'QiNo',
+  'SxNo',
+  'SpNo',
+  'ONo',
+  'NNo',
+  'Ct',
+  'UCt',
+];

src/Data/Sectionheaders.ts

@@ -0,0 +1,26 @@
+/** Data related to the display titles of certain sections in menu screens */
+
+/** Display titles of the headers of the Cookie Monster settings section */
+export const ConfigGroups: { [index: string]: string } = {
+  Favourite: 'Favourite Settings',
+  Calculation: 'Calculation',
+  Notation: 'Notation',
+  Colours: 'Colours and colour coding',
+  BarsDisplay: 'Infobars and visual settings',
+  Tooltip: 'Tooltips',
+  Statistics: 'Statistics',
+  Notification: 'Notifications',
+  Miscellaneous: 'Miscellaneous',
+};
+
+/** Display titles of the headers of the notification section of the Cookie Monster settings */
+export const ConfigGroupsNotification: { [index: string]: string } = {
+  NotificationGeneral: 'General Notifications',
+  NotificationGC: 'Golden Cookie',
+  NotificationFC: 'Fortune Cookie',
+  NotificationSea: 'Season Special',
+  NotificationGard: 'Garden Tick',
+  NotificationMagi: 'Full Magic Bar',
+  NotificationWrink: 'Wrinkler',
+  NotificationWrinkMax: 'Maximum Wrinklers',
+};

src/Data/SettingClasses/BaseSetting.ts

@@ -0,0 +1,11 @@
+/** The basic setting class */
+export default class Setting {
+  type: string;
+
+  group: string;
+
+  constructor(type: string, group: string) {
+    this.type = type;
+    this.group = group;
+  }
+}

src/Data/SettingClasses/SettingColours.ts

@@ -0,0 +1,11 @@
+import Setting from './BaseSetting';
+
+/** The colour picker setting class */
+export default class SettingColours extends Setting {
+  desc: string;
+
+  constructor(type: string, group: string, desc: string) {
+    super(type, group);
+    this.desc = desc;
+  }
+}

src/Data/SettingClasses/SettingInputNumber.ts

@@ -0,0 +1,27 @@
+import Setting from './BaseSetting';
+
+/** The number input setting class */
+export default class SettingInputNumber extends Setting {
+  label: string[];
+
+  desc: string;
+
+  min: number;
+
+  max: number;
+
+  constructor(
+    type: string,
+    group: string,
+    label: string[],
+    desc: string,
+    min: number,
+    max: number,
+  ) {
+    super(type, group);
+    this.label = label;
+    this.desc = desc;
+    this.min = min;
+    this.max = max;
+  }
+}

src/Data/SettingClasses/SettingStandard.ts

@@ -0,0 +1,29 @@
+import Setting from './BaseSetting';
+
+/** The standard toggle setting class */
+export default class SettingStandard extends Setting {
+  label: string[];
+
+  desc: string;
+
+  toggle: boolean;
+
+  func: () => void;
+
+  constructor(
+    type: string,
+    group: string,
+    label: string[],
+    desc: string,
+    toggle: boolean,
+    func?: () => void,
+  ) {
+    super(type, group);
+    this.label = label;
+    this.desc = desc;
+    this.toggle = toggle;
+    if (func !== undefined) {
+      this.func = func;
+    }
+  }
+}

src/Data/SettingClasses/SettingVolume.ts

@@ -0,0 +1,17 @@
+import Setting from './BaseSetting';
+
+/** The volume level setting class */
+export default class SettingVolume extends Setting {
+  label: string[];
+
+  desc: string;
+
+  constructor(type: string, group: string, label: string[], desc: string) {
+    super(type, group);
+    this.label = label;
+    this.desc = desc;
+    for (let i = 0; i < 101; i++) {
+      this.label[i] = `${i}%`;
+    }
+  }
+}

src/Data/SettingsData.js

@@ -0,0 +1,834 @@
+import CheckNotificationPermissions from '../Config/CheckNotificationPermissions';
+import { ToggleTimerBar, ToggleTimerBarPos } from '../Config/SpecificToggles';
+import ToggleBotBar from '../Config/Toggles/ToggleBotBar';
+import ToggleDetailedTime from '../Config/Toggles/ToggleDetailedTime';
+import ToggleGCTimer from '../Config/Toggles/ToggleGCTimer';
+import ToggleSectionHideButtons from '../Config/Toggles/ToggleSectionHideButtons';
+import ToggleToolWarnPos from '../Config/Toggles/ToggleToolWarnPos';
+import ToggleUpgradeBarAndColour from '../Config/Toggles/ToggleUpgradeBarAndColour';
+import ToggleUpgradeBarFixedPos from '../Config/Toggles/ToggleUpgradeBarFixedPos';
+import ToggleWrinklerButtons from '../Config/Toggles/ToggleWrinklerButtons';
+import { CMOptions } from '../Config/VariablesAndData';
+import UpdateBuildings from '../Disp/BuildingsUpgrades/Buildings';
+import UpdateUpgradeSectionsHeight from '../Disp/BuildingsUpgrades/UpdateUpgradeSectionsHeight';
+import UpdateUpgrades from '../Disp/BuildingsUpgrades/Upgrades';
+import RefreshScale from '../Disp/HelperFunctions/RefreshScale';
+import { UpdateFavicon } from '../Disp/TabTitle/FavIcon';
+import { SimDoSims } from '../Sim/VariablesAndData';
+import SettingColours from './SettingClasses/SettingColours.ts';
+import SettingInputNumber from './SettingClasses/SettingInputNumber.ts';
+import SettingStandard from './SettingClasses/SettingStandard.ts';
+import SettingVolume from './SettingClasses/SettingVolume.ts';
+
+/** This includes all options of CookieMonster and their relevant data */
+const Config = {
+  // Calculation
+  CPSMode: new SettingStandard(
+    'bool',
+    'Calculation',
+    ['Current cookies per second', 'Average cookies per second'],
+    'Calculate times using current cookies per second or average cookies per second',
+    false,
+  ),
+  AvgCPSHist: new SettingStandard(
+    'bool',
+    'Calculation',
+    [
+      'Average CPS in past 10s',
+      'Average CPS in past 15s',
+      'Average CPS in past 30s',
+      'Average CPS in past 1m',
+      'Average CPS in past 5m',
+      'Average CPS in past 10m',
+      'Average CPS in past 15m',
+      'Average CPS in past 30m',
+    ],
+    'How much time average Cookies Per Second should consider',
+    false,
+  ),
+  AvgClicksHist: new SettingStandard(
+    'bool',
+    'Calculation',
+    [
+      'Average clicks in past 1s',
+      'Average clicks in past 5s',
+      'Average clicks in past 10s',
+      'Average clicks in past 15s',
+      'Average clicks in past 30s',
+    ],
+    'How much time average Cookie Clicks should consider',
+    false,
+  ),
+  CalcWrink: new SettingStandard(
+    'bool',
+    'Calculation',
+    [
+      'Calculate with wrinklers OFF',
+      'Calculate with wrinklers ON',
+      'Calculate with single fattest wrinkler ON',
+    ],
+    'Calculate times and average Cookies Per Second with (only the single non-shiny fattest) wrinklers',
+    true,
+    () => {
+      SimDoSims = true; // eslint-disable-line no-unused-vars
+    },
+  ),
+
+  // Notation
+  Scale: new SettingStandard(
+    'bool',
+    'Notation',
+    [
+      "Game's setting scale",
+      'Metric',
+      'Short scale',
+      'Short scale (Abbreviated)',
+      'Scientific notation',
+      'Engineering notation',
+    ],
+    'Change how long numbers are formatted',
+    false,
+    () => {
+      RefreshScale();
+    },
+  ),
+  ScaleDecimals: new SettingStandard(
+    'bool',
+    'Notation',
+    ['1 decimals', '2 decimals', '3 decimals'],
+    `Set the number of decimals used when applicable. This only works with Cookie Monster scales and not with "Game's Setting Scale"`,
+    false,
+    () => {
+      RefreshScale();
+    },
+  ),
+  ScaleSeparator: new SettingStandard(
+    'bool',
+    'Notation',
+    ['. for decimals (standard)', '. for thousands'],
+    'Set the separator used for decimals and thousands',
+    false,
+    () => {
+      RefreshScale();
+    },
+  ),
+  ScaleCutoff: new SettingInputNumber(
+    'numscale',
+    'Notation',
+    'Notation cut-off point: ',
+    'The number from which Cookie Monster will start formatting numbers based on chosen scale. Standard is 999,999. Setting this above 999,999,999 might break certain notations',
+    1,
+    999999999,
+  ),
+  TimeFormat: new SettingStandard(
+    'bool',
+    'Notation',
+    ['Time XXd, XXh, XXm, XXs', 'Time XX:XX:XX:XX:XX'],
+    'Change the time format',
+    false,
+  ),
+  DetailedTime: new SettingStandard(
+    'bool',
+    'Notation',
+    ['Detailed time OFF', 'Detailed time ON'],
+    'Change how time is displayed in certain statistics and tooltips',
+    true,
+    () => {
+      ToggleDetailedTime();
+    },
+  ),
+  PPDisplayTime: new SettingStandard(
+    'bool',
+    'Notation',
+    ['PP as value (standard)', 'PP as time unit'],
+    'Display PP as calculated value or as approximate time unit. Note that PP does not translate directly into a time unit and this is therefore only an approximation.',
+    false,
+  ),
+
+  // Colours
+  BuildColour: new SettingStandard(
+    'bool',
+    'Colours',
+    ['Building colours OFF', 'Building colours ON'],
+    'Colour code buildings',
+    true,
+    () => {
+      UpdateBuildings();
+    },
+  ),
+  PPOnlyConsiderBuyable: new SettingStandard(
+    'bool',
+    'Colours',
+    ["Don't ignore non-buyable", 'Ignore non-buyable'],
+    "Makes Cookie Monster label buildings and upgrades you can't buy right now red, useful in those situations where you just want to spend your full bank 'most optimally'",
+    true,
+  ),
+  PPExcludeTop: new SettingStandard(
+    'bool',
+    'Colours',
+    [
+      "Don't ignore any",
+      'Ignore 1st best',
+      'Ignore 1st and 2nd best',
+      'Ignore 1st, 2nd and 3rd best',
+    ],
+    'Makes Cookie Monster ignore the 1st, 2nd or 3rd best buildings in labeling and colouring PP values',
+    true,
+  ),
+  PPRigidelMode: new SettingStandard(
+    'bool',
+    'Colours',
+    ['Rigidel mode OFF', 'Rigidel mode ON'],
+    'Makes Cookie Monster ignore all "buy 1" options when colouring PP in order to stay at a total building count ending in 10 for pantheon god Rigidel',
+    true,
+  ),
+  PPSecondsLowerLimit: new SettingInputNumber(
+    'numscale',
+    'Colours',
+    'Lower limit for PP (in seconds): ',
+    'If a building or upgrade costs less than the specified seconds of CPS it will also be considered optimal and label it as such ("PP is less than xx seconds of CPS"); setting to 0 ignores this option',
+    0,
+    Infinity,
+  ),
+  ColourBlue: new SettingColours(
+    'colour',
+    'Colours',
+    'Standard colour is blue. Used to show upgrades better than best PP building, for Click Frenzy bar, and for various labels',
+  ),
+  ColourGreen: new SettingColours(
+    'colour',
+    'Colours',
+    'Standard colour is green. Used to show best PP building, for Blood Frenzy bar, and for various labels',
+  ),
+  ColourYellow: new SettingColours(
+    'colour',
+    'Colours',
+    'Standard colour is yellow. Used to show buildings within the top 10 of PP, for Frenzy bar, and for various labels',
+  ),
+  ColourOrange: new SettingColours(
+    'colour',
+    'Colours',
+    'Standard colour is orange. Used to show buildings within the top 20 of PP, for Next Reindeer bar, and for various labels',
+  ),
+  ColourRed: new SettingColours(
+    'colour',
+    'Colours',
+    'Standard colour is Red. Used to show buildings within the top 30 of PP, for Clot bar, and for various labels',
+  ),
+  ColourPurple: new SettingColours(
+    'colour',
+    'Colours',
+    'Standard colour is purple. Used to show buildings outside of the top 30 of PP, for Next Cookie bar, and for various labels',
+  ),
+  ColourGray: new SettingColours(
+    'colour',
+    'Colours',
+    'Standard colour is gray. Used to show negative or infinity PP, and for Next Cookie/Next Reindeer bar',
+  ),
+  ColourPink: new SettingColours(
+    'colour',
+    'Colours',
+    'Standard colour is pink. Used for Dragonflight bar',
+  ),
+  ColourBrown: new SettingColours(
+    'colour',
+    'Colours',
+    'Standard colour is brown. Used for Dragon Harvest bar',
+  ),
+
+  // BarsDisplay
+  BotBar: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Bottom bar OFF', 'Bottom bar ON'],
+    'Building information',
+    true,
+    () => {
+      ToggleBotBar();
+    },
+  ),
+  TimerBar: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Timer bar OFF', 'Timer bar ON'],
+    'Bar with timers for golden cookie, season popup, Frenzy (Normal, Clot, Elder), Click Frenzy',
+    true,
+    () => {
+      ToggleTimerBar();
+    },
+  ),
+  TimerBarPos: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Timer bar position (top left)', 'Timer bar position (bottom)'],
+    'Placement of the timer bar',
+    false,
+    () => {
+      ToggleTimerBarPos();
+    },
+  ),
+  TimerBarOverlay: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Timer bar overlay OFF', 'Timer bar overlay only seconds', 'Timer bar overlay full'],
+    'Overlay on timers displaying seconds and/or percentage left',
+    true,
+  ),
+  UpBarColour: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Upgrade colours/bar OFF', 'Upgrade colours with bar ON', 'Upgrade colours without bar ON'],
+    'Colour code upgrades and optionally add a counter bar',
+    false,
+    () => {
+      ToggleUpgradeBarAndColour();
+    },
+  ),
+  UpgradeBarFixedPos: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Upgrade bar fixed position OFF', 'Upgrade bar fixed position ON'],
+    'Lock the upgrade bar at top of the screen to prevent it from moving ofscreen when scrolling',
+    true,
+    () => {
+      ToggleUpgradeBarFixedPos();
+    },
+  ),
+  SortBuildings: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    [
+      'Sort buildings: default',
+      'Sort buildings: PP of x1 purchase',
+      'Sort buildings: PP of selected bulk mode',
+    ],
+    'Sort the display of buildings in either default order or by PP',
+    false,
+    () => {
+      UpdateBuildings();
+    },
+  ),
+  SortUpgrades: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Sort upgrades: default', 'Sort upgrades: PP'],
+    'Sort the display of upgrades in either default order or by PP',
+    false,
+    () => {
+      UpdateUpgrades();
+    },
+  ),
+  UpgradesNeverCollapse: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Upgrades always expanded OFF', 'Upgrades always expanded ON'],
+    'Toggle to make the upgrades sections always expanded to the size needed to display all upgrades',
+    true,
+    () => {
+      UpdateUpgradeSectionsHeight();
+    },
+  ),
+  DragonAuraInfo: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Extra dragon aura info OFF', 'Extra dragon aura info ON'],
+    'Shows information about changes in CPS and costs in the dragon aura interface.',
+    true,
+  ),
+  GrimoireBar: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Grimoire magic meter timer OFF', 'Grimoire magic meter timer ON'],
+    'A timer on how long before the Grimoire magic meter is full',
+    true,
+  ),
+  GCTimer: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Golden cookie timer OFF', 'Golden cookie timer ON'],
+    'A timer on the golden cookie when it has been spawned',
+    true,
+    () => {
+      ToggleGCTimer();
+    },
+  ),
+  Favicon: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Favicon OFF', 'Favicon ON'],
+    'Update favicon with golden/wrath cookie',
+    true,
+    () => {
+      UpdateFavicon();
+    },
+  ),
+  WrinklerButtons: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Extra wrinkler buttons OFF', 'Extra wrinkler buttons ON'],
+    'Show buttons for popping wrinklers at bottom of cookie section',
+    true,
+    () => {
+      ToggleWrinklerButtons();
+    },
+  ),
+  HideSectionsButtons: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Hide buildings/upgrades button OFF', 'Hide buildings/upgrades button ON'],
+    'Show buttons for hiding and showing the buildings and upgrades sections in the right column',
+    true,
+    () => {
+      ToggleSectionHideButtons();
+    },
+  ),
+
+  // Tooltip
+  TooltipBuildUpgrade: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Building/upgrade tooltip information OFF', 'Building/upgrade tooltip information ON'],
+    'Extra information in building/upgrade tooltips',
+    true,
+  ),
+  TooltipAmor: new SettingStandard(
+    'bool',
+    'Tooltip',
+    [
+      'Buildings tooltip amortization information OFF',
+      'Buildings tooltip amortization information ON',
+    ],
+    'Add amortization information to buildings tooltip',
+    true,
+  ),
+  ToolWarnLucky: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Tooltip lucky warning OFF', 'Tooltip lucky warning ON'],
+    'A warning when buying if it will put the bank under the amount needed for max "Lucky!" rewards',
+    true,
+  ),
+  ToolWarnLuckyFrenzy: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Tooltip lucky frenzy warning OFF', 'Tooltip lucky frenzy warning ON'],
+    'A warning when buying if it will put the bank under the amount needed for max "Lucky!" (Frenzy) rewards',
+    true,
+  ),
+  ToolWarnConjure: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Tooltip conjure warning OFF', 'Tooltip conjure warning ON'],
+    'A warning when buying if it will put the bank under the amount needed for max "Conjure Baked Goods" rewards',
+    true,
+  ),
+  ToolWarnConjureFrenzy: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Tooltip conjure frenzy warning OFF', 'Tooltip conjure frenzy warning ON'],
+    'A warning when buying if it will put the bank under the amount needed for max "Conjure Baked Goods" rewards with Frenzy active',
+    true,
+  ),
+  ToolWarnEdifice: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Tooltip edifice warning OFF', 'Tooltip edifice warning ON'],
+    'A warning when buying if it will put the bank under the amount needed for "Spontaneous Edifice" to possibly give you your most expensive building',
+    true,
+  ),
+  ToolWarnUser: new SettingInputNumber(
+    'numscale',
+    'Tooltip',
+    'Tooltip warning at x times CPS: ',
+    'Use this to show a customized warning if buying it will put the bank under the amount equal to value times cps; setting to 0 disables the function altogether',
+    0,
+    Infinity,
+  ),
+  ToolWarnBon: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Calculate tooltip warning with bonus CPS OFF', 'Calculate tooltip warning with bonus CPS ON'],
+    'Calculate the warning with or without the bonus CPS you get from buying',
+    true,
+  ),
+  ToolWarnPos: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Tooltip warning position (left)', 'Tooltip warning position (bottom)'],
+    'Placement of the warning boxes',
+    false,
+    () => {
+      ToggleToolWarnPos();
+    },
+  ),
+  TooltipGrim: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Grimoire tooltip information OFF', 'Grimoire tooltip information ON'],
+    'Extra information in tooltip for grimoire',
+    true,
+  ),
+  TooltipWrink: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Wrinkler tooltip OFF', 'Wrinkler tooltip ON'],
+    'Shows the amount of cookies a wrinkler will give when popping it',
+    true,
+  ),
+  TooltipLump: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Sugar lump tooltip OFF', 'Sugar lump tooltip ON'],
+    'Shows the current Sugar Lump type in Sugar lump tooltip.',
+    true,
+  ),
+  TooltipPlots: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Garden plots tooltip OFF', 'Garden plots tooltip ON'],
+    'Shows a tooltip for plants that have a cookie reward.',
+    true,
+  ),
+  TooltipPantheon: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Pantheon tooltip OFF', 'Pantheon tooltip ON'],
+    'Shows additional info in the pantheon tooltip',
+    true,
+  ),
+  TooltipAscendButton: new SettingStandard(
+    'bool',
+    'Tooltip',
+    ['Show Extra Info Ascend Tooltip OFF', 'Show Extra Info Ascend Tooltip ON'],
+    'Shows additional info in the ascend tooltip',
+    true,
+  ),
+
+  // Statistics
+  Stats: new SettingStandard(
+    'bool',
+    'Statistics',
+    ['Statistics OFF', 'Statistics ON'],
+    'Extra Cookie Monster statistics!',
+    true,
+  ),
+  MissingUpgrades: new SettingStandard(
+    'bool',
+    'Statistics',
+    ['Missing upgrades OFF', 'Missing upgrades ON'],
+    'Shows missing upgrades in statistics menu',
+    true,
+  ),
+  MissingAchievements: new SettingStandard(
+    'bool',
+    'Statistics',
+    ['Missing Achievements OFF', 'Missing Normal Achievements ON'],
+    'Shows missing normal achievements in statistics menu.',
+    true,
+  ),
+  UpStats: new SettingStandard(
+    'bool',
+    'Statistics',
+    ['Statistics update rate (default)', 'Statistics update rate (1s)'],
+    'Default rate is once every 5 seconds',
+    false,
+  ),
+  HeavenlyChipsTarget: new SettingInputNumber(
+    'numscale',
+    'Statistics',
+    'Heavenly chips target: ',
+    'Use this to set a heavenly chips target that will be counted towards in the "prestige" statsistics sections',
+    1,
+    Infinity,
+  ),
+  ShowMissedGC: new SettingStandard(
+    'bool',
+    'Statistics',
+    ['Missed GC OFF', 'Missed GC ON'],
+    'Show a stat in the statistics screen that counts how many golden cookies you have missed',
+    true,
+  ),
+
+  // Notification
+  Title: new SettingStandard(
+    'bool',
+    'NotificationGeneral',
+    ['Title OFF', 'Title ON', 'Title pinned tab highlight'],
+    'Update title with colden cookie/season popup timers; pinned tab highlight only changes the title when a golden cookie/season popup spawns; "!" means that golden cookie/reindeer can spawn',
+    true,
+  ),
+  GeneralSound: new SettingStandard(
+    'bool',
+    'NotificationGeneral',
+    ['Consider game volume setting OFF', 'Consider game volume setting ON'],
+    'Turning this toggle to "off" makes Cookie Monster no longer consider the volume setting of the base game, allowing mod notifications to play with base game volume turned down',
+    true,
+  ),
+  GCNotification: new SettingStandard(
+    'bool',
+    'NotificationGC',
+    ['Notification OFF', 'Notification ON'],
+    'Create a notification when golden cookie spawns',
+    true,
+    () => {
+      CheckNotificationPermissions(CMOptions.GCNotification);
+    },
+  ),
+  GCFlash: new SettingStandard(
+    'bool',
+    'NotificationGC',
+    ['Flash OFF', 'Flash ON'],
+    'Flash screen on golden cookie',
+    true,
+  ),
+  ColourGCFlash: new SettingColours(
+    'colour',
+    'NotificationGC',
+    'The colour of the GC flash, standard colour is white',
+  ),
+  GCSound: new SettingStandard(
+    'bool',
+    'NotificationGC',
+    ['Sound OFF', 'Sound ON'],
+    'Play a sound on golden cookie',
+    true,
+  ),
+  GCVolume: new SettingVolume('vol', 'NotificationGC', [], 'Volume'),
+  GCSoundURL: new SettingStandard(
+    'url',
+    'NotificationGC',
+    'Sound URL:',
+    'URL of the sound to be played when a golden cookie spawns',
+  ),
+  FortuneNotification: new SettingStandard(
+    'bool',
+    'NotificationFC',
+    ['Notification OFF', 'Notification ON'],
+    'Create a notification when fortune cookie is on the ticker',
+    true,
+    () => {
+      CheckNotificationPermissions(CMOptions.FortuneNotification);
+    },
+  ),
+  FortuneFlash: new SettingStandard(
+    'bool',
+    'NotificationFC',
+    ['Flash OFF', 'Flash ON'],
+    'Flash screen on fortune cookie spawn',
+    true,
+  ),
+  ColourFortuneFlash: new SettingColours(
+    'colour',
+    'NotificationFC',
+    'The colour of the fortune flash, standard colour is white',
+  ),
+  FortuneSound: new SettingStandard(
+    'bool',
+    'NotificationFC',
+    ['Sound OFF', 'Sound ON'],
+    'Play a sound on fortune cookie spawn',
+    true,
+  ),
+  FortuneVolume: new SettingVolume('vol', 'NotificationFC', [], 'Volume'),
+  FortuneSoundURL: new SettingStandard(
+    'url',
+    'NotificationFC',
+    'Sound URL:',
+    'URL of the sound to be played when the ticker has a fortune cookie',
+  ),
+  SeaNotification: new SettingStandard(
+    'bool',
+    'NotificationSea',
+    ['Notification OFF', 'Notification ON'],
+    'Create a notification on season popup',
+    true,
+    () => {
+      CheckNotificationPermissions(CMOptions.SeaNotification);
+    },
+  ),
+  SeaFlash: new SettingStandard(
+    'bool',
+    'NotificationSea',
+    ['Flash OFF', 'Flash ON'],
+    'Flash screen on season popup',
+    true,
+  ),
+  ColourSeaFlash: new SettingColours(
+    'colour',
+    'NotificationSea',
+    'The colour of the season popup flash, standard colour is white',
+  ),
+  SeaSound: new SettingStandard(
+    'bool',
+    'NotificationSea',
+    ['Sound OFF', 'Sound ON'],
+    'Play a sound on season popup',
+    true,
+  ),
+  SeaVolume: new SettingVolume('vol', 'NotificationSea', [], 'Volume'),
+  SeaSoundURL: new SettingStandard(
+    'url',
+    'NotificationSea',
+    'Sound URL:',
+    'URL of the sound to be played when on season popup spawns',
+  ),
+  GardFlash: new SettingStandard(
+    'bool',
+    'NotificationGard',
+    ['Garden Tick Flash OFF', 'Flash ON'],
+    'Flash screen on garden tick',
+    true,
+  ),
+  ColourGardFlash: new SettingColours(
+    'colour',
+    'NotificationGard',
+    'The colour of the garden flash, standard colour is white',
+  ),
+  GardSound: new SettingStandard(
+    'bool',
+    'NotificationGard',
+    ['Sound OFF', 'Sound ON'],
+    'Play a sound on garden tick',
+    true,
+  ),
+  GardVolume: new SettingVolume('vol', 'NotificationGard', [], 'Volume'),
+  GardSoundURL: new SettingStandard(
+    'url',
+    'NotificationGard',
+    'Garden Tick Sound URL:',
+    'URL of the sound to be played when the garden ticks',
+  ),
+  MagicNotification: new SettingStandard(
+    'bool',
+    'NotificationMagi',
+    ['Notification OFF', 'Notification ON'],
+    'Create a notification when magic reaches maximum',
+    true,
+    () => {
+      CheckNotificationPermissions(CMOptions.MagicNotification);
+    },
+  ),
+  MagicFlash: new SettingStandard(
+    'bool',
+    'NotificationMagi',
+    ['Flash OFF', 'Flash ON'],
+    'Flash screen when magic reaches maximum',
+    true,
+  ),
+  ColourMagicFlash: new SettingColours(
+    'colour',
+    'NotificationMagi',
+    'The colour of the magic flash, standard colour is white',
+  ),
+  MagicSound: new SettingStandard(
+    'bool',
+    'NotificationMagi',
+    ['Sound OFF', 'Sound ON'],
+    'Play a sound when magic reaches maximum',
+    true,
+  ),
+  MagicVolume: new SettingVolume('vol', 'NotificationMagi', [], 'Volume'),
+  MagicSoundURL: new SettingStandard(
+    'url',
+    'NotificationMagi',
+    'Sound URL:',
+    'URL of the sound to be played when magic reaches maxium',
+  ),
+  WrinklerNotification: new SettingStandard(
+    'bool',
+    'NotificationWrink',
+    ['Notification OFF', 'Notification ON'],
+    'Create a notification when a wrinkler appears',
+    true,
+    () => {
+      CheckNotificationPermissions(CMOptions.WrinklerNotification);
+    },
+  ),
+  WrinklerFlash: new SettingStandard(
+    'bool',
+    'NotificationWrink',
+    ['Flash OFF', 'Flash ON'],
+    'Flash screen when a wrinkler appears',
+    true,
+  ),
+  ColourWrinklerFlash: new SettingColours(
+    'colour',
+    'NotificationWrink',
+    'The colour of the wrinkler flash, standard colour is white',
+  ),
+  WrinklerSound: new SettingStandard(
+    'bool',
+    'NotificationWrink',
+    ['Sound OFF', 'Sound ON'],
+    'Play a sound when a wrinkler appears',
+    true,
+  ),
+  WrinklerVolume: new SettingVolume('vol', 'NotificationWrink', [], 'Volume'),
+  WrinklerSoundURL: new SettingStandard(
+    'url',
+    'NotificationWrink',
+    'Sound URL:',
+    'URL of the sound to be played when a wrinkler appears',
+  ),
+  WrinklerMaxNotification: new SettingStandard(
+    'bool',
+    'NotificationWrinkMax',
+    ['Notification OFF', 'Notification ON'],
+    'Create a notification when the maximum amount of wrinklers has appeared',
+    true,
+    () => {
+      CheckNotificationPermissions(CMOptions.WrinklerMaxNotification);
+    },
+  ),
+  WrinklerMaxFlash: new SettingStandard(
+    'bool',
+    'NotificationWrinkMax',
+    ['Flash OFF', 'Flash ON'],
+    'Flash screen when the maximum amount of Wrinklers has appeared',
+    true,
+  ),
+  ColourWrinklerMaxFlash: new SettingColours(
+    'colour',
+    'NotificationWrinkMax',
+    'The colour of the maximum wrinkler flash, standard colour is white',
+  ),
+  WrinklerMaxSound: new SettingStandard(
+    'bool',
+    'NotificationWrinkMax',
+    ['Sound OFF', 'Sound ON'],
+    'Play a sound when the maximum amount of wrinklers has appeared',
+    true,
+  ),
+  WrinklerMaxVolume: new SettingVolume('vol', 'NotificationWrinkMax', [], 'Volume'),
+  WrinklerMaxSoundURL: new SettingStandard(
+    'url',
+    'NotificationWrinkMax',
+    'Sound URL:',
+    'URL of the sound to be played when the maximum amount of wrinklers has appeared',
+  ),
+
+  // Miscellaneous
+  BulkBuyBlock: new SettingStandard(
+    'bool',
+    'Miscellaneous',
+    ['Block bulk buying OFF', 'Block bulk buying ON'],
+    "Block clicking bulk buying when you can't buy all. This prevents buying 7 of a building when you are in buy-10 or buy-100 mode.",
+    true,
+  ),
+  FavouriteSettings: new SettingStandard(
+    'bool',
+    'Miscellaneous',
+    [
+      'Favourite settings section OFF',
+      'Favourite settings section ON',
+      'Favourite settings section ON (Locked)',
+    ],
+    "Show stars before each setting which allows selecting it for a 'favourites' section at the top of the Cookie Monster settings. Setting this to Locked removes the stars but shows the 'favourites' section",
+    true,
+    () => {
+      Game.UpdateMenu();
+    },
+  ),
+};
+
+export default Config;

src/Data/SettingsDefault.ts

@@ -0,0 +1,142 @@
+/** This array describes all default settings */
+const ConfigDefault: {
+  [index: string]: string | number | { [index: string]: number };
+} = {
+  CPSMode: 1,
+  AvgCPSHist: 3,
+  AvgClicksHist: 0,
+  CalcWrink: 0,
+  Scale: 2,
+  ScaleDecimals: 2,
+  ScaleSeparator: 0,
+  ScaleCutoff: 999999,
+  TimeFormat: 0,
+  DetailedTime: 1,
+  PPDisplayTime: 0,
+  BuildColour: 1,
+  PPOnlyConsiderBuyable: 0,
+  PPExcludeTop: 0,
+  PPRigidelMode: 0,
+  PPSecondsLowerLimit: 0,
+  ColourBlue: '#4bb8f0',
+  ColourGreen: '#00ff00',
+  ColourYellow: '#ffff00',
+  ColourOrange: '#ff7f00',
+  ColourRed: '#ff0000',
+  ColourPurple: '#ff00ff',
+  ColourGray: '#b3b3b3',
+  ColourPink: '#ff1493',
+  ColourBrown: '#8b4513',
+  BotBar: 1,
+  TimerBar: 1,
+  TimerBarPos: 0,
+  TimerBarOverlay: 2,
+  UpBarColour: 1,
+  UpgradeBarFixedPos: 1,
+  SortBuildings: 0,
+  SortUpgrades: 0,
+  UpgradesNeverCollapse: 0,
+  DragonAuraInfo: 1,
+  GrimoireBar: 1,
+  GCTimer: 1,
+  Favicon: 1,
+  WrinklerButtons: 1,
+  HideSectionsButtons: 0,
+  TooltipBuildUpgrade: 1,
+  TooltipAmor: 0,
+  ToolWarnLucky: 1,
+  ToolWarnLuckyFrenzy: 1,
+  ToolWarnConjure: 1,
+  ToolWarnConjureFrenzy: 1,
+  ToolWarnEdifice: 1,
+  ToolWarnUser: 0,
+  ToolWarnBon: 1,
+  ToolWarnPos: 1,
+  TooltipGrim: 1,
+  TooltipWrink: 1,
+  TooltipLump: 1,
+  TooltipPlots: 1,
+  TooltipPantheon: 1,
+  TooltipAscendButton: 1,
+  Stats: 1,
+  MissingUpgrades: 1,
+  MissingAchievements: 0,
+  UpStats: 1,
+  HeavenlyChipsTarget: 1,
+  ShowMissedGC: 1,
+  Title: 1,
+  GeneralSound: 1,
+  GCNotification: 0,
+  GCFlash: 1,
+  ColourGCFlash: '#ffffff',
+  GCSound: 1,
+  GCVolume: 100,
+  GCSoundURL: 'https://freesound.org/data/previews/66/66717_931655-lq.mp3',
+  FortuneNotification: 0,
+  FortuneFlash: 1,
+  ColourFortuneFlash: '#ffffff',
+  FortuneSound: 1,
+  FortuneVolume: 100,
+  FortuneSoundURL: 'https://freesound.org/data/previews/174/174027_3242494-lq.mp3',
+  SeaNotification: 0,
+  SeaFlash: 1,
+  ColourSeaFlash: '#ffffff',
+  SeaSound: 1,
+  SeaVolume: 100,
+  SeaSoundURL: 'https://www.freesound.org/data/previews/121/121099_2193266-lq.mp3',
+  GardFlash: 1,
+  ColourGardFlash: '#ffffff',
+  GardSound: 1,
+  GardVolume: 100,
+  GardSoundURL: 'https://freesound.org/data/previews/103/103046_861714-lq.mp3',
+  MagicNotification: 0,
+  MagicFlash: 1,
+  ColourMagicFlash: '#ffffff',
+  MagicSound: 1,
+  MagicVolume: 100,
+  MagicSoundURL: 'https://freesound.org/data/previews/221/221683_1015240-lq.mp3',
+  WrinklerNotification: 0,
+  WrinklerFlash: 1,
+  ColourWrinklerFlash: '#ffffff',
+  WrinklerSound: 1,
+  WrinklerVolume: 100,
+  WrinklerSoundURL: 'https://freesound.org/data/previews/124/124186_8043-lq.mp3',
+  WrinklerMaxNotification: 0,
+  WrinklerMaxFlash: 1,
+  ColourWrinklerMaxFlash: '#ffffff',
+  WrinklerMaxSound: 1,
+  WrinklerMaxVolume: 100,
+  WrinklerMaxSoundURL: 'https://freesound.org/data/previews/152/152743_15663-lq.mp3',
+  BulkBuyBlock: 0,
+  FavouriteSettings: 1,
+  Header: {
+    Favourite: 1,
+    Calculation: 1,
+    Notation: 1,
+    Colours: 1,
+    BarsDisplay: 1,
+    Tooltip: 1,
+    Statistics: 1,
+    Notification: 1,
+    NotificationGeneral: 1,
+    NotificationGC: 1,
+    NotificationFC: 1,
+    NotificationSea: 1,
+    NotificationGard: 1,
+    NotificationMagi: 1,
+    NotificationWrink: 1,
+    NotificationWrinkMax: 1,
+    Miscellaneous: 1,
+    Lucky: 1,
+    Chain: 1,
+    Spells: 1,
+    Garden: 1,
+    Prestige: 1,
+    Wrink: 1,
+    Sea: 1,
+    Misc: 1,
+    InfoTab: 1,
+  },
+};
+
+export default ConfigDefault;

src/Disp/BeautifyAndFormatting/Beautify.js

@@ -0,0 +1,76 @@
+/** General functions to format or beautify strings */
+
+import { CMOptions } from '../../Config/VariablesAndData';
+import { metric, shortScale, shortScaleAbbreviated } from '../../Data/Scales.ts';
+import { BackupFunctions } from '../../Main/VariablesAndData';
+
+/**
+ * This function returns formats number based on the Scale setting
+ * @param	{number}	num		Number to be beautified
+ * @param 	{any}		floats 	Used in some scenario's by CM.Backup.Beautify (Game's original function)
+ * @param	{number}	forced	Used to force (type 3) in certains cases
+ * @returns	{string}			Formatted number
+ */
+export default function Beautify(num, floats, forced) {
+  const decimals = CMOptions.ScaleDecimals + 1;
+  if (num === Infinity) {
+    return 'Infinity';
+  }
+  if (typeof num === 'undefined') {
+    return '0';
+  }
+  if (CMOptions.Scale === 0) {
+    return BackupFunctions.Beautify(num, floats);
+  }
+  if (Number.isFinite(num)) {
+    if (num < 0) {
+      return `-${Beautify(Math.abs(num))}`;
+    }
+    let answer = '';
+    if (num === 0) {
+      return num.toString();
+    }
+    if (num > 0.001 && num < CMOptions.ScaleCutoff) {
+      if (CMOptions.ScaleSeparator) answer = num.toLocaleString('nl');
+      else answer = num.toLocaleString('en');
+      return answer;
+    }
+    if ((CMOptions.Scale === 4 && !forced) || forced === 4) {
+      // Scientific notation, 123456789 => 1.235E+8
+      answer = num.toExponential(decimals).toString().replace('e', 'E');
+    } else {
+      const exponential = num.toExponential().toString();
+      const AmountOfTenPowerThree = Math.floor(exponential.slice(exponential.indexOf('e') + 1) / 3);
+      answer = (num / Number(`1e${AmountOfTenPowerThree * 3}`)).toFixed(decimals);
+      // answer is now "xxx.xx" (e.g., 123456789 would be 123.46)
+      if ((CMOptions.Scale === 1 && !forced) || forced === 1) {
+        // Metric scale, 123456789 => 123.457 M
+        if (num >= 0.01 && num < Number(`1e${metric.length * 3}`)) {
+          answer += ` ${metric[AmountOfTenPowerThree]}`;
+        } else answer = Beautify(num, 0, 4); // If number is too large or little, revert to scientific notation
+      } else if ((CMOptions.Scale === 2 && !forced) || forced === 2) {
+        // Short scale, 123456789 => 123.457 M
+        if (num >= 0.01 && num < Number(`1e${shortScale.length * 3}`)) {
+          answer += ` ${shortScale[AmountOfTenPowerThree]}`;
+        } else answer = Beautify(num, 0, 4); // If number is too large or little, revert to scientific notation
+      } else if ((CMOptions.Scale === 3 && !forced) || forced === 3) {
+        // Short scale, 123456789 => 123.457 M
+        if (num >= 0.01 && num < Number(`1e${shortScaleAbbreviated.length * 3}`)) {
+          answer += ` ${shortScaleAbbreviated[AmountOfTenPowerThree]}`;
+        } else answer = Beautify(num, 0, 4); // If number is too large or little, revert to scientific notation
+      } else if ((CMOptions.Scale === 5 && !forced) || forced === 5) {
+        // Engineering notation, 123456789 => 123.457E+6
+        answer += `E${AmountOfTenPowerThree * 3}`;
+      }
+    }
+    if (answer === '') {
+      // eslint-disable-next-line no-console
+      console.log(`Could not beautify number with Cookie Monster Beautify: ${num}`);
+      answer = BackupFunctions.Beautify(num, floats);
+    }
+    if (CMOptions.ScaleSeparator) answer = answer.replace('.', ',');
+    return answer;
+  }
+  console.log(`Could not beautify number with Cookie Monster Beautify: ${num}`); // eslint-disable-line no-console
+  return BackupFunctions.Beautify(num, floats);
+}

src/Disp/BeautifyAndFormatting/FormatTime.js

@@ -0,0 +1,42 @@
+import { CMOptions } from '../../Config/VariablesAndData';
+
+/**
+ * This function returns time as a string depending on TimeFormat setting
+ * @param  	{number} 	time		Time to be formatted
+ * @param  	{number}	longFormat 	1 or 0
+ * @returns	{string}				Formatted time
+ */
+export default function FormatTime(time, longFormat) {
+  let formattedTime = time;
+  if (time === Infinity) return time;
+  if (time < 0) return 'Negative time period';
+  formattedTime = Math.ceil(time);
+  const y = Math.floor(formattedTime / 31536000);
+  const d = Math.floor((formattedTime % 31536000) / 86400);
+  const h = Math.floor(((formattedTime % 31536000) % 86400) / 3600);
+  const m = Math.floor((((formattedTime % 31536000) % 86400) % 3600) / 60);
+  const s = Math.floor((((formattedTime % 31536000) % 86400) % 3600) % 60);
+  let str = '';
+  if (CMOptions.TimeFormat) {
+    if (formattedTime > 3155760000) return 'XX:XX:XX:XX:XX';
+    str += `${(y < 10 ? '0' : '') + y}:`;
+    str += `${(d < 10 ? '0' : '') + d}:`;
+    str += `${(h < 10 ? '0' : '') + h}:`;
+    str += `${(m < 10 ? '0' : '') + m}:`;
+    str += (s < 10 ? '0' : '') + s;
+  } else {
+    if (formattedTime > 777600000) return longFormat ? 'Over 9000 days!' : '>9000d';
+    str +=
+      y > 0
+        ? `${y + (longFormat ? (y === 1 ? ' year' : ' years') : 'y')}, ` // eslint-disable-line no-nested-ternary
+        : '';
+    if (str.length > 0 || d > 0)
+      str += `${d + (longFormat ? (d === 1 ? ' day' : ' days') : 'd')}, `; // eslint-disable-line no-nested-ternary
+    if (str.length > 0 || h > 0)
+      str += `${h + (longFormat ? (h === 1 ? ' hour' : ' hours') : 'h')}, `; // eslint-disable-line no-nested-ternary
+    if (str.length > 0 || m > 0)
+      str += `${m + (longFormat ? (m === 1 ? ' minute' : ' minutes') : 'm')}, `; // eslint-disable-line no-nested-ternary
+    str += s + (longFormat ? (s === 1 ? ' second' : ' seconds') : 's'); // eslint-disable-line no-nested-ternary
+  }
+  return str;
+}

src/Disp/BeautifyAndFormatting/GetTimeColour.js

@@ -0,0 +1,24 @@
+import { CMOptions } from '../../Config/VariablesAndData';
+import { ColourGreen, ColourOrange, ColourRed, ColourYellow } from '../VariablesAndData';
+import FormatTime from './FormatTime';
+
+/**
+ * This function returns the color to be used for time-strings
+ * @param	{number}			time			Time to be coloured
+ * @returns {{string, string}}	{text, color}	Both the formatted time and color as strings in an array
+ */
+export default function GetTimeColour(time) {
+  let color;
+  let text;
+  if (time <= 0) {
+    if (CMOptions.TimeFormat) text = '00:00:00:00:00';
+    else text = 'Done!';
+    color = ColourGreen;
+  } else {
+    text = FormatTime(time);
+    if (time > 300) color = ColourRed;
+    else if (time > 60) color = ColourOrange;
+    else color = ColourYellow;
+  }
+  return { text, color };
+}

src/Disp/BuildingsUpgrades/Buildings.js

@@ -0,0 +1,113 @@
+import { CacheObjects1, CacheObjects10, CacheObjects100 } from '../../Cache/VariablesAndData';
+import { CMOptions } from '../../Config/VariablesAndData';
+import BuildingSell from '../../Sim/SimulationEvents/SellBuilding';
+import Beautify from '../BeautifyAndFormatting/Beautify';
+import { ColoursOrdering, LastTargetBuildings } from '../VariablesAndData';
+
+/**
+ * Section: Functions related to right column of the screen (buildings/upgrades)
+
+/**
+ * This function adjusts some things in the column of buildings.
+ * It colours them, helps display the correct sell-price and shuffles the order when CM.Options.SortBuildings is set
+ * The function is called by CM.Disp.Draw(), CM.Disp.UpdateColours() & CM.Disp.RefreshScale()
+ * And by changes in CM.Options.BuildColour, CM.Options.SortBuild & CM.Data.Config.BulkBuildColour
+ */
+export default function UpdateBuildings() {
+  let target = Game.buyBulk;
+  if (Game.buyMode === 1) {
+    LastTargetBuildings = target;
+  } else {
+    target = LastTargetBuildings;
+  }
+  if (target === 1) target = CacheObjects1;
+  else if (target === 10) target = CacheObjects10;
+  else if (target === 100) target = CacheObjects100;
+
+  if (Game.buyMode === 1) {
+    if (CMOptions.BuildColour === 1) {
+      Object.keys(target).forEach((i) => {
+        l(`productPrice${Game.Objects[i].id}`).style.color = CMOptions[`Colour${target[i].color}`];
+      });
+    } else {
+      Object.keys(Game.Objects).forEach((i) => {
+        l(`productPrice${Game.Objects[i].id}`).style.removeProperty('color');
+      });
+    }
+  } else if (Game.buyMode === -1) {
+    Object.keys(CacheObjects1).forEach((i) => {
+      const o = Game.Objects[i];
+      l(`productPrice${o.id}`).style.color = '';
+      /*
+       * Fix sell price displayed in the object in the store.
+       *
+       * The buildings sell price displayed by the game itself (without any mod) is incorrect.
+       * The following line of code fixes this issue, and can be safely removed when the game gets fixed.
+       *
+       * This issue is extensively detailed here: https://github.com/Aktanusa/CookieMonster/issues/359#issuecomment-735658262
+       */
+      l(`productPrice${o.id}`).innerHTML = Beautify(
+        BuildingSell(o, o.basePrice, o.amount, o.free, Game.buyBulk, 1),
+      );
+    });
+  }
+
+  // Build array of pointers, sort by pp, use array index (+2) as the grid row number
+  // (grid rows are 1-based indexing, and row 1 is the bulk buy/sell options)
+  // This regulates sorting of buildings
+  if (Game.buyMode === 1 && CMOptions.SortBuildings) {
+    let arr;
+    if (CMOptions.SortBuildings === 1) {
+      arr = Object.keys(CacheObjects1).map((k) => {
+        const o = CacheObjects1[k];
+        o.name = k;
+        o.id = Game.Objects[k].id;
+        return o;
+      });
+
+      arr.sort((a, b) =>
+        ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary
+        ColoursOrdering.indexOf(b.color)
+          ? 1
+          : ColoursOrdering.indexOf(a.color) < ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
+          ? -1
+          : a.pp < b.pp
+          ? -1
+          : 0,
+      );
+    } else if (CMOptions.SortBuildings === 2) {
+      arr = Object.keys(target).map((k) => {
+        const o = target[k];
+        o.name = k;
+        o.id = Game.Objects[k].id;
+        return o;
+      });
+
+      arr.sort((a, b) =>
+        ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary
+        ColoursOrdering.indexOf(b.color)
+          ? 1
+          : ColoursOrdering.indexOf(a.color) < ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
+          ? -1
+          : a.pp < b.pp
+          ? -1
+          : 0,
+      );
+    }
+
+    for (let x = 0; x < arr.length; x++) {
+      Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
+    }
+  } else {
+    const arr = Object.keys(CacheObjects1).map((k) => {
+      const o = CacheObjects1[k];
+      o.name = k;
+      o.id = Game.Objects[k].id;
+      return o;
+    });
+    arr.sort((a, b) => a.id - b.id);
+    for (let x = 0; x < arr.length; x++) {
+      Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
+    }
+  }
+}

src/Disp/BuildingsUpgrades/UpdateUpgradeSectionsHeight.js

@@ -0,0 +1,27 @@
+import { CMOptions } from '../../Config/VariablesAndData';
+
+/**
+ * This function toggles the upgrade to be always expanded
+ * It is called by a change in CM.Options.ToolWarnPos
+ * and upon creation of the warning tooltip by CM.Disp.UpdateTooltipWarnings()
+ */
+export default function UpdateUpgradeSectionsHeight() {
+  Object.values(document.getElementsByClassName('storeSection')).forEach((section) => {
+    if (CMOptions.UpgradesNeverCollapse || section.id === 'products') {
+      section.style.height = 'auto'; // eslint-disable-line no-param-reassign
+    } else if (section.id === 'vaultUpgrades') {
+      section.style.height = ''; // eslint-disable-line no-param-reassign
+      section.style.minHeight = '0px'; // eslint-disable-line no-param-reassign
+    } else if (section.id === 'upgrades') {
+      section.style.height = ''; // eslint-disable-line no-param-reassign
+      if (section.className.includes('hasMenu')) {
+        section.style.minHeight = '82px'; // eslint-disable-line no-param-reassign
+      } else {
+        section.style.minHeight = '60px'; // eslint-disable-line no-param-reassign
+      }
+    } else {
+      section.style.height = ''; // eslint-disable-line no-param-reassign
+      section.style.minHeight = '60px'; // eslint-disable-line no-param-reassign
+    }
+  });
+}

src/Disp/BuildingsUpgrades/UpgradeBar.js

@@ -0,0 +1,91 @@
+import {
+  ColourBackPre,
+  ColourBlue,
+  ColourGray,
+  ColourGreen,
+  ColourOrange,
+  ColourPurple,
+  ColourRed,
+  ColourTextPre,
+  ColourYellow,
+} from '../VariablesAndData';
+
+/**
+ * This function creates the legend for the upgrade bar
+ * @returns	{object}	legend	The legend-object to be added
+ */
+function CreateUpgradeBarLegend() {
+  const legend = document.createElement('div');
+  legend.style.minWidth = '330px';
+  legend.style.marginBottom = '4px';
+  const title = document.createElement('div');
+  title.className = 'name';
+  title.style.marginBottom = '4px';
+  title.textContent = 'Legend';
+  legend.appendChild(title);
+
+  const legendLine = function (color, text) {
+    const div = document.createElement('div');
+    div.style.verticalAlign = 'middle';
+    const span = document.createElement('span');
+    span.className = ColourBackPre + color;
+    span.style.display = 'inline-block';
+    span.style.height = '10px';
+    span.style.width = '10px';
+    span.style.marginRight = '4px';
+    div.appendChild(span);
+    div.appendChild(document.createTextNode(text));
+    return div;
+  };
+
+  legend.appendChild(legendLine(ColourBlue, 'Better than the best PP of a building option'));
+  legend.appendChild(legendLine(ColourGreen, 'Same as the best PP building option'));
+  legend.appendChild(legendLine(ColourYellow, 'Within the top 10 of PP for buildings'));
+  legend.appendChild(legendLine(ColourOrange, 'Within the top 20 of PP for buildings'));
+  legend.appendChild(legendLine(ColourRed, 'Within the top 30 of PP for buildings'));
+  legend.appendChild(legendLine(ColourPurple, 'Outside of the top 30 of PP for buildings'));
+  legend.appendChild(legendLine(ColourGray, 'Negative or infinity PP'));
+  return legend;
+}
+
+/**
+ * This function creates the upgrade bar above the upgrade-section in the right section of the screen
+ */
+export default function CreateUpgradeBar() {
+  const UpgradeBar = document.createElement('div');
+  UpgradeBar.id = 'CMUpgradeBar';
+  UpgradeBar.style.width = '100%';
+  UpgradeBar.style.backgroundColor = 'black';
+  UpgradeBar.style.textAlign = 'center';
+  UpgradeBar.style.fontWeight = 'bold';
+  UpgradeBar.style.display = 'none';
+  UpgradeBar.style.zIndex = '21';
+  UpgradeBar.onmouseout = function () {
+    Game.tooltip.hide();
+  };
+
+  const placeholder = document.createElement('div');
+  placeholder.appendChild(CreateUpgradeBarLegend());
+  UpgradeBar.onmouseover = function () {
+    Game.tooltip.draw(this, escape(placeholder.innerHTML), 'store');
+  };
+
+  const upgradeNumber = function (id, color) {
+    const span = document.createElement('span');
+    span.id = id;
+    span.className = ColourTextPre + color;
+    span.style.width = '14.28571428571429%';
+    span.style.display = 'inline-block';
+    span.textContent = '0';
+    return span;
+  };
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarBlue', ColourBlue));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGreen', ColourGreen));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarYellow', ColourYellow));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarOrange', ColourOrange));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarRed', ColourRed));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarPurple', ColourPurple));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGray', ColourGray));
+
+  l('upgrades').parentNode.insertBefore(UpgradeBar, l('upgrades').parentNode.childNodes[3]);
+}

src/Disp/BuildingsUpgrades/Upgrades.js

@@ -0,0 +1,99 @@
+import { CacheUpgrades } from '../../Cache/VariablesAndData';
+import { CMOptions } from '../../Config/VariablesAndData';
+import {
+  ColourBackPre,
+  ColourBlue,
+  ColourGray,
+  ColourGreen,
+  ColourOrange,
+  ColourPurple,
+  ColourRed,
+  ColoursOrdering,
+  ColourYellow,
+} from '../VariablesAndData';
+
+/**
+ * This function adjusts some things in the upgrades section
+ * It colours them and shuffles the order when CM.Options.SortBuildings is set
+ * The function is called by CM.Disp.Draw(), CM.Disp.ToggleUpgradeBarAndColour & CM.Disp.RefreshScale()
+ * And by changes in CM.Options.SortUpgrades
+ */
+export default function UpdateUpgrades() {
+  // This counts the amount of upgrades for each pp group and updates the Upgrade Bar
+  if (CMOptions.UpBarColour > 0) {
+    let blue = 0;
+    let green = 0;
+    let yellow = 0;
+    let orange = 0;
+    let red = 0;
+    let purple = 0;
+    let gray = 0;
+
+    Object.keys(Game.UpgradesInStore).forEach((i) => {
+      const me = Game.UpgradesInStore[i];
+      let addedColour = false;
+      for (let j = 0; j < l(`upgrade${i}`).childNodes.length; j += 1) {
+        if (l(`upgrade${i}`).childNodes[j].className.indexOf(ColourBackPre) !== -1) {
+          l(`upgrade${i}`).childNodes[j].className = ColourBackPre + CacheUpgrades[me.name].color;
+          addedColour = true;
+          break;
+        }
+      }
+      if (!addedColour) {
+        const div = document.createElement('div');
+        div.style.width = '10px';
+        div.style.height = '10px';
+        div.className = ColourBackPre + CacheUpgrades[me.name].color;
+        l(`upgrade${i}`).appendChild(div);
+      }
+      if (CacheUpgrades[me.name].color === ColourBlue) blue += 1;
+      else if (CacheUpgrades[me.name].color === ColourGreen) green += 1;
+      else if (CacheUpgrades[me.name].color === ColourYellow) yellow += 1;
+      else if (CacheUpgrades[me.name].color === ColourOrange) orange += 1;
+      else if (CacheUpgrades[me.name].color === ColourRed) red += 1;
+      else if (CacheUpgrades[me.name].color === ColourPurple) purple += 1;
+      else if (CacheUpgrades[me.name].color === ColourGray) gray += 1;
+    });
+
+    l('CMUpgradeBarBlue').textContent = blue;
+    l('CMUpgradeBarGreen').textContent = green;
+    l('CMUpgradeBarYellow').textContent = yellow;
+    l('CMUpgradeBarOrange').textContent = orange;
+    l('CMUpgradeBarRed').textContent = red;
+    l('CMUpgradeBarPurple').textContent = purple;
+    l('CMUpgradeBarGray').textContent = gray;
+  }
+
+  const arr = [];
+  // Build array of pointers, sort by pp, set flex positions
+  // This regulates sorting of upgrades
+  for (let x = 0; x < Game.UpgradesInStore.length; x += 1) {
+    const o = {};
+    o.name = Game.UpgradesInStore[x].name;
+    o.price = Game.UpgradesInStore[x].basePrice;
+    o.pp = CacheUpgrades[o.name].pp;
+    o.color = CacheUpgrades[o.name].color;
+    arr.push(o);
+  }
+
+  if (CMOptions.SortUpgrades) {
+    arr.sort((a, b) =>
+      ColoursOrdering.indexOf(a.color) > ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
+        ? 1
+        : ColoursOrdering.indexOf(a.color) < ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
+        ? -1
+        : a.pp < b.pp
+        ? -1
+        : 0,
+    );
+  } else {
+    arr.sort((a, b) => a.price - b.price);
+  }
+
+  const nameChecker = function (arr2, upgrade) {
+    return arr2.findIndex((e) => e.name === upgrade.name);
+  };
+  for (let x = 0; x < Game.UpgradesInStore.length; x += 1) {
+    l(`upgrade${x}`).style.order = nameChecker(arr, Game.UpgradesInStore[x]) + 1;
+  }
+}

src/Disp/Dragon/Dragon.js

@@ -0,0 +1,68 @@
+/** Functions related to the Dragon */
+
+import CacheDragonCost from '../../Cache/Dragon/Dragon';
+import { CacheCostDragonUpgrade } from '../../Cache/VariablesAndData';
+import { CMOptions } from '../../Config/VariablesAndData';
+import CalculateChangeAura from '../../Sim/SimulationEvents/AuraChange';
+import Beautify from '../BeautifyAndFormatting/Beautify';
+import FormatTime from '../BeautifyAndFormatting/FormatTime';
+
+/**
+ * This functions adds the two extra lines about CPS and time to recover to the aura picker infoscreen
+ * @param	{number}	aura	The number of the aura currently selected by the mouse/user
+ */
+export function AddAuraInfo(aura) {
+  if (CMOptions.DragonAuraInfo === 1) {
+    const [bonusCPS, priceOfChange] = CalculateChangeAura(aura);
+    const timeToRecover = FormatTime(priceOfChange / (bonusCPS + Game.cookiesPs));
+    let bonusCPSPercentage;
+    if (Game.cookiesPs === 0) bonusCPSPercentage = Beautify(Infinity);
+    else bonusCPSPercentage = Beautify((bonusCPS / Game.cookiesPs) * 100);
+
+    l('dragonAuraInfo').style.minHeight = '60px';
+    l('dragonAuraInfo').style.margin = '8px';
+    l('dragonAuraInfo').appendChild(document.createElement('div')).className = 'line';
+    const div = document.createElement('div');
+    div.style.minWidth = '200px';
+    div.style.textAlign = 'center';
+    div.textContent = `Picking this aura will change CPS by ${Beautify(
+      bonusCPS,
+    )} (${bonusCPSPercentage}% of current CPS).`;
+    l('dragonAuraInfo').appendChild(div);
+    const div2 = document.createElement('div');
+    div2.style.minWidth = '200px';
+    div2.style.textAlign = 'center';
+    div2.textContent = `It will take ${timeToRecover} to recover the cost.`;
+    l('dragonAuraInfo').appendChild(div2);
+  }
+}
+
+/**
+ * This functions adds a tooltip to the level up button displaying the cost of rebuying all
+ * It is called by Game.ToggleSpecialMenu() after CM.Main.ReplaceNative()
+ */
+export function AddDragonLevelUpTooltip() {
+  // Check if it is the dragon popup that is on screen
+  if (
+    (l('specialPopup').className.match(/onScreen/) &&
+      l('specialPopup').children[0].style.background.match(/dragon/)) !== null
+  ) {
+    for (let i = 0; i < l('specialPopup').childNodes.length; i++) {
+      if (l('specialPopup').childNodes[i].className === 'optionBox') {
+        l('specialPopup').children[i].onmouseover = function () {
+          CacheDragonCost();
+          Game.tooltip.dynamic = 1;
+          Game.tooltip.draw(
+            l('specialPopup'),
+            `<div style="min-width:200px;text-align:center;">${CacheCostDragonUpgrade}</div>`,
+            'this',
+          );
+          Game.tooltip.wobble();
+        };
+        l('specialPopup').children[i].onmouseout = function () {
+          Game.tooltip.shouldHide = 1;
+        };
+      }
+    }
+  }
+}

src/Disp/DrawHook.js

@@ -0,0 +1,61 @@
+import ToggleWrinklerButtons from '../Config/Toggles/ToggleWrinklerButtons';
+import { CMOptions } from '../Config/VariablesAndData';
+import Beautify from './BeautifyAndFormatting/Beautify';
+import UpdateBuildings from './BuildingsUpgrades/Buildings';
+import UpdateUpgradeSectionsHeight from './BuildingsUpgrades/UpdateUpgradeSectionsHeight';
+import UpdateUpgrades from './BuildingsUpgrades/Upgrades';
+import { UpdateBotBar } from './InfoBars/BottomBar';
+import { UpdateTimerBar } from './InfoBars/TimerBar';
+import RefreshMenu from './MenuSections/Refreshmenu';
+import UpdateTooltips from './Tooltips/UpdateTooltips';
+import { CheckWrinklerTooltip, UpdateWrinklerTooltip } from './Tooltips/WrinklerTooltips';
+
+/**
+ * This function handles all custom drawing for the Game.Draw() function.
+ * It is hooked on 'draw' by CM.RegisterHooks()
+ */
+export default function CMDrawHook() {
+  // Draw autosave timer in stats menu, this must be done here to make it count down correctly
+  if (
+    Game.prefs.autosave &&
+    Game.drawT % 10 === 0 && // with autosave ON and every 10 ticks
+    Game.onMenu === 'stats' &&
+    CMOptions.Stats // while being on the stats menu only
+  ) {
+    const timer = document.getElementById('CMStatsAutosaveTimer');
+    if (timer) {
+      timer.innerText = Game.sayTime(Game.fps * 60 - (Game.T % (Game.fps * 60)), 4);
+    }
+  }
+
+  // Update colors
+  UpdateBuildings();
+  UpdateUpgrades();
+  UpdateUpgradeSectionsHeight();
+
+  // Redraw timers
+  UpdateTimerBar();
+
+  // Update Bottom Bar
+  UpdateBotBar();
+
+  // Update Tooltip
+  UpdateTooltips();
+
+  // Update Wrinkler Tooltip
+  CheckWrinklerTooltip();
+  UpdateWrinklerTooltip();
+
+  // Change menu refresh interval
+  RefreshMenu();
+
+  // Update display of wrinkler buttons, this checks if Elder Pledge has been bought and if they should be disabled
+  ToggleWrinklerButtons();
+
+  // Replace Cookies counter because Orteil uses very weird code to "pad" it...
+  if (CMOptions.Scale) {
+    let str = l('cookies').innerHTML.replace(/.*(?=<br>)/i, Beautify(Game.cookies));
+    if (Game.prefs.monospace) str = `<span class="monospace">${str}</span>`;
+    l('cookies').innerHTML = str;
+  }
+}

src/Disp/GoldenCookieTimers/GoldenCookieTimers.js

@@ -0,0 +1,40 @@
+/** Section: Functions related to the Golden Cookie Timers */
+
+import { CMOptions } from '../../Config/VariablesAndData';
+import { GCTimers } from '../VariablesAndData';
+
+/**
+ * This function creates a new Golden Cookie Timer and appends it CM.Disp.GCTimers based on the id of the cookie
+ * @param	{object}	cookie	A Golden Cookie object
+ */
+export default function CreateGCTimer(cookie) {
+  const GCTimer = document.createElement('div');
+  GCTimer.id = `GCTimer${cookie.id}`;
+  GCTimer.style.width = '96px';
+  GCTimer.style.height = '96px';
+  GCTimer.style.position = 'absolute';
+  GCTimer.style.zIndex = '10000000001';
+  GCTimer.style.textAlign = 'center';
+  GCTimer.style.lineHeight = '96px';
+  GCTimer.style.fontFamily = '"Kavoon", Georgia, serif';
+  GCTimer.style.fontSize = '35px';
+  GCTimer.style.cursor = 'pointer';
+  GCTimer.style.display = 'block';
+  if (CMOptions.GCTimer === 0) GCTimer.style.display = 'none';
+  GCTimer.style.left = cookie.l.style.left;
+  GCTimer.style.top = cookie.l.style.top;
+  GCTimer.onclick = function () {
+    cookie.pop();
+  };
+  GCTimer.onmouseover = function () {
+    cookie.l.style.filter = 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))'; // eslint-disable-line no-param-reassign
+    cookie.l.style.webkitFilter = 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))'; // eslint-disable-line no-param-reassign
+  };
+  GCTimer.onmouseout = function () {
+    cookie.l.style.filter = ''; // eslint-disable-line no-param-reassign
+    cookie.l.style.webkitFilter = ''; // eslint-disable-line no-param-reassign
+  };
+
+  GCTimers[cookie.id] = GCTimer;
+  l('shimmers').appendChild(GCTimer);
+}

src/Disp/HelperFunctions/CalculateGrimoireRefillTime.js

@@ -0,0 +1,16 @@
+/**
+ * This function calculates the time it takes to reach a certain magic level
+ * @param	{number}	currentMagic		The current magic level
+ * @param	{number}	maxMagic			The user's max magic level
+ * @param	{number}	targetMagic			The target magic level
+ * @returns	{number}	count / Game.fps	The time it takes to reach targetMagic
+ */
+export default function CalculateGrimoireRefillTime(currentMagic, maxMagic, targetMagic) {
+  let magic = currentMagic;
+  let count = 0;
+  while (magic < targetMagic) {
+    magic += Math.max(0.002, (magic / Math.max(maxMagic, 100)) ** 0.5) * 0.002;
+    count += 1;
+  }
+  return count / Game.fps;
+}

src/Disp/HelperFunctions/GetCPS.js

@@ -0,0 +1,35 @@
+import {
+  CacheAverageCPS,
+  CacheCurrWrinklerCount,
+  CacheCurrWrinklerCPSMult,
+  CacheWrinklersFattest,
+} from '../../Cache/VariablesAndData';
+import { CMOptions } from '../../Config/VariablesAndData';
+
+/**
+ * This function returns the cps as either current or average CPS depending on CM.Options.CPSMode
+ * @returns	{number}	The average or current cps
+ */
+export default function GetCPS() {
+  if (CMOptions.CPSMode) {
+    return CacheAverageCPS;
+  }
+  if (CMOptions.CalcWrink === 0) {
+    return Game.cookiesPs * (1 - Game.cpsSucked);
+  }
+  if (CMOptions.CalcWrink === 1) {
+    return Game.cookiesPs * (CacheCurrWrinklerCPSMult + (1 - CacheCurrWrinklerCount * 0.05));
+  }
+  if (CacheWrinklersFattest[1] !== null)
+    if (CMOptions.CalcWrink === 2 && Game.wrinklers[CacheWrinklersFattest[1]].type === 1) {
+      return (
+        Game.cookiesPs *
+        ((CacheCurrWrinklerCPSMult * 3) / CacheCurrWrinklerCount +
+          (1 - CacheCurrWrinklerCount * 0.05))
+      );
+    }
+  return (
+    Game.cookiesPs *
+    (CacheCurrWrinklerCPSMult / CacheCurrWrinklerCount + (1 - CacheCurrWrinklerCount * 0.05))
+  );
+}

src/Disp/HelperFunctions/GetLumpColour.js

@@ -0,0 +1,33 @@
+import {
+  ColourGray,
+  ColourGreen,
+  ColourOrange,
+  ColourPurple,
+  ColourRed,
+  ColourYellow,
+} from '../VariablesAndData';
+
+/**
+ * This function returns Name and Colour as object for sugar lump type that is given as input param.
+ * It is called by CM.Disp.UpdateTooltipSugarLump()
+ * @param 	{string} 				type 			Sugar Lump Type.
+ * @returns {{string}, {string}}	text, color		An array containing the text and display-color of the sugar lump
+ */
+export default function GetLumpColour(type) {
+  if (type === 0) {
+    return { text: 'Normal', color: ColourGray };
+  }
+  if (type === 1) {
+    return { text: 'Bifurcated', color: ColourGreen };
+  }
+  if (type === 2) {
+    return { text: 'Golden', color: ColourYellow };
+  }
+  if (type === 3) {
+    return { text: 'Meaty', color: ColourOrange };
+  }
+  if (type === 4) {
+    return { text: 'Caramelized', color: ColourPurple };
+  }
+  return { text: 'Unknown Sugar Lump', color: ColourRed };
+}

src/Disp/HelperFunctions/GetWrinkConfigBank.js

@@ -0,0 +1,17 @@
+import { CacheWrinklersFattest, CacheWrinklersTotal } from '../../Cache/VariablesAndData';
+import { CMOptions } from '../../Config/VariablesAndData';
+
+/**
+ * This function returns the total amount stored in the Wrinkler Bank
+ * as calculated by  CM.Cache.CacheWrinklers() if CM.Options.CalcWrink is set
+ * @returns	{number}	0 or the amount of cookies stored (CM.Cache.WrinklersTotal)
+ */
+export default function GetWrinkConfigBank() {
+  if (CMOptions.CalcWrink === 1) {
+    return CacheWrinklersTotal;
+  }
+  if (CMOptions.CalcWrink === 2) {
+    return CacheWrinklersFattest[0];
+  }
+  return 0;
+}

src/Disp/HelperFunctions/PopWrinklers.js

@@ -0,0 +1,11 @@
+/**
+ * This function pops all normal wrinklers
+ * It is called by a click of the 'pop all' button created by CM.Disp.AddMenuStats()
+ */
+export default function PopAllNormalWrinklers() {
+  Object.keys(Game.wrinklers).forEach((i) => {
+    if (Game.wrinklers[i].sucked > 0 && Game.wrinklers[i].type === 0) {
+      Game.wrinklers[i].hp = 0;
+    }
+  });
+}

src/Disp/HelperFunctions/RefreshScale.js

@@ -0,0 +1,17 @@
+import UpdateBuildings from '../BuildingsUpgrades/Buildings';
+import UpdateUpgrades from '../BuildingsUpgrades/Upgrades';
+import { UpdateBotBar } from '../InfoBars/BottomBar';
+
+/**
+ * This function refreshes all numbers after a change in scale-setting
+ * It is therefore called by a changes in CM.Options.Scale, CM.Options.ScaleDecimals, CM.Options.ScaleSeparator and CM.Options.ScaleCutoff
+ */
+export default function RefreshScale() {
+  BeautifyAll();
+  Game.RefreshStore();
+  Game.RebuildUpgrades();
+
+  UpdateBotBar();
+  UpdateBuildings();
+  UpdateUpgrades();
+}

src/Disp/HelperFunctions/UpdateAscendState.js

@@ -0,0 +1,20 @@
+import { ToggleTimerBar } from '../../Config/SpecificToggles';
+import ToggleBotBar from '../../Config/Toggles/ToggleBotBar';
+import { CMOptions } from '../../Config/VariablesAndData';
+import UpdateBackground from './UpdateBackground';
+
+/**
+ * This function disables and shows the bars created by CookieMonster when the game is "ascending"
+ * It is called by CM.Disp.Draw()
+ */
+export default function UpdateAscendState() {
+  if (Game.OnAscend) {
+    l('game').style.bottom = '0px';
+    if (CMOptions.BotBar === 1) l('CMBotBar').style.display = 'none';
+    if (CMOptions.TimerBar === 1) l('CMTimerBar').style.display = 'none';
+  } else {
+    ToggleBotBar();
+    ToggleTimerBar();
+  }
+  UpdateBackground();
+}