Merge pull request #787 from DanielNoord/newrepo

New repository

.eslintignore

@@ -1,6 +0,0 @@
-CookieMonster.js
-CookieMonster.user.js
-src/*.js
-!src/CookieMonster.js
-!src/*/*
-dist/*

.eslintrc.js

@@ -1,40 +0,0 @@
-module.exports = {
-	env: {
-		browser: true,
-		es2021: true,
-	},
-	globals: {
-		Game: 'writable',
-		l: 'readonly',
-		b64_to_utf8: 'readonly',
-		utf8_to_b64: 'readonly',
-		realAudio: 'readonly',
-		BeautifyAll: 'readonly',
-		CM: 'writable',
-		unsafeWindow: 'readonly',
-	},
-	extends: 'airbnb-base',
-	parserOptions: {
-		ecmaVersion: 12,
-	},
-	rules: {
-		indent: ['error', 'tab'],
-		'import/no-named-default': 'off',
-		'import/no-mutable-exports': 'off',
-		'no-tabs': 'off',
-		'max-len': 'off',
-		'no-param-reassign': 'off',
-		'no-plusplus': 'off',
-		'no-new-func': 'off',
-		'no-restricted-syntax': 'off',
-		'no-mixed-operators': 'off',
-		'prefer-destructuring': 'off',
-		'func-names': 'off',
-		'no-console': 'off',
-		'no-nested-ternary': 'off',
-		'prefer-arrow-callback': 'off',
-		'no-new': 'off',
-		'no-alert': 'off',
-		'no-restricted-globals': 'off',
-	},
-};

.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

@@ -19,5 +19,8 @@ If applicable, add screenshots to help explain your problem.
 
 **Save file**
 ```
-If applicable please copy your save file here
+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/workflows/CI.yml

@@ -1,31 +1,32 @@
 name: CI
 on: pull_request
 jobs:
-  Check_ESLint:
+  Check_linting_test_and_build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - 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: |
-        npm install
+        npx webpack -o ./tmp --env production
-        npx eslint src
+        if cmp <(head -n 2 dist/CookieMonsterDev.js) <(head -n 2 tmp/CookieMonsterDev.js); then
-  Check_main_file:
+            echo '### SUCCESS: CookieMonsterDev is correctly built! ###'
-    runs-on: ubuntu-latest
+        else
-    steps:
+            echo '### WARNING: CookieMonsterDev.js does not seem to be correct. Make sure to run "npm run build" after saving all your changes! ###'
-    - uses: actions/checkout@v2
+            exit 1
+        fi
     - name: Check if CookieMonster.js is built correctly
+      if: github.ref == 'refs/heads/master'
       run: |
-        npm install
+       if cmp <(head -n 2 dist/CookieMonsterDev.js) <(head -n 2 dist/CookieMonster.js); then
-        npx webpack -o ./test --env production
-        if cmp <(head -n 2 dist/CookieMonster.js) <(head -n 2 test/CookieMonster.js); then
             echo '### SUCCESS: CookieMonster is correctly built! ###'
         else
-            echo '### WARNING: CookieMonster.js does not seem to be correct. Make sure to run "npm run build" after saving all your changes! ###'
+            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
-        if cmp <(head -n 2 CookieMonster.js) <(head -n 2 test/CookieMonster.js); then
-            echo '### SUCCESS: CookieMonster is correctly built! ###'
-        else
-            echo '### WARNING: Make sure to move the file from the /dist folder to the main folder. Otherwise Github Pages won't notice it ###'
             exit 1
         fi

.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"
+}

CONTRIBUTING.md

@@ -1,22 +0,0 @@
-The following is a description of the our approach to the project.
-
-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.
-
-Here is a description of what should be stored in each of the source JS. Make edits to the source file first and then use the combine file to compile the final file:
-
-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
-Footer | The footer of CM's JS (not modified often or ever)
-Header | The header of CM's JS (not modified often or ever)
-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.
-- Try to follow the formatting and annotation as specified by JSCode
-- PR's should target the `dev` branch

CookieMonster.user.js

@@ -6,14 +6,8 @@
 const readyCheck = setInterval(() => {
   const Game = unsafeWindow.Game;
 
-    if (
+  if (typeof Game !== 'undefined' && typeof Game.ready !== 'undefined' && Game.ready) {
-        typeof Game !== "undefined" &&
+    Game.LoadMod('https://cookiemonsterteam.github.io/CookieMonster/dist/CookieMonster.js');
-        typeof Game.ready !== "undefined" &&
-        Game.ready
-    ) {
-        Game.LoadMod(
-            "https://aktanusa.github.io/CookieMonster/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

@@ -16,15 +16,16 @@ 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
+* Light Blue: (upgrades) This item has a better PP than the best building to buy
-* Green: This item has the best PP
+* Green: This building has the best PP
-* Yellow: This item is not the best, but it is closer to best than it is to worst
+* Yellow: This building is within the top 10 of best PP's
-* Orange: This item is not the worst, but it is closer to worst than it is to best
+* Orange: This building is within the top 20 of best PP's
-* Red: This item has the worst PP
+* Red: This building is within the top 30 of best PP's
-* Purple: (upgrades) This item has a worse PP than any building
+* Purple: This building is worse than the top 10 of best PP's
-* Gray: (upgrades) This item has not been calculated and/or cannot be calculated due to no definitive worth.
+* 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.
 

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/
+ */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cookiemonster-mod",
-    "version": "2.031.5",
+  "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": [
@@ -11,12 +11,12 @@
     "Orteil"
   ],
   "scripts": {
-        "eslint_src": "eslint src",
+    "eslint-src": "eslint src test",
-        "build": "run-s eslint_src pack_prod remove_comment",
+    "build": "run-s eslint-src pack-prod test",
-        "build_test": "run-s pack_dev",
+    "build-test": "run-s pack-dev",
-        "pack_prod": "webpack --env production",
+    "pack-prod": "webpack --env production",
-        "pack_dev": "webpack",
+    "pack-dev": "webpack",
-        "remove_comment": "sed -i '' -e '/\\/\\/# sourceMappingURL.*/d' dist/CookieMonster.js"
+    "test": "mocha"
   },
   "repository": {
     "type": "git",
@@ -43,10 +43,22 @@
   },
   "homepage": "https://github.com/Aktanusa/CookieMonster#readme",
   "devDependencies": {
-        "eslint": "^7.19.0",
+    "@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"
   },

src/Cache/CPS/AverageQueue.js

@@ -1,7 +1,10 @@
-/* eslint-disable no-unused-vars */
 import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData';
 import {
-	ChoEggDiff, ClicksDiff, CookiesDiff, WrinkDiff, WrinkFattestDiff,
+  ChoEggDiff,
+  ClicksDiff,
+  CookiesDiff,
+  WrinkDiff,
+  WrinkFattestDiff,
 } from '../VariablesAndData';
 
 /**
@@ -30,16 +33,25 @@ export class CMAvgQueue {
    * @returns {number}	ret			The average
    */
   calcAverage(timePeriod) {
-		if (timePeriod > this.maxLength) timePeriod = this.maxLength;
+    let time = timePeriod;
-		if (timePeriod > this.queue.length) timePeriod = this.queue.length;
+    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 - timePeriod; i--) {
+    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 / timePeriod;
+    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);
   }
 }
 
@@ -48,9 +60,9 @@ export class CMAvgQueue {
  * Called by CM.Cache.InitCache()
  */
 export function InitCookiesDiff() {
-	CookiesDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]);
+  CookiesDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars
-	WrinkDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]);
+  WrinkDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars
-	WrinkFattestDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]);
+  WrinkFattestDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars
-	ChoEggDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]);
+  ChoEggDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars
-	ClicksDiff = new CMAvgQueue(ClickTimes[ClickTimes.length - 1]);
+  ClicksDiff = new CMAvgQueue(ClickTimes[ClickTimes.length - 1]); // eslint-disable-line no-unused-vars
 }

src/Cache/CPS/CPS.js

@@ -1,9 +1,28 @@
-/* eslint-disable no-unused-vars */
-
 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,
+  CacheAverageClicks,
+  CacheAverageCPS,
+  CacheAverageGainBank,
+  CacheAverageGainChoEgg,
+  CacheAverageGainWrink,
+  CacheAverageGainWrinkFattest,
+  CacheAvgCPSWithChoEgg,
+  CacheLastChoEgg,
+  CacheLastClicks,
+  CacheLastCookies,
+  CacheLastCPSCheck,
+  CacheLastWrinkCookies,
+  CacheLastWrinkFattestCookies,
+  CacheRealCookiesEarned,
+  CacheSellForChoEgg,
+  CacheWrinklersFattest,
+  CacheWrinklersTotal,
+  ChoEggDiff,
+  ClicksDiff,
+  CookiesDiff,
+  WrinkDiff,
+  WrinkFattestDiff,
 } from '../VariablesAndData';
 
 /**
@@ -20,15 +39,16 @@ export default function CacheAvgCPS() {
   if ((Game.T / Game.fps) % 1 === 0) {
     let choEggTotal = Game.cookies + CacheSellForChoEgg;
     if (Game.cpsSucked > 0) choEggTotal += CacheWrinklersTotal;
-		CacheRealCookiesEarned = Math.max(Game.cookiesEarned, choEggTotal);
+    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 bankDiffAvg = Math.max(0, Game.cookies - CacheLastCookies) / timeDiff;
-		const wrinkDiffAvg = Math.max(0, (CacheWrinklersTotal - CacheLastWrinkCookies)) / timeDiff;
+    const wrinkDiffAvg = Math.max(0, CacheWrinklersTotal - CacheLastWrinkCookies) / timeDiff;
-		const wrinkFattestDiffAvg = Math.max(0, (CacheWrinklersFattest[0] - CacheLastWrinkFattestCookies)) / timeDiff;
+    const wrinkFattestDiffAvg =
-		const choEggDiffAvg = Math.max(0, (choEggTotal - CacheLastChoEgg)) / timeDiff;
+      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);
@@ -56,12 +76,14 @@ export default function CacheAvgCPS() {
     if (CMOptions.CalcWrink === 1) CacheAverageCPS += CacheAverageGainWrink;
     if (CMOptions.CalcWrink === 2) CacheAverageCPS += CacheAverageGainWrinkFattest;
 
-		const choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg'));
+    const choEgg = Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg');
 
     if (choEgg || CMOptions.CalcWrink === 0) {
-			CacheAvgCPSWithChoEgg = CacheAverageGainBank + CacheAverageGainWrink + (choEgg ? CacheAverageGainChoEgg : 0);
+      CacheAvgCPSWithChoEgg =
-		} else CacheAvgCPSWithChoEgg = CacheAverageCPS;
+        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

@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars */
 import { SimObjects } from '../../Sim/VariablesAndData';
 import { CacheCurrWrinklerCount, CacheCurrWrinklerCPSMult } from '../VariablesAndData';
 
@@ -10,9 +9,9 @@ import { CacheCurrWrinklerCount, CacheCurrWrinklerCPSMult } from '../VariablesAn
 export default function CacheCurrWrinklerCPS() {
   CacheCurrWrinklerCPSMult = 0;
   let count = 0;
-	for (const i in Game.wrinklers) {
+  Object.keys(Game.wrinklers).forEach((i) => {
-		if (Game.wrinklers[i].phase === 2) count++;
+    if (Game.wrinklers[i].phase === 2) count += 1;
-	}
+  });
   let godMult = 1;
   if (SimObjects.Temple.minigameLoaded) {
     const godLvl = Game.hasGod('scorn');
@@ -20,6 +19,11 @@ export default function CacheCurrWrinklerCPS() {
     else if (godLvl === 2) godMult *= 1.1;
     else if (godLvl === 3) godMult *= 1.05;
   }
-	CacheCurrWrinklerCount = count;
+  CacheCurrWrinklerCount = count; // eslint-disable-line no-unused-vars
-	CacheCurrWrinklerCPSMult = count * (count * 0.05 * 1.1) * (Game.Has('Sacrilegious corruption') * 0.05 + 1) * (Game.Has('Wrinklerspawn') * 0.05 + 1) * godMult;
+  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

@@ -4,8 +4,8 @@
  */
 export default function GetCPSBuffMult() {
   let mult = 1;
-	for (const i of Object.keys(Game.buffs)) {
+  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

@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars */
 import CalcNoGoldSwitchCPS from '../../Sim/Calculations/NoGoldenSwitchCalc';
 import { CacheNoGoldSwitchCookiesPS } from '../VariablesAndData';
 
@@ -10,5 +9,5 @@ import { CacheNoGoldSwitchCookiesPS } from '../VariablesAndData';
 export default function CacheNoGoldSwitchCPS() {
   if (Game.Has('Golden switch [off]')) {
     CacheNoGoldSwitchCookiesPS = CalcNoGoldSwitchCPS();
-	} else CacheNoGoldSwitchCookiesPS = Game.cookiesPs;
+  } else CacheNoGoldSwitchCookiesPS = Game.cookiesPs; // eslint-disable-line no-unused-vars
 }

src/Cache/CPS/SellChoEgg.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars */
 import SellBuildingsForChoEgg from '../../Sim/SimulationEvents/SellBuildingForChoEgg';
 import { CacheSellForChoEgg } from '../VariablesAndData';
 
@@ -13,13 +12,13 @@ export default function CacheSellAllForChoEgg() {
   if (Game.Objects.Bank.minigameLoaded) {
     const marketGoods = Game.Objects.Bank.minigame.goods;
     let goodsVal = 0;
-		for (const i of Object.keys(marketGoods)) {
+    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;
+  CacheSellForChoEgg = sellTotal; // eslint-disable-line no-unused-vars
 }

src/Cache/CacheInit.js

@@ -1,4 +1,4 @@
-/* eslint-disable no-unused-vars */
+import { ClickTimes } from '../Disp/VariablesAndData';
 import { CMAvgQueue, InitCookiesDiff } from './CPS/AverageQueue';
 import CacheAvgCPS from './CPS/CPS';
 import CacheDragonAuras from './Dragon/CacheDragonAuras';
@@ -9,7 +9,8 @@ import CacheHeavenlyChipsPS from './Stats/HeavenlyChips';
 import CacheAllMissingUpgrades from './Stats/MissingUpgrades';
 import CacheSeasonSpec from './Stats/Reindeer';
 import { CacheGoldenAndWrathCookiesMults, CacheStatsCookies } from './Stats/Stats';
-import { HeavenlyChipsDiff } from './VariablesAndData';
+import AllAmountTillNextAchievement from './TillNextAchievement/AllAmountTillNextAchievement';
+import { CacheAverageCookiesFromClicks, HeavenlyChipsDiff } from './VariablesAndData';
 import CacheWrinklers from './Wrinklers/Wrinklers';
 
 /**
@@ -24,8 +25,11 @@ export default function InitCache() {
   CacheAllMissingUpgrades();
   CacheSeasonSpec();
   InitCookiesDiff();
-	HeavenlyChipsDiff = new CMAvgQueue(5); // Used by CM.Cache.CacheHeavenlyChipsPS()
+  /** 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();

src/Cache/CacheLoop.js

@@ -1,5 +1,4 @@
-/* eslint-disable no-unused-vars */
+import FormatTime from '../Disp/BeautifyAndFormatting/FormatTime';
-import { FormatTime } from '../Disp/BeautifyAndFormatting/BeautifyFormatting';
 import GetCPS from '../Disp/HelperFunctions/GetCPS';
 import CacheAvgCPS from './CPS/CPS';
 import CacheCurrWrinklerCPS from './CPS/CurrWrinklerCPS';
@@ -21,6 +20,10 @@ export default function LoopCache() {
   CacheAvgCPS();
   CacheHeavenlyChipsPS();
 
-	const cookiesToNext = Game.HowManyCookiesReset(Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) + 1) - (Game.cookiesEarned + Game.cookiesReset);
+  const cookiesToNext =
-	CacheTimeTillNextPrestige = FormatTime(cookiesToNext / GetCPS());
+    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

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

src/Cache/Dragon/Dragon.js

@@ -1,21 +1,23 @@
-/* eslint-disable no-unused-vars */
 /** Functions related to the Dragon */
 
-import { Beautify } from '../../Disp/BeautifyAndFormatting/BeautifyFormatting';
+import Beautify from '../../Disp/BeautifyAndFormatting/Beautify';
 import CopyData from '../../Sim/SimulationData/CopyData';
 import { SimDoSims, SimObjects } from '../../Sim/VariablesAndData';
-import {
+import { CacheCostDragonUpgrade, CacheLastDragonLevel } from '../VariablesAndData';
-	CacheCostDragonUpgrade, CacheDragonAura, CacheDragonAura2, 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')) {
+    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];
+      const amount = Game.dragonLevels[Game.dragonLevel].buy
+        .toString()
+        .match(/sacrifice\((.*?)\)/)[1];
       if (target !== 'i') {
         target = target.replaceAll("'", '');
         if (Game.Objects[target].amount < amount) {
@@ -24,33 +26,38 @@ export default function CacheDragonCost() {
           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);
+            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--;
+            SimObjects[target].amount -= 1;
           }
-					CacheCostDragonUpgrade = `Cost to rebuy: ${(cost)}`;
+          CacheCostDragonUpgrade = `Cost to rebuy: ${Beautify(cost)}`;
         }
       } else {
         let cost = 0;
         CopyData();
-				for (const j of Object.keys(Game.Objects)) {
+        Object.keys(Game.Objects).forEach((j) => {
           target = j;
           if (Game.Objects[target].amount < amount) {
             CacheCostDragonUpgrade = 'Not enough buildings to sell';
-						break;
+            return;
-					} else {
+          }
           for (let i = 0; i < amount; i++) {
-							let price = SimObjects[target].basePrice * Game.priceIncrease ** Math.max(0, SimObjects[target].amount - 1 - SimObjects[target].free);
+            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--;
+            SimObjects[target].amount -= 1;
-						}
-					}
-					CacheCostDragonUpgrade = `Cost to rebuy: ${Beautify(cost)}`;
           }
+          CacheCostDragonUpgrade = `Cost to rebuy: ${Beautify(cost)}`; // eslint-disable-line no-unused-vars
+        });
       }
     }
     CacheLastDragonLevel = Game.dragonLevel;

src/Cache/PP/Building.js

@@ -1,10 +1,12 @@
-/* eslint-disable no-unused-vars */
 import { CMOptions } from '../../Config/VariablesAndData';
 import GetWrinkConfigBank from '../../Disp/HelperFunctions/GetWrinkConfigBank';
-import { ColorGray } from '../../Disp/VariablesAndData';
+import { ColourGray } from '../../Disp/VariablesAndData';
 import {
-	CacheArrayOfPPs,
+  CacheMinPP,
-	CacheMaxPP, CacheMidPP, CacheMinPP, CacheObjects1, CacheObjects10, CacheObjects100,
+  CacheObjects1,
+  CacheObjects10,
+  CacheObjects100,
+  CachePPArray,
 } from '../VariablesAndData';
 import ColourOfPP from './ColourOfPP';
 
@@ -13,14 +15,31 @@ import ColourOfPP from './ColourOfPP';
  * It saves all date in CM.Cache.Objects...
  * It is called by CM.Cache.CacheBuildingsPP()
  */
-function CacheBuildingsBulkPP(target) {
+function CacheColour(target, amount) {
-	for (const i of Object.keys(target)) {
+  Object.keys(target).forEach((i) => {
-		if (Game.cookiesPs) {
+    if (CMOptions.PPRigidelMode && amount === 1) {
-			target[i].pp = (Math.max(target[i].price - (Game.cookies + GetWrinkConfigBank()), 0) / Game.cookiesPs) + (target[i].price / target[i].bonus);
+      target[i].color = ColourGray; // eslint-disable-line no-param-reassign
-		} else target[i].pp = (target[i].price / target[i].bonus);
+      return;
-
-		target[i].color = ColourOfPP(target[i], target[i].price);
     }
+    // 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]);
+  });
 }
 
 /**
@@ -29,73 +48,28 @@ function CacheBuildingsBulkPP(target) {
  */
 export default function CacheBuildingsPP() {
   CacheMinPP = Infinity;
-	CacheMaxPP = 1;
+  CachePPArray = [];
-	CacheArrayOfPPs = [];
   if (typeof CMOptions.PPExcludeTop === 'undefined') CMOptions.PPExcludeTop = 0; // Otherwise breaks during initialization
 
-	// Calculate PP and colors when compared to purchase of optimal building in single-purchase mode
+  // Calculate PP and colors
-	if (CMOptions.ColorPPBulkMode === 0 && Game.buyMode > 0) {
+  CachePP(CacheObjects1, 1);
-		for (const i of Object.keys(CacheObjects1)) {
+  CachePP(CacheObjects10, 10);
-			if (Game.cookiesPs) {
+  CachePP(CacheObjects100, 100);
-				CacheObjects1[i].pp = (Math.max(Game.Objects[i].getPrice() - (Game.cookies + GetWrinkConfigBank()), 0) / Game.cookiesPs) + (Game.Objects[i].getPrice() / CacheObjects1[i].bonus);
-			} else CacheObjects1[i].pp = (Game.Objects[i].getPrice() / CacheObjects1[i].bonus);
-			CacheArrayOfPPs.push([CacheObjects1[i].pp, Game.Objects[i].getPrice()]);
-		}
-		// Set CM.Cache.min to best non-excluded buidliung
-		CacheArrayOfPPs.sort((a, b) => a[0] - b[0]);
-		if (CMOptions.PPOnlyConsiderBuyable) {
-			while (CacheArrayOfPPs[0][1] > Game.cookies) {
-				if (CacheArrayOfPPs.length === 1) {
-					break;
-				}
-				CacheArrayOfPPs.shift();
-			}
-		}
-		CacheMinPP = CacheArrayOfPPs[CMOptions.PPExcludeTop][0];
-		CacheMaxPP = CacheArrayOfPPs[CacheArrayOfPPs.length - 1][0];
-		CacheMidPP = ((CacheMaxPP - CacheMinPP) / 2) + CacheMinPP;
-		for (const i of Object.keys(CacheObjects1)) {
-			CacheObjects1[i].color = ColourOfPP(CacheObjects1[i], Game.Objects[i].getPrice());
-			// Colour based on excluding certain top-buildings
-			for (let j = 0; j < CMOptions.PPExcludeTop; j++) {
-				if (CacheObjects1[i].pp === CacheArrayOfPPs[j][0]) CacheObjects1[i].color = ColorGray;
-			}
-		}
-		// Calculate PP of bulk-buy modes
-		CacheBuildingsBulkPP(CacheObjects10);
-		CacheBuildingsBulkPP(CacheObjects100);
-	} else if (Game.buyMode > 0) {
-		// Calculate PP and colors when compared to purchase of selected bulk mode
-		let target;
-		if (Game.buyBulk === 1) target = CacheObjects1;
-		else if (Game.buyBulk === 10) target = CacheObjects10;
-		else if (Game.buyBulk === 100) target = CacheObjects100;
-		for (const i of Object.keys(target)) {
-			if (Game.cookiesPs) {
-				target[i].pp = (Math.max(Game.Objects[i].bulkPrice - (Game.cookies + GetWrinkConfigBank()), 0) / Game.cookiesPs) + (Game.Objects[i].bulkPrice / target[i].bonus);
-			} else target[i].pp = (Game.Objects[i].bulkPrice / target[i].bonus);
-			CacheArrayOfPPs.push([target[i].pp, Game.Objects[i].bulkPrice]);
-		}
-		// Set CM.Cache.min to best non-excluded buidliung
-		CacheArrayOfPPs.sort((a, b) => a[0] - b[0]);
-		if (CMOptions.PPOnlyConsiderBuyable) {
-			while (CacheArrayOfPPs[0][1] > Game.cookies) {
-				if (CacheArrayOfPPs.length === 1) {
-					break;
-				}
-				CacheArrayOfPPs.shift();
-			}
-		}
-		CacheMinPP = CacheArrayOfPPs[CMOptions.PPExcludeTop][0];
-		CacheMaxPP = CacheArrayOfPPs[CacheArrayOfPPs.length - 1][0];
-		CacheMidPP = ((CacheMaxPP - CacheMinPP) / 2) + CacheMinPP;
 
-		for (const i of Object.keys(CacheObjects1)) {
+  // Set CM.Cache.min to best non-excluded buidliung
-			target[i].color = ColourOfPP(target[i], Game.Objects[i].bulkPrice);
+  CachePPArray.sort((a, b) => a[0] - b[0]);
-			// Colour based on excluding certain top-buildings
+  let indexOfMin = 0;
-			for (let j = 0; j < CMOptions.PPExcludeTop; j++) {
+  if (CMOptions.PPOnlyConsiderBuyable) {
-				if (target[i].pp === CacheArrayOfPPs[j][0]) target[i].color = ColorGray;
+    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

@@ -1,9 +1,15 @@
 import { CMOptions } from '../../Config/VariablesAndData';
 import GetCPS from '../../Disp/HelperFunctions/GetCPS';
 import {
-	ColorBlue, ColorGray, ColorGreen, ColorOrange, ColorPurple, ColorRed, ColorYellow,
+  ColourBlue,
+  ColourGray,
+  ColourGreen,
+  ColourOrange,
+  ColourPurple,
+  ColourRed,
+  ColourYellow,
 } from '../../Disp/VariablesAndData';
-import { CacheMaxPP, CacheMidPP, CacheMinPP } from '../VariablesAndData';
+import { CacheMinPP, CachePPArray } from '../VariablesAndData';
 
 /**
  * This functions return the colour assosciated with the given pp value
@@ -15,21 +21,21 @@ import { CacheMaxPP, CacheMidPP, CacheMinPP } from '../VariablesAndData';
 export default function ColourOfPP(me, price) {
   let color = '';
   // Colour based on PP
-	if (me.pp <= 0 || me.pp === Infinity) color = ColorGray;
+  if (me.pp <= 0 || me.pp === Infinity) color = ColourGray;
-	else if (me.pp < CacheMinPP) color = ColorBlue;
+  else if (me.pp < CacheMinPP) color = ColourBlue;
-	else if (me.pp === CacheMinPP) color = ColorGreen;
+  else if (me.pp === CacheMinPP) color = ColourGreen;
-	else if (me.pp === CacheMaxPP) color = ColorRed;
+  else if (me.pp < CachePPArray[10][0]) color = ColourYellow;
-	else if (me.pp > CacheMaxPP) color = ColorPurple;
+  else if (me.pp < CachePPArray[20][0]) color = ColourOrange;
-	else if (me.pp > CacheMidPP) color = ColorOrange;
+  else if (me.pp < CachePPArray[30][0]) color = ColourRed;
-	else color = ColorYellow;
+  else color = ColourPurple;
 
   // Colour based on price in terms of CPS
   if (Number(CMOptions.PPSecondsLowerLimit) !== 0) {
-		if (price / GetCPS() < Number(CMOptions.PPSecondsLowerLimit)) color = ColorBlue;
+    if (price / GetCPS() < Number(CMOptions.PPSecondsLowerLimit)) color = ColourBlue;
   }
   // Colour based on being able to purchase
   if (CMOptions.PPOnlyConsiderBuyable) {
-		if (price - Game.cookies > 0) color = ColorRed;
+    if (price - Game.cookies > 0) color = ColourRed;
   }
   return color;
 }

src/Cache/PP/Upgrade.js

@@ -7,12 +7,15 @@ import ColourOfPP from './ColourOfPP';
  * It is called by CM.Cache.CachePP()
  */
 export default function CacheUpgradePP() {
-	for (const i of Object.keys(CacheUpgrades)) {
+  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);
+      CacheUpgrades[i].pp =
-		} else CacheUpgrades[i].pp = (Game.Upgrades[i].getPrice() / CacheUpgrades[i].bonus);
+        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

@@ -1,11 +1,19 @@
-/* eslint-disable no-unused-vars */
 /** 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 {
-	CacheDoRemakeBuildPrices, CacheObjects1, CacheObjects10, CacheObjects100, CacheUpgrades,
+  CacheAverageGainBank,
+  CacheAverageGainWrink,
+  CacheAverageGainWrinkFattest,
+  CacheDoRemakeBuildPrices,
+  CacheObjects1,
+  CacheObjects10,
+  CacheObjects100,
+  CacheObjectsNextAchievement,
+  CacheUpgrades,
 } from '../VariablesAndData';
 
 /**
@@ -14,15 +22,15 @@ import {
  * @param	{amount}	amount	Amount to be bought
  * @parem	{string}	target	The target Cache object ("Objects1", "Objects10" or "Objects100")
  */
-function CacheBuildingIncome(amount, target) {
+function CacheBuildingIncome(amount) {
-	const result = [];
+  const result = {};
-	for (const i of Object.keys(Game.Objects)) {
+  Object.keys(Game.Objects).forEach((i) => {
     result[i] = {};
     result[i].bonus = BuyBuildingsBonusIncome(i, amount);
     if (amount !== 1) {
-			CacheDoRemakeBuildPrices = 1;
+      CacheDoRemakeBuildPrices = 1; // eslint-disable-line no-unused-vars
-		}
     }
+  });
   return result;
 }
 
@@ -32,23 +40,55 @@ function CacheBuildingIncome(amount, target) {
  */
 function CacheUpgradeIncome() {
   CacheUpgrades = [];
-	for (const i of Object.keys(Game.Upgrades)) {
+  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() {
-	for (const i of Object.keys(Game.Objects)) {
+  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);
+    CacheObjects1[i].price = BuildingGetPrice(
-		CacheObjects10[i].price = BuildingGetPrice(Game.Objects[i], Game.Objects[i].basePrice, Game.Objects[i].amount, Game.Objects[i].free, 10);
+      Game.Objects[i],
-		CacheObjects100[i].price = BuildingGetPrice(Game.Objects[i], Game.Objects[i].basePrice, Game.Objects[i].amount, Game.Objects[i].free, 100);
+      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,
+    );
+  });
 }
 
 /**

src/Cache/Stats/ChainCookies.js

@@ -1,7 +1,21 @@
-/* eslint-disable no-unused-vars */
 import GetCPSBuffMult from '../CPS/GetCPSBuffMult';
 import {
-	CacheChainFrenzyMaxReward, CacheChainFrenzyRequired, CacheChainFrenzyRequiredNext, CacheChainFrenzyWrathMaxReward, CacheChainFrenzyWrathRequired, CacheChainFrenzyWrathRequiredNext, CacheChainMaxReward, CacheChainRequired, CacheChainRequiredNext, CacheChainWrathMaxReward, CacheChainWrathRequired, CacheChainWrathRequiredNext, CacheDragonsFortuneMultAdjustment, CacheGoldenCookiesMult, CacheNoGoldSwitchCookiesPS, CacheWrathCookiesMult,
+  CacheChainFrenzyMaxReward,
+  CacheChainFrenzyRequired,
+  CacheChainFrenzyRequiredNext,
+  CacheChainFrenzyWrathMaxReward,
+  CacheChainFrenzyWrathRequired,
+  CacheChainFrenzyWrathRequiredNext,
+  CacheChainMaxReward,
+  CacheChainRequired,
+  CacheChainRequiredNext,
+  CacheChainWrathMaxReward,
+  CacheChainWrathRequired,
+  CacheChainWrathRequiredNext,
+  CacheDragonsFortuneMultAdjustment,
+  CacheGoldenCookiesMult,
+  CacheNoGoldSwitchCookiesPS,
+  CacheWrathCookiesMult,
 } from '../VariablesAndData';
 
 /**
@@ -18,12 +32,18 @@ export function MaxChainCookieReward(digit, maxPayout, mult) {
   let nextMoni = 0;
   let nextRequired = 0;
   let chain = 1 + Math.max(0, Math.ceil(Math.log(Game.cookies) / Math.LN10) - 10);
-	while (nextMoni < maxPayout) {
+  while (nextMoni < maxPayout * mult) {
-		moni = Math.max(digit, Math.min(Math.floor(1 / 9 * 10 ** chain * digit * mult), maxPayout * mult));
+    moni = Math.max(
-		nextMoni = Math.max(digit, Math.min(Math.floor(1 / 9 * 10 ** (chain + 1) * digit * mult), maxPayout * mult));
+      digit,
-		nextRequired = Math.floor(1 / 9 * 10 ** (chain + 1) * digit * mult);
+      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++;
+    chain += 1;
   }
   return [totalFromChain, moni, nextRequired];
 }
@@ -52,18 +72,21 @@ export function CacheChain() {
   else maxPayout = 0;
 
   CacheChainMaxReward = MaxChainCookieReward(7, maxPayout, CacheGoldenCookiesMult);
-	CacheChainRequired = CacheChainMaxReward[1] * 2 / CacheGoldenCookiesMult;
+  CacheChainRequired = (CacheChainMaxReward[1] * 2) / CacheGoldenCookiesMult; // eslint-disable-line no-unused-vars
-	CacheChainRequiredNext = CacheChainMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
+  CacheChainRequiredNext = CacheChainMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment; // eslint-disable-line no-unused-vars
 
   CacheChainWrathMaxReward = MaxChainCookieReward(6, maxPayout, CacheWrathCookiesMult);
-	CacheChainWrathRequired = CacheChainWrathMaxReward[1] * 2 / CacheWrathCookiesMult;
+  CacheChainWrathRequired = (CacheChainWrathMaxReward[1] * 2) / CacheWrathCookiesMult; // eslint-disable-line no-unused-vars
-	CacheChainWrathRequiredNext = CacheChainWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
+  CacheChainWrathRequiredNext = // eslint-disable-line no-unused-vars
+    CacheChainWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
 
   CacheChainFrenzyMaxReward = MaxChainCookieReward(7, maxPayout * 7, CacheGoldenCookiesMult);
-	CacheChainFrenzyRequired = CacheChainFrenzyMaxReward[1] * 2 / CacheGoldenCookiesMult;
+  CacheChainFrenzyRequired = (CacheChainFrenzyMaxReward[1] * 2) / CacheGoldenCookiesMult; // eslint-disable-line no-unused-vars
-	CacheChainFrenzyRequiredNext = CacheChainFrenzyMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
+  CacheChainFrenzyRequiredNext = // eslint-disable-line no-unused-vars
+    CacheChainFrenzyMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
 
   CacheChainFrenzyWrathMaxReward = MaxChainCookieReward(6, maxPayout * 7, CacheWrathCookiesMult);
-	CacheChainFrenzyWrathRequired = CacheChainFrenzyWrathMaxReward[1] * 2 / CacheWrathCookiesMult;
+  CacheChainFrenzyWrathRequired = (CacheChainFrenzyWrathMaxReward[1] * 2) / CacheWrathCookiesMult; // eslint-disable-line no-unused-vars
-	CacheChainFrenzyWrathRequiredNext = CacheChainFrenzyWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
+  CacheChainFrenzyWrathRequiredNext = // eslint-disable-line no-unused-vars
+    CacheChainFrenzyWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
 }

src/Cache/Stats/HeavenlyChips.js

@@ -1,6 +1,8 @@
-/* eslint-disable no-unused-vars */
 import {
-	CacheHCPerSecond, CacheLastHeavenlyCheck, CacheLastHeavenlyChips, HeavenlyChipsDiff,
+  CacheHCPerSecond,
+  CacheLastHeavenlyCheck,
+  CacheLastHeavenlyChips,
+  HeavenlyChipsDiff,
 } from '../VariablesAndData';
 
 /**
@@ -18,7 +20,7 @@ export default function CacheHeavenlyChipsPS() {
 
     // Add recent gains to AvgQueue's
     const timeDiff = currDate - CacheLastHeavenlyCheck;
-		const heavenlyChipsDiffAvg = Math.max(0, (ascendNowToGet - CacheLastHeavenlyChips)) / timeDiff;
+    const heavenlyChipsDiffAvg = Math.max(0, ascendNowToGet - CacheLastHeavenlyChips) / timeDiff;
     for (let i = 0; i < timeDiff; i++) {
       HeavenlyChipsDiff.addLatest(heavenlyChipsDiffAvg);
     }
@@ -28,6 +30,6 @@ export default function CacheHeavenlyChipsPS() {
     CacheLastHeavenlyChips = ascendNowToGet;
 
     // Get average gain over period of 5 seconds
-		CacheHCPerSecond = HeavenlyChipsDiff.calcAverage(5);
+    CacheHCPerSecond = HeavenlyChipsDiff.calcAverage(5); // eslint-disable-line no-unused-vars
   }
 }

src/Cache/Stats/MissingUpgrades.js

@@ -1,6 +1,9 @@
-/* eslint-disable no-unused-vars */
+import { crateMissing } from '../../Disp/MenuSections/Statistics/CreateMissingUpgrades';
-import { crateMissing } from '../../Disp/MenuSections/CreateMissingUpgrades';
+import {
-import { CacheMissingUpgrades, CacheMissingUpgradesCookies, CacheMissingUpgradesPrestige } from '../VariablesAndData';
+  CacheMissingUpgrades,
+  CacheMissingUpgradesCookies,
+  CacheMissingUpgradesPrestige,
+} from '../VariablesAndData';
 
 /**
  * This functions caches variables related to missing upgrades
@@ -15,9 +18,9 @@ export default function CacheAllMissingUpgrades() {
   CacheMissingUpgradesPrestige = '';
   const list = [];
   // sort the upgrades
-	for (const i of Object.keys(Game.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;
@@ -25,16 +28,19 @@ export default function CacheAllMissingUpgrades() {
   };
   list.sort(sortMap);
 
-	for (const i of Object.keys(list)) {
+  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;
+      else if (me.pool !== 'toggle' && me.pool !== 'unused' && me.pool !== 'debug')
-		}
+        CacheMissingUpgrades += str;
+      /* eslint-enable no-unused-vars */
     }
+  });
 }

src/Cache/Stats/Reindeer.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars */
 import { CacheSeaSpec } from '../VariablesAndData';
 
 /**
@@ -12,6 +11,6 @@ export default function CacheSeasonSpec() {
     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;
+    if (Game.Has('Ho ho ho-flavored frosting')) CacheSeaSpec *= 2; // eslint-disable-line no-unused-vars
   }
 }

src/Cache/Stats/Stats.js

@@ -1,10 +1,22 @@
-/* eslint-disable no-unused-vars */
 /** 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,
+  CacheConjure,
+  CacheConjureReward,
+  CacheDragonsFortuneMultAdjustment,
+  CacheEdifice,
+  CacheEdificeBuilding,
+  CacheGoldenCookiesMult,
+  CacheLucky,
+  CacheLuckyFrenzy,
+  CacheLuckyReward,
+  CacheLuckyRewardFrenzy,
+  CacheLuckyWrathReward,
+  CacheLuckyWrathRewardFrenzy,
+  CacheNoGoldSwitchCookiesPS,
+  CacheWrathCookiesMult,
 } from '../VariablesAndData';
 
 /**
@@ -16,29 +28,31 @@ export function CacheStatsCookies() {
   const cpsBuffMult = GetCPSBuffMult();
   if (cpsBuffMult > 0) CacheLucky /= cpsBuffMult;
   else CacheLucky = 0;
-	CacheLuckyReward = CacheGoldenCookiesMult * (CacheLucky * 0.15) + 13;
+  CacheLuckyReward = CacheGoldenCookiesMult * (CacheLucky * 0.15) + 13; // eslint-disable-line no-unused-vars
-	CacheLuckyWrathReward = CacheWrathCookiesMult * (CacheLucky * 0.15) + 13;
+  CacheLuckyWrathReward = CacheWrathCookiesMult * (CacheLucky * 0.15) + 13; // eslint-disable-line no-unused-vars
   CacheLuckyFrenzy = CacheLucky * 7;
-	CacheLuckyRewardFrenzy = CacheGoldenCookiesMult * (CacheLuckyFrenzy * 0.15) + 13;
+  CacheLuckyRewardFrenzy = CacheGoldenCookiesMult * (CacheLuckyFrenzy * 0.15) + 13; // eslint-disable-line no-unused-vars
-	CacheLuckyWrathRewardFrenzy = CacheWrathCookiesMult * (CacheLuckyFrenzy * 0.15) + 13;
+  CacheLuckyWrathRewardFrenzy = CacheWrathCookiesMult * (CacheLuckyFrenzy * 0.15) + 13; // eslint-disable-line no-unused-vars
   CacheConjure = CacheLucky * 2;
-	CacheConjureReward = CacheConjure * 0.15;
+  CacheConjureReward = CacheConjure * 0.15; // eslint-disable-line no-unused-vars
 
   CacheEdifice = 0;
   let max = 0;
   let n = 0;
-	for (const i of Object.keys(Game.Objects)) {
+  Object.keys(Game.Objects).forEach((i) => {
     if (Game.Objects[i].amount > max) max = Game.Objects[i].amount;
-		if (Game.Objects[i].amount > 0) n++;
+    if (Game.Objects[i].amount > 0) n += 1;
-	}
+  });
-	for (const i of Object.keys(Game.Objects)) {
+  Object.keys(Game.Objects).forEach((i) => {
-		if ((Game.Objects[i].amount < max || n === 1)
+    if (
-			&& Game.Objects[i].amount < 400
+      (Game.Objects[i].amount < max || n === 1) &&
-			&& Game.Objects[i].price * 2 > CacheEdifice) {
+      Game.Objects[i].amount < 400 &&
+      Game.Objects[i].price * 2 > CacheEdifice
+    ) {
       CacheEdifice = Game.Objects[i].price * 2;
-			CacheEdificeBuilding = i;
+      CacheEdificeBuilding = i; // eslint-disable-line no-unused-vars
-		}
     }
+  });
 }
 
 /**
@@ -68,6 +82,6 @@ export function CacheGoldenAndWrathCookiesMults() {
   // 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;
+    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

@@ -28,18 +28,19 @@ 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 CacheAvgCps = 0;
 export let CacheCurrWrinklerCPSMult = 0;
 export let CacheCurrWrinklerCount = 0;
 
 export let CacheUpgrades = {};
 
 export let CacheAverageClicks = {};
+export let CacheAverageCookiesFromClicks;
 
 export let CacheMissingUpgrades = {};
 export let CacheMissingUpgradesPrestige = {};
@@ -66,10 +67,10 @@ export let CacheSeasonPopShimmer = {};
 
 export let CacheTimeTillNextPrestige = 0;
 
+/** Stores lowest PP value */
 export let CacheMinPP = 0;
-export let CacheMidPP = 0;
+/** Stores all PP values of all buildings for all buy settings (1, 10, 100) */
-export let CacheMaxPP = 0;
+export let CachePPArray = [];
-export let CacheArrayOfPPs = [];
 
 export let CacheGoldenShimmersByID = {};
 
@@ -100,3 +101,18 @@ 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

@@ -1,9 +1,10 @@
-/* eslint-disable no-unused-vars */
 /** Caches data related to Wrinklers */
 
 import { SimObjects } from '../../Sim/VariablesAndData';
 import {
-	CacheWrinklersFattest, CacheWrinklersNormal, CacheWrinklersTotal,
+  CacheWrinklersFattest,
+  CacheWrinklersNormal,
+  CacheWrinklersTotal,
 } from '../VariablesAndData';
 
 /**
@@ -14,8 +15,11 @@ import {
  * @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].sucked;
+    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
@@ -27,9 +31,9 @@ export default function CacheWrinklers() {
       else if (godLvl === 2) sucked *= 1.1;
       else if (godLvl === 3) sucked *= 1.05;
     }
-		CacheWrinklersTotal += sucked;
+    CacheWrinklersTotal += sucked; // eslint-disable-line no-unused-vars
     if (Game.wrinklers[i].type === 0) {
-			CacheWrinklersNormal += sucked;
+      CacheWrinklersNormal += sucked; // eslint-disable-line no-unused-vars
       if (sucked > CacheWrinklersFattest[0]) CacheWrinklersFattest = [sucked, i];
     }
   }

src/Config/CheckNotificationPermissions.js

@@ -18,7 +18,7 @@ function CheckNotificationPermissions(ToggleOnOff) {
 
     // Check if the browser supports notifications and which type
     if (!('Notification' in window)) {
-			console.log('This browser does not support notifications.');
+      console.log('This browser does not support notifications.'); // eslint-disable-line no-console
     } else if (checkNotificationPromise()) {
       Notification.requestPermission().then();
     } else {

src/Config/SaveLoadReload/SaveLoadReloadSettings.js

@@ -1,8 +1,9 @@
-import { default as ConfigDefault } from '../../Data/SettingsDefault';
+import ConfigDefault from '../../Data/SettingsDefault.ts';
-import { default as ConfigData } from '../../Data/SettingsData';
+import ConfigData from '../../Data/SettingsData';
 import { CMOptions } from '../VariablesAndData';
 import save from '../../InitSaveLoad/save';
-import CMLoop from '../../Main/Loop';
+import CMLoopHook from '../../Main/LoopHook';
+import UpdateColours from '../../Disp/HelperFunctions/UpdateColours';
 
 /** Functions related to saving, loading and restoring all settings */
 
@@ -13,7 +14,9 @@ import CMLoop from '../../Main/Loop';
  * 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 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()}`);
@@ -33,46 +36,42 @@ export function LoadConfig(settings) {
   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;
-		for (const i in ConfigDefault) {
+    Object.keys(ConfigDefault).forEach((i) => {
       if (typeof CMOptions[i] === 'undefined') {
         mod = true;
         CMOptions[i] = ConfigDefault[i];
-			} else if (i !== 'Header' && i !== 'Colors') {
-				if (i.indexOf('SoundURL') === -1) {
-					if (!(CMOptions[i] > -1 && CMOptions[i] < ConfigData[i].label.length)) {
-						mod = true;
-						CMOptions[i] = ConfigDefault[i];
-					}
-				} else if (typeof CMOptions[i] !== 'string') { // Sound URLs
-					mod = true;
-					CMOptions[i] = ConfigDefault[i];
-				}
       } else if (i === 'Header') {
-				for (const j in ConfigDefault.Header) {
+        Object.keys(ConfigDefault.Header).forEach((j) => {
-					if (typeof CMOptions[i][j] === 'undefined' || !(CMOptions[i][j] > -1 && CMOptions[i][j] < 2)) {
+          if (
+            typeof CMOptions[i][j] === 'undefined' ||
+            !(CMOptions[i][j] > -1 && CMOptions[i][j] < 2)
+          ) {
             mod = true;
             CMOptions[i][j] = ConfigDefault[i][j];
           }
+        });
       }
-			} else { // Colors
+    });
-				for (const j in ConfigDefault.Colors) {
-					if (typeof CMOptions[i][j] === 'undefined' || typeof CMOptions[i][j] !== 'string') {
-						mod = true;
-						CMOptions[i][j] = ConfigDefault[i][j];
-					}
-				}
-			}
-		}
     if (mod) SaveConfig();
-		CMLoop(); // Do loop once
+    CMLoopHook(); // Do loop once
-		for (const i in ConfigDefault) {
+    Object.keys(ConfigDefault).forEach((i) => {
       if (i !== 'Header' && typeof ConfigData[i].func !== 'undefined') {
         ConfigData[i].func();
       }
-		}
+    });
-	} else { // Default values
+  } else {
+    // Default values
     LoadConfig(ConfigDefault);
   }
+  Game.UpdateMenu();
+  UpdateColours();
 }

src/Config/SpecificToggles.js

@@ -15,7 +15,8 @@ export function UpdateBotTimerBarPosition() {
     l('game').style.bottom = '70px';
   } else if (CMOptions.TimerBar === 1 && CMOptions.TimerBarPos === 1) {
     l('game').style.bottom = l('CMTimerBar').style.height;
-	} else { // No bars
+  } else {
+    // No bars
     l('game').style.bottom = '0px';
   }
 

src/Config/ToggleSetting.js

@@ -1,4 +1,4 @@
-import { default as ConfigData } from '../Data/SettingsData';
+import ConfigData from '../Data/SettingsData';
 import { SaveConfig } from './SaveLoadReload/SaveLoadReloadSettings';
 import { CMOptions } from './VariablesAndData';
 
@@ -13,7 +13,7 @@ export const ConfigPrefix = 'CMConfig';
  * @param 	{string}	config	The name of the option
  */
 export function ToggleConfig(config) {
-	CMOptions[config]++;
+  CMOptions[config] += 1;
 
   if (CMOptions[config] === ConfigData[config].label.length) {
     CMOptions[config] = 0;
@@ -24,7 +24,6 @@ export function ToggleConfig(config) {
     ConfigData[config].func();
   }
 
-	l(ConfigPrefix + config).innerHTML = ConfigData[config].label[CMOptions[config]];
   SaveConfig();
 }
 
@@ -47,7 +46,7 @@ export function ToggleConfigVolume(config) {
  * @param 	{string}	config	The name of the header
  */
 export function ToggleHeader(config) {
-	CMOptions.Header[config]++;
+  CMOptions.Header[config] += 1;
   if (CMOptions.Header[config] > 1) CMOptions.Header[config] = 0;
   SaveConfig();
 }

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

@@ -8,12 +8,13 @@ import { CMOptions } from '../VariablesAndData';
  */
 export default function ToggleGCTimer() {
   if (CMOptions.GCTimer === 1) {
-		for (const i of Object.keys(GCTimers)) {
+    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 {
-		for (const i of Object.keys(GCTimers)) GCTimers[i].style.display = 'none';
+    // 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/ToggleUpgradeBarAndColor.js

@@ -1,22 +0,0 @@
-import UpdateUpgrades from '../../Disp/BuildingsUpgrades/Upgrades';
-import { CMOptions } from '../VariablesAndData';
-
-/**
- * Section: Functions related to the Upgrade Bar
-
-/**
- * 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/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

@@ -5,7 +5,8 @@ import { CMOptions } from '../VariablesAndData';
  * 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
+  if (CMOptions.UpgradeBarFixedPos === 1) {
+    // Fix to top of screen when scrolling
     l('CMUpgradeBar').style.position = 'sticky';
     l('CMUpgradeBar').style.top = '0px';
   } else {

src/Config/Toggles/ToggleWrinklerButtons.js

@@ -5,7 +5,7 @@ import { CMOptions } from '../VariablesAndData';
  * It is called by changes in CM.Options.WrinklerButtons
  */
 export default function ToggleWrinklerButtons() {
-	if (CMOptions.WrinklerButtons) {
+  if (CMOptions.WrinklerButtons && Game.elderWrath) {
     l('PopAllNormalWrinklerButton').style.display = '';
     l('PopFattestWrinklerButton').style.display = '';
   } else {

src/Config/VariablesAndData.js

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

src/CookieMonster.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars */
 import init from './InitSaveLoad/init';
 import load from './InitSaveLoad/load';
 import save from './InitSaveLoad/save';

src/Data/Gamedata.js

@@ -1,94 +0,0 @@
-/** Data copied directly from the game */
-
-/** Array of the names of all fortune cookies obtainable from the ticker */
-export const Fortunes = [
-	'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 = [
-	'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 = ['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 = ['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 = ['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 = {
-	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/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.js

@@ -1,29 +0,0 @@
-/** Data related directly to Cookie Monster */
-
-export const VersionMajor = '2.031';
-export const VersionMinor = '5';
-
-/** Information about Cookie Monster to be displayed in the info section */
-export const ModDescription = `<div class="listing">
- <a href="https://github.com/Aktanusa/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">
-The latest update (v 2.031.5) sees a total rehaul of the backend of the mod. It does not introduce any new functions, this is planned for the next release.</br>
-We believe we have fixed all bugs related to this new code, but if you find any bugs, please report them on the GitHub!</br>
-</br>
-<b>Besides, this update fixes the following bugs:</b></br>
-- Fixed some upgrade tooltips which did not display the full effect of buying the upgrades</br>
-- Fixed not always being able to sell when "blocking bulk buy"</br>
-- Fixed heavenly chips per second display</br>
-- Fixed small display bug when pressing shift and hovering over garden plots</br>
-- Fixed some bugs with the display of numbers and formatting of them</br>
-</br>
-</div>
-`;

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.js

@@ -1,148 +0,0 @@
-/** Data related directly to the scales used by Cookie Monster */
-
-/** Array of abbreviations used in the "Metric" scale */
-export const metric = ['',
-	'',
-	'M',
-	'G',
-	'T',
-	'P',
-	'E',
-	'Z',
-	'Y',
-];
-
-/** Array of abbreviations used in the "Short" scale */
-export const shortScale = ['',
-	'',
-	'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 = ['',
-	'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/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.js

@@ -1,24 +0,0 @@
-/** 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 = {
-	BarsColors: 'Bars/Colors',
-	Calculation: 'Calculation',
-	Notification: 'Notification',
-	Tooltip: 'Tooltips and additional insights',
-	Statistics: 'Statistics',
-	Notation: 'Notation',
-	Miscellaneous: 'Miscellaneous',
-};
-
-/** Display titles of the headers of the notification section of the Cookie Monster settings */
-export const ConfigGroupsNotification = {
-	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/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.js

@@ -1,54 +0,0 @@
-/* eslint-disable max-classes-per-file */
-/** This describes all forms of settings used by Cookie Monster */
-
-/** The basic setting class */
-export class Setting {
-	constructor(type, group) {
-		this.type = type;
-		this.group = group;
-	}
-}
-
-/** The standard toggle setting class */
-export class SettingStandard extends Setting {
-	constructor(type, group, label, desc, toggle, func = null) {
-		super(type, group);
-		this.label = label;
-		this.desc = desc;
-		this.toggle = toggle;
-		if (func) {
-			this.func = func;
-		}
-	}
-}
-/** The colour picker setting class */
-export class SettingColours extends Setting {
-	constructor(type, group, desc, func) {
-		super(type, group);
-		this.desc = desc;
-		this.func = func;
-	}
-}
-
-/** The volume level setting class */
-export class SettingVolume extends Setting {
-	constructor(type, group, label, desc) {
-		super(type, group);
-		this.label = label;
-		this.desc = desc;
-		for (let i = 0; i < 101; i++) {
-			this.label[i] = `${i}%`;
-		}
-	}
-}
-
-/** The number input setting class */
-export class SettingInputNumber extends Setting {
-	constructor(type, group, label, desc, min, max) {
-		super(type, group);
-		this.label = label;
-		this.desc = desc;
-		this.min = min;
-		this.max = max;
-	}
-}

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/SettingsDefault.js

@@ -1,97 +0,0 @@
-/** This array describes all default settings */
-const ConfigDefault = {
-	BotBar: 1,
-	TimerBar: 1,
-	TimerBarPos: 0,
-	TimerBarOverlay: 2,
-	BuildColor: 1,
-	BulkBuildColor: 0,
-	UpBarColor: 1,
-	UpgradeBarFixedPos: 1,
-	CalcWrink: 0,
-	CPSMode: 1,
-	AvgCPSHist: 3,
-	AvgClicksHist: 0,
-	ColorPPBulkMode: 1,
-	PPExcludeTop: 0,
-	PPSecondsLowerLimit: 0,
-	PPOnlyConsiderBuyable: 0,
-	ToolWarnBon: 0,
-	Title: 1,
-	GeneralSound: 1,
-	GCNotification: 0,
-	GCFlash: 1,
-	GCSound: 1,
-	GCVolume: 100,
-	GCSoundURL: 'https://freesound.org/data/previews/66/66717_931655-lq.mp3',
-	FortuneNotification: 0,
-	FortuneFlash: 1,
-	FortuneSound: 1,
-	FortuneVolume: 100,
-	FortuneSoundURL: 'https://freesound.org/data/previews/174/174027_3242494-lq.mp3',
-	SeaNotification: 0,
-	SeaFlash: 1,
-	SeaSound: 1,
-	SeaVolume: 100,
-	SeaSoundURL: 'https://www.freesound.org/data/previews/121/121099_2193266-lq.mp3',
-	GardFlash: 1,
-	GardSound: 1,
-	GardVolume: 100,
-	GardSoundURL: 'https://freesound.org/data/previews/103/103046_861714-lq.mp3',
-	MagicNotification: 0,
-	MagicFlash: 1,
-	MagicSound: 1,
-	MagicVolume: 100,
-	MagicSoundURL: 'https://freesound.org/data/previews/221/221683_1015240-lq.mp3',
-	WrinklerNotification: 0,
-	WrinklerFlash: 1,
-	WrinklerSound: 1,
-	WrinklerVolume: 100,
-	WrinklerSoundURL: 'https://freesound.org/data/previews/124/124186_8043-lq.mp3',
-	WrinklerMaxNotification: 0,
-	WrinklerMaxFlash: 1,
-	WrinklerMaxSound: 1,
-	WrinklerMaxVolume: 100,
-	WrinklerMaxSoundURL: 'https://freesound.org/data/previews/152/152743_15663-lq.mp3',
-	TooltipBuildUpgrade: 1,
-	TooltipAmor: 0,
-	ToolWarnLucky: 1,
-	ToolWarnLuckyFrenzy: 1,
-	ToolWarnConjure: 1,
-	ToolWarnConjureFrenzy: 1,
-	ToolWarnEdifice: 1,
-	ToolWarnUser: 0,
-	ToolWarnPos: 1,
-	TooltipGrim: 1,
-	TooltipWrink: 1,
-	TooltipLump: 1,
-	TooltipPlots: 1,
-	DragonAuraInfo: 1,
-	TooltipAscendButton: 1,
-	Stats: 1,
-	MissingUpgrades: 1,
-	UpStats: 1,
-	TimeFormat: 0,
-	DetailedTime: 1,
-	GrimoireBar: 1,
-	HeavenlyChipsTarget: 1,
-	ShowMissedGC: 1,
-	Scale: 2,
-	ScaleDecimals: 2,
-	ScaleSeparator: 0,
-	ScaleCutoff: 999999,
-	Colors: {
-		Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513',
-	},
-	SortBuildings: 0,
-	SortUpgrades: 0,
-	GCTimer: 1,
-	Favicon: 1,
-	WrinklerButtons: 1,
-	BulkBuyBlock: 0,
-	Header: {
-		BarsColors: 1, Calculation: 1, Notification: 1, NotificationGeneral: 1, NotificationGC: 1, NotificationFC: 1, NotificationSea: 1, NotificationGard: 1, NotificationMagi: 1, NotificationWrink: 1, NotificationWrinkMax: 1, Tooltip: 1, Statistics: 1, Notation: 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/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/BeautifyFormatting.js

@@ -1,119 +0,0 @@
-/** General functions to format or beautify strings */
-
-import { CMOptions } from '../../Config/VariablesAndData';
-import { metric, shortScale, shortScaleAbbreviated } from '../../Data/Scales';
-import { BackupFunctions } from '../../Main/VariablesAndData';
-import {
-	ColorGreen, ColorOrange, ColorRed, ColorYellow,
-} from '../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 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)) {
-		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 === '') {
-			console.log(`Could not beautify number with CM.Disp.Beautify: ${num}`);
-			answer = BackupFunctions.Beautify(num, floats);
-		}
-		if (CMOptions.ScaleSeparator) answer = answer.replace('.', ',');
-		return answer;
-	}
-	console.log(`Could not beautify number with CM.Disp.Beautify: ${num}`);
-	return BackupFunctions.Beautify(num, floats);
-}
-
-/**
- * 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 function FormatTime(time, longFormat) {
-	if (time === Infinity) return time;
-	time = Math.ceil(time);
-	const y = Math.floor(time / 31557600);
-	const d = Math.floor(time % 31557600 / 86400);
-	const h = Math.floor(time % 86400 / 3600);
-	const m = Math.floor(time % 3600 / 60);
-	const s = Math.floor(time % 60);
-	let str = '';
-	if (CMOptions.TimeFormat) {
-		if (time > 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 (time > 777600000) return longFormat ? 'Over 9000 days!' : '>9000d';
-		str += (y > 0 ? `${y + (longFormat ? (y === 1 ? ' year' : ' years') : 'y')}, ` : '');
-		str += (d > 0 ? `${d + (longFormat ? (d === 1 ? ' day' : ' days') : 'd')}, ` : '');
-		if (str.length > 0 || h > 0) str += `${h + (longFormat ? (h === 1 ? ' hour' : ' hours') : 'h')}, `;
-		if (str.length > 0 || m > 0) str += `${m + (longFormat ? (m === 1 ? ' minute' : ' minutes') : 'm')}, `;
-		str += s + (longFormat ? (s === 1 ? ' second' : ' seconds') : 's');
-	}
-	return str;
-}
-
-/**
- * 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 function GetTimeColor(time) {
-	let color;
-	let text;
-	if (time <= 0) {
-		if (CMOptions.TimeFormat) text = '00:00:00:00:00';
-		else text = 'Done!';
-		color = ColorGreen;
-	} else {
-		text = FormatTime(time);
-		if (time > 300) color = ColorRed;
-		else if (time > 60) color = ColorOrange;
-		else color = ColorYellow;
-	}
-	return { text, color };
-}

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

@@ -1,8 +1,8 @@
 import { CacheObjects1, CacheObjects10, CacheObjects100 } from '../../Cache/VariablesAndData';
 import { CMOptions } from '../../Config/VariablesAndData';
 import BuildingSell from '../../Sim/SimulationEvents/SellBuilding';
-import { Beautify } from '../BeautifyAndFormatting/BeautifyFormatting';
+import Beautify from '../BeautifyAndFormatting/Beautify';
-import { Colors, LastTargetBuildings } from '../VariablesAndData';
+import { ColoursOrdering, LastTargetBuildings } from '../VariablesAndData';
 
 /**
  * Section: Functions related to right column of the screen (buildings/upgrades)
@@ -10,8 +10,8 @@ import { Colors, LastTargetBuildings } from '../VariablesAndData';
 /**
  * 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.UpdateColors() & CM.Disp.RefreshScale()
+ * The function is called by CM.Disp.Draw(), CM.Disp.UpdateColours() & CM.Disp.RefreshScale()
- * And by changes in CM.Options.BuildColor, CM.Options.SortBuild & CM.Data.Config.BulkBuildColor
+ * And by changes in CM.Options.BuildColour, CM.Options.SortBuild & CM.Data.Config.BulkBuildColour
  */
 export default function UpdateBuildings() {
   let target = Game.buyBulk;
@@ -25,17 +25,17 @@ export default function UpdateBuildings() {
   else if (target === 100) target = CacheObjects100;
 
   if (Game.buyMode === 1) {
-		if (CMOptions.BuildColor === 1) {
+    if (CMOptions.BuildColour === 1) {
-			for (const i of Object.keys(target)) {
+      Object.keys(target).forEach((i) => {
-				l(`productPrice${Game.Objects[i].id}`).style.color = CMOptions.Colors[target[i].color];
+        l(`productPrice${Game.Objects[i].id}`).style.color = CMOptions[`Colour${target[i].color}`];
-			}
+      });
     } else {
-			for (const i of Object.keys(Game.Objects)) {
+      Object.keys(Game.Objects).forEach((i) => {
         l(`productPrice${Game.Objects[i].id}`).style.removeProperty('color');
-			}
+      });
     }
   } else if (Game.buyMode === -1) {
-		for (const i of Object.keys(CacheObjects1)) {
+    Object.keys(CacheObjects1).forEach((i) => {
       const o = Game.Objects[i];
       l(`productPrice${o.id}`).style.color = '';
       /*
@@ -46,22 +46,54 @@ export default function UpdateBuildings() {
        *
        * 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));
+      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) {
-		const arr = Object.keys(target).map((k) => {
+    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(function (a, b) { return (Colors.indexOf(a.color) > Colors.indexOf(b.color) ? 1 : (Colors.indexOf(a.color) < Colors.indexOf(b.color) ? -1 : (a.pp < b.pp) ? -1 : 0)); });
+      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}`;

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

@@ -1,5 +1,13 @@
 import {
-	ColorBackPre, ColorBlue, ColorGray, ColorGreen, ColorOrange, ColorPurple, ColorRed, ColorTextPre, ColorYellow,
+  ColourBackPre,
+  ColourBlue,
+  ColourGray,
+  ColourGreen,
+  ColourOrange,
+  ColourPurple,
+  ColourRed,
+  ColourTextPre,
+  ColourYellow,
 } from '../VariablesAndData';
 
 /**
@@ -20,7 +28,7 @@ function CreateUpgradeBarLegend() {
     const div = document.createElement('div');
     div.style.verticalAlign = 'middle';
     const span = document.createElement('span');
-		span.className = ColorBackPre + color;
+    span.className = ColourBackPre + color;
     span.style.display = 'inline-block';
     span.style.height = '10px';
     span.style.width = '10px';
@@ -30,13 +38,13 @@ function CreateUpgradeBarLegend() {
     return div;
   };
 
-	legend.appendChild(legendLine(ColorBlue, 'Better than best PP building'));
+  legend.appendChild(legendLine(ColourBlue, 'Better than the best PP of a building option'));
-	legend.appendChild(legendLine(ColorGreen, 'Same as best PP building'));
+  legend.appendChild(legendLine(ColourGreen, 'Same as the best PP building option'));
-	legend.appendChild(legendLine(ColorYellow, 'Between best and worst PP buildings closer to best'));
+  legend.appendChild(legendLine(ColourYellow, 'Within the top 10 of PP for buildings'));
-	legend.appendChild(legendLine(ColorOrange, 'Between best and worst PP buildings closer to worst'));
+  legend.appendChild(legendLine(ColourOrange, 'Within the top 20 of PP for buildings'));
-	legend.appendChild(legendLine(ColorRed, 'Same as worst PP building'));
+  legend.appendChild(legendLine(ColourRed, 'Within the top 30 of PP for buildings'));
-	legend.appendChild(legendLine(ColorPurple, 'Worse than worst PP building'));
+  legend.appendChild(legendLine(ColourPurple, 'Outside of the top 30 of PP for buildings'));
-	legend.appendChild(legendLine(ColorGray, 'Negative or infinity PP'));
+  legend.appendChild(legendLine(ColourGray, 'Negative or infinity PP'));
   return legend;
 }
 
@@ -52,28 +60,32 @@ export default function CreateUpgradeBar() {
   UpgradeBar.style.fontWeight = 'bold';
   UpgradeBar.style.display = 'none';
   UpgradeBar.style.zIndex = '21';
-	UpgradeBar.onmouseout = function () { Game.tooltip.hide(); };
+  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'); };
+  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 = ColorTextPre + color;
+    span.className = ColourTextPre + color;
     span.style.width = '14.28571428571429%';
     span.style.display = 'inline-block';
     span.textContent = '0';
     return span;
   };
-	UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarBlue', ColorBlue));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarBlue', ColourBlue));
-	UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGreen', ColorGreen));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGreen', ColourGreen));
-	UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarYellow', ColorYellow));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarYellow', ColourYellow));
-	UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarOrange', ColorOrange));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarOrange', ColourOrange));
-	UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarRed', ColorRed));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarRed', ColourRed));
-	UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarPurple', ColorPurple));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarPurple', ColourPurple));
-	UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGray', ColorGray));
+  UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGray', ColourGray));
 
   l('upgrades').parentNode.insertBefore(UpgradeBar, l('upgrades').parentNode.childNodes[3]);
 }

src/Disp/BuildingsUpgrades/Upgrades.js

@@ -1,18 +1,26 @@
 import { CacheUpgrades } from '../../Cache/VariablesAndData';
 import { CMOptions } from '../../Config/VariablesAndData';
 import {
-	ColorBackPre, ColorBlue, ColorGray, ColorGreen, ColorOrange, ColorPurple, ColorRed, Colors, ColorYellow,
+  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.ToggleUpgradeBarAndColor & CM.Disp.RefreshScale()
+ * 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.UpBarColor > 0) {
+  if (CMOptions.UpBarColour > 0) {
     let blue = 0;
     let green = 0;
     let yellow = 0;
@@ -21,31 +29,31 @@ export default function UpdateUpgrades() {
     let purple = 0;
     let gray = 0;
 
-		for (const i of Object.keys(Game.UpgradesInStore)) {
+    Object.keys(Game.UpgradesInStore).forEach((i) => {
       const me = Game.UpgradesInStore[i];
-			let addedColor = false;
+      let addedColour = false;
-			for (let j = 0; j < l(`upgrade${i}`).childNodes.length; j++) {
+      for (let j = 0; j < l(`upgrade${i}`).childNodes.length; j += 1) {
-				if (l(`upgrade${i}`).childNodes[j].className.indexOf(ColorBackPre) !== -1) {
+        if (l(`upgrade${i}`).childNodes[j].className.indexOf(ColourBackPre) !== -1) {
-					l(`upgrade${i}`).childNodes[j].className = ColorBackPre + CacheUpgrades[me.name].color;
+          l(`upgrade${i}`).childNodes[j].className = ColourBackPre + CacheUpgrades[me.name].color;
-					addedColor = true;
+          addedColour = true;
           break;
         }
       }
-			if (!addedColor) {
+      if (!addedColour) {
         const div = document.createElement('div');
         div.style.width = '10px';
         div.style.height = '10px';
-				div.className = ColorBackPre + CacheUpgrades[me.name].color;
+        div.className = ColourBackPre + CacheUpgrades[me.name].color;
         l(`upgrade${i}`).appendChild(div);
       }
-			if (CacheUpgrades[me.name].color === ColorBlue) blue++;
+      if (CacheUpgrades[me.name].color === ColourBlue) blue += 1;
-			else if (CacheUpgrades[me.name].color === ColorGreen) green++;
+      else if (CacheUpgrades[me.name].color === ColourGreen) green += 1;
-			else if (CacheUpgrades[me.name].color === ColorYellow) yellow++;
+      else if (CacheUpgrades[me.name].color === ColourYellow) yellow += 1;
-			else if (CacheUpgrades[me.name].color === ColorOrange) orange++;
+      else if (CacheUpgrades[me.name].color === ColourOrange) orange += 1;
-			else if (CacheUpgrades[me.name].color === ColorRed) red++;
+      else if (CacheUpgrades[me.name].color === ColourRed) red += 1;
-			else if (CacheUpgrades[me.name].color === ColorPurple) purple++;
+      else if (CacheUpgrades[me.name].color === ColourPurple) purple += 1;
-			else if (CacheUpgrades[me.name].color === ColorGray) gray++;
+      else if (CacheUpgrades[me.name].color === ColourGray) gray += 1;
-		}
+    });
 
     l('CMUpgradeBarBlue').textContent = blue;
     l('CMUpgradeBarGreen').textContent = green;
@@ -59,16 +67,25 @@ export default function UpdateUpgrades() {
   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++) {
+  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(function (a, b) { return (Colors.indexOf(a.color) > Colors.indexOf(b.color) ? 1 : (Colors.indexOf(a.color) < Colors.indexOf(b.color) ? -1 : (a.pp < b.pp) ? -1 : 0)); });
+    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);
   }
@@ -76,7 +93,7 @@ export default function UpdateUpgrades() {
   const nameChecker = function (arr2, upgrade) {
     return arr2.findIndex((e) => e.name === upgrade.name);
   };
-	for (let x = 0; x < Game.UpgradesInStore.length; x++) {
+  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

@@ -4,7 +4,8 @@ import CacheDragonCost from '../../Cache/Dragon/Dragon';
 import { CacheCostDragonUpgrade } from '../../Cache/VariablesAndData';
 import { CMOptions } from '../../Config/VariablesAndData';
 import CalculateChangeAura from '../../Sim/SimulationEvents/AuraChange';
-import { Beautify, FormatTime } from '../BeautifyAndFormatting/BeautifyFormatting';
+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
@@ -14,7 +15,9 @@ export function AddAuraInfo(aura) {
   if (CMOptions.DragonAuraInfo === 1) {
     const [bonusCPS, priceOfChange] = CalculateChangeAura(aura);
     const timeToRecover = FormatTime(priceOfChange / (bonusCPS + Game.cookiesPs));
-		const bonusCPSPercentage = Beautify(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';
@@ -22,7 +25,9 @@ export function AddAuraInfo(aura) {
     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).`;
+    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';
@@ -38,16 +43,25 @@ export function AddAuraInfo(aura) {
  */
 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) {
+  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.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; };
+        l('specialPopup').children[i].onmouseout = function () {
+          Game.tooltip.shouldHide = 1;
+        };
       }
     }
   }

src/Disp/Draw.js

@@ -1,49 +0,0 @@
-import { CMOptions } from '../Config/VariablesAndData';
-import { Beautify } from './BeautifyAndFormatting/BeautifyFormatting';
-import UpdateBuildings from './BuildingsUpgrades/Buildings';
-import UpdateUpgrades from './BuildingsUpgrades/Upgrades';
-import { UpdateBotBar } from './InfoBars/BottomBar';
-import { UpdateTimerBar } from './InfoBars/TimerBar';
-import RefreshMenu from './MenuSections/Refreshmenu';
-import { UpdateTooltips } from './Tooltips/Tooltip';
-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 Draw() {
-	// 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();
-
-	// Redraw timers
-	UpdateTimerBar();
-
-	// Update Bottom Bar
-	UpdateBotBar();
-
-	// Update Tooltip
-	UpdateTooltips();
-
-	// Update Wrinkler Tooltip
-	CheckWrinklerTooltip();
-	UpdateWrinklerTooltip();
-
-	// Change menu refresh interval
-	RefreshMenu();
-
-	// Replace Cookies counter because Orteil uses very weird code to "pad" it...
-	l('cookies').innerHTML = l('cookies').innerHTML.replace(/.*(?=<br>)/i, Beautify(Game.cookies));
-}

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

@@ -23,9 +23,17 @@ export default function CreateGCTimer(cookie) {
   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.onclick = function () {
-	GCTimer.onmouseover = function () { cookie.l.style.filter = 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))'; cookie.l.style.webkitFilter = 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))'; };
+    cookie.pop();
-	GCTimer.onmouseout = function () { cookie.l.style.filter = ''; cookie.l.style.webkitFilter = ''; };
+  };
+  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

@@ -6,10 +6,11 @@
  * @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 (currentMagic < targetMagic) {
+  while (magic < targetMagic) {
-		currentMagic += Math.max(0.002, (currentMagic / Math.max(maxMagic, 100)) ** 0.5) * 0.002;
+    magic += Math.max(0.002, (magic / Math.max(maxMagic, 100)) ** 0.5) * 0.002;
-		count++;
+    count += 1;
   }
   return count / Game.fps;
 }

src/Disp/HelperFunctions/GetCPS.js

@@ -1,5 +1,8 @@
 import {
-	CacheAvgCps, CacheCurrWrinklerCount, CacheCurrWrinklerCPSMult, CacheWrinklersFattest,
+  CacheAverageCPS,
+  CacheCurrWrinklerCount,
+  CacheCurrWrinklerCPSMult,
+  CacheWrinklersFattest,
 } from '../../Cache/VariablesAndData';
 import { CMOptions } from '../../Config/VariablesAndData';
 
@@ -9,13 +12,24 @@ import { CMOptions } from '../../Config/VariablesAndData';
  */
 export default function GetCPS() {
   if (CMOptions.CPSMode) {
-		return CacheAvgCps;
+    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 (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)));
+  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/GetLumpColor.js

@@ -1,24 +0,0 @@
-import {
-	ColorGray, ColorGreen, ColorOrange, ColorPurple, ColorRed, ColorYellow,
-} from '../VariablesAndData';
-
-/**
- * This function returns Name and Color 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 GetLumpColor(type) {
-	if (type === 0) {
-		return { text: 'Normal', color: ColorGray };
-	} if (type === 1) {
-		return { text: 'Bifurcated', color: ColorGreen };
-	} if (type === 2) {
-		return { text: 'Golden', color: ColorYellow };
-	} if (type === 3) {
-		return { text: 'Meaty', color: ColorOrange };
-	} if (type === 4) {
-		return { text: 'Caramelized', color: ColorPurple };
-	}
-	return { text: 'Unknown Sugar Lump', color: ColorRed };
-}

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

@@ -9,7 +9,8 @@ import { CMOptions } from '../../Config/VariablesAndData';
 export default function GetWrinkConfigBank() {
   if (CMOptions.CalcWrink === 1) {
     return CacheWrinklersTotal;
-	} if (CMOptions.CalcWrink === 2) {
+  }
+  if (CMOptions.CalcWrink === 2) {
     return CacheWrinklersFattest[0];
   }
   return 0;

src/Disp/HelperFunctions/PopWrinklers.js

@@ -3,9 +3,9 @@
  * It is called by a click of the 'pop all' button created by CM.Disp.AddMenuStats()
  */
 export default function PopAllNormalWrinklers() {
-	for (const i of Object.keys(Game.wrinklers)) {
+  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/UpdateBackground.js

@@ -8,4 +8,5 @@ export default function UpdateBackground() {
   Game.Background.canvas.height = Game.Background.canvas.parentNode.offsetHeight;
   Game.LeftBackground.canvas.width = Game.LeftBackground.canvas.parentNode.offsetWidth;
   Game.LeftBackground.canvas.height = Game.LeftBackground.canvas.parentNode.offsetHeight;
+  Game.DrawBackground();
 }

src/Disp/HelperFunctions/UpdateColors.js

@@ -1,24 +0,0 @@
-import { CMOptions } from '../../Config/VariablesAndData';
-import UpdateBuildings from '../BuildingsUpgrades/Buildings';
-import {
-	ColorBackPre, ColorBorderPre, Colors, ColorTextPre,
-} from '../VariablesAndData';
-
-/**
- * This function changes/refreshes colours if the user has set new standard colours
- * The function is therefore called by a change in CM.Options.Colors
- */
-export default function UpdateColors() {
-	let str = '';
-	for (let i = 0; i < Colors.length; i++) {
-		str += `.${ColorTextPre}${Colors[i]} { color: ${CMOptions.Colors[Colors[i]]}; }\n`;
-	}
-	for (let i = 0; i < Colors.length; i++) {
-		str += `.${ColorBackPre}${Colors[i]} { background-color: ${CMOptions.Colors[Colors[i]]}; }\n`;
-	}
-	for (let i = 0; i < Colors.length; i++) {
-		str += `.${ColorBorderPre}${Colors[i]} { border: 1px solid ${CMOptions.Colors[Colors[i]]}; }\n`;
-	}
-	l('CMCSS').textContent = str;
-	UpdateBuildings(); // Class has been already set
-}

src/Disp/HelperFunctions/UpdateColours.js

@@ -0,0 +1,33 @@
+import { CMOptions } from '../../Config/VariablesAndData';
+import UpdateBuildings from '../BuildingsUpgrades/Buildings';
+import {
+  ColourBackPre,
+  ColourBorderPre,
+  ColoursOrdering,
+  ColourTextPre,
+} from '../VariablesAndData';
+
+/**
+ * This function changes/refreshes colours if the user has set new standard colours
+ * The function is therefore called by a change in CM.Options.Colours
+ */
+export default function UpdateColours() {
+  let str = '';
+  for (let i = 0; i < ColoursOrdering.length; i++) {
+    str += `.${ColourTextPre}${ColoursOrdering[i]} { color: ${
+      CMOptions[`Colour${ColoursOrdering[i]}`]
+    }; }\n`;
+  }
+  for (let i = 0; i < ColoursOrdering.length; i++) {
+    str += `.${ColourBackPre}${ColoursOrdering[i]} { background-color: ${
+      CMOptions[`Colour${ColoursOrdering[i]}`]
+    }; }\n`;
+  }
+  for (let i = 0; i < ColoursOrdering.length; i++) {
+    str += `.${ColourBorderPre}${ColoursOrdering[i]} { border: 1px solid ${
+      CMOptions[`Colour${ColoursOrdering[i]}`]
+    }; }\n`;
+  }
+  l('CMCSS').textContent = str;
+  UpdateBuildings(); // Class has been already set
+}

src/Disp/InfoBars/BottomBar.js

@@ -2,13 +2,14 @@
 
 import { CacheObjects1, CacheObjects10, CacheObjects100 } from '../../Cache/VariablesAndData';
 import { CMOptions } from '../../Config/VariablesAndData';
-import { VersionMajor, VersionMinor } from '../../Data/Moddata';
+import { VersionMajor, VersionMinor } from '../../Data/Moddata.ts';
-import { Beautify, GetTimeColor } from '../BeautifyAndFormatting/BeautifyFormatting';
+import Beautify from '../BeautifyAndFormatting/Beautify';
+import FormatTime from '../BeautifyAndFormatting/FormatTime';
+import GetTimeColour from '../BeautifyAndFormatting/GetTimeColour';
+
 import GetCPS from '../HelperFunctions/GetCPS';
 import GetWrinkConfigBank from '../HelperFunctions/GetWrinkConfigBank';
-import {
+import { ColourBlue, ColourTextPre, ColourYellow, LastTargetBotBar } from '../VariablesAndData';
-	ColorBlue, ColorTextPre, ColorYellow, LastTargetBotBar,
-} from '../VariablesAndData';
 import { CreateBotBarBuildingColumn } from './CreateDOMElements';
 
 /**
@@ -36,25 +37,25 @@ export function CreateBotBar() {
   const firstCol = function (text, color) {
     const td = document.createElement('td');
     td.style.textAlign = 'right';
-		td.className = ColorTextPre + color;
+    td.className = ColourTextPre + color;
     td.textContent = text;
     return td;
   };
   const type = tbody.appendChild(document.createElement('tr'));
   type.style.fontWeight = 'bold';
-	type.appendChild(firstCol(`CM ${VersionMajor}.${VersionMinor}`, ColorYellow));
+  type.appendChild(firstCol(`CM ${VersionMajor}.${VersionMinor}`, ColourYellow));
   const bonus = tbody.appendChild(document.createElement('tr'));
-	bonus.appendChild(firstCol('Bonus Income', ColorBlue));
+  bonus.appendChild(firstCol('Bonus Income', ColourBlue));
   const pp = tbody.appendChild(document.createElement('tr'));
-	pp.appendChild(firstCol('Payback Period', ColorBlue));
+  pp.appendChild(firstCol('Payback Period', ColourBlue));
   const time = tbody.appendChild(document.createElement('tr'));
-	time.appendChild(firstCol('Time Left', ColorBlue));
+  time.appendChild(firstCol('Time Left', ColourBlue));
 
   l('wrapper').appendChild(BotBar);
 
-	for (const i of Object.keys(Game.Objects)) {
+  Object.keys(Game.Objects).forEach((i) => {
     CreateBotBarBuildingColumn(i);
-	}
+  });
 }
 
 /**
@@ -63,7 +64,7 @@ export function CreateBotBar() {
 export function UpdateBotBar() {
   if (CMOptions.BotBar === 1 && CacheObjects1 && Game.buyMode === 1) {
     let count = 0;
-		for (const i of Object.keys(CacheObjects1)) {
+    Object.keys(CacheObjects1).forEach((i) => {
       let target = Game.buyBulk;
       if (Game.buyMode === 1) {
         LastTargetBotBar = target;
@@ -73,16 +74,32 @@ export function UpdateBotBar() {
       if (target === 1) target = CacheObjects1;
       if (target === 10) target = CacheObjects10;
       if (target === 100) target = CacheObjects100;
-			count++;
+      count += 1;
-			l('CMBotBar').firstChild.firstChild.childNodes[0].childNodes[count].childNodes[1].textContent = Game.Objects[i].amount;
+      l('CMBotBar').firstChild.firstChild.childNodes[0].childNodes[
-			l('CMBotBar').firstChild.firstChild.childNodes[1].childNodes[count].textContent = Beautify(target[i].bonus, 2);
+        count
-			l('CMBotBar').firstChild.firstChild.childNodes[2].childNodes[count].className = ColorTextPre + target[i].color;
+      ].childNodes[1].textContent = Game.Objects[i].amount;
-			l('CMBotBar').firstChild.firstChild.childNodes[2].childNodes[count].textContent = Beautify(target[i].pp, 2);
+      l('CMBotBar').firstChild.firstChild.childNodes[1].childNodes[count].textContent = Beautify(
-			const timeColor = GetTimeColor((Game.Objects[i].bulkPrice - (Game.cookies + GetWrinkConfigBank())) / GetCPS());
+        target[i].bonus,
-			l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[count].className = ColorTextPre + timeColor.color;
+        2,
-			if (timeColor.text === 'Done!' && Game.cookies < Game.Objects[i].bulkPrice) {
+      );
-				l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[count].textContent = `${timeColor.text} (with Wrink)`;
+      l('CMBotBar').firstChild.firstChild.childNodes[2].childNodes[count].className =
-			} else l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[count].textContent = timeColor.text;
+        ColourTextPre + target[i].color;
-		}
+      let PPString;
+      if (CMOptions.PPDisplayTime) PPString = FormatTime(Math.round(target[i].pp));
+      else PPString = Beautify(Math.round(target[i].pp), 2);
+      l('CMBotBar').firstChild.firstChild.childNodes[2].childNodes[count].textContent = PPString;
+      const timeColour = GetTimeColour(
+        (Game.Objects[i].bulkPrice - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),
+      );
+      l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[count].className =
+        ColourTextPre + timeColour.color;
+      if (timeColour.text === 'Done!' && Game.cookies < Game.Objects[i].bulkPrice) {
+        l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[
+          count
+        ].textContent = `${timeColour.text} (with Wrink)`;
+      } else
+        l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[count].textContent =
+          timeColour.text;
+    });
   }
 }

src/Disp/InfoBars/CreateDOMElements.js

@@ -1,6 +1,6 @@
 /** Functions to create various DOM elements used by the Bars */
 
-import { ColorBackPre, ColorBlue, ColorTextPre } from '../VariablesAndData';
+import { ColourBackPre, ColourBlue, ColourTextPre } from '../VariablesAndData';
 
 /**
  * This function creates an indivudual timer for the timer bar
@@ -47,7 +47,7 @@ export function CreateTimer(id, name, bars) {
       colorBar.style.borderBottomRightRadius = '10px';
     }
     if (typeof bars[i].color !== 'undefined') {
-			colorBar.className = ColorBackPre + bars[i].color;
+      colorBar.className = ColourBackPre + bars[i].color;
     }
     div.appendChild(colorBar);
   }
@@ -76,14 +76,20 @@ export function CreateBotBarBuildingColumn(buildingName) {
 
     const i = buildingName;
     const header = type.appendChild(document.createElement('td'));
-		header.appendChild(document.createTextNode(`${i.indexOf(' ') !== -1 ? i.substring(0, i.indexOf(' ')) : i} (`));
+    header.appendChild(
+      document.createTextNode(`${i.indexOf(' ') !== -1 ? i.substring(0, i.indexOf(' ')) : i} (`),
+    );
 
     const span = header.appendChild(document.createElement('span'));
-		span.className = ColorTextPre + ColorBlue;
+    span.className = ColourTextPre + ColourBlue;
 
     header.appendChild(document.createTextNode(')'));
+    type.lastChild.style.paddingLeft = '8px';
     bonus.appendChild(document.createElement('td'));
+    bonus.lastChild.style.paddingLeft = '8px';
     pp.appendChild(document.createElement('td'));
+    pp.lastChild.style.paddingLeft = '8px';
     time.appendChild(document.createElement('td'));
+    time.lastChild.style.paddingLeft = '2px';
   }
 }

src/Disp/InfoBars/TimerBar.js

@@ -3,8 +3,12 @@
 import { UpdateBotTimerBarPosition } from '../../Config/SpecificToggles';
 import { CMOptions } from '../../Config/VariablesAndData';
 import {
-	BuffColors,
+  BuffColours,
-	ColorBackPre, ColorGray, ColorOrange, ColorPurple, LastNumberOfTimers,
+  ColourBackPre,
+  ColourGray,
+  ColourOrange,
+  ColourPurple,
+  LastNumberOfTimers,
 } from '../VariablesAndData';
 import { CreateTimer } from './CreateDOMElements';
 
@@ -22,16 +26,21 @@ export function CreateTimerBar() {
   TimerBar.style.backgroundColor = 'black';
 
   // Create standard Golden Cookie bar
-	const CMTimerBarGC = CreateTimer('CMTimerBarGC',
+  const CMTimerBarGC = CreateTimer('CMTimerBarGC', 'Next Cookie', [
-		'Next Cookie',
+    { id: 'CMTimerBarGCMinBar', color: ColourGray },
-		[{ id: 'CMTimerBarGCMinBar', color: ColorGray }, { id: 'CMTimerBarGCBar', color: ColorPurple }]);
+    { id: 'CMTimerBarGCBar', color: ColourPurple },
+  ]);
   TimerBar.appendChild(CMTimerBarGC);
 
   // Create standard Reindeer bar
-	const CMTimerBarRen = CreateTimer('CMTimerBarRen',
+  const CMTimerBarRen = CreateTimer('CMTimerBarRen', 'Next Reindeer', [
-		'Next Reindeer',
+    { id: 'CMTimerBarRenMinBar', color: ColourGray },
-		[{ id: 'CMTimerBarRenMinBar', color: ColorGray }, { id: 'CMTimerBarRenBar', color: ColorOrange }]);
+    { id: 'CMTimerBarRenBar', color: ColourOrange },
+  ]);
   TimerBar.appendChild(CMTimerBarRen);
+  const TimerBarBuffTimers = document.createElement('div');
+  TimerBarBuffTimers.id = 'CMTimerBarBuffTimers';
+  TimerBar.appendChild(TimerBarBuffTimers);
 
   l('wrapper').appendChild(TimerBar);
 }
@@ -50,8 +59,15 @@ export function UpdateTimerBar() {
     // Regulates visibility of Golden Cookie timer
     if (Game.shimmerTypes.golden.spawned === 0 && !Game.Has('Golden switch [off]')) {
       l('CMTimerBarGC').style.display = '';
-			l('CMTimerBarGCMinBar').style.width = `${Math.round(Math.max(0, Game.shimmerTypes.golden.minTime - Game.shimmerTypes.golden.time) * maxWidthTwoBar / Game.shimmerTypes.golden.maxTime)}px`;
+      l('CMTimerBarGCMinBar').style.width = `${Math.round(
-			if (CMOptions.TimerBarOverlay >= 1) l('CMTimerBarGCMinBar').textContent = Math.ceil((Game.shimmerTypes.golden.minTime - Game.shimmerTypes.golden.time) / Game.fps);
+        (Math.max(0, Game.shimmerTypes.golden.minTime - Game.shimmerTypes.golden.time) *
+          maxWidthTwoBar) /
+          Game.shimmerTypes.golden.maxTime,
+      )}px`;
+      if (CMOptions.TimerBarOverlay >= 1)
+        l('CMTimerBarGCMinBar').textContent = Math.ceil(
+          (Game.shimmerTypes.golden.minTime - Game.shimmerTypes.golden.time) / Game.fps,
+        );
       else l('CMTimerBarGCMinBar').textContent = '';
       if (Game.shimmerTypes.golden.minTime === Game.shimmerTypes.golden.maxTime) {
         l('CMTimerBarGCMinBar').style.borderTopRightRadius = '10px';
@@ -60,52 +76,99 @@ export function UpdateTimerBar() {
         l('CMTimerBarGCMinBar').style.borderTopRightRadius = '';
         l('CMTimerBarGCMinBar').style.borderBottomRightRadius = '';
       }
-			l('CMTimerBarGCBar').style.width = `${Math.round(Math.min(Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.minTime, Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) * maxWidthTwoBar / Game.shimmerTypes.golden.maxTime)}px`;
+      l('CMTimerBarGCBar').style.width = `${Math.round(
-			if (CMOptions.TimerBarOverlay >= 1) l('CMTimerBarGCBar').textContent = Math.ceil(Math.min(Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.minTime, Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) / Game.fps);
+        (Math.min(
+          Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.minTime,
+          Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time,
+        ) *
+          maxWidthTwoBar) /
+          Game.shimmerTypes.golden.maxTime,
+      )}px`;
+      if (CMOptions.TimerBarOverlay >= 1)
+        l('CMTimerBarGCBar').textContent = Math.ceil(
+          Math.min(
+            Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.minTime,
+            Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time,
+          ) / Game.fps,
+        );
       else l('CMTimerBarGCBar').textContent = '';
-			l('CMTimerBarGCTime').textContent = Math.ceil((Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) / Game.fps);
+      l('CMTimerBarGCTime').textContent = Math.ceil(
-			numberOfTimers++;
+        (Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) / Game.fps,
+      );
+      numberOfTimers += 1;
     } else l('CMTimerBarGC').style.display = 'none';
 
     // Regulates visibility of Reindeer timer
     if (Game.season === 'christmas' && Game.shimmerTypes.reindeer.spawned === 0) {
       l('CMTimerBarRen').style.display = '';
-			l('CMTimerBarRenMinBar').style.width = `${Math.round(Math.max(0, Game.shimmerTypes.reindeer.minTime - Game.shimmerTypes.reindeer.time) * maxWidthTwoBar / Game.shimmerTypes.reindeer.maxTime)}px`;
+      l('CMTimerBarRenMinBar').style.width = `${Math.round(
-			if (CMOptions.TimerBarOverlay >= 1) l('CMTimerBarRenMinBar').textContent = Math.ceil((Game.shimmerTypes.reindeer.minTime - Game.shimmerTypes.reindeer.time) / Game.fps);
+        (Math.max(0, Game.shimmerTypes.reindeer.minTime - Game.shimmerTypes.reindeer.time) *
+          maxWidthTwoBar) /
+          Game.shimmerTypes.reindeer.maxTime,
+      )}px`;
+      if (CMOptions.TimerBarOverlay >= 1)
+        l('CMTimerBarRenMinBar').textContent = Math.ceil(
+          (Game.shimmerTypes.reindeer.minTime - Game.shimmerTypes.reindeer.time) / Game.fps,
+        );
       else l('CMTimerBarRenMinBar').textContent = '';
-			l('CMTimerBarRenBar').style.width = `${Math.round(Math.min(Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.minTime, Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time) * maxWidthTwoBar / Game.shimmerTypes.reindeer.maxTime)}px`;
+      l('CMTimerBarRenBar').style.width = `${Math.round(
-			if (CMOptions.TimerBarOverlay >= 1) l('CMTimerBarRenBar').textContent = Math.ceil(Math.min(Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.minTime, Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time) / Game.fps);
+        (Math.min(
+          Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.minTime,
+          Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time,
+        ) *
+          maxWidthTwoBar) /
+          Game.shimmerTypes.reindeer.maxTime,
+      )}px`;
+      if (CMOptions.TimerBarOverlay >= 1)
+        l('CMTimerBarRenBar').textContent = Math.ceil(
+          Math.min(
+            Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.minTime,
+            Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time,
+          ) / Game.fps,
+        );
       else l('CMTimerBarRenBar').textContent = '';
-			l('CMTimerBarRenTime').textContent = Math.ceil((Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time) / Game.fps);
+      l('CMTimerBarRenTime').textContent = Math.ceil(
-			numberOfTimers++;
+        (Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time) / Game.fps,
+      );
+      numberOfTimers += 1;
     } else {
       l('CMTimerBarRen').style.display = 'none';
     }
 
     // On every frame all buff-timers are deleted and re-created
     const BuffTimerBars = {};
-		for (const i of Object.keys(Game.buffs)) {
+    l('CMTimerBarBuffTimers').innerHTML = '';
+    Object.keys(Game.buffs).forEach((i) => {
       if (Game.buffs[i]) {
-				const timer = CreateTimer(Game.buffs[i].name, Game.buffs[i].name, [{ id: `${Game.buffs[i].name}Bar` }]);
+        const timer = CreateTimer(Game.buffs[i].name, Game.buffs[i].name, [
+          { id: `${Game.buffs[i].name}Bar` },
+        ]);
         timer.style.display = '';
-				let classColor = '';
+        let classColour = '';
         // Gives specific timers specific colors
-				if (typeof BuffColors[Game.buffs[i].name] !== 'undefined') {
+        if (typeof BuffColours[Game.buffs[i].name] !== 'undefined') {
-					classColor = BuffColors[Game.buffs[i].name];
+          classColour = BuffColours[Game.buffs[i].name];
-				} else classColor = ColorPurple;
+        } else classColour = ColourPurple;
-				timer.lastChild.children[1].className = ColorBackPre + classColor;
+        timer.lastChild.children[1].className = ColourBackPre + classColour;
         timer.lastChild.children[1].style.color = 'black';
-				if (CMOptions.TimerBarOverlay === 2) timer.lastChild.children[1].textContent = `${Math.round(100 * (Game.buffs[i].time / Game.buffs[i].maxTime))}%`;
+        if (CMOptions.TimerBarOverlay === 2)
+          timer.lastChild.children[1].textContent = `${Math.round(
+            100 * (Game.buffs[i].time / Game.buffs[i].maxTime),
+          )}%`;
         else timer.lastChild.children[1].textContent = '';
-				timer.lastChild.children[1].style.width = `${Math.round(Game.buffs[i].time * (maxWidthOneBar - Math.ceil(Game.buffs[i].time / Game.fps).toString().length * 8) / Game.buffs[i].maxTime)}px`;
+        timer.lastChild.children[1].style.width = `${Math.round(
+          (Game.buffs[i].time *
+            (maxWidthOneBar - Math.ceil(Game.buffs[i].time / Game.fps).toString().length * 8)) /
+            Game.buffs[i].maxTime,
+        )}px`;
         timer.lastChild.children[2].textContent = Math.ceil(Game.buffs[i].time / Game.fps);
-				numberOfTimers++;
+        numberOfTimers += 1;
         BuffTimerBars[Game.buffs[i].name] = timer;
       }
-		}
+    });
-		for (const i of Object.keys(BuffTimerBars)) {
+    Object.keys(BuffTimerBars).forEach((i) => {
-			l('CMTimerBar').appendChild(BuffTimerBars[i]);
+      l('CMTimerBarBuffTimers').appendChild(BuffTimerBars[i]);
-		}
+    });
 
     if (numberOfTimers !== 0) {
       l('CMTimerBar').style.height = `${numberOfTimers * 12 + 2}px`;

src/Disp/Initialization/CreateSectionHideButtons.js

@@ -0,0 +1,34 @@
+/**
+ * This function creates two objects at the top of the right column that allowing hiding the upgrade and building section
+ */
+export default function CreateSectionHideButtons() {
+  const div = document.createElement('div');
+  div.id = 'CMSectionHidButtons';
+  div.style.textAlign = 'center';
+  const a = document.createElement('a');
+  a.className = 'option';
+  a.onclick = function () {
+    if (l('upgrades').style.display === 'flex') {
+      l('upgrades').style.display = 'none';
+      l('toggleUpgrades').style.display = 'none';
+      l('techUpgrades').style.display = 'none';
+      l('vaultUpgrades').style.display = 'none';
+    } else {
+      l('upgrades').style.display = 'flex';
+      if (l('toggleUpgrades').children.length !== 0) l('toggleUpgrades').style.display = 'block';
+      if (l('techUpgrades').children.length !== 0) l('techUpgrades').style.display = 'block';
+      if (l('vaultUpgrades').children.length !== 0) l('vaultUpgrades').style.display = 'block';
+    }
+  };
+  a.textContent = 'Hide/Show Upgrades';
+  div.appendChild(a);
+  const b = document.createElement('a');
+  b.className = 'option';
+  b.onclick = function () {
+    if (l('products').style.display === 'grid') l('products').style.display = 'none';
+    else l('products').style.display = 'grid';
+  };
+  b.textContent = 'Hide/Show Buildings';
+  div.appendChild(b);
+  l('store').insertBefore(div, l('store').childNodes[2]);
+}

src/Disp/Initialization/CreateWrinklerButton.js

@@ -1,5 +1,6 @@
 import { CacheWrinklersFattest } from '../../Cache/VariablesAndData';
 import PopAllNormalWrinklers from '../HelperFunctions/PopWrinklers';
+import { CreateTooltip } from '../Tooltips/Tooltip';
 
 /**
  * This function creates two objects at the bottom of the left column that allowing popping of wrinklers
@@ -9,12 +10,32 @@ export default function CreateWrinklerButtons() {
   popAllA.id = 'PopAllNormalWrinklerButton';
   popAllA.textContent = 'Pop All Normal';
   popAllA.className = 'option';
-	popAllA.onclick = function () { PopAllNormalWrinklers(); };
+  popAllA.onclick = function () {
+    PopAllNormalWrinklers();
+  };
+  popAllA.onmouseout = function () {
+    Game.tooltip.shouldHide = 1;
+  };
+  popAllA.onmouseover = function () {
+    Game.tooltip.dynamic = 1;
+    Game.tooltip.draw(this, () => CreateTooltip('wb', 'PopAll'), 'this');
+    Game.tooltip.wobble();
+  };
   l('sectionLeftExtra').children[0].append(popAllA);
   const popFattestA = document.createElement('a');
   popFattestA.id = 'PopFattestWrinklerButton';
   popFattestA.textContent = 'Pop Single Fattest';
   popFattestA.className = 'option';
-	popFattestA.onclick = function () { if (CacheWrinklersFattest[1] !== null) Game.wrinklers[CacheWrinklersFattest[1]].hp = 0; };
+  popFattestA.onclick = function () {
+    if (CacheWrinklersFattest[1] !== null) Game.wrinklers[CacheWrinklersFattest[1]].hp = 0;
+  };
+  popFattestA.onmouseout = function () {
+    Game.tooltip.shouldHide = 1;
+  };
+  popFattestA.onmouseover = function () {
+    Game.tooltip.dynamic = 1;
+    Game.tooltip.draw(this, () => CreateTooltip('wb', 'PopFattest'), 'this');
+    Game.tooltip.wobble();
+  };
   l('sectionLeftExtra').children[0].append(popFattestA);
 }