Merge pull request #787 from DanielNoord/newrepo

New repository

.eslintrc.js

@@ -1,34 +0,0 @@
-module.exports = {
-  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', 'plugin:prettier/recommended'],
-  parserOptions: {
-    ecmaVersion: 12,
-  },
-  ignorePatterns: ['*CookieMonster*.js', 'dist/*', 'node_modules/*'],
-  rules: {
-    'import/no-mutable-exports': 'off',
-    'no-plusplus': ['error', { allowForLoopAfterthoughts: true }],
-    'func-names': 'off',
-    'prefer-destructuring': ['error', { object: true, array: false }],
-    'max-len': [
-      1,
-      {
-        code: 100,
-        ignoreComments: true,
-        ignoreStrings: true,
-        ignoreTemplateLiterals: true,
-      },
-    ],
-  },
-};

.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/ISSUE_TEMPLATE/bug_report.md

@@ -22,3 +22,5 @@ If applicable, add screenshots to help explain your problem.
 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

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

CookieMonster.user.js

@@ -4,16 +4,10 @@
 // ==/UserScript==
 
 const readyCheck = setInterval(() => {
-    const Game = unsafeWindow.Game;
+  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" &&
+    clearInterval(readyCheck);
-        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

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,67 +1,75 @@
 {
-    "name": "cookiemonster-mod",
+  "name": "cookiemonster-mod",
-    "version": "2.031.7",
+  "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.",
+  "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",
+  "main": "CookieMonster.js",
-    "keywords": [
+  "keywords": [
-        "Cookie Clicker",
+    "Cookie Clicker",
-        "javascript",
+    "javascript",
-        "mod",
+    "mod",
-        "Dashnet",
+    "Dashnet",
-        "Orteil"
+    "Orteil"
-    ],
+  ],
-    "scripts": {
+  "scripts": {
-        "copy-file": "cp dist/CookieMonster.js CookieMonster.js",
+    "eslint-src": "eslint src test",
-        "eslint-src": "eslint src",
+    "build": "run-s eslint-src pack-prod test",
-        "build": "run-s eslint-src pack-prod remove-comment copy-file",
+    "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",
+    "test": "mocha"
-        "remove-comment": "sed -i '' -e '/\\/\\/# sourceMappingURL.*/d' dist/CookieMonster.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Aktanusa/CookieMonster.git"
+  },
+  "license": "MIT",
+  "author": {
+    "name": "Aktanusa",
+    "email": "chanam.geo@yahoo.com"
+  },
+  "contributors": [
+    {
+      "name": "Daniël van Noord",
+      "email": "13665637+DanielNoord@users.noreply.github.com"
     },
-    "repository": {
+    {
-        "type": "git",
+      "name": "Aran Leite",
-        "url": "git+https://github.com/Aktanusa/CookieMonster.git"
+      "email": "hyoretsu@gmail.com",
-    },
+      "url": "https://www.linkedin.com/in/aranleite"
-    "license": "MIT",
-    "author": {
-        "name": "Aktanusa",
-        "email": "chanam.geo@yahoo.com"
-    },
-    "contributors": [
-        {
-            "name": "Daniël van Noord",
-            "email": "13665637+DanielNoord@users.noreply.github.com"
-        },
-        {
-            "name": "Aran Leite",
-            "email": "hyoretsu@gmail.com",
-            "url": "https://www.linkedin.com/in/aranleite"
-        }
-    ],
-    "bugs": {
-        "url": "https://github.com/Aktanusa/CookieMonster/issues"
-    },
-    "homepage": "https://github.com/Aktanusa/CookieMonster#readme",
-    "devDependencies": {
-        "eslint": "^7.19.0",
-        "eslint-config-airbnb-base": "^14.2.1",
-        "eslint-config-prettier": "^8.1.0",
-        "eslint-plugin-import": "^2.22.1",
-        "eslint-plugin-prettier": "^3.3.1",
-        "npm-run-all": "^4.1.5",
-        "prettier": "2.2.1",
-        "webpack": "^5.24.4",
-        "webpack-cli": "^4.5.0"
-    },
-    "ccrepo": {
-        "icon": [
-            10,
-            0
-        ],
-        "name": "Cookie Monster"
-    },
-    "dependencies": {
-        "@eastdesire/jscolor": "^2.4.5"
     }
+  ],
+  "bugs": {
+    "url": "https://github.com/Aktanusa/CookieMonster/issues"
+  },
+  "homepage": "https://github.com/Aktanusa/CookieMonster#readme",
+  "devDependencies": {
+    "@types/chai": "^4.2.16",
+    "@types/mocha": "^8.2.2",
+    "@typescript-eslint/eslint-plugin": "^4.22.0",
+    "@typescript-eslint/parser": "^4.21.0",
+    "chai": "^4.3.4",
+    "eslint": "^7.23.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-import": "^2.22.1",
+    "esm": "^3.2.25",
+    "mocha": "^8.3.2",
+    "npm-run-all": "^4.1.5",
+    "prettier": "2.2.1",
+    "ts-loader": "^8.1.0",
+    "ts-node": "^9.1.1",
+    "typescript": "^4.2.3",
+    "webpack": "^5.24.4",
+    "webpack-cli": "^4.5.0"
+  },
+  "ccrepo": {
+    "icon": [
+      10,
+      0
+    ],
+    "name": "Cookie Monster"
+  },
+  "dependencies": {
+    "@eastdesire/jscolor": "^2.4.5"
+  }
 }

src/Cache/CPS/AverageQueue.js

@@ -37,11 +37,7 @@ export class CMAvgQueue {
     if (time > this.maxLength) time = this.maxLength;
     if (time > this.queue.length) time = this.queue.length;
     let ret = 0;
-    for (
+    for (let i = this.queue.length - 1; i >= 0 && i > this.queue.length - 1 - time; i--) {
-      let i = this.queue.length - 1;
-      i >= 0 && i > this.queue.length - 1 - time;
-      i--
-    ) {
       ret += this.queue[i];
     }
     if (ret === 0) {

src/Cache/CPS/CPS.js

@@ -45,11 +45,9 @@ export default function CacheAvgCPS() {
     // Add recent gains to AvgQueue's
     const timeDiff = currDate - CacheLastCPSCheck;
     const bankDiffAvg = Math.max(0, Game.cookies - CacheLastCookies) / timeDiff;
-    const wrinkDiffAvg =
+    const wrinkDiffAvg = Math.max(0, CacheWrinklersTotal - CacheLastWrinkCookies) / timeDiff;
-      Math.max(0, CacheWrinklersTotal - CacheLastWrinkCookies) / timeDiff;
     const wrinkFattestDiffAvg =
-      Math.max(0, CacheWrinklersFattest[0] - CacheLastWrinkFattestCookies) /
+      Math.max(0, CacheWrinklersFattest[0] - CacheLastWrinkFattestCookies) / timeDiff;
-      timeDiff;
     const choEggDiffAvg = Math.max(0, choEggTotal - CacheLastChoEgg) / timeDiff;
     const clicksDiffAvg = (Game.cookieClicks - CacheLastClicks) / timeDiff;
     for (let i = 0; i < timeDiff; i++) {
@@ -76,22 +74,16 @@ export default function CacheAvgCPS() {
     CacheAverageGainChoEgg = ChoEggDiff.calcAverage(cpsLength);
     CacheAverageCPS = CacheAverageGainBank;
     if (CMOptions.CalcWrink === 1) CacheAverageCPS += CacheAverageGainWrink;
-    if (CMOptions.CalcWrink === 2)
+    if (CMOptions.CalcWrink === 2) CacheAverageCPS += CacheAverageGainWrinkFattest;
-      CacheAverageCPS += CacheAverageGainWrinkFattest;
 
-    const choEgg =
+    const choEgg = Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg');
-      Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg');
 
     if (choEgg || CMOptions.CalcWrink === 0) {
       CacheAvgCPSWithChoEgg =
-        CacheAverageGainBank +
+        CacheAverageGainBank + CacheAverageGainWrink + (choEgg ? CacheAverageGainChoEgg : 0);
-        CacheAverageGainWrink +
-        (choEgg ? CacheAverageGainChoEgg : 0);
     } else CacheAvgCPSWithChoEgg = CacheAverageCPS; // eslint-disable-line no-unused-vars
 
     // eslint-disable-next-line no-unused-vars
-    CacheAverageClicks = ClicksDiff.calcAverage(
+    CacheAverageClicks = ClicksDiff.calcAverage(ClickTimes[CMOptions.AvgClicksHist]);
-      ClickTimes[CMOptions.AvgClicksHist],
-    );
   }
 }

src/Cache/CPS/CurrWrinklerCPS.js

@@ -1,8 +1,5 @@
 import { SimObjects } from '../../Sim/VariablesAndData';
-import {
+import { CacheCurrWrinklerCount, CacheCurrWrinklerCPSMult } from '../VariablesAndData';
-  CacheCurrWrinklerCount,
-  CacheCurrWrinklerCPSMult,
-} from '../VariablesAndData';
 
 /**
  * This functions caches the current Wrinkler CPS multiplier

src/Cache/CPS/GetCPSBuffMult.js

@@ -5,8 +5,7 @@
 export default function GetCPSBuffMult() {
   let mult = 1;
   Object.keys(Game.buffs).forEach((i) => {
-    if (typeof Game.buffs[i].multCpS !== 'undefined')
+    if (typeof Game.buffs[i].multCpS !== 'undefined') mult *= Game.buffs[i].multCpS;
-      mult *= Game.buffs[i].multCpS;
   });
   return mult;
 }

src/Cache/CacheInit.js

@@ -3,22 +3,14 @@ import { CMAvgQueue, InitCookiesDiff } from './CPS/AverageQueue';
 import CacheAvgCPS from './CPS/CPS';
 import CacheDragonAuras from './Dragon/CacheDragonAuras';
 import CachePP from './PP/PP';
-import {
+import { CacheBuildingsPrices, CacheIncome } from './PriceAndIncome/PriceAndIncome';
-  CacheBuildingsPrices,
-  CacheIncome,
-} from './PriceAndIncome/PriceAndIncome';
 import { CacheChain } from './Stats/ChainCookies';
 import CacheHeavenlyChipsPS from './Stats/HeavenlyChips';
 import CacheAllMissingUpgrades from './Stats/MissingUpgrades';
 import CacheSeasonSpec from './Stats/Reindeer';
-import {
+import { CacheGoldenAndWrathCookiesMults, CacheStatsCookies } from './Stats/Stats';
-  CacheGoldenAndWrathCookiesMults,
+import AllAmountTillNextAchievement from './TillNextAchievement/AllAmountTillNextAchievement';
-  CacheStatsCookies,
+import { CacheAverageCookiesFromClicks, HeavenlyChipsDiff } from './VariablesAndData';
-} from './Stats/Stats';
-import {
-  CacheAverageCookiesFromClicks,
-  HeavenlyChipsDiff,
-} from './VariablesAndData';
 import CacheWrinklers from './Wrinklers/Wrinklers';
 
 /**
@@ -35,10 +27,9 @@ export default function InitCache() {
   InitCookiesDiff();
   /** Used by CM.Cache.CacheHeavenlyChipsPS() */
   HeavenlyChipsDiff = new CMAvgQueue(5); // eslint-disable-line no-unused-vars
-  CacheAverageCookiesFromClicks = new CMAvgQueue( // eslint-disable-line no-unused-vars
+  CacheAverageCookiesFromClicks = new CMAvgQueue(ClickTimes[ClickTimes.length - 1] * 20); // eslint-disable-line no-unused-vars
-    ClickTimes[ClickTimes.length - 1] * 20,
-  );
   CacheHeavenlyChipsPS();
+  AllAmountTillNextAchievement();
   CacheAvgCPS();
   CacheIncome();
   CacheBuildingsPrices();

src/Cache/CacheLoop.js

@@ -1,4 +1,4 @@
-import { FormatTime } from '../Disp/BeautifyAndFormatting/BeautifyFormatting';
+import FormatTime from '../Disp/BeautifyAndFormatting/FormatTime';
 import GetCPS from '../Disp/HelperFunctions/GetCPS';
 import CacheAvgCPS from './CPS/CPS';
 import CacheCurrWrinklerCPS from './CPS/CurrWrinklerCPS';
@@ -22,8 +22,7 @@ export default function LoopCache() {
 
   const cookiesToNext =
     Game.HowManyCookiesReset(
-      Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) +
+      Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) + 1,
-        1,
     ) -
     (Game.cookiesEarned + Game.cookiesReset);
   CacheTimeTillNextPrestige = FormatTime(cookiesToNext / GetCPS()); // eslint-disable-line no-unused-vars

src/Cache/Dragon/Dragon.js

@@ -1,12 +1,9 @@
 /** 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,
-  CacheLastDragonLevel,
-} from '../VariablesAndData';
 
 /**
  * This functions caches the current cost of upgrading the dragon level so it can be displayed in the tooltip
@@ -17,9 +14,7 @@ export default function CacheDragonCost() {
       Game.dragonLevel < 25 &&
       Game.dragonLevels[Game.dragonLevel].buy.toString().includes('sacrifice')
     ) {
-      let target = Game.dragonLevels[Game.dragonLevel].buy
+      let target = Game.dragonLevels[Game.dragonLevel].buy.toString().match(/Objects\[(.*)\]/)[1];
-        .toString()
-        .match(/Objects\[(.*)\]/)[1];
       const amount = Game.dragonLevels[Game.dragonLevel].buy
         .toString()
         .match(/sacrifice\((.*?)\)/)[1];
@@ -34,10 +29,7 @@ export default function CacheDragonCost() {
             let price =
               SimObjects[target].basePrice *
               Game.priceIncrease **
-                Math.max(
+                Math.max(0, SimObjects[target].amount - 1 - SimObjects[target].free);
-                  0,
-                  SimObjects[target].amount - 1 - SimObjects[target].free,
-                );
             price = Game.modifyBuildingPrice(SimObjects[target], price);
             price = Math.ceil(price);
             cost += price;
@@ -58,10 +50,7 @@ export default function CacheDragonCost() {
             let price =
               SimObjects[target].basePrice *
               Game.priceIncrease **
-                Math.max(
+                Math.max(0, SimObjects[target].amount - 1 - SimObjects[target].free);
-                  0,
-                  SimObjects[target].amount - 1 - SimObjects[target].free,
-                );
             price = Game.modifyBuildingPrice(SimObjects[target], price);
             price = Math.ceil(price);
             cost += price;

src/Cache/PP/Building.js

@@ -22,10 +22,7 @@ function CacheColour(target, amount) {
       return;
     }
     // eslint-disable-next-line no-param-reassign
-    target[i].color = ColourOfPP(
+    target[i].color = ColourOfPP(target[i], Game.Objects[i].getSumPrice(amount));
-      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
@@ -38,12 +35,10 @@ function CachePP(target, amount) {
     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) /
+        Math.max(price - (Game.cookies + GetWrinkConfigBank()), 0) / Game.cookiesPs +
-          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))
+    if (!(CMOptions.PPRigidelMode && amount === 1)) CachePPArray.push([target[i].pp, amount]);
-      CachePPArray.push([target[i].pp, amount]);
   });
 }
 

src/Cache/PP/ColourOfPP.js

@@ -31,8 +31,7 @@ export default function ColourOfPP(me, price) {
 
   // Colour based on price in terms of CPS
   if (Number(CMOptions.PPSecondsLowerLimit) !== 0) {
-    if (price / GetCPS() < Number(CMOptions.PPSecondsLowerLimit))
+    if (price / GetCPS() < Number(CMOptions.PPSecondsLowerLimit)) color = ColourBlue;
-      color = ColourBlue;
   }
   // Colour based on being able to purchase
   if (CMOptions.PPOnlyConsiderBuyable) {

src/Cache/PP/Upgrade.js

@@ -10,20 +10,12 @@ export default function CacheUpgradePP() {
   Object.keys(CacheUpgrades).forEach((i) => {
     if (Game.cookiesPs) {
       CacheUpgrades[i].pp =
-        Math.max(
+        Math.max(Game.Upgrades[i].getPrice() - (Game.cookies + GetWrinkConfigBank()), 0) /
-          Game.Upgrades[i].getPrice() - (Game.cookies + GetWrinkConfigBank()),
-          0,
-        ) /
           Game.cookiesPs +
         Game.Upgrades[i].getPrice() / CacheUpgrades[i].bonus;
-    } else
+    } else CacheUpgrades[i].pp = Game.Upgrades[i].getPrice() / CacheUpgrades[i].bonus;
-      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].color = ColourOfPP(CacheUpgrades[i], Game.Upgrades[i].getPrice());
-      CacheUpgrades[i],
-      Game.Upgrades[i].getPrice(),
-    );
   });
 }

src/Cache/PriceAndIncome/PriceAndIncome.js

@@ -12,6 +12,7 @@ import {
   CacheObjects1,
   CacheObjects10,
   CacheObjects100,
+  CacheObjectsNextAchievement,
   CacheUpgrades,
 } from '../VariablesAndData';
 
@@ -43,10 +44,8 @@ function CacheUpgradeIncome() {
     const bonusIncome = BuyUpgradesBonusIncome(i);
     if (i === 'Elder Pledge') {
       CacheUpgrades[i] = { bonus: Game.cookiesPs - CacheAverageGainBank };
-      if (CMOptions.CalcWrink === 1)
+      if (CMOptions.CalcWrink === 1) CacheUpgrades[i].bonus -= CacheAverageGainWrink;
-        CacheUpgrades[i].bonus -= CacheAverageGainWrink;
+      else if (CMOptions.CalcWrink === 2) CacheUpgrades[i].bonus -= CacheAverageGainWrinkFattest;
-      else if (CMOptions.CalcWrink === 2)
-        CacheUpgrades[i].bonus -= CacheAverageGainWrinkFattest;
       if (!Number.isFinite(CacheUpgrades[i].bonus)) CacheUpgrades[i].bonus = 0;
     } else {
       CacheUpgrades[i] = {};
@@ -82,6 +81,13 @@ export function CacheBuildingsPrices() {
       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

@@ -31,22 +31,15 @@ export function MaxChainCookieReward(digit, maxPayout, mult) {
   let moni = 0;
   let nextMoni = 0;
   let nextRequired = 0;
-  let chain =
+  let chain = 1 + Math.max(0, Math.ceil(Math.log(Game.cookies) / Math.LN10) - 10);
-    1 + Math.max(0, Math.ceil(Math.log(Game.cookies) / Math.LN10) - 10);
   while (nextMoni < maxPayout * mult) {
     moni = Math.max(
       digit,
-      Math.min(
+      Math.min(Math.floor((1 / 9) * 10 ** chain * digit * mult), maxPayout * mult),
-        Math.floor((1 / 9) * 10 ** chain * digit * mult),
-        maxPayout * mult,
-      ),
     );
     nextMoni = Math.max(
       digit,
-      Math.min(
+      Math.min(Math.floor((1 / 9) * 10 ** (chain + 1) * digit * mult), maxPayout * mult),
-        Math.floor((1 / 9) * 10 ** (chain + 1) * digit * mult),
-        maxPayout * mult,
-      ),
     );
     nextRequired = Math.floor((1 / 9) * 10 ** (chain + 1) * digit * mult);
     totalFromChain += moni;
@@ -72,65 +65,28 @@ export function MaxChainCookieReward(digit, maxPayout, mult) {
  * @global	{number}			CM.Cache.ChainFrenzyWrathRequiredNext		Total cookies needed for next level for wrath frenzy chain
  */
 export function CacheChain() {
-  let maxPayout =
+  let maxPayout = CacheNoGoldSwitchCookiesPS * 60 * 60 * 6 * CacheDragonsFortuneMultAdjustment;
-    CacheNoGoldSwitchCookiesPS *
-    60 *
-    60 *
-    6 *
-    CacheDragonsFortuneMultAdjustment;
   // Removes effect of Frenzy etc.
   const cpsBuffMult = GetCPSBuffMult();
   if (cpsBuffMult > 0) maxPayout /= cpsBuffMult;
   else maxPayout = 0;
 
-  CacheChainMaxReward = MaxChainCookieReward(
+  CacheChainMaxReward = MaxChainCookieReward(7, maxPayout, CacheGoldenCookiesMult);
-    7,
-    maxPayout,
-    CacheGoldenCookiesMult,
-  );
   CacheChainRequired = (CacheChainMaxReward[1] * 2) / CacheGoldenCookiesMult; // eslint-disable-line no-unused-vars
-  CacheChainRequiredNext = // eslint-disable-line no-unused-vars
+  CacheChainRequiredNext = CacheChainMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment; // eslint-disable-line no-unused-vars
-    CacheChainMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
 
-  CacheChainWrathMaxReward = MaxChainCookieReward(
+  CacheChainWrathMaxReward = MaxChainCookieReward(6, maxPayout, CacheWrathCookiesMult);
-    6,
+  CacheChainWrathRequired = (CacheChainWrathMaxReward[1] * 2) / CacheWrathCookiesMult; // eslint-disable-line no-unused-vars
-    maxPayout,
-    CacheWrathCookiesMult,
-  );
-  CacheChainWrathRequired = // eslint-disable-line no-unused-vars
-    (CacheChainWrathMaxReward[1] * 2) / CacheWrathCookiesMult;
   CacheChainWrathRequiredNext = // eslint-disable-line no-unused-vars
-    CacheChainWrathMaxReward[2] /
+    CacheChainWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
-    60 /
-    60 /
-    6 /
-    CacheDragonsFortuneMultAdjustment;
 
-  CacheChainFrenzyMaxReward = MaxChainCookieReward(
+  CacheChainFrenzyMaxReward = MaxChainCookieReward(7, maxPayout * 7, CacheGoldenCookiesMult);
-    7,
+  CacheChainFrenzyRequired = (CacheChainFrenzyMaxReward[1] * 2) / CacheGoldenCookiesMult; // eslint-disable-line no-unused-vars
-    maxPayout * 7,
-    CacheGoldenCookiesMult,
-  );
-  CacheChainFrenzyRequired = // eslint-disable-line no-unused-vars
-    (CacheChainFrenzyMaxReward[1] * 2) / CacheGoldenCookiesMult;
   CacheChainFrenzyRequiredNext = // eslint-disable-line no-unused-vars
-    CacheChainFrenzyMaxReward[2] /
+    CacheChainFrenzyMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
-    60 /
-    60 /
-    6 /
-    CacheDragonsFortuneMultAdjustment;
 
-  CacheChainFrenzyWrathMaxReward = MaxChainCookieReward(
+  CacheChainFrenzyWrathMaxReward = MaxChainCookieReward(6, maxPayout * 7, CacheWrathCookiesMult);
-    6,
+  CacheChainFrenzyWrathRequired = (CacheChainFrenzyWrathMaxReward[1] * 2) / CacheWrathCookiesMult; // eslint-disable-line no-unused-vars
-    maxPayout * 7,
-    CacheWrathCookiesMult,
-  );
-  CacheChainFrenzyWrathRequired = // eslint-disable-line no-unused-vars
-    (CacheChainFrenzyWrathMaxReward[1] * 2) / CacheWrathCookiesMult;
   CacheChainFrenzyWrathRequiredNext = // eslint-disable-line no-unused-vars
-    CacheChainFrenzyWrathMaxReward[2] /
+    CacheChainFrenzyWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
-    60 /
-    60 /
-    6 /
-    CacheDragonsFortuneMultAdjustment;
 }

src/Cache/Stats/HeavenlyChips.js

@@ -15,15 +15,12 @@ export default function CacheHeavenlyChipsPS() {
   // Only calculate every new second
   if ((Game.T / Game.fps) % 1 === 0) {
     const chipsOwned = Game.HowMuchPrestige(Game.cookiesReset);
-    const ascendNowToOwn = Math.floor(
+    const ascendNowToOwn = Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned));
-      Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned),
-    );
     const ascendNowToGet = ascendNowToOwn - Math.floor(chipsOwned);
 
     // Add recent gains to AvgQueue's
     const timeDiff = currDate - CacheLastHeavenlyCheck;
-    const heavenlyChipsDiffAvg =
+    const heavenlyChipsDiffAvg = Math.max(0, ascendNowToGet - CacheLastHeavenlyChips) / timeDiff;
-      Math.max(0, ascendNowToGet - CacheLastHeavenlyChips) / timeDiff;
     for (let i = 0; i < timeDiff; i++) {
       HeavenlyChipsDiff.addLatest(heavenlyChipsDiffAvg);
     }

src/Cache/Stats/MissingUpgrades.js

@@ -38,11 +38,7 @@ export default function CacheAllMissingUpgrades() {
       /* eslint-disable no-unused-vars */
       if (me.pool === 'prestige') CacheMissingUpgradesPrestige += str;
       else if (me.pool === 'cookie') CacheMissingUpgradesCookies += str;
-      else if (
+      else if (me.pool !== 'toggle' && me.pool !== 'unused' && me.pool !== 'debug')
-        me.pool !== 'toggle' &&
-        me.pool !== 'unused' &&
-        me.pool !== 'debug'
-      )
         CacheMissingUpgrades += str;
       /* eslint-enable no-unused-vars */
     }

src/Cache/Stats/Stats.js

@@ -31,10 +31,8 @@ export function CacheStatsCookies() {
   CacheLuckyReward = CacheGoldenCookiesMult * (CacheLucky * 0.15) + 13; // eslint-disable-line no-unused-vars
   CacheLuckyWrathReward = CacheWrathCookiesMult * (CacheLucky * 0.15) + 13; // eslint-disable-line no-unused-vars
   CacheLuckyFrenzy = CacheLucky * 7;
-  CacheLuckyRewardFrenzy = // eslint-disable-line no-unused-vars
+  CacheLuckyRewardFrenzy = CacheGoldenCookiesMult * (CacheLuckyFrenzy * 0.15) + 13; // eslint-disable-line no-unused-vars
-    CacheGoldenCookiesMult * (CacheLuckyFrenzy * 0.15) + 13;
+  CacheLuckyWrathRewardFrenzy = CacheWrathCookiesMult * (CacheLuckyFrenzy * 0.15) + 13; // eslint-disable-line no-unused-vars
-  CacheLuckyWrathRewardFrenzy = // eslint-disable-line no-unused-vars
-    CacheWrathCookiesMult * (CacheLuckyFrenzy * 0.15) + 13;
   CacheConjure = CacheLucky * 2;
   CacheConjureReward = CacheConjure * 0.15; // eslint-disable-line no-unused-vars
 
@@ -84,7 +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 *=
+    CacheDragonsFortuneMultAdjustment *= 1 + Game.auraMult("Dragon's Fortune") * 1.23;
-      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,6 +28,7 @@ export let CacheLastChoEgg = 0;
 export let CacheObjects1 = {};
 export let CacheObjects10 = {};
 export let CacheObjects100 = {};
+export let CacheObjectsNextAchievement = {};
 
 export let CacheWrinklersTotal = 0;
 export let CacheWrinklersNormal = 0;

src/Cache/Wrinklers/Wrinklers.js

@@ -34,8 +34,7 @@ export default function CacheWrinklers() {
     CacheWrinklersTotal += sucked; // eslint-disable-line no-unused-vars
     if (Game.wrinklers[i].type === 0) {
       CacheWrinklersNormal += sucked; // eslint-disable-line no-unused-vars
-      if (sucked > CacheWrinklersFattest[0])
+      if (sucked > CacheWrinklersFattest[0]) CacheWrinklersFattest = [sucked, i];
-        CacheWrinklersFattest = [sucked, i];
     }
   }
 }

src/Config/SaveLoadReload/SaveLoadReloadSettings.js

@@ -1,4 +1,4 @@
-import ConfigDefault from '../../Data/SettingsDefault';
+import ConfigDefault from '../../Data/SettingsDefault.ts';
 import ConfigData from '../../Data/SettingsData';
 import { CMOptions } from '../VariablesAndData';
 import save from '../../InitSaveLoad/save';
@@ -19,14 +19,8 @@ export function SaveConfig() {
   );
   const CookieMonsterSave = saveString.match(/CookieMonster.*(;|$)/);
   if (CookieMonsterSave !== null) {
-    const newSaveString = saveString.replace(
+    const newSaveString = saveString.replace(CookieMonsterSave[0], `CookieMonster:${save()}`);
-      CookieMonsterSave[0],
+    localStorage.setItem('CookieClickerGame', escape(`${utf8_to_b64(newSaveString)}!END!`));
-      `CookieMonster:${save()}`,
-    );
-    localStorage.setItem(
-      'CookieClickerGame',
-      escape(`${utf8_to_b64(newSaveString)}!END!`),
-    );
   }
 }
 

src/Config/SpecificToggles.js

@@ -7,15 +7,9 @@ import { CMOptions } from './VariablesAndData';
  * This function changes the position of both the bottom and timer bar
  */
 export function UpdateBotTimerBarPosition() {
-  if (
+  if (CMOptions.BotBar === 1 && CMOptions.TimerBar === 1 && CMOptions.TimerBarPos === 1) {
-    CMOptions.BotBar === 1 &&
-    CMOptions.TimerBar === 1 &&
-    CMOptions.TimerBarPos === 1
-  ) {
     l('CMBotBar').style.bottom = l('CMTimerBar').style.height;
-    l('game').style.bottom = `${
+    l('game').style.bottom = `${Number(l('CMTimerBar').style.height.replace('px', '')) + 70}px`;
-      Number(l('CMTimerBar').style.height.replace('px', '')) + 70
-    }px`;
   } else if (CMOptions.BotBar === 1) {
     l('CMBotBar').style.bottom = '0px';
     l('game').style.bottom = '70px';

src/Config/ToggleSetting.js

@@ -17,16 +17,13 @@ export function ToggleConfig(config) {
 
   if (CMOptions[config] === ConfigData[config].label.length) {
     CMOptions[config] = 0;
-    if (ConfigData[config].toggle)
+    if (ConfigData[config].toggle) l(ConfigPrefix + config).className = 'option off';
-      l(ConfigPrefix + config).className = 'option off';
   } else l(ConfigPrefix + config).className = 'option';
 
   if (typeof ConfigData[config].func !== 'undefined') {
     ConfigData[config].func();
   }
 
-  l(ConfigPrefix + config).innerHTML =
-    ConfigData[config].label[CMOptions[config]];
   SaveConfig();
 }
 

src/Config/Toggles/ToggleFavourites.js

@@ -6,8 +6,6 @@ import { FavouriteSettings } from '../../Disp/VariablesAndData';
  */
 export default function ToggleFavouriteSetting(config) {
   if (FavouriteSettings.includes(config))
-    FavouriteSettings = FavouriteSettings.filter(function (ele) {
+    FavouriteSettings = FavouriteSettings.filter((ele) => ele !== config);
-      return ele !== config;
-    });
   else FavouriteSettings.push(config);
 }

src/Data/Gamedata.ts

@@ -1,7 +1,7 @@
 /** Data copied directly from the game */
 
 /** Array of the names of all fortune cookies obtainable from the ticker */
-export const Fortunes = [
+export const Fortunes: string[] = [
   'Fortune #001',
   'Fortune #002',
   'Fortune #003',
@@ -28,7 +28,7 @@ export const Fortunes = [
 ];
 
 /** Array of the names of all Halloween cookies */
-export const HalloCookies = [
+export const HalloCookies: string[] = [
   'Skull cookies',
   'Ghost cookies',
   'Bat cookies',
@@ -39,7 +39,7 @@ export const HalloCookies = [
 ];
 
 /** Array of the names of all Christmas cookies */
-export const ChristCookies = [
+export const ChristCookies: string[] = [
   'Christmas tree biscuits',
   'Snowflake biscuits',
   'Snowman biscuits',
@@ -50,7 +50,7 @@ export const ChristCookies = [
 ];
 
 /** Array of the names of all Valentine cookies */
-export const ValCookies = [
+export const ValCookies: string[] = [
   'Pure heart biscuits',
   'Ardent heart biscuits',
   'Sour heart biscuits',
@@ -61,7 +61,7 @@ export const ValCookies = [
 ];
 
 /** Array of the names of all plant drops */
-export const PlantDrops = [
+export const PlantDrops: string[] = [
   'Elderwort biscuits',
   'Bakeberry cookies',
   'Duketater cookies',
@@ -72,7 +72,7 @@ export const PlantDrops = [
 ];
 
 /** All possible effects plants and other items can have with a display-title */
-export const Effects = {
+export const Effects: { [index: string]: string } = {
   buildingCost: 'Building prices',
   click: 'Cookies per click',
   cps: 'Total CPS',

src/Data/Moddata.js

@@ -1,39 +0,0 @@
-/** Data related directly to Cookie Monster */
-
-export const VersionMajor = '2.031';
-export const VersionMinor = '7';
-
-/** 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">
-These are the release notes for the latest update (v 2.031.7).</br>
-</br>
-This update implements the following functions:</br>
-- Updated the ordering and description of all settings of Cookie Monster</br>
-- Colours of Flash notifications can now be set by the user</br>
-- You can now select a number of settings to be your 'favourite'. They will be displayed at the top of all other settings in a new section. This functionality is toggleable and you can find it in the miscellaneous section</br>
-- The statistics page now shows cookies earned by clicking for a selected time period</br>
-- The statistics page can now show missing normal achievements, this can be toggled in the settings</br>
-</br>
-This update fixes the following bugs:</br>
-- Fixed some typo's</br>
-- No longer show the wrinkler pop buttons when wrinklers can't spawn</br>
-- Fixed incorrect calculation of plant maturity for relevant tooltips</br>
-- Fixed edit prompts not working in settings</br>
-- Fixed red and purple being switched around for PP colour coding</br>
-- Fixed incorrect notation of numbers in Dragon tooltip and interface</br>
-- Fixed incorrect calculation of changing Dragon aura cost</br>
-- Fixed incorrect calculation of changing Pantheon gods effect</br>
-- Fixed fluctuating PP values when god Cyclius was selected</br>
-- Fixed black flickering when Golden Cookies or buffs start</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.ts

@@ -1,10 +1,10 @@
 /** 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'];
+export const metric: string[] = ['', '', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
 
 /** Array of abbreviations used in the "Short" scale */
-export const shortScale = [
+export const shortScale: string[] = [
   '',
   '',
   'M',
@@ -34,7 +34,7 @@ export const shortScale = [
 ];
 
 /** Array of abbreviations used in the "Abbreviated Short" scale */
-export const shortScaleAbbreviated = [
+export const shortScaleAbbreviated: string[] = [
   '',
   'K',
   'M',

src/Data/Sectionheaders.ts

@@ -1,7 +1,7 @@
 /** 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 = {
+export const ConfigGroups: { [index: string]: string } = {
   Favourite: 'Favourite Settings',
   Calculation: 'Calculation',
   Notation: 'Notation',
@@ -14,7 +14,7 @@ export const ConfigGroups = {
 };
 
 /** Display titles of the headers of the notification section of the Cookie Monster settings */
-export const ConfigGroupsNotification = {
+export const ConfigGroupsNotification: { [index: string]: string } = {
   NotificationGeneral: 'General Notifications',
   NotificationGC: 'Golden Cookie',
   NotificationFC: 'Fortune Cookie',

src/Data/SettingClasses.js

@@ -1,53 +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) {
-    super(type, group);
-    this.desc = desc;
-  }
-}
-
-/** 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/SettingsData.js

@@ -10,16 +10,15 @@ import ToggleUpgradeBarFixedPos from '../Config/Toggles/ToggleUpgradeBarFixedPos
 import ToggleWrinklerButtons from '../Config/Toggles/ToggleWrinklerButtons';
 import { CMOptions } from '../Config/VariablesAndData';
 import UpdateBuildings from '../Disp/BuildingsUpgrades/Buildings';
+import UpdateUpgradeSectionsHeight from '../Disp/BuildingsUpgrades/UpdateUpgradeSectionsHeight';
 import UpdateUpgrades from '../Disp/BuildingsUpgrades/Upgrades';
 import RefreshScale from '../Disp/HelperFunctions/RefreshScale';
 import { UpdateFavicon } from '../Disp/TabTitle/FavIcon';
 import { SimDoSims } from '../Sim/VariablesAndData';
-import {
+import SettingColours from './SettingClasses/SettingColours.ts';
-  SettingStandard,
+import SettingInputNumber from './SettingClasses/SettingInputNumber.ts';
-  SettingColours,
+import SettingStandard from './SettingClasses/SettingStandard.ts';
-  SettingVolume,
+import SettingVolume from './SettingClasses/SettingVolume.ts';
-  SettingInputNumber,
-} from './SettingClasses';
 
 /** This includes all options of CookieMonster and their relevant data */
 const Config = {
@@ -70,7 +69,7 @@ const Config = {
     ],
     'Calculate times and average Cookies Per Second with (only the single non-shiny fattest) wrinklers',
     true,
-    function () {
+    () => {
       SimDoSims = true; // eslint-disable-line no-unused-vars
     },
   ),
@@ -89,7 +88,7 @@ const Config = {
     ],
     'Change how long numbers are formatted',
     false,
-    function () {
+    () => {
       RefreshScale();
     },
   ),
@@ -99,7 +98,7 @@ const Config = {
     ['1 decimals', '2 decimals', '3 decimals'],
     `Set the number of decimals used when applicable. This only works with Cookie Monster scales and not with "Game's Setting Scale"`,
     false,
-    function () {
+    () => {
       RefreshScale();
     },
   ),
@@ -109,7 +108,7 @@ const Config = {
     ['. for decimals (standard)', '. for thousands'],
     'Set the separator used for decimals and thousands',
     false,
-    function () {
+    () => {
       RefreshScale();
     },
   ),
@@ -134,7 +133,7 @@ const Config = {
     ['Detailed time OFF', 'Detailed time ON'],
     'Change how time is displayed in certain statistics and tooltips',
     true,
-    function () {
+    () => {
       ToggleDetailedTime();
     },
   ),
@@ -153,7 +152,7 @@ const Config = {
     ['Building colours OFF', 'Building colours ON'],
     'Colour code buildings',
     true,
-    function () {
+    () => {
       UpdateBuildings();
     },
   ),
@@ -244,7 +243,7 @@ const Config = {
     ['Bottom bar OFF', 'Bottom bar ON'],
     'Building information',
     true,
-    function () {
+    () => {
       ToggleBotBar();
     },
   ),
@@ -254,7 +253,7 @@ const Config = {
     ['Timer bar OFF', 'Timer bar ON'],
     'Bar with timers for golden cookie, season popup, Frenzy (Normal, Clot, Elder), Click Frenzy',
     true,
-    function () {
+    () => {
       ToggleTimerBar();
     },
   ),
@@ -264,32 +263,24 @@ const Config = {
     ['Timer bar position (top left)', 'Timer bar position (bottom)'],
     'Placement of the timer bar',
     false,
-    function () {
+    () => {
       ToggleTimerBarPos();
     },
   ),
   TimerBarOverlay: new SettingStandard(
     'bool',
     'BarsDisplay',
-    [
+    ['Timer bar overlay OFF', 'Timer bar overlay only seconds', 'Timer bar overlay full'],
-      'Timer bar overlay OFF',
-      'Timer bar overlay only seconds',
-      'Timer bar overlay full',
-    ],
     'Overlay on timers displaying seconds and/or percentage left',
     true,
   ),
   UpBarColour: new SettingStandard(
     'bool',
     'BarsDisplay',
-    [
+    ['Upgrade colours/bar OFF', 'Upgrade colours with bar ON', 'Upgrade colours without bar ON'],
-      'Upgrade colours/bar OFF',
-      'Upgrade colours with bar ON',
-      'Upgrade colours without bar ON',
-    ],
     'Colour code upgrades and optionally add a counter bar',
     false,
-    function () {
+    () => {
       ToggleUpgradeBarAndColour();
     },
   ),
@@ -299,7 +290,7 @@ const Config = {
     ['Upgrade bar fixed position OFF', 'Upgrade bar fixed position ON'],
     'Lock the upgrade bar at top of the screen to prevent it from moving ofscreen when scrolling',
     true,
-    function () {
+    () => {
       ToggleUpgradeBarFixedPos();
     },
   ),
@@ -313,7 +304,7 @@ const Config = {
     ],
     'Sort the display of buildings in either default order or by PP',
     false,
-    function () {
+    () => {
       UpdateBuildings();
     },
   ),
@@ -323,10 +314,20 @@ const Config = {
     ['Sort upgrades: default', 'Sort upgrades: PP'],
     'Sort the display of upgrades in either default order or by PP',
     false,
-    function () {
+    () => {
       UpdateUpgrades();
     },
   ),
+  UpgradesNeverCollapse: new SettingStandard(
+    'bool',
+    'BarsDisplay',
+    ['Upgrades always expanded OFF', 'Upgrades always expanded ON'],
+    'Toggle to make the upgrades sections always expanded to the size needed to display all upgrades',
+    true,
+    () => {
+      UpdateUpgradeSectionsHeight();
+    },
+  ),
   DragonAuraInfo: new SettingStandard(
     'bool',
     'BarsDisplay',
@@ -347,7 +348,7 @@ const Config = {
     ['Golden cookie timer OFF', 'Golden cookie timer ON'],
     'A timer on the golden cookie when it has been spawned',
     true,
-    function () {
+    () => {
       ToggleGCTimer();
     },
   ),
@@ -357,7 +358,7 @@ const Config = {
     ['Favicon OFF', 'Favicon ON'],
     'Update favicon with golden/wrath cookie',
     true,
-    function () {
+    () => {
       UpdateFavicon();
     },
   ),
@@ -367,7 +368,7 @@ const Config = {
     ['Extra wrinkler buttons OFF', 'Extra wrinkler buttons ON'],
     'Show buttons for popping wrinklers at bottom of cookie section',
     true,
-    function () {
+    () => {
       ToggleWrinklerButtons();
     },
   ),
@@ -377,7 +378,7 @@ const Config = {
     ['Hide buildings/upgrades button OFF', 'Hide buildings/upgrades button ON'],
     'Show buttons for hiding and showing the buildings and upgrades sections in the right column',
     true,
-    function () {
+    () => {
       ToggleSectionHideButtons();
     },
   ),
@@ -386,10 +387,7 @@ const Config = {
   TooltipBuildUpgrade: new SettingStandard(
     'bool',
     'Tooltip',
-    [
+    ['Building/upgrade tooltip information OFF', 'Building/upgrade tooltip information ON'],
-      'Building/upgrade tooltip information OFF',
-      'Building/upgrade tooltip information ON',
-    ],
     'Extra information in building/upgrade tooltips',
     true,
   ),
@@ -449,10 +447,7 @@ const Config = {
   ToolWarnBon: new SettingStandard(
     'bool',
     'Tooltip',
-    [
+    ['Calculate tooltip warning with bonus CPS OFF', 'Calculate tooltip warning with bonus CPS ON'],
-      'Calculate tooltip warning with bonus CPS OFF',
-      'Calculate tooltip warning with bonus CPS ON',
-    ],
     'Calculate the warning with or without the bonus CPS you get from buying',
     true,
   ),
@@ -462,7 +457,7 @@ const Config = {
     ['Tooltip warning position (left)', 'Tooltip warning position (bottom)'],
     'Placement of the warning boxes',
     false,
-    function () {
+    () => {
       ToggleToolWarnPos();
     },
   ),
@@ -529,7 +524,7 @@ const Config = {
     'Statistics',
     ['Missing Achievements OFF', 'Missing Normal Achievements ON'],
     'Shows missing normal achievements in statistics menu.',
-    false,
+    true,
   ),
   UpStats: new SettingStandard(
     'bool',
@@ -575,7 +570,7 @@ const Config = {
     ['Notification OFF', 'Notification ON'],
     'Create a notification when golden cookie spawns',
     true,
-    function () {
+    () => {
       CheckNotificationPermissions(CMOptions.GCNotification);
     },
   ),
@@ -611,7 +606,7 @@ const Config = {
     ['Notification OFF', 'Notification ON'],
     'Create a notification when fortune cookie is on the ticker',
     true,
-    function () {
+    () => {
       CheckNotificationPermissions(CMOptions.FortuneNotification);
     },
   ),
@@ -647,7 +642,7 @@ const Config = {
     ['Notification OFF', 'Notification ON'],
     'Create a notification on season popup',
     true,
-    function () {
+    () => {
       CheckNotificationPermissions(CMOptions.SeaNotification);
     },
   ),
@@ -709,7 +704,7 @@ const Config = {
     ['Notification OFF', 'Notification ON'],
     'Create a notification when magic reaches maximum',
     true,
-    function () {
+    () => {
       CheckNotificationPermissions(CMOptions.MagicNotification);
     },
   ),
@@ -745,7 +740,7 @@ const Config = {
     ['Notification OFF', 'Notification ON'],
     'Create a notification when a wrinkler appears',
     true,
-    function () {
+    () => {
       CheckNotificationPermissions(CMOptions.WrinklerNotification);
     },
   ),
@@ -781,7 +776,7 @@ const Config = {
     ['Notification OFF', 'Notification ON'],
     'Create a notification when the maximum amount of wrinklers has appeared',
     true,
-    function () {
+    () => {
       CheckNotificationPermissions(CMOptions.WrinklerMaxNotification);
     },
   ),
@@ -804,12 +799,7 @@ const Config = {
     'Play a sound when the maximum amount of wrinklers has appeared',
     true,
   ),
-  WrinklerMaxVolume: new SettingVolume(
+  WrinklerMaxVolume: new SettingVolume('vol', 'NotificationWrinkMax', [], 'Volume'),
-    'vol',
-    'NotificationWrinkMax',
-    [],
-    'Volume',
-  ),
   WrinklerMaxSoundURL: new SettingStandard(
     'url',
     'NotificationWrinkMax',
@@ -835,7 +825,7 @@ const Config = {
     ],
     "Show stars before each setting which allows selecting it for a 'favourites' section at the top of the Cookie Monster settings. Setting this to Locked removes the stars but shows the 'favourites' section",
     true,
-    function () {
+    () => {
       Game.UpdateMenu();
     },
   ),

src/Data/SettingsDefault.ts

@@ -1,5 +1,7 @@
 /** This array describes all default settings */
-const ConfigDefault = {
+const ConfigDefault: {
+  [index: string]: string | number | { [index: string]: number };
+} = {
   CPSMode: 1,
   AvgCPSHist: 3,
   AvgClicksHist: 0,
@@ -33,6 +35,7 @@ const ConfigDefault = {
   UpgradeBarFixedPos: 1,
   SortBuildings: 0,
   SortUpgrades: 0,
+  UpgradesNeverCollapse: 0,
   DragonAuraInfo: 1,
   GrimoireBar: 1,
   GCTimer: 1,
@@ -74,15 +77,13 @@ const ConfigDefault = {
   ColourFortuneFlash: '#ffffff',
   FortuneSound: 1,
   FortuneVolume: 100,
-  FortuneSoundURL:
+  FortuneSoundURL: 'https://freesound.org/data/previews/174/174027_3242494-lq.mp3',
-    'https://freesound.org/data/previews/174/174027_3242494-lq.mp3',
   SeaNotification: 0,
   SeaFlash: 1,
   ColourSeaFlash: '#ffffff',
   SeaSound: 1,
   SeaVolume: 100,
-  SeaSoundURL:
+  SeaSoundURL: 'https://www.freesound.org/data/previews/121/121099_2193266-lq.mp3',
-    'https://www.freesound.org/data/previews/121/121099_2193266-lq.mp3',
   GardFlash: 1,
   ColourGardFlash: '#ffffff',
   GardSound: 1,
@@ -93,22 +94,19 @@ const ConfigDefault = {
   ColourMagicFlash: '#ffffff',
   MagicSound: 1,
   MagicVolume: 100,
-  MagicSoundURL:
+  MagicSoundURL: 'https://freesound.org/data/previews/221/221683_1015240-lq.mp3',
-    'https://freesound.org/data/previews/221/221683_1015240-lq.mp3',
   WrinklerNotification: 0,
   WrinklerFlash: 1,
   ColourWrinklerFlash: '#ffffff',
   WrinklerSound: 1,
   WrinklerVolume: 100,
-  WrinklerSoundURL:
+  WrinklerSoundURL: 'https://freesound.org/data/previews/124/124186_8043-lq.mp3',
-    'https://freesound.org/data/previews/124/124186_8043-lq.mp3',
   WrinklerMaxNotification: 0,
   WrinklerMaxFlash: 1,
   ColourWrinklerMaxFlash: '#ffffff',
   WrinklerMaxSound: 1,
   WrinklerMaxVolume: 100,
-  WrinklerMaxSoundURL:
+  WrinklerMaxSoundURL: 'https://freesound.org/data/previews/152/152743_15663-lq.mp3',
-    'https://freesound.org/data/previews/152/152743_15663-lq.mp3',
   BulkBuyBlock: 0,
   FavouriteSettings: 1,
   Header: {

src/Disp/BeautifyAndFormatting/Beautify.js

@@ -1,14 +1,8 @@
 /** General functions to format or beautify strings */
 
 import { CMOptions } from '../../Config/VariablesAndData';
-import { metric, shortScale, shortScaleAbbreviated } from '../../Data/Scales';
+import { metric, shortScale, shortScaleAbbreviated } from '../../Data/Scales.ts';
 import { BackupFunctions } from '../../Main/VariablesAndData';
-import {
-  ColourGreen,
-  ColourOrange,
-  ColourRed,
-  ColourYellow,
-} from '../VariablesAndData';
 
 /**
  * This function returns formats number based on the Scale setting
@@ -17,7 +11,7 @@ import {
  * @param	{number}	forced	Used to force (type 3) in certains cases
  * @returns	{string}			Formatted number
  */
-export function Beautify(num, floats, forced) {
+export default function Beautify(num, floats, forced) {
   const decimals = CMOptions.ScaleDecimals + 1;
   if (num === Infinity) {
     return 'Infinity';
@@ -46,12 +40,8 @@ export function Beautify(num, floats, forced) {
       answer = num.toExponential(decimals).toString().replace('e', 'E');
     } else {
       const exponential = num.toExponential().toString();
-      const AmountOfTenPowerThree = Math.floor(
+      const AmountOfTenPowerThree = Math.floor(exponential.slice(exponential.indexOf('e') + 1) / 3);
-        exponential.slice(exponential.indexOf('e') + 1) / 3,
+      answer = (num / Number(`1e${AmountOfTenPowerThree * 3}`)).toFixed(decimals);
-      );
-      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
@@ -65,10 +55,7 @@ export function Beautify(num, floats, forced) {
         } 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 (
+        if (num >= 0.01 && num < Number(`1e${shortScaleAbbreviated.length * 3}`)) {
-          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) {
@@ -78,9 +65,7 @@ export function Beautify(num, floats, forced) {
     }
     if (answer === '') {
       // eslint-disable-next-line no-console
-      console.log(
+      console.log(`Could not beautify number with Cookie Monster Beautify: ${num}`);
-        `Could not beautify number with Cookie Monster Beautify: ${num}`,
-      );
       answer = BackupFunctions.Beautify(num, floats);
     }
     if (CMOptions.ScaleSeparator) answer = answer.replace('.', ',');
@@ -89,66 +74,3 @@ export function Beautify(num, floats, forced) {
   console.log(`Could not beautify number with Cookie Monster Beautify: ${num}`); // eslint-disable-line no-console
   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) {
-  let formattedTime = time;
-  if (time === Infinity) return time;
-  if (time < 0) return 'Negative time period';
-  formattedTime = Math.ceil(time);
-  const y = Math.floor(formattedTime / 31557600);
-  const d = Math.floor((formattedTime % 31557600) / 86400);
-  const h = Math.floor((formattedTime % 86400) / 3600);
-  const m = Math.floor((formattedTime % 3600) / 60);
-  const s = Math.floor(formattedTime % 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
-        : '';
-    str +=
-      d > 0 ? `${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;
-}
-
-/**
- * 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 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/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,11 +1,7 @@
-import {
+import { CacheObjects1, CacheObjects10, CacheObjects100 } from '../../Cache/VariablesAndData';
-  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 { ColoursOrdering, LastTargetBuildings } from '../VariablesAndData';
 
 /**
@@ -31,8 +27,7 @@ export default function UpdateBuildings() {
   if (Game.buyMode === 1) {
     if (CMOptions.BuildColour === 1) {
       Object.keys(target).forEach((i) => {
-        l(`productPrice${Game.Objects[i].id}`).style.color =
+        l(`productPrice${Game.Objects[i].id}`).style.color = CMOptions[`Colour${target[i].color}`];
-          CMOptions[`Colour${target[i].color}`];
       });
     } else {
       Object.keys(Game.Objects).forEach((i) => {
@@ -70,16 +65,16 @@ export default function UpdateBuildings() {
         return o;
       });
 
-      arr.sort(function (a, b) {
+      arr.sort((a, b) =>
-        return ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary
+        ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary
-          ColoursOrdering.indexOf(b.color)
+        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;
+          : 0,
-      });
+      );
     } else if (CMOptions.SortBuildings === 2) {
       arr = Object.keys(target).map((k) => {
         const o = target[k];
@@ -88,16 +83,16 @@ export default function UpdateBuildings() {
         return o;
       });
 
-      arr.sort(function (a, b) {
+      arr.sort((a, b) =>
-        return ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary
+        ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary
-          ColoursOrdering.indexOf(b.color)
+        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;
+          : 0,
-      });
+      );
     }
 
     for (let x = 0; x < arr.length; x++) {

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

@@ -38,24 +38,12 @@ function CreateUpgradeBarLegend() {
     return div;
   };
 
-  legend.appendChild(
+  legend.appendChild(legendLine(ColourBlue, 'Better than the best PP of a building option'));
-    legendLine(ColourBlue, 'Better than the best PP of a building option'),
+  legend.appendChild(legendLine(ColourGreen, 'Same as the best PP building option'));
-  );
+  legend.appendChild(legendLine(ColourYellow, 'Within the top 10 of PP for buildings'));
-  legend.appendChild(
+  legend.appendChild(legendLine(ColourOrange, 'Within the top 20 of PP for buildings'));
-    legendLine(ColourGreen, 'Same as the best PP building option'),
+  legend.appendChild(legendLine(ColourRed, 'Within the top 30 of PP for buildings'));
-  );
+  legend.appendChild(legendLine(ColourPurple, 'Outside of the top 30 of PP for buildings'));
-  legend.appendChild(
-    legendLine(ColourYellow, 'Within the top 10 of PP for buildings'),
-  );
-  legend.appendChild(
-    legendLine(ColourOrange, 'Within the top 20 of PP for buildings'),
-  );
-  legend.appendChild(
-    legendLine(ColourRed, 'Within the top 30 of PP for buildings'),
-  );
-  legend.appendChild(
-    legendLine(ColourPurple, 'Outside of the top 30 of PP for buildings'),
-  );
   legend.appendChild(legendLine(ColourGray, 'Negative or infinity PP'));
   return legend;
 }
@@ -67,7 +55,7 @@ export default function CreateUpgradeBar() {
   const UpgradeBar = document.createElement('div');
   UpgradeBar.id = 'CMUpgradeBar';
   UpgradeBar.style.width = '100%';
-  UpgradeBar.style.backgroundColour = 'black';
+  UpgradeBar.style.backgroundColor = 'black';
   UpgradeBar.style.textAlign = 'center';
   UpgradeBar.style.fontWeight = 'bold';
   UpgradeBar.style.display = 'none';
@@ -99,8 +87,5 @@ export default function CreateUpgradeBar() {
   UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarPurple', ColourPurple));
   UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGray', ColourGray));
 
-  l('upgrades').parentNode.insertBefore(
+  l('upgrades').parentNode.insertBefore(UpgradeBar, l('upgrades').parentNode.childNodes[3]);
-    UpgradeBar,
-    l('upgrades').parentNode.childNodes[3],
-  );
 }

src/Disp/BuildingsUpgrades/Upgrades.js

@@ -33,11 +33,8 @@ export default function UpdateUpgrades() {
       const me = Game.UpgradesInStore[i];
       let addedColour = false;
       for (let j = 0; j < l(`upgrade${i}`).childNodes.length; j += 1) {
-        if (
+        if (l(`upgrade${i}`).childNodes[j].className.indexOf(ColourBackPre) !== -1) {
-          l(`upgrade${i}`).childNodes[j].className.indexOf(ColourBackPre) !== -1
+          l(`upgrade${i}`).childNodes[j].className = ColourBackPre + CacheUpgrades[me.name].color;
-        ) {
-          l(`upgrade${i}`).childNodes[j].className =
-            ColourBackPre + CacheUpgrades[me.name].color;
           addedColour = true;
           break;
         }
@@ -75,19 +72,20 @@ export default function UpdateUpgrades() {
     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) {
+    arr.sort((a, b) =>
-      return ColoursOrdering.indexOf(a.color) > ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
+      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;
+        : 0,
-    });
+    );
   } else {
     arr.sort((a, b) => a.price - b.price);
   }
@@ -96,7 +94,6 @@ export default function UpdateUpgrades() {
     return arr2.findIndex((e) => e.name === upgrade.name);
   };
   for (let x = 0; x < Game.UpgradesInStore.length; x += 1) {
-    l(`upgrade${x}`).style.order =
+    l(`upgrade${x}`).style.order = nameChecker(arr, Game.UpgradesInStore[x]) + 1;
-      nameChecker(arr, Game.UpgradesInStore[x]) + 1;
   }
 }

src/Disp/Dragon/Dragon.js

@@ -4,10 +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 {
+import Beautify from '../BeautifyAndFormatting/Beautify';
-  Beautify,
+import FormatTime from '../BeautifyAndFormatting/FormatTime';
-  FormatTime,
-} from '../BeautifyAndFormatting/BeautifyFormatting';
 
 /**
  * This functions adds the two extra lines about CPS and time to recover to the aura picker infoscreen
@@ -16,15 +14,14 @@ import {
 export function AddAuraInfo(aura) {
   if (CMOptions.DragonAuraInfo === 1) {
     const [bonusCPS, priceOfChange] = CalculateChangeAura(aura);
-    const timeToRecover = FormatTime(
+    const timeToRecover = FormatTime(priceOfChange / (bonusCPS + Game.cookiesPs));
-      priceOfChange / (bonusCPS + Game.cookiesPs),
+    let bonusCPSPercentage;
-    );
+    if (Game.cookiesPs === 0) bonusCPSPercentage = Beautify(Infinity);
-    const bonusCPSPercentage = Beautify((bonusCPS / Game.cookiesPs) * 100);
+    else bonusCPSPercentage = Beautify((bonusCPS / Game.cookiesPs) * 100);
 
     l('dragonAuraInfo').style.minHeight = '60px';
     l('dragonAuraInfo').style.margin = '8px';
-    l('dragonAuraInfo').appendChild(document.createElement('div')).className =
+    l('dragonAuraInfo').appendChild(document.createElement('div')).className = 'line';
-      'line';
     const div = document.createElement('div');
     div.style.minWidth = '200px';
     div.style.textAlign = 'center';

src/Disp/DrawHook.js

@@ -1,16 +1,14 @@
 import ToggleWrinklerButtons from '../Config/Toggles/ToggleWrinklerButtons';
 import { CMOptions } from '../Config/VariablesAndData';
-import { Beautify } from './BeautifyAndFormatting/BeautifyFormatting';
+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 {
+import { CheckWrinklerTooltip, UpdateWrinklerTooltip } from './Tooltips/WrinklerTooltips';
-  CheckWrinklerTooltip,
-  UpdateWrinklerTooltip,
-} from './Tooltips/WrinklerTooltips';
 
 /**
  * This function handles all custom drawing for the Game.Draw() function.
@@ -26,16 +24,14 @@ export default function CMDrawHook() {
   ) {
     const timer = document.getElementById('CMStatsAutosaveTimer');
     if (timer) {
-      timer.innerText = Game.sayTime(
+      timer.innerText = Game.sayTime(Game.fps * 60 - (Game.T % (Game.fps * 60)), 4);
-        Game.fps * 60 - (Game.T % (Game.fps * 60)),
-        4,
-      );
     }
   }
 
   // Update colors
   UpdateBuildings();
   UpdateUpgrades();
+  UpdateUpgradeSectionsHeight();
 
   // Redraw timers
   UpdateTimerBar();
@@ -58,10 +54,7 @@ export default function CMDrawHook() {
 
   // Replace Cookies counter because Orteil uses very weird code to "pad" it...
   if (CMOptions.Scale) {
-    let str = l('cookies').innerHTML.replace(
+    let str = l('cookies').innerHTML.replace(/.*(?=<br>)/i, Beautify(Game.cookies));
-      /.*(?=<br>)/i,
-      Beautify(Game.cookies),
-    );
     if (Game.prefs.monospace) str = `<span class="monospace">${str}</span>`;
     l('cookies').innerHTML = str;
   }

src/Disp/GoldenCookieTimers/GoldenCookieTimers.js

@@ -27,10 +27,8 @@ export default function CreateGCTimer(cookie) {
     cookie.pop();
   };
   GCTimer.onmouseover = function () {
-    cookie.l.style.filter = // eslint-disable-line no-param-reassign
+    cookie.l.style.filter = 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))'; // eslint-disable-line no-param-reassign
-      '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))'; // eslint-disable-line no-param-reassign
-    cookie.l.style.webkitFilter = // eslint-disable-line no-param-reassign
-      'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))';
   };
   GCTimer.onmouseout = function () {
     cookie.l.style.filter = ''; // eslint-disable-line no-param-reassign

src/Disp/HelperFunctions/CalculateGrimoireRefillTime.js

@@ -5,11 +5,7 @@
  * @param	{number}	targetMagic			The target magic level
  * @returns	{number}	count / Game.fps	The time it takes to reach targetMagic
  */
-export default function CalculateGrimoireRefillTime(
+export default function CalculateGrimoireRefillTime(currentMagic, maxMagic, targetMagic) {
-  currentMagic,
-  maxMagic,
-  targetMagic,
-) {
   let magic = currentMagic;
   let count = 0;
   while (magic < targetMagic) {

src/Disp/HelperFunctions/GetCPS.js

@@ -18,16 +18,10 @@ export default function GetCPS() {
     return Game.cookiesPs * (1 - Game.cpsSucked);
   }
   if (CMOptions.CalcWrink === 1) {
-    return (
+    return Game.cookiesPs * (CacheCurrWrinklerCPSMult + (1 - CacheCurrWrinklerCount * 0.05));
-      Game.cookiesPs *
-      (CacheCurrWrinklerCPSMult + (1 - CacheCurrWrinklerCount * 0.05))
-    );
   }
   if (CacheWrinklersFattest[1] !== null)
-    if (
+    if (CMOptions.CalcWrink === 2 && Game.wrinklers[CacheWrinklersFattest[1]].type === 1) {
-      CMOptions.CalcWrink === 2 &&
-      Game.wrinklers[CacheWrinklersFattest[1]].type === 1
-    ) {
       return (
         Game.cookiesPs *
         ((CacheCurrWrinklerCPSMult * 3) / CacheCurrWrinklerCount +
@@ -36,7 +30,6 @@ export default function GetCPS() {
     }
   return (
     Game.cookiesPs *
-    (CacheCurrWrinklerCPSMult / CacheCurrWrinklerCount +
+    (CacheCurrWrinklerCPSMult / CacheCurrWrinklerCount + (1 - CacheCurrWrinklerCount * 0.05))
-      (1 - CacheCurrWrinklerCount * 0.05))
   );
 }

src/Disp/HelperFunctions/GetWrinkConfigBank.js

@@ -1,7 +1,4 @@
-import {
+import { CacheWrinklersFattest, CacheWrinklersTotal } from '../../Cache/VariablesAndData';
-  CacheWrinklersFattest,
-  CacheWrinklersTotal,
-} from '../../Cache/VariablesAndData';
 import { CMOptions } from '../../Config/VariablesAndData';
 
 /**

src/Disp/HelperFunctions/UpdateBackground.js

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

src/Disp/InfoBars/BottomBar.js

@@ -1,25 +1,15 @@
 /** Functions related to the Bottom Bar */
 
-import {
+import { CacheObjects1, CacheObjects10, CacheObjects100 } from '../../Cache/VariablesAndData';
-  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 {
+import Beautify from '../BeautifyAndFormatting/Beautify';
-  Beautify,
+import FormatTime from '../BeautifyAndFormatting/FormatTime';
-  FormatTime,
+import GetTimeColour from '../BeautifyAndFormatting/GetTimeColour';
-  GetTimeColour,
+
-} from '../BeautifyAndFormatting/BeautifyFormatting';
 import GetCPS from '../HelperFunctions/GetCPS';
 import GetWrinkConfigBank from '../HelperFunctions/GetWrinkConfigBank';
-import {
+import { ColourBlue, ColourTextPre, ColourYellow, LastTargetBotBar } from '../VariablesAndData';
-  ColourBlue,
-  ColourTextPre,
-  ColourYellow,
-  LastTargetBotBar,
-} from '../VariablesAndData';
 import { CreateBotBarBuildingColumn } from './CreateDOMElements';
 
 /**
@@ -32,12 +22,11 @@ export function CreateBotBar() {
   BotBar.style.width = '100%';
   BotBar.style.position = 'absolute';
   BotBar.style.display = 'none';
-  BotBar.style.backgroundColour = '#262224';
+  BotBar.style.backgroundColor = '#262224';
   BotBar.style.backgroundImage = 'linear-gradient(to bottom, #4d4548, #000000)';
   BotBar.style.borderTop = '1px solid black';
   BotBar.style.overflow = 'auto';
-  BotBar.style.textShadow =
+  BotBar.style.textShadow = '-1px 0 black, 0 1px black, 1px 0 black, 0 -1px black';
-    '-1px 0 black, 0 1px black, 1px 0 black, 0 -1px black';
 
   const table = BotBar.appendChild(document.createElement('table'));
   table.style.width = '100%';
@@ -54,9 +43,7 @@ export function CreateBotBar() {
   };
   const type = tbody.appendChild(document.createElement('tr'));
   type.style.fontWeight = 'bold';
-  type.appendChild(
+  type.appendChild(firstCol(`CM ${VersionMajor}.${VersionMinor}`, ColourYellow));
-    firstCol(`CM ${VersionMajor}.${VersionMinor}`, ColourYellow),
-  );
   const bonus = tbody.appendChild(document.createElement('tr'));
   bonus.appendChild(firstCol('Bonus Income', ColourBlue));
   const pp = tbody.appendChild(document.createElement('tr'));
@@ -91,37 +78,28 @@ export function UpdateBotBar() {
       l('CMBotBar').firstChild.firstChild.childNodes[0].childNodes[
         count
       ].childNodes[1].textContent = Game.Objects[i].amount;
-      l('CMBotBar').firstChild.firstChild.childNodes[1].childNodes[
+      l('CMBotBar').firstChild.firstChild.childNodes[1].childNodes[count].textContent = Beautify(
-        count
+        target[i].bonus,
-      ].textContent = Beautify(target[i].bonus, 2);
+        2,
-      l('CMBotBar').firstChild.firstChild.childNodes[2].childNodes[
-        count
-      ].className = 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[
+      l('CMBotBar').firstChild.firstChild.childNodes[2].childNodes[count].className =
-        count
+        ColourTextPre + target[i].color;
-      ].className = ColourTextPre + timeColour.color;
+      let PPString;
-      if (
+      if (CMOptions.PPDisplayTime) PPString = FormatTime(Math.round(target[i].pp));
-        timeColour.text === 'Done!' &&
+      else PPString = Beautify(Math.round(target[i].pp), 2);
-        Game.cookies < Game.Objects[i].bulkPrice
+      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[
+        l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[count].textContent =
-          count
+          timeColour.text;
-        ].textContent = timeColour.text;
     });
   }
 }

src/Disp/InfoBars/CreateDOMElements.js

@@ -77,9 +77,7 @@ export function CreateBotBarBuildingColumn(buildingName) {
     const i = buildingName;
     const header = type.appendChild(document.createElement('td'));
     header.appendChild(
-      document.createTextNode(
+      document.createTextNode(`${i.indexOf(' ') !== -1 ? i.substring(0, i.indexOf(' ')) : i} (`),
-        `${i.indexOf(' ') !== -1 ? i.substring(0, i.indexOf(' ')) : i} (`,
-      ),
     );
 
     const span = header.appendChild(document.createElement('span'));

src/Disp/InfoBars/TimerBar.js

@@ -23,7 +23,7 @@ export function CreateTimerBar() {
   TimerBar.style.height = '0px';
   TimerBar.style.fontSize = '10px';
   TimerBar.style.fontWeight = 'bold';
-  TimerBar.style.backgroundColour = 'black';
+  TimerBar.style.backgroundColor = 'black';
 
   // Create standard Golden Cookie bar
   const CMTimerBarGC = CreateTimer('CMTimerBarGC', 'Next Cookie', [
@@ -57,28 +57,19 @@ export function UpdateTimerBar() {
     let numberOfTimers = 0;
 
     // Regulates visibility of Golden Cookie timer
-    if (
+    if (Game.shimmerTypes.golden.spawned === 0 && !Game.Has('Golden switch [off]')) {
-      Game.shimmerTypes.golden.spawned === 0 &&
-      !Game.Has('Golden switch [off]')
-    ) {
       l('CMTimerBarGC').style.display = '';
       l('CMTimerBarGCMinBar').style.width = `${Math.round(
-        (Math.max(
+        (Math.max(0, Game.shimmerTypes.golden.minTime - Game.shimmerTypes.golden.time) *
-          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.shimmerTypes.golden.minTime - Game.shimmerTypes.golden.time) / Game.fps,
-            Game.fps,
         );
       else l('CMTimerBarGCMinBar').textContent = '';
-      if (
+      if (Game.shimmerTypes.golden.minTime === Game.shimmerTypes.golden.maxTime) {
-        Game.shimmerTypes.golden.minTime === Game.shimmerTypes.golden.maxTime
-      ) {
         l('CMTimerBarGCMinBar').style.borderTopRightRadius = '10px';
         l('CMTimerBarGCMinBar').style.borderBottomRightRadius = '10px';
       } else {
@@ -102,37 +93,27 @@ export function UpdateTimerBar() {
         );
       else l('CMTimerBarGCBar').textContent = '';
       l('CMTimerBarGCTime').textContent = Math.ceil(
-        (Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) /
+        (Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) / Game.fps,
-          Game.fps,
       );
       numberOfTimers += 1;
     } else l('CMTimerBarGC').style.display = 'none';
 
     // Regulates visibility of Reindeer timer
-    if (
+    if (Game.season === 'christmas' && Game.shimmerTypes.reindeer.spawned === 0) {
-      Game.season === 'christmas' &&
-      Game.shimmerTypes.reindeer.spawned === 0
-    ) {
       l('CMTimerBarRen').style.display = '';
       l('CMTimerBarRenMinBar').style.width = `${Math.round(
-        (Math.max(
+        (Math.max(0, Game.shimmerTypes.reindeer.minTime - Game.shimmerTypes.reindeer.time) *
-          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.minTime - Game.shimmerTypes.reindeer.time) / Game.fps,
-            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.maxTime - Game.shimmerTypes.reindeer.minTime,
-            Game.shimmerTypes.reindeer.minTime,
           Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time,
         ) *
           maxWidthTwoBar) /
@@ -141,16 +122,13 @@ export function UpdateTimerBar() {
       if (CMOptions.TimerBarOverlay >= 1)
         l('CMTimerBarRenBar').textContent = Math.ceil(
           Math.min(
-            Game.shimmerTypes.reindeer.maxTime -
+            Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.minTime,
-              Game.shimmerTypes.reindeer.minTime,
+            Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time,
-            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.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time) / Game.fps,
-          Game.fps,
       );
       numberOfTimers += 1;
     } else {
@@ -180,13 +158,10 @@ export function UpdateTimerBar() {
         else timer.lastChild.children[1].textContent = '';
         timer.lastChild.children[1].style.width = `${Math.round(
           (Game.buffs[i].time *
-            (maxWidthOneBar -
+            (maxWidthOneBar - Math.ceil(Game.buffs[i].time / Game.fps).toString().length * 8)) /
-              Math.ceil(Game.buffs[i].time / Game.fps).toString().length * 8)) /
             Game.buffs[i].maxTime,
         )}px`;
-        timer.lastChild.children[2].textContent = Math.ceil(
+        timer.lastChild.children[2].textContent = Math.ceil(Game.buffs[i].time / Game.fps);
-          Game.buffs[i].time / Game.fps,
-        );
         numberOfTimers += 1;
         BuffTimerBars[Game.buffs[i].name] = timer;
       }

src/Disp/Initialization/CreateSectionHideButtons.js

@@ -15,12 +15,9 @@ export default function CreateSectionHideButtons() {
       l('vaultUpgrades').style.display = 'none';
     } else {
       l('upgrades').style.display = 'flex';
-      if (l('toggleUpgrades').children.length !== 0)
+      if (l('toggleUpgrades').children.length !== 0) l('toggleUpgrades').style.display = 'block';
-        l('toggleUpgrades').style.display = 'block';
+      if (l('techUpgrades').children.length !== 0) l('techUpgrades').style.display = 'block';
-      if (l('techUpgrades').children.length !== 0)
+      if (l('vaultUpgrades').children.length !== 0) l('vaultUpgrades').style.display = 'block';
-        l('techUpgrades').style.display = 'block';
-      if (l('vaultUpgrades').children.length !== 0)
-        l('vaultUpgrades').style.display = 'block';
     }
   };
   a.textContent = 'Hide/Show Upgrades';
@@ -28,8 +25,7 @@ export default function CreateSectionHideButtons() {
   const b = document.createElement('a');
   b.className = 'option';
   b.onclick = function () {
-    if (l('products').style.display === 'grid')
+    if (l('products').style.display === 'grid') l('products').style.display = 'none';
-      l('products').style.display = 'none';
     else l('products').style.display = 'grid';
   };
   b.textContent = 'Hide/Show Buildings';

src/Disp/Initialization/CreateWrinklerButton.js

@@ -18,13 +18,7 @@ export default function CreateWrinklerButtons() {
   };
   popAllA.onmouseover = function () {
     Game.tooltip.dynamic = 1;
-    Game.tooltip.draw(
+    Game.tooltip.draw(this, () => CreateTooltip('wb', 'PopAll'), 'this');
-      this,
-      function () {
-        return CreateTooltip('wb', 'PopAll');
-      },
-      'this',
-    );
     Game.tooltip.wobble();
   };
   l('sectionLeftExtra').children[0].append(popAllA);
@@ -33,21 +27,14 @@ export default function CreateWrinklerButtons() {
   popFattestA.textContent = 'Pop Single Fattest';
   popFattestA.className = 'option';
   popFattestA.onclick = function () {
-    if (CacheWrinklersFattest[1] !== null)
+    if (CacheWrinklersFattest[1] !== null) Game.wrinklers[CacheWrinklersFattest[1]].hp = 0;
-      Game.wrinklers[CacheWrinklersFattest[1]].hp = 0;
   };
   popFattestA.onmouseout = function () {
     Game.tooltip.shouldHide = 1;
   };
   popFattestA.onmouseover = function () {
     Game.tooltip.dynamic = 1;
-    Game.tooltip.draw(
+    Game.tooltip.draw(this, () => CreateTooltip('wb', 'PopFattest'), 'this');
-      this,
-      function () {
-        return CreateTooltip('wb', 'PopFattest');
-      },
-      'this',
-    );
     Game.tooltip.wobble();
   };
   l('sectionLeftExtra').children[0].append(popFattestA);

src/Disp/MenuSections/Info/InfoPage.js

@@ -2,7 +2,7 @@
 
 import { ToggleHeader } from '../../../Config/ToggleSetting';
 import { CMOptions } from '../../../Config/VariablesAndData';
-import { LatestReleaseNotes, ModDescription } from '../../../Data/Moddata';
+import { LatestReleaseNotes, ModDescription } from '../../../Data/Moddata.ts';
 
 /**
  * This function adds stats created by CookieMonster to the stats page

src/Disp/MenuSections/Settings/CreateOption.js

@@ -1,22 +1,15 @@
 import jscolor, * as JsColor from '@eastdesire/jscolor';
 import ToggleFavouriteSetting from '../../../Config/Toggles/ToggleFavourites';
 import { SaveConfig } from '../../../Config/SaveLoadReload/SaveLoadReloadSettings';
-import {
+import { ConfigPrefix, ToggleConfig, ToggleConfigVolume } from '../../../Config/ToggleSetting';
-  ConfigPrefix,
-  ToggleConfig,
-  ToggleConfigVolume,
-} from '../../../Config/ToggleSetting';
 import { CMOptions } from '../../../Config/VariablesAndData';
-import {} from '../../../Data/Sectionheaders';
+import {} from '../../../Data/Sectionheaders.ts';
 import Config from '../../../Data/SettingsData';
 import RefreshScale from '../../HelperFunctions/RefreshScale';
 import UpdateColours from '../../HelperFunctions/UpdateColours';
 import Flash from '../../Notifications/Flash';
 import PlaySound from '../../Notifications/Sound';
-import {
+import { FavouriteSettings, SimpleTooltipElements } from '../../VariablesAndData';
-  FavouriteSettings,
-  SimpleTooltipElements,
-} from '../../VariablesAndData';
 import CookieMonsterPrompt from '../Prompt';
 
 /**
@@ -37,10 +30,7 @@ function CreateFavouriteStar(config) {
     Game.UpdateMenu();
   };
   FavStar.onmouseover = function () {
-    Game.tooltip.draw(
+    Game.tooltip.draw(this, escape(SimpleTooltipElements.FavouriteSettingPlaceholder.innerHTML));
-      this,
-      escape(SimpleTooltipElements.FavouriteSettingPlaceholder.innerHTML),
-    );
   };
   FavStar.onmouseout = function () {
     Game.tooltip.hide();
@@ -70,6 +60,7 @@ export default function CreatePrefOption(config) {
     a.id = ConfigPrefix + config;
     a.onclick = function () {
       ToggleConfig(config);
+      Game.UpdateMenu();
     };
     a.textContent = Config[config].label[CMOptions[config]];
     div.appendChild(a);
@@ -102,9 +93,11 @@ export default function CreatePrefOption(config) {
     slider.value = CMOptions[config];
     slider.oninput = function () {
       ToggleConfigVolume(config);
+      Game.UpdateMenu();
     };
     slider.onchange = function () {
       ToggleConfigVolume(config);
+      Game.UpdateMenu();
     };
     volume.appendChild(slider);
     div.appendChild(volume);
@@ -221,6 +214,7 @@ export default function CreatePrefOption(config) {
       CMOptions[config] = this.value;
       SaveConfig();
       RefreshScale();
+      Game.UpdateMenu();
     };
     div.appendChild(input);
     div.appendChild(document.createTextNode(' '));

src/Disp/MenuSections/Settings/SettingsPage.js

@@ -1,11 +1,8 @@
 import { LoadConfig } from '../../../Config/SaveLoadReload/SaveLoadReloadSettings';
 import { CMOptions } from '../../../Config/VariablesAndData';
-import {
+import { ConfigGroups, ConfigGroupsNotification } from '../../../Data/Sectionheaders.ts';
-  ConfigGroups,
-  ConfigGroupsNotification,
-} from '../../../Data/Sectionheaders';
 import Config from '../../../Data/SettingsData';
-import ConfigDefault from '../../../Data/SettingsDefault';
+import ConfigDefault from '../../../Data/SettingsDefault.ts';
 import { FavouriteSettings } from '../../VariablesAndData';
 import CreatePrefHeader from './CreateHeader';
 import CreatePrefOption from './CreateOption';
@@ -35,24 +32,19 @@ export default function AddMenuPref(title) {
         // Make sub-sections of Notification section
         if (group === 'Notification') {
           Object.keys(ConfigGroupsNotification).forEach((subGroup) => {
-            const subGroupObject = CreatePrefHeader(
+            const subGroupObject = CreatePrefHeader(subGroup, ConfigGroupsNotification[subGroup]); // (group, display-name of group)
-              subGroup,
-              ConfigGroupsNotification[subGroup],
-            ); // (group, display-name of group)
             subGroupObject.style.fontSize = '15px';
             subGroupObject.style.opacity = '0.5';
             frag.appendChild(subGroupObject);
             if (CMOptions.Header[subGroup]) {
               Object.keys(Config).forEach((option) => {
-                if (Config[option].group === subGroup)
+                if (Config[option].group === subGroup) frag.appendChild(CreatePrefOption(option));
-                  frag.appendChild(CreatePrefOption(option));
               });
             }
           });
         } else {
           Object.keys(Config).forEach((option) => {
-            if (Config[option].group === group)
+            if (Config[option].group === group) frag.appendChild(CreatePrefOption(option));
-              frag.appendChild(CreatePrefOption(option));
           });
         }
       }
@@ -72,8 +64,6 @@ export default function AddMenuPref(title) {
 
   l('menu').childNodes[2].insertBefore(
     frag,
-    l('menu').childNodes[2].childNodes[
+    l('menu').childNodes[2].childNodes[l('menu').childNodes[2].childNodes.length - 1],
-      l('menu').childNodes[2].childNodes.length - 1
-    ],
   );
 }

src/Disp/MenuSections/Statistics/AddStatsPage.js

@@ -3,7 +3,7 @@
 import { AddMissingUpgrades } from './CreateMissingUpgrades';
 import * as CreateSections from './CreateStatsSections';
 import * as CreateElements from './CreateDOMElements';
-import * as GameData from '../../../Data/Gamedata';
+import * as GameData from '../../../Data/Gamedata.ts';
 import { CMOptions } from '../../../Config/VariablesAndData';
 
 import {
@@ -16,7 +16,7 @@ import {
 import PopAllNormalWrinklers from '../../HelperFunctions/PopWrinklers';
 import { ClickTimes, CookieTimes } from '../../VariablesAndData';
 import GetCPS from '../../HelperFunctions/GetCPS';
-import { Beautify } from '../../BeautifyAndFormatting/BeautifyFormatting';
+import Beautify from '../../BeautifyAndFormatting/Beautify';
 import AddMissingAchievements from './CreateMissingAchievements';
 
 /**
@@ -64,9 +64,7 @@ export default function AddMenuStats(title) {
       const popAllFrag = document.createDocumentFragment();
       popAllFrag.appendChild(
         document.createTextNode(
-          `${Beautify(CacheWrinklersTotal)} / ${Beautify(
+          `${Beautify(CacheWrinklersTotal)} / ${Beautify(CacheWrinklersNormal)} `,
-            CacheWrinklersNormal,
-          )} `,
         ),
       );
       const popAllA = document.createElement('a');
@@ -77,31 +75,22 @@ export default function AddMenuStats(title) {
       };
       popAllFrag.appendChild(popAllA);
       stats.appendChild(
-        CreateElements.StatsListing(
+        CreateElements.StatsListing('basic', 'Rewards of Popping (All/Normal)', popAllFrag),
-          'basic',
-          'Rewards of Popping (All/Normal)',
-          popAllFrag,
-        ),
       );
       const popFattestFrag = document.createDocumentFragment();
-      popFattestFrag.appendChild(
+      popFattestFrag.appendChild(document.createTextNode(`${Beautify(CacheWrinklersFattest[0])} `));
-        document.createTextNode(`${Beautify(CacheWrinklersFattest[0])} `),
-      );
       const popFattestA = document.createElement('a');
       popFattestA.textContent = 'Pop Single Fattest';
       popFattestA.className = 'option';
       popFattestA.onclick = function () {
-        if (CacheWrinklersFattest[1] !== null)
+        if (CacheWrinklersFattest[1] !== null) Game.wrinklers[CacheWrinklersFattest[1]].hp = 0;
-          Game.wrinklers[CacheWrinklersFattest[1]].hp = 0;
       };
       popFattestFrag.appendChild(popFattestA);
       stats.appendChild(
         CreateElements.StatsListing(
           'basic',
           `Rewards of Popping Single Fattest Non-Shiny Wrinkler (id: ${
-            CacheWrinklersFattest[1] !== null
+            CacheWrinklersFattest[1] !== null ? CacheWrinklersFattest[1] : 'None'
-              ? CacheWrinklersFattest[1]
-              : 'None'
           })`,
           popFattestFrag,
         ),
@@ -128,9 +117,9 @@ export default function AddMenuStats(title) {
     stats.appendChild(
       CreateElements.StatsListing(
         'basic',
-        `Average cookie clicks per second (past ${
+        `Average cookie clicks per second (past ${ClickTimes[CMOptions.AvgClicksHist]}${
-          ClickTimes[CMOptions.AvgClicksHist]
+          CMOptions.AvgClicksHist === 0 ? ' second' : ' seconds'
-        }${CMOptions.AvgClicksHist === 0 ? ' second' : ' seconds'})`,
+        })`,
         document.createTextNode(Beautify(CacheAverageClicks, 1)),
       ),
     );
@@ -181,9 +170,7 @@ export default function AddMenuStats(title) {
         Game.fps * 60 - (Game.OnAscend ? 0 : Game.T % (Game.fps * 60)),
         4,
       );
-      stats.appendChild(
+      stats.appendChild(CreateElements.StatsListing('basic', 'Time till autosave', timer));
-        CreateElements.StatsListing('basic', 'Time till autosave', timer),
-      );
     }
   }
 

src/Disp/MenuSections/Statistics/CreateDOMElements.js

@@ -64,10 +64,7 @@ export function StatsListing(type, name, text, placeholder) {
       Game.tooltip.hide();
     };
     tooltip.onmouseover = function () {
-      Game.tooltip.draw(
+      Game.tooltip.draw(this, escape(SimpleTooltipElements[placeholder].innerHTML));
-        this,
-        escape(SimpleTooltipElements[placeholder].innerHTML),
-      );
     };
     tooltip.style.cursor = 'default';
     tooltip.style.display = 'inline-block';

src/Disp/MenuSections/Statistics/CreateMissingAchievements.js

@@ -7,8 +7,7 @@ function CrateTooltipLockedAchievements(me) {
   tags.push('Locked', 0);
 
   let neuromancy = 0;
-  if (Game.Has('Neuromancy') || (Game.sesame && me.pool === 'debug'))
+  if (Game.Has('Neuromancy') || (Game.sesame && me.pool === 'debug')) neuromancy = 1;
-    neuromancy = 1;
   if (neuromancy && me.won === 0) tags.push('Click to win!', '#00c462');
   else if (neuromancy && me.won > 0) tags.push('Click to lose!', '#00c462');
 
@@ -21,9 +20,9 @@ function CrateTooltipLockedAchievements(me) {
   let tagsStr = '';
   for (let i = 0; i < tags.length; i += 2) {
     if (i % 2 === 0)
-      tagsStr += ` <div class="tag" style="color:${
+      tagsStr += ` <div class="tag" style="color:${tags[i + 1] === 0 ? '#fff' : tags[i + 1]};">[${
-        tags[i + 1] === 0 ? '#fff' : tags[i + 1]
+        tags[i]
-      };">[${tags[i]}]</div>`;
+      }]</div>`;
   }
   tagsStr = tagsStr.substring(1);
 
@@ -35,9 +34,9 @@ function CrateTooltipLockedAchievements(me) {
   ${tagsStr}<div class="line"></div><div class="description">${desc}</div></div>
   ${
     Game.sesame
-      ? `<div style="font-size:9px;">Id : ${me.id} | Order : ${Math.floor(
+      ? `<div style="font-size:9px;">Id : ${me.id} | Order : ${Math.floor(me.order)}${
-          me.order,
+          me.tier ? ` | Tier : ${me.tier}` : ''
-        )}${me.tier ? ` | Tier : ${me.tier}` : ''}</div>`
+        }</div>`
       : ''
   }`;
 }
@@ -55,12 +54,10 @@ export default function AddMissingAchievements() {
   if (CMOptions.MissingAchievements) {
     Object.values(achievs.children).forEach((achievsCrate) => {
       if (!achievsCrate.className.includes('enabled')) {
-        const id = achievsCrate.onclick.toString().match(/(?<=\[).*(?=\])/g)[0];
+        const id = achievsCrate.onclick.toString().split(/\[(.*)\]/gi)[1];
         const { icon } = Game.AchievementsById[id];
         // eslint-disable-next-line no-param-reassign
-        achievsCrate.style.backgroundPosition = `${-icon[0] * 48}px ${
+        achievsCrate.style.backgroundPosition = `${-icon[0] * 48}px ${-icon[1] * 48}px`;
-          -icon[1] * 48
-        }px`;
         // eslint-disable-next-line no-param-reassign
         achievsCrate.onmouseover = function () {
           if (!Game.mouseDown) {
@@ -68,13 +65,10 @@ export default function AddMissingAchievements() {
             Game.tooltip.dynamic = 1;
             Game.tooltip.draw(
               this,
-              function () {
+              () =>
-                return (function () {
+                (function () {
-                  return CrateTooltipLockedAchievements(
+                  return CrateTooltipLockedAchievements(Game.AchievementsById[id]);
-                    Game.AchievementsById[id],
+                })(),
-                  );
-                })();
-              },
               'top',
             );
             Game.tooltip.wobble();

src/Disp/MenuSections/Statistics/CreateMissingUpgrades.js

@@ -12,22 +12,16 @@ import {
 export function AddMissingUpgrades() {
   l('menu').childNodes.forEach((menuSection) => {
     if (menuSection.children[0]) {
-      if (
+      if (menuSection.children[0].innerHTML === 'Prestige' && CacheMissingUpgradesPrestige) {
-        menuSection.children[0].innerHTML === 'Prestige' &&
-        CacheMissingUpgradesPrestige
-      ) {
         const prestigeUpgradesMissing =
-          CacheMissingUpgradesPrestige.match(new RegExp('div', 'g') || [])
+          CacheMissingUpgradesPrestige.match(new RegExp('div', 'g') || []).length / 2;
-            .length / 2;
         const title = document.createElement('div');
         title.id = 'CMMissingUpgradesPrestigeTitle';
         title.className = 'listing';
         const titlefrag = document.createElement('div');
         titlefrag.innerHTML = `<b>Missing Prestige upgrades:</b> ${prestigeUpgradesMissing}/${
           Game.PrestigeUpgrades.length
-        } (${Math.floor(
+        } (${Math.floor((prestigeUpgradesMissing / Game.PrestigeUpgrades.length) * 100)}%)`;
-          (prestigeUpgradesMissing / Game.PrestigeUpgrades.length) * 100,
-        )}%)`;
         title.appendChild(titlefrag);
         menuSection.appendChild(title);
         const upgrades = document.createElement('div');
@@ -46,8 +40,7 @@ export function AddMissingUpgrades() {
             Game.UpgradesByPool[''].length + Game.UpgradesByPool.tech.length
           } (${Math.floor(
             (normalUpgradesMissing /
-              (Game.UpgradesByPool[''].length +
+              (Game.UpgradesByPool[''].length + Game.UpgradesByPool.tech.length)) *
-                Game.UpgradesByPool.tech.length)) *
               100,
           )}%)`;
           title.appendChild(titlefrag);
@@ -62,17 +55,14 @@ export function AddMissingUpgrades() {
         }
         if (CacheMissingUpgradesCookies) {
           const cookieUpgradesMissing =
-            CacheMissingUpgradesCookies.match(new RegExp('div', 'g') || [])
+            CacheMissingUpgradesCookies.match(new RegExp('div', 'g') || []).length / 2;
-              .length / 2;
           const title = document.createElement('div');
           title.id = 'CMMissingUpgradesCookiesTitle';
           title.className = 'listing';
           const titlefrag = document.createElement('div');
           titlefrag.innerHTML = `<b>Missing Cookie upgrades:</b> ${cookieUpgradesMissing}/${
             Game.UpgradesByPool.cookie.length
-          } (${Math.floor(
+          } (${Math.floor((cookieUpgradesMissing / Game.UpgradesByPool.cookie.length) * 100)}%)`;
-            (cookieUpgradesMissing / Game.UpgradesByPool.cookie.length) * 100,
-          )}%)`;
           title.appendChild(titlefrag);
           menuSection.appendChild(title);
           const upgrades = document.createElement('div');
@@ -104,8 +94,8 @@ export function crateMissing(me) {
   const tooltip = `function() {return Game.crateTooltip(Game.UpgradesById[${me.id}], 'stats');}`;
   return `<div class="${classes}"
 	${Game.getDynamicTooltip(tooltip, 'top', true)}
-	style = "${`${
+	style = "${`${icon[2] ? `background-image: url(${icon[2]});` : ''}background-position:${
-    icon[2] ? `background-image: url(${icon[2]});` : ''
+    -icon[0] * 48
-  }background-position:${-icon[0] * 48}px ${-icon[1] * 48}px`};">
+  }px ${-icon[1] * 48}px`};">
 	</div>`;
 }

src/Disp/MenuSections/Statistics/CreateStatsSections.js

@@ -1,6 +1,6 @@
 /** Functions to create the individual sections of the Statistics page */
 
-import * as GameData from '../../../Data/Gamedata';
+import * as GameData from '../../../Data/Gamedata.ts';
 import { MaxChainCookieReward } from '../../../Cache/Stats/ChainCookies';
 import {
   CacheAvgCPSWithChoEgg,
@@ -38,15 +38,12 @@ import {
 } from '../../../Cache/VariablesAndData';
 import { CMOptions } from '../../../Config/VariablesAndData';
 import ResetBonus from '../../../Sim/SimulationEvents/ResetAscension';
-import {
-  Beautify,
-  FormatTime,
-} from '../../BeautifyAndFormatting/BeautifyFormatting';
-
 import GetCPS from '../../HelperFunctions/GetCPS';
 import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank';
 import { ColourGreen, ColourRed, ColourTextPre } from '../../VariablesAndData';
 import { StatsListing, StatsHeader, StatsMissDisp } from './CreateDOMElements';
+import Beautify from '../../BeautifyAndFormatting/Beautify';
+import FormatTime from '../../BeautifyAndFormatting/FormatTime';
 
 /**
  * This function creates the "Lucky" section of the stats page
@@ -61,13 +58,10 @@ export function LuckySection() {
   const section = document.createElement('div');
   section.className = 'CMStatsLuckySection';
 
-  const luckyColour =
+  const luckyColour = Game.cookies + GetWrinkConfigBank() < CacheLucky ? ColourRed : ColourGreen;
-    Game.cookies + GetWrinkConfigBank() < CacheLucky ? ColourRed : ColourGreen;
   const luckyTime =
     Game.cookies + GetWrinkConfigBank() < CacheLucky
-      ? FormatTime(
+      ? FormatTime((CacheLucky - (Game.cookies + GetWrinkConfigBank())) / GetCPS())
-          (CacheLucky - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),
-        )
       : '';
   const luckyReqFrag = document.createDocumentFragment();
   const luckyReqSpan = document.createElement('span');
@@ -81,23 +75,14 @@ export function LuckySection() {
     luckyReqFrag.appendChild(luckyReqSmall);
   }
   section.appendChild(
-    StatsListing(
+    StatsListing('withTooltip', '"Lucky!" cookies required', luckyReqFrag, goldCookTooltip),
-      'withTooltip',
-      '"Lucky!" cookies required',
-      luckyReqFrag,
-      goldCookTooltip,
-    ),
   );
 
   const luckyColourFrenzy =
-    Game.cookies + GetWrinkConfigBank() < CacheLuckyFrenzy
+    Game.cookies + GetWrinkConfigBank() < CacheLuckyFrenzy ? ColourRed : ColourGreen;
-      ? ColourRed
-      : ColourGreen;
   const luckyTimeFrenzy =
     Game.cookies + GetWrinkConfigBank() < CacheLuckyFrenzy
-      ? FormatTime(
+      ? FormatTime((CacheLuckyFrenzy - (Game.cookies + GetWrinkConfigBank())) / GetCPS())
-          (CacheLuckyFrenzy - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),
-        )
       : '';
   const luckyReqFrenFrag = document.createDocumentFragment();
   const luckyReqFrenSpan = document.createElement('span');
@@ -125,8 +110,7 @@ export function LuckySection() {
   luckyRewardMaxSpan.style.fontWeight = 'bold';
   luckyRewardMaxSpan.className = ColourTextPre + CacheLuckyReward;
   luckyRewardMaxSpan.textContent =
-    Beautify(CacheLuckyReward) +
+    Beautify(CacheLuckyReward) + (luckySplit ? ` / ${Beautify(CacheLuckyWrathReward)}` : '');
-    (luckySplit ? ` / ${Beautify(CacheLuckyWrathReward)}` : '');
   section.appendChild(
     StatsListing(
       'withTooltip',
@@ -187,15 +171,10 @@ export function ChainSection() {
   section.className = 'CMStatsChainSection';
 
   const chainColour =
-    Game.cookies + GetWrinkConfigBank() < CacheChainRequired
+    Game.cookies + GetWrinkConfigBank() < CacheChainRequired ? ColourRed : ColourGreen;
-      ? ColourRed
-      : ColourGreen;
   const chainTime =
     Game.cookies + GetWrinkConfigBank() < CacheChainRequired
-      ? FormatTime(
+      ? FormatTime((CacheChainRequired - (Game.cookies + GetWrinkConfigBank())) / GetCPS())
-          (CacheChainRequired - (Game.cookies + GetWrinkConfigBank())) /
-            GetCPS(),
-        )
       : '';
   const chainReqFrag = document.createDocumentFragment();
   const chainReqSpan = document.createElement('span');
@@ -209,24 +188,14 @@ export function ChainSection() {
     chainReqFrag.appendChild(chainReqSmall);
   }
   section.appendChild(
-    StatsListing(
+    StatsListing('withTooltip', '"Chain" cookies required', chainReqFrag, goldCookTooltip),
-      'withTooltip',
-      '"Chain" cookies required',
-      chainReqFrag,
-      goldCookTooltip,
-    ),
   );
 
   const chainWrathColour =
-    Game.cookies + GetWrinkConfigBank() < CacheChainWrathRequired
+    Game.cookies + GetWrinkConfigBank() < CacheChainWrathRequired ? ColourRed : ColourGreen;
-      ? ColourRed
-      : ColourGreen;
   const chainWrathTime =
     Game.cookies + GetWrinkConfigBank() < CacheChainWrathRequired
-      ? FormatTime(
+      ? FormatTime((CacheChainWrathRequired - (Game.cookies + GetWrinkConfigBank())) / GetCPS())
-          (CacheChainWrathRequired - (Game.cookies + GetWrinkConfigBank())) /
-            GetCPS(),
-        )
       : '';
   const chainWrathReqFrag = document.createDocumentFragment();
   const chainWrathReqSpan = document.createElement('span');
@@ -249,15 +218,10 @@ export function ChainSection() {
   );
 
   const chainColourFrenzy =
-    Game.cookies + GetWrinkConfigBank() < CacheChainFrenzyRequired
+    Game.cookies + GetWrinkConfigBank() < CacheChainFrenzyRequired ? ColourRed : ColourGreen;
-      ? ColourRed
-      : ColourGreen;
   const chainTimeFrenzy =
     Game.cookies + GetWrinkConfigBank() < CacheChainFrenzyRequired
-      ? FormatTime(
+      ? FormatTime((CacheChainFrenzyRequired - (Game.cookies + GetWrinkConfigBank())) / GetCPS())
-          (CacheChainFrenzyRequired - (Game.cookies + GetWrinkConfigBank())) /
-            GetCPS(),
-        )
       : '';
   const chainReqFrenFrag = document.createDocumentFragment();
   const chainReqFrenSpan = document.createElement('span');
@@ -280,15 +244,11 @@ export function ChainSection() {
   );
 
   const chainWrathColourFrenzy =
-    Game.cookies + GetWrinkConfigBank() < CacheChainFrenzyWrathRequired
+    Game.cookies + GetWrinkConfigBank() < CacheChainFrenzyWrathRequired ? ColourRed : ColourGreen;
-      ? ColourRed
-      : ColourGreen;
   const chainWrathTimeFrenzy =
     Game.cookies + GetWrinkConfigBank() < CacheChainFrenzyWrathRequired
       ? FormatTime(
-          (CacheChainFrenzyWrathRequired -
+          (CacheChainFrenzyWrathRequired - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),
-            (Game.cookies + GetWrinkConfigBank())) /
-            GetCPS(),
         )
       : '';
   const chainWrathReqFrenFrag = document.createDocumentFragment();
@@ -316,9 +276,7 @@ export function ChainSection() {
       'withTooltip',
       '"Chain" reward (max) (golden / wrath)',
       document.createTextNode(
-        `${Beautify(CacheChainMaxReward[0])} / ${Beautify(
+        `${Beautify(CacheChainMaxReward[0])} / ${Beautify(CacheChainWrathMaxReward[0])}`,
-          CacheChainWrathMaxReward[0],
-        )}`,
       ),
       goldCookTooltip,
     ),
@@ -329,9 +287,7 @@ export function ChainSection() {
       'withTooltip',
       '"Chain" reward (max) (frenzy) (golden / wrath)',
       document.createTextNode(
-        `${Beautify(CacheChainFrenzyMaxReward[0])} / ${Beautify(
+        `${Beautify(CacheChainFrenzyMaxReward[0])} / ${Beautify(CacheChainFrenzyMaxReward[0])}`,
-          CacheChainFrenzyMaxReward[0],
-        )}`,
       ),
       goldCookTooltip,
     ),
@@ -341,23 +297,13 @@ export function ChainSection() {
     Game.cookiesPs * 60 * 60 * 6 * CacheDragonsFortuneMultAdjustment,
     Game.cookies * 0.5,
   );
-  const chainCur = MaxChainCookieReward(
+  const chainCur = MaxChainCookieReward(7, chainCurMax, CacheGoldenCookiesMult)[0];
-    7,
+  const chainCurWrath = MaxChainCookieReward(6, chainCurMax, CacheWrathCookiesMult)[0];
-    chainCurMax,
-    CacheGoldenCookiesMult,
-  )[0];
-  const chainCurWrath = MaxChainCookieReward(
-    6,
-    chainCurMax,
-    CacheWrathCookiesMult,
-  )[0];
   section.appendChild(
     StatsListing(
       'withTooltip',
       '"Chain" reward (cur) (golden / wrath)',
-      document.createTextNode(
+      document.createTextNode(`${Beautify(chainCur)} / ${Beautify(chainCurWrath)}`),
-        `${Beautify(chainCur)} / ${Beautify(chainCurWrath)}`,
-      ),
       goldCookTooltip,
     ),
   );
@@ -367,9 +313,7 @@ export function ChainSection() {
       'withTooltip',
       'CPS needed for next level (g / w)',
       document.createTextNode(
-        `${Beautify(CacheChainRequiredNext)} / ${Beautify(
+        `${Beautify(CacheChainRequiredNext)} / ${Beautify(CacheChainWrathRequiredNext)}`,
-          CacheChainWrathRequiredNext,
-        )}`,
       ),
       'ChainNextLevelPlaceholder',
     ),
@@ -398,14 +342,10 @@ export function SpellsSection() {
   section.className = 'CMStatsSpellsSection';
 
   const conjureColour =
-    Game.cookies + GetWrinkConfigBank() < CacheConjure
+    Game.cookies + GetWrinkConfigBank() < CacheConjure ? ColourRed : ColourGreen;
-      ? ColourRed
-      : ColourGreen;
   const conjureTime =
     Game.cookies + GetWrinkConfigBank() < CacheConjure
-      ? FormatTime(
+      ? FormatTime((CacheConjure - (Game.cookies + GetWrinkConfigBank())) / GetCPS())
-          (CacheConjure - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),
-        )
       : '';
 
   const conjureReqFrag = document.createDocumentFragment();
@@ -437,18 +377,14 @@ export function SpellsSection() {
   );
 
   const conjureFrenzyColour =
-    Game.cookies + GetWrinkConfigBank() < CacheConjure * 7
+    Game.cookies + GetWrinkConfigBank() < CacheConjure * 7 ? ColourRed : ColourGreen;
-      ? ColourRed
-      : ColourGreen;
   const conjureFrenzyCur = Math.min(
     (Game.cookies + GetWrinkConfigBank()) * 0.15,
     CacheNoGoldSwitchCookiesPS * 60 * 30,
   );
   const conjureFrenzyTime =
     Game.cookies + GetWrinkConfigBank() < CacheConjure * 7
-      ? FormatTime(
+      ? FormatTime((CacheConjure * 7 - (Game.cookies + GetWrinkConfigBank())) / GetCPS())
-          (CacheConjure * 7 - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),
-        )
       : '';
 
   const conjureFrenzyReqFrag = document.createDocumentFragment();
@@ -491,9 +427,7 @@ export function SpellsSection() {
       StatsListing(
         'withTooltip',
         '"Spontaneous Edifice" cookies required (most expensive building)',
-        document.createTextNode(
+        document.createTextNode(`${Beautify(CacheEdifice)} (${CacheEdificeBuilding})`),
-          `${Beautify(CacheEdifice)} (${CacheEdificeBuilding})`,
-        ),
         'GoldCookTooltipPlaceholder',
       ),
     );
@@ -509,60 +443,40 @@ export function GardenSection() {
   const section = document.createElement('div');
   section.className = 'CMStatsGardenSection';
 
-  const bakeberryColour =
+  const bakeberryColour = Game.cookies < Game.cookiesPs * 60 * 10 * 100 ? ColourRed : ColourGreen;
-    Game.cookies < Game.cookiesPs * 60 * 10 * 100 ? ColourRed : ColourGreen;
   const bakeberryFrag = document.createElement('span');
   bakeberryFrag.style.fontWeight = 'bold';
   bakeberryFrag.className = ColourTextPre + bakeberryColour;
   bakeberryFrag.textContent = Beautify(Game.cookiesPs * 60 * 10 * 100);
   section.appendChild(
-    StatsListing(
+    StatsListing('basic', 'Cookies required for max reward of Bakeberry: ', bakeberryFrag),
-      'basic',
-      'Cookies required for max reward of Bakeberry: ',
-      bakeberryFrag,
-    ),
   );
 
-  const chocorootColour =
+  const chocorootColour = Game.cookies < Game.cookiesPs * 60 * 100 ? ColourRed : ColourGreen;
-    Game.cookies < Game.cookiesPs * 60 * 100 ? ColourRed : ColourGreen;
   const chocorootFrag = document.createElement('span');
   chocorootFrag.style.fontWeight = 'bold';
   chocorootFrag.className = ColourTextPre + chocorootColour;
   chocorootFrag.textContent = Beautify(Game.cookiesPs * 60 * 100);
   section.appendChild(
-    StatsListing(
+    StatsListing('basic', 'Cookies required for max reward of Chocoroot: ', chocorootFrag),
-      'basic',
-      'Cookies required for max reward of Chocoroot: ',
-      chocorootFrag,
-    ),
   );
 
-  const queenbeetColour =
+  const queenbeetColour = Game.cookies < Game.cookiesPs * 60 * 60 * 25 ? ColourRed : ColourGreen;
-    Game.cookies < Game.cookiesPs * 60 * 60 * 25 ? ColourRed : ColourGreen;
   const queenbeetFrag = document.createElement('span');
   queenbeetFrag.style.fontWeight = 'bold';
   queenbeetFrag.className = ColourTextPre + queenbeetColour;
   queenbeetFrag.textContent = Beautify(Game.cookiesPs * 60 * 60 * 25);
   section.appendChild(
-    StatsListing(
+    StatsListing('basic', 'Cookies required for max reward of Queenbeet: ', queenbeetFrag),
-      'basic',
-      'Cookies required for max reward of Queenbeet: ',
-      queenbeetFrag,
-    ),
   );
 
-  const duketaterColour =
+  const duketaterColour = Game.cookies < Game.cookiesPs * 60 * 15 * 100 ? ColourRed : ColourGreen;
-    Game.cookies < Game.cookiesPs * 60 * 15 * 100 ? ColourRed : ColourGreen;
   const duketaterFrag = document.createElement('span');
   duketaterFrag.style.fontWeight = 'bold';
   duketaterFrag.className = ColourTextPre + duketaterColour;
   duketaterFrag.textContent = Beautify(Game.cookiesPs * 60 * 15 * 100);
   section.appendChild(
-    StatsListing(
+    StatsListing('basic', 'Cookies required for max reward of Duketater: ', duketaterFrag),
-      'basic',
-      'Cookies required for max reward of Duketater: ',
-      duketaterFrag,
-    ),
   );
   const missingPlantDrops = [];
   Object.keys(GameData.PlantDrops).forEach((i) => {
@@ -572,11 +486,7 @@ export function GardenSection() {
   });
   if (missingPlantDrops.length !== 0) {
     section.appendChild(
-      StatsListing(
+      StatsListing('basic', 'Rare plant drops left to unlock', StatsMissDisp(missingPlantDrops)),
-        'basic',
-        'Rare plant drops left to unlock',
-        StatsMissDisp(missingPlantDrops),
-      ),
     );
   }
   return section;
@@ -595,18 +505,14 @@ export function PrestigeSection() {
       CacheRealCookiesEarned +
         Game.cookiesReset +
         CacheWrinklersTotal +
-        (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')
+        (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg') ? CacheLastChoEgg : 0),
-          ? CacheLastChoEgg
-          : 0),
     ),
   );
   section.appendChild(
     StatsListing(
       'withTooltip',
       'Prestige level (cur / max)',
-      document.createTextNode(
+      document.createTextNode(`${Beautify(Game.prestige)} / ${Beautify(possiblePresMax)}`),
-        `${Beautify(Game.prestige)} / ${Beautify(possiblePresMax)}`,
-      ),
       'PrestMaxTooltipPlaceholder',
     ),
   );
@@ -617,21 +523,14 @@ export function PrestigeSection() {
       (CacheRealCookiesEarned +
         Game.cookiesReset +
         CacheWrinklersTotal +
-        ((
+        ((Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg') ? CacheLastChoEgg : 0)
-          Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')
-            ? CacheLastChoEgg
-            : 0
-        )
           ? CacheLastChoEgg
           : 0)),
   );
   const cookiesNextFrag = document.createDocumentFragment();
   cookiesNextFrag.appendChild(document.createTextNode(Beautify(neededCook)));
   const cookiesNextSmall = document.createElement('small');
-  cookiesNextSmall.textContent = ` (${FormatTime(
+  cookiesNextSmall.textContent = ` (${FormatTime(neededCook / CacheAvgCPSWithChoEgg, 1)})`;
-    neededCook / CacheAvgCPSWithChoEgg,
-    1,
-  )})`;
   cookiesNextFrag.appendChild(cookiesNextSmall);
   section.appendChild(
     StatsListing(
@@ -666,8 +565,7 @@ export function PrestigeSection() {
   const HCTarget = Number(CMOptions.HeavenlyChipsTarget);
   if (!Number.isNaN(HCTarget)) {
     const CookiesTillTarget =
-      HCTarget -
+      HCTarget - Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned));
-      Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned));
     if (CookiesTillTarget > 0) {
       section.appendChild(
         StatsListing(
@@ -680,9 +578,7 @@ export function PrestigeSection() {
         StatsListing(
           'basic',
           'Time till target (cur, current 5 second average)',
-          document.createTextNode(
+          document.createTextNode(FormatTime(CookiesTillTarget / CacheHCPerSecond)),
-            FormatTime(CookiesTillTarget / CacheHCPerSecond),
-          ),
         ),
       );
     }
@@ -698,18 +594,11 @@ export function PrestigeSection() {
     resetFrag.appendChild(resetSmall);
   }
   section.appendChild(
-    StatsListing(
+    StatsListing('withTooltip', 'Reset bonus income', resetFrag, 'ResetTooltipPlaceholder'),
-      'withTooltip',
-      'Reset bonus income',
-      resetFrag,
-      'ResetTooltipPlaceholder',
-    ),
   );
 
   const currentPrestige = Math.floor(Game.HowMuchPrestige(Game.cookiesReset));
-  const willHave = Math.floor(
+  const willHave = Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned));
-    Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned),
-  );
   const willGet = willHave - currentPrestige;
   if (!Game.Has('Lucky digit')) {
     let delta7 = 7 - (willHave % 10);
@@ -722,9 +611,7 @@ export function PrestigeSection() {
         `${next7Total.toLocaleString()} / ${next7Reset.toLocaleString()} (+${delta7})`,
       ),
     );
-    section.appendChild(
+    section.appendChild(StatsListing('basic', 'Next "Lucky Digit" (total / reset)', frag7));
-      StatsListing('basic', 'Next "Lucky Digit" (total / reset)', frag7),
-    );
   }
 
   if (!Game.Has('Lucky number')) {
@@ -738,9 +625,7 @@ export function PrestigeSection() {
         `${next777Total.toLocaleString()} / ${next777Reset.toLocaleString()} (+${delta777})`,
       ),
     );
-    section.appendChild(
+    section.appendChild(StatsListing('basic', 'Next "Lucky Number" (total / reset)', frag777));
-      StatsListing('basic', 'Next "Lucky Number" (total / reset)', frag777),
-    );
   }
 
   if (!Game.Has('Lucky payout')) {
@@ -754,9 +639,7 @@ export function PrestigeSection() {
         `${next777777Total.toLocaleString()} / ${next777777Reset.toLocaleString()} (+${delta777777})`,
       ),
     );
-    section.appendChild(
+    section.appendChild(StatsListing('basic', 'Next "Lucky Payout" (total / reset)', frag777777));
-      StatsListing('basic', 'Next "Lucky Payout" (total / reset)', frag777777),
-    );
   }
 
   return section;
@@ -806,8 +689,7 @@ export function SeasonSection() {
       specDisp = true;
     }
   });
-  const choEgg =
+  const choEgg = Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg');
-    Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg');
   const centEgg = Game.Has('Century egg');
 
   if (Game.season === 'christmas' || specDisp || choEgg || centEgg) {
@@ -837,9 +719,7 @@ export function SeasonSection() {
             'basic',
             'Chance of receiving a cookie from wrinkler/shiny wrinkler',
             document.createTextNode(
-              `${Beautify(
+              `${Beautify((1 - failRateHalloween) * obtainedCookiesChance * 100)}% / ${Beautify(
-                (1 - failRateHalloween) * obtainedCookiesChance * 100,
-              )}% / ${Beautify(
                 (1 - failRateHalloween * 0.9) * obtainedCookiesChance * 100,
               )}%`,
             ),
@@ -870,9 +750,7 @@ export function SeasonSection() {
             'basic',
             'Chance of receiving a cookie from reindeer',
             document.createTextNode(
-              `${Beautify(
+              `${Beautify((1 - failRateChristmas) * obtainedCookiesChance * 100)}%`,
-                (1 - failRateChristmas) * obtainedCookiesChance * 100,
-              )}%`,
             ),
           ),
         );
@@ -900,23 +778,14 @@ export function SeasonSection() {
         // Calculations courtesy of @svschouw, at https://github.com/Aktanusa/CookieMonster/issues/25
         const succesRateEgg = 1 - failRateEgg;
         const obtainedEggs = Game.eggDrops.length - missingNormalEggs.length;
-        const obtainedRareEggs =
+        const obtainedRareEggs = Game.rareEggDrops.length - missingRareEggs.length;
-          Game.rareEggDrops.length - missingRareEggs.length;
+        const pNormal1 = succesRateEgg * 0.9 * (1 - obtainedEggs / Game.eggDrops.length);
-        const pNormal1 =
+        const pRare1 = succesRateEgg * 0.1 * (1 - obtainedRareEggs / Game.rareEggDrops.length);
-          succesRateEgg * 0.9 * (1 - obtainedEggs / Game.eggDrops.length);
+        const pRedropNormal = succesRateEgg * 0.9 * (obtainedEggs / Game.eggDrops.length);
-        const pRare1 =
+        const pRedropRare = succesRateEgg * 0.1 * (obtainedRareEggs / Game.rareEggDrops.length);
-          succesRateEgg *
-          0.1 *
-          (1 - obtainedRareEggs / Game.rareEggDrops.length);
-        const pRedropNormal =
-          succesRateEgg * 0.9 * (obtainedEggs / Game.eggDrops.length);
-        const pRedropRare =
-          succesRateEgg * 0.1 * (obtainedRareEggs / Game.rareEggDrops.length);
         const pRedrop = pRedropNormal + pRedropRare;
-        const pNormal2 =
+        const pNormal2 = pRedrop * 0.9 * (1 - obtainedEggs / Game.eggDrops.length);
-          pRedrop * 0.9 * (1 - obtainedEggs / Game.eggDrops.length);
+        const pRare2 = pRedrop * 0.1 * (1 - obtainedRareEggs / Game.rareEggDrops.length);
-        const pRare2 =
-          pRedrop * 0.1 * (1 - obtainedRareEggs / Game.rareEggDrops.length);
         return [pNormal1 + pNormal2, pRare1 + pRare2];
       };
       if (missingNormalEggs.length !== 0) {
@@ -932,29 +801,21 @@ export function SeasonSection() {
             'basic',
             'Chance of receiving an egg from wrinkler/golden cookie',
             document.createTextNode(
-              `${Beautify(dropRateEgg(0.98)[0] * 100)}% / ${Beautify(
+              `${Beautify(dropRateEgg(0.98)[0] * 100)}% / ${Beautify(dropRateEgg(0.9)[0] * 100)}%`,
-                dropRateEgg(0.9)[0] * 100,
-              )}%`,
             ),
           ),
         );
       }
       if (missingRareEggs.length !== 0) {
         section.appendChild(
-          StatsListing(
+          StatsListing('basic', 'Rare easter eggs left to unlock', StatsMissDisp(missingRareEggs)),
-            'basic',
-            'Rare easter eggs left to unlock',
-            StatsMissDisp(missingRareEggs),
-          ),
         );
         section.appendChild(
           StatsListing(
             'basic',
             'Chance of receiving a rare egg from wrinkler/golden cookie',
             document.createTextNode(
-              `${Beautify(dropRateEgg(0.98)[1] * 100)}% / ${Beautify(
+              `${Beautify(dropRateEgg(0.98)[1] * 100)}% / ${Beautify(dropRateEgg(0.9)[1] * 100)}%`,
-                dropRateEgg(0.9)[1] * 100,
-              )}%`,
             ),
           ),
         );
@@ -962,11 +823,7 @@ export function SeasonSection() {
 
       if (Game.season === 'christmas')
         section.appendChild(
-          StatsListing(
+          StatsListing('basic', 'Reindeer reward', document.createTextNode(Beautify(CacheSeaSpec))),
-            'basic',
-            'Reindeer reward',
-            document.createTextNode(Beautify(CacheSeaSpec)),
-          ),
         );
       if (choEgg) {
         section.appendChild(
@@ -983,9 +840,7 @@ export function SeasonSection() {
           StatsListing(
             'basic',
             'Century egg multiplier',
-            document.createTextNode(
+            document.createTextNode(`${Math.round((CacheCentEgg - 1) * 10000) / 100}%`),
-              `${Math.round((CacheCentEgg - 1) * 10000) / 100}%`,
-            ),
           ),
         );
       }

src/Disp/Notifications/Flash.js

@@ -12,26 +12,24 @@ import { isInitializing } from '../../InitSaveLoad/Variables';
 export default function Flash(mode, config, forced) {
   // The arguments check makes the sound not play upon initialization of the mod
   if (
-    ((CMOptions[config] === 1 || forced) &&
+    ((CMOptions[config] === 1 || forced) && mode === 3 && isInitializing === false) ||
-      mode === 3 &&
-      isInitializing === false) ||
     mode === 1
   ) {
     l('CMFlashScreen').style.backgroundColor = CMOptions[`Colour${config}`];
     l('CMFlashScreen').style.opacity = '0.5';
     if (mode === 3) {
       l('CMFlashScreen').style.display = 'inline';
-      setTimeout(function () {
+      setTimeout(() => {
         Flash(2, config, true);
       }, 1000 / Game.fps);
     } else {
-      setTimeout(function () {
+      setTimeout(() => {
         Flash(0, config, true);
       }, 1000 / Game.fps);
     }
   } else if (mode === 2) {
     l('CMFlashScreen').style.opacity = '1';
-    setTimeout(function () {
+    setTimeout(() => {
       Flash(1, config, true);
     }, 1000 / Game.fps);
   } else if (mode === 0) l('CMFlashScreen').style.display = 'none';

src/Disp/Notifications/Sound.js

@@ -14,8 +14,7 @@ export default function PlaySound(url, sndConfig, volConfig, forced) {
   if ((CMOptions[sndConfig] === 1 || forced) && isInitializing === false) {
     // eslint-disable-next-line new-cap
     const sound = new Audio(url);
-    if (CMOptions.GeneralSound)
+    if (CMOptions.GeneralSound) sound.volume = (CMOptions[volConfig] / 100) * (Game.volume / 100);
-      sound.volume = (CMOptions[volConfig] / 100) * (Game.volume / 100);
     else sound.volume = CMOptions[volConfig] / 100;
     sound.play();
   }

src/Disp/TabTitle/FavIcon.js

@@ -20,12 +20,7 @@ export function CreateFavicon() {
 export function UpdateFavicon() {
   if (CMOptions.Favicon === 1 && LastGoldenCookieState > 0) {
     if (CacheSpawnedGoldenShimmer.wrath)
-      l('CMFavicon').href =
+      l('CMFavicon').href = 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
-        'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
+    else l('CMFavicon').href = 'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
-    else
+  } else l('CMFavicon').href = 'https://orteil.dashnet.org/cookieclicker/favicon.ico';
-      l('CMFavicon').href =
-        'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
-  } else
-    l('CMFavicon').href =
-      'https://orteil.dashnet.org/cookieclicker/favicon.ico';
 }

src/Disp/TabTitle/TabTitle.js

@@ -1,14 +1,8 @@
 /** Functions related to updating the tab in the browser's tab-bar */
 
-import {
+import { CacheSeasonPopShimmer, CacheSpawnedGoldenShimmer } from '../../Cache/VariablesAndData';
-  CacheSeasonPopShimmer,
-  CacheSpawnedGoldenShimmer,
-} from '../../Cache/VariablesAndData';
 import { CMOptions } from '../../Config/VariablesAndData';
-import {
+import { LastSeasonPopupState, LastTickerFortuneState } from '../../Main/VariablesAndData';
-  LastSeasonPopupState,
-  LastTickerFortuneState,
-} from '../../Main/VariablesAndData';
 import { Title } from '../VariablesAndData';
 
 /**
@@ -28,14 +22,10 @@ export default function UpdateTitle() {
     if (CacheSpawnedGoldenShimmer) {
       if (CacheSpawnedGoldenShimmer.wrath)
         titleGC = `[W${Math.ceil(CacheSpawnedGoldenShimmer.life / Game.fps)}]`;
-      else
+      else titleGC = `[G${Math.ceil(CacheSpawnedGoldenShimmer.life / Game.fps)}]`;
-        titleGC = `[G${Math.ceil(CacheSpawnedGoldenShimmer.life / Game.fps)}]`;
     } else if (!Game.Has('Golden switch [off]')) {
-      titleGC = `[${
+      titleGC = `[${Number(l('CMTimerBarGCMinBar').textContent) < 0 ? '!' : ''}${Math.ceil(
-        Number(l('CMTimerBarGCMinBar').textContent) < 0 ? '!' : ''
+        (Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) / Game.fps,
-      }${Math.ceil(
-        (Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) /
-          Game.fps,
       )}]`;
     } else titleGC = '[GS]';
 
@@ -46,15 +36,10 @@ export default function UpdateTitle() {
 
     if (Game.season === 'christmas') {
       addSP = true;
-      if (LastSeasonPopupState)
+      if (LastSeasonPopupState) titleSP = `[R${Math.ceil(CacheSeasonPopShimmer.life / Game.fps)}]`;
-        titleSP = `[R${Math.ceil(CacheSeasonPopShimmer.life / Game.fps)}]`;
       else {
-        titleSP = `[${
+        titleSP = `[${Number(l('CMTimerBarRenMinBar').textContent) < 0 ? '!' : ''}${Math.ceil(
-          Number(l('CMTimerBarRenMinBar').textContent) < 0 ? '!' : ''
+          (Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time) / Game.fps,
-        }${Math.ceil(
-          (Game.shimmerTypes.reindeer.maxTime -
-            Game.shimmerTypes.reindeer.time) /
-            Game.fps,
         )}]`;
       }
     }
@@ -64,9 +49,7 @@ export default function UpdateTitle() {
     if (str.charAt(0) === '[') {
       str = str.substring(str.lastIndexOf(']') + 1);
     }
-    document.title = `${
+    document.title = `${titleGC + (addFC ? titleFC : '') + (addSP ? titleSP : '')} ${str}`;
-      titleGC + (addFC ? titleFC : '') + (addSP ? titleSP : '')
-    } ${str}`;
   } else if (CMOptions.Title === 2) {
     let str = '';
     let spawn = false;

src/Disp/Tooltips/AscendButton.js

@@ -4,7 +4,7 @@ import {
   CacheTimeTillNextPrestige,
 } from '../../Cache/VariablesAndData';
 import { CMOptions } from '../../Config/VariablesAndData';
-import { Beautify } from '../BeautifyAndFormatting/BeautifyFormatting';
+import Beautify from '../BeautifyAndFormatting/Beautify';
 
 /**
  * This function creates a header object for tooltips.
@@ -15,44 +15,35 @@ export default function ReplaceAscendTooltip() {
   const cookiesToNext = Math.max(
     0,
     Game.HowManyCookiesReset(
-      Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) +
+      Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) + 1,
-        1,
     ) -
       (Game.cookiesEarned + Game.cookiesReset),
   );
 
-  const startDate = Game.sayTime(
+  const startDate = Game.sayTime(((Date.now() - Game.startDate) / 1000) * Game.fps, -1);
-    ((Date.now() - Game.startDate) / 1000) * Game.fps,
-    -1,
-  );
   let str = '';
   str += `You've been on this run for <b>${
     startDate === '' ? 'not very long' : startDate
   }</b>.<br>`;
   str += '<div class="line"></div>';
   if (Game.prestige > 0) {
-    str += `Your prestige level is currently <b>${Beautify(
+    str += `Your prestige level is currently <b>${Beautify(Game.prestige)}</b>.<br>(CpS +${Beautify(
       Game.prestige,
-    )}</b>.<br>(CpS +${Beautify(Game.prestige)}%)`;
+    )}%)`;
     str += '<div class="line"></div>';
   }
-  if (CacheLastHeavenlyChips < 1)
+  if (CacheLastHeavenlyChips < 1) str += 'Ascending now would grant you no prestige.';
-    str += 'Ascending now would grant you no prestige.';
   else if (CacheLastHeavenlyChips < 2)
     str +=
       'Ascending now would grant you<br><b>1 prestige level</b> (+1% CpS)<br>and <b>1 heavenly chip</b> to spend.';
   else
     str += `Ascending now would grant you<br><b>${Beautify(
       CacheLastHeavenlyChips,
-    )} prestige levels</b> (+${Beautify(
+    )} prestige levels</b> (+${Beautify(CacheLastHeavenlyChips)}% CpS)<br>and <b>${Beautify(
-      CacheLastHeavenlyChips,
-    )}% CpS)<br>and <b>${Beautify(
       CacheLastHeavenlyChips,
     )} heavenly chips</b> to spend.`;
   str += '<div class="line"></div>';
-  str += `You need <b>${Beautify(
+  str += `You need <b>${Beautify(cookiesToNext)} more cookies</b> for the next level.<br>`;
-    cookiesToNext,
-  )} more cookies</b> for the next level.<br>`;
   str += `${
     CMOptions.TooltipAscendButton
       ? `<div class='line'></div>It takes ${CacheTimeTillNextPrestige} to reach the next level and you were making ${Beautify(

src/Disp/Tooltips/CreateTooltip.js

@@ -54,13 +54,7 @@ export function TooltipCreateWarningSection() {
   TooltipWarn.style.bottom = 'auto';
   TooltipWarn.id = 'CMDispTooltipWarningParent';
 
-  const create = function (
+  const create = function (boxId, color, labelTextFront, labelTextBack, deficitId) {
-    boxId,
-    color,
-    labelTextFront,
-    labelTextBack,
-    deficitId,
-  ) {
     const box = document.createElement('div');
     box.id = boxId;
     box.style.display = 'none';
@@ -182,13 +176,17 @@ export function TooltipCreateCalculationSection(tooltip) {
   tooltip.appendChild(time);
 
   if (TooltipType === 'b') {
-    tooltip.appendChild(
+    tooltip.appendChild(TooltipCreateHeader('Production left till next achievement'));
-      TooltipCreateHeader('Production left till next achievement'),
+    tooltip.lastChild.id = 'CMTooltipProductionLeftHeader'; // eslint-disable-line no-param-reassign
-    );
-    // Assign a id in order to hide when no achiev's are left
-    tooltip.lastChild.id = 'CMTooltipProductionHeader'; // eslint-disable-line no-param-reassign
     const production = document.createElement('div');
-    production.id = 'CMTooltipProduction';
+    production.id = 'CMTooltipProductionLeft';
+    tooltip.appendChild(production);
+  }
+  if (TooltipType === 'b') {
+    tooltip.appendChild(TooltipCreateHeader('Buildings (price / PP) left till next achievement'));
+    tooltip.lastChild.id = 'CMTooltipNextAchievementHeader'; // eslint-disable-line no-param-reassign
+    const production = document.createElement('div');
+    production.id = 'CMTooltipNextAchievement';
     tooltip.appendChild(production);
   }
 }

src/Disp/Tooltips/Tooltip.js

@@ -1,15 +1,9 @@
 import UpdateTooltips from './UpdateTooltips';
-import {
+import { SimpleTooltipElements, TooltipName, TooltipType } from '../VariablesAndData';
-  Beautify,
-  GetTimeColour,
-} from '../BeautifyAndFormatting/BeautifyFormatting';
-import {
-  SimpleTooltipElements,
-  TooltipName,
-  TooltipType,
-} from '../VariablesAndData';
 import { CMOptions } from '../../Config/VariablesAndData';
 import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
+import GetTimeColour from '../BeautifyAndFormatting/GetTimeColour';
+import Beautify from '../BeautifyAndFormatting/Beautify';
 
 /** All general functions related to creating and updating tooltips */
 
@@ -95,32 +89,20 @@ export function CreateTooltip(type, name) {
   } else if (type === 'u') {
     // Upgrades
     if (!Game.UpgradesInStore[name]) return '';
-    l('tooltip').innerHTML = Game.crateTooltip(
+    l('tooltip').innerHTML = Game.crateTooltip(Game.UpgradesInStore[name], 'store');
-      Game.UpgradesInStore[name],
-      'store',
-    );
   } else if (type === 's') l('tooltip').innerHTML = Game.lumpTooltip();
   // Sugar Lumps
   else if (type === 'g')
-    l('tooltip').innerHTML = Game.Objects['Wizard tower'].minigame.spellTooltip(
+    l('tooltip').innerHTML = Game.Objects['Wizard tower'].minigame.spellTooltip(name)();
-      name,
-    )();
   // Grimoire
   else if (type === 'p')
-    l('tooltip').innerHTML = Game.ObjectsById[2].minigame.tileTooltip(
+    l('tooltip').innerHTML = Game.ObjectsById[2].minigame.tileTooltip(name[0], name[1])();
-      name[0],
-      name[1],
-    )();
   // Harvest all button in garden
-  else if (type === 'ha')
+  else if (type === 'ha') l('tooltip').innerHTML = Game.ObjectsById[2].minigame.toolTooltip(1)();
-    l('tooltip').innerHTML = Game.ObjectsById[2].minigame.toolTooltip(1)();
   else if (type === 'wb') l('tooltip').innerHTML = '';
-  else if (type === 'pag')
+  else if (type === 'pag') l('tooltip').innerHTML = Game.Objects.Temple.minigame.godTooltip(name)();
-    l('tooltip').innerHTML = Game.Objects.Temple.minigame.godTooltip(name)();
   else if (type === 'pas')
-    l('tooltip').innerHTML = Game.Objects.Temple.minigame.slotTooltip(
+    l('tooltip').innerHTML = Game.Objects.Temple.minigame.slotTooltip(name[0])();
-      name[0],
-    )();
 
   // Adds area for extra tooltip-sections
   if (

src/Disp/Tooltips/TypesOfTooltips/Building.js

@@ -1,15 +1,16 @@
+import ColourOfPP from '../../../Cache/PP/ColourOfPP';
 import {
   CacheObjects1,
   CacheObjects10,
   CacheObjects100,
+  CacheObjectsNextAchievement,
 } from '../../../Cache/VariablesAndData';
 import { CMOptions } from '../../../Config/VariablesAndData';
+import BuyBuildingsBonusIncome from '../../../Sim/SimulationEvents/BuyBuildingBonusIncome';
 import { SimObjects } from '../../../Sim/VariablesAndData';
-import {
+import Beautify from '../../BeautifyAndFormatting/Beautify';
-  Beautify,
+import FormatTime from '../../BeautifyAndFormatting/FormatTime';
-  FormatTime,
+import GetTimeColour from '../../BeautifyAndFormatting/GetTimeColour';
-  GetTimeColour,
-} from '../../BeautifyAndFormatting/BeautifyFormatting';
 import GetCPS from '../../HelperFunctions/GetCPS';
 import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank';
 import {
@@ -44,9 +45,7 @@ export default function Building() {
 
     if (CMOptions.TooltipBuildUpgrade === 1 && Game.buyMode === 1) {
       l('CMTooltipIncome').textContent = Beautify(TooltipBonusIncome, 2);
-      const increase = Math.round(
+      const increase = Math.round((TooltipBonusIncome / Game.cookiesPs) * 10000);
-        (TooltipBonusIncome / Game.cookiesPs) * 10000,
-      );
       if (Number.isFinite(increase) && increase !== 0) {
         l('CMTooltipIncome').textContent += ` (${increase / 100}% of income)`;
       } else {
@@ -54,8 +53,7 @@ export default function Building() {
           CMOptions.ScaleSeparator ? ',' : '.'
         }01% of income)`;
       }
-      l('CMTooltipBorder').className =
+      l('CMTooltipBorder').className = ColourTextPre + target[TooltipName].color;
-        ColourTextPre + target[TooltipName].color;
       if (CMOptions.PPDisplayTime)
         l('CMTooltipPP').textContent = FormatTime(target[TooltipName].pp);
       else l('CMTooltipPP').textContent = Beautify(target[TooltipName].pp, 2);
@@ -64,39 +62,61 @@ export default function Building() {
         (TooltipPrice - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),
       );
       l('CMTooltipTime').textContent = timeColour.text;
-      if (
+      if (timeColour.text === 'Done!' && Game.cookies < target[TooltipName].price) {
-        timeColour.text === 'Done!' &&
-        Game.cookies < target[TooltipName].price
-      ) {
         l('CMTooltipTime').textContent = `${timeColour.text} (with Wrink)`;
       } else l('CMTooltipTime').textContent = timeColour.text;
       l('CMTooltipTime').className = ColourTextPre + timeColour.color;
     }
 
     // Add "production left till next achievement"-bar
-    l('CMTooltipProductionHeader').style.display = 'none';
+    l('CMTooltipProductionLeftHeader').style.display = 'none';
     l('CMTooltipTime').style.marginBottom = '0px';
 
-    // Can this ESLint error be solved while retaining the functionality of break?
     // eslint-disable-next-line no-restricted-syntax
     for (const i of Object.keys(Game.Objects[TooltipName].productionAchievs)) {
-      if (
+      if (!Game.HasAchiev(Game.Objects[TooltipName].productionAchievs[i].achiev.name)) {
-        !Game.HasAchiev(
+        const nextProductionAchiev = Game.Objects[TooltipName].productionAchievs[i];
-          Game.Objects[TooltipName].productionAchievs[i].achiev.name,
-        )
-      ) {
-        const nextProductionAchiev =
-          Game.Objects[TooltipName].productionAchievs[i];
         l('CMTooltipTime').style.marginBottom = '4px';
-        l('CMTooltipProductionHeader').style.display = '';
+        l('CMTooltipProductionLeftHeader').style.display = '';
-        l('CMTooltipProduction').className = `ProdAchievement${TooltipName}`;
+        l('CMTooltipProductionLeft').className = `ProdAchievement${TooltipName}`;
-        l('CMTooltipProduction').textContent = Beautify(
+        l('CMTooltipProductionLeft').textContent = Beautify(
           nextProductionAchiev.pow - SimObjects[TooltipName].totalCookies,
           15,
         );
-        l('CMTooltipProduction').style.color = 'white';
+        l('CMTooltipProductionLeft').style.color = 'white';
         break;
       }
     }
+
+    const ObjectsTillNext = CacheObjectsNextAchievement[TooltipName];
+    if (ObjectsTillNext.AmountNeeded < 101) {
+      l('CMTooltipProductionLeft').style.marginBottom = '4px';
+      l('CMTooltipNextAchievementHeader').style.display = '';
+
+      let PPOfAmount;
+      if (Game.cookiesPs) {
+        PPOfAmount =
+          Math.max(ObjectsTillNext.price - (Game.cookies + GetWrinkConfigBank()), 0) /
+            Game.cookiesPs +
+          ObjectsTillNext.price /
+            BuyBuildingsBonusIncome(TooltipName, ObjectsTillNext.AmountNeeded);
+      } else
+        PPOfAmount =
+          ObjectsTillNext.price /
+          BuyBuildingsBonusIncome(TooltipName, ObjectsTillNext.AmountNeeded);
+
+      l('CMTooltipNextAchievement').textContent = `${Beautify(
+        ObjectsTillNext.AmountNeeded,
+      )} / ${Beautify(ObjectsTillNext.price)} / `;
+      l('CMTooltipNextAchievement').style.color = 'white';
+      const PPFrag = document.createElement('span');
+      if (CMOptions.PPDisplayTime) PPFrag.textContent = FormatTime(PPOfAmount);
+      else PPFrag.textContent = Beautify(PPOfAmount);
+      PPFrag.className = ColourTextPre + ColourOfPP({ pp: PPOfAmount }, ObjectsTillNext.price);
+      l('CMTooltipNextAchievement').appendChild(PPFrag);
+    } else {
+      l('CMTooltipNextAchievementHeader').style.display = 'none';
+      l('CMTooltipProductionLeft').style.marginBottom = '0px';
+    }
   } else l('CMTooltipArea').style.display = 'none';
 }

src/Disp/Tooltips/TypesOfTooltips/GardenPlots.js

@@ -1,5 +1,5 @@
 import { CMOptions } from '../../../Config/VariablesAndData';
-import { Beautify } from '../../BeautifyAndFormatting/BeautifyFormatting';
+import Beautify from '../../BeautifyAndFormatting/Beautify';
 import { TooltipName } from '../../VariablesAndData';
 import * as Create from '../CreateTooltip';
 
@@ -9,46 +9,31 @@ import * as Create from '../CreateTooltip';
  */
 export default function GardenPlots() {
   const { minigame } = Game.Objects.Farm;
-  if (
+  if (CMOptions.TooltipPlots && minigame.plot[TooltipName[1]][TooltipName[0]][0] !== 0) {
-    CMOptions.TooltipPlots &&
-    minigame.plot[TooltipName[1]][TooltipName[0]][0] !== 0
-  ) {
     const mature =
       minigame.plot[TooltipName[1]][TooltipName[0]][1] >
-      minigame.plantsById[minigame.plot[TooltipName[1]][TooltipName[0]][0] - 1]
+      minigame.plantsById[minigame.plot[TooltipName[1]][TooltipName[0]][0] - 1].mature;
-        .mature;
     const plantName =
-      minigame.plantsById[minigame.plot[TooltipName[1]][TooltipName[0]][0] - 1]
+      minigame.plantsById[minigame.plot[TooltipName[1]][TooltipName[0]][0] - 1].name;
-        .name;
+    l('CMTooltipBorder').appendChild(Create.TooltipCreateHeader('Reward (Current / Maximum)'));
-    l('CMTooltipBorder').appendChild(
-      Create.TooltipCreateHeader('Reward (Current / Maximum)'),
-    );
     const reward = document.createElement('div');
     reward.id = 'CMTooltipPlantReward';
     l('CMTooltipBorder').appendChild(reward);
     if (plantName === 'Bakeberry') {
       l('CMTooltipPlantReward').textContent = `${
-        mature
+        mature ? Beautify(Math.min(Game.cookies * 0.03, Game.cookiesPs * 60 * 30)) : '0'
-          ? Beautify(Math.min(Game.cookies * 0.03, Game.cookiesPs * 60 * 30))
-          : '0'
       } / ${Beautify(Game.cookiesPs * 60 * 30)}`;
     } else if (plantName === 'Chocoroot' || plantName === 'White chocoroot') {
       l('CMTooltipPlantReward').textContent = `${
-        mature
+        mature ? Beautify(Math.min(Game.cookies * 0.03, Game.cookiesPs * 60 * 3)) : '0'
-          ? Beautify(Math.min(Game.cookies * 0.03, Game.cookiesPs * 60 * 3))
-          : '0'
       } / ${Beautify(Game.cookiesPs * 60 * 3)}`;
     } else if (plantName === 'Queenbeet') {
       l('CMTooltipPlantReward').textContent = `${
-        mature
+        mature ? Beautify(Math.min(Game.cookies * 0.04, Game.cookiesPs * 60 * 60)) : '0'
-          ? Beautify(Math.min(Game.cookies * 0.04, Game.cookiesPs * 60 * 60))
-          : '0'
       } / ${Beautify(Game.cookiesPs * 60 * 60)}`;
     } else if (plantName === 'Duketater') {
       l('CMTooltipPlantReward').textContent = `${
-        mature
+        mature ? Beautify(Math.min(Game.cookies * 0.08, Game.cookiesPs * 60 * 120)) : '0'
-          ? Beautify(Math.min(Game.cookies * 0.08, Game.cookiesPs * 60 * 120))
-          : '0'
       } / ${Beautify(Game.cookiesPs * 60 * 120)}`;
     } else l('CMTooltipArea').style.display = 'none';
   } else l('CMTooltipArea').style.display = 'none';

src/Disp/Tooltips/TypesOfTooltips/Grimoire.js

@@ -1,9 +1,7 @@
 import { CacheNoGoldSwitchCookiesPS } from '../../../Cache/VariablesAndData';
 import { CMOptions } from '../../../Config/VariablesAndData';
-import {
+import Beautify from '../../BeautifyAndFormatting/Beautify';
-  Beautify,
+import GetTimeColour from '../../BeautifyAndFormatting/GetTimeColour';
-  GetTimeColour,
-} from '../../BeautifyAndFormatting/BeautifyFormatting';
 import CalculateGrimoireRefillTime from '../../HelperFunctions/CalculateGrimoireRefillTime';
 import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank';
 import { ColourTextPre, TooltipName } from '../../VariablesAndData';
@@ -50,9 +48,7 @@ export default function Grimoire() {
 
     // Extra information on cookies gained when spell is Conjure Baked Goods (Name === 0)
     if (TooltipName === '0') {
-      tooltipBox.appendChild(
+      tooltipBox.appendChild(Create.TooltipCreateHeader('Cookies to be gained/lost'));
-        Create.TooltipCreateHeader('Cookies to be gained/lost'),
-      );
       const conjure = document.createElement('div');
       conjure.id = 'x';
       tooltipBox.appendChild(conjure);

src/Disp/Tooltips/TypesOfTooltips/HarvestAll.js

@@ -1,5 +1,5 @@
 import { CMOptions } from '../../../Config/VariablesAndData';
-import { Beautify } from '../../BeautifyAndFormatting/BeautifyFormatting';
+import Beautify from '../../BeautifyAndFormatting/Beautify';
 import * as Create from '../CreateTooltip';
 
 /**
@@ -10,9 +10,7 @@ import * as Create from '../CreateTooltip';
 export default function HarvestAll() {
   const { minigame } = Game.Objects.Farm;
   if (CMOptions.TooltipLump) {
-    l('CMTooltipBorder').appendChild(
+    l('CMTooltipBorder').appendChild(Create.TooltipCreateHeader('Cookies gained from harvesting:'));
-      Create.TooltipCreateHeader('Cookies gained from harvesting:'),
-    );
     let totalGain = 0;
     let mortal = 0;
     if (Game.keys[16] && Game.keys[17]) mortal = 1;
@@ -27,31 +25,17 @@ export default function HarvestAll() {
           if (mortal && me.immortal) count = false;
           if (tile[1] < me.matureBase) count = false;
           if (count && plantName === 'Bakeberry') {
-            totalGain += Math.min(
+            totalGain += Math.min(Game.cookies * 0.03, Game.cookiesPs * 60 * 30);
-              Game.cookies * 0.03,
+          } else if ((count && plantName === 'Chocoroot') || plantName === 'White chocoroot') {
-              Game.cookiesPs * 60 * 30,
-            );
-          } else if (
-            (count && plantName === 'Chocoroot') ||
-            plantName === 'White chocoroot'
-          ) {
             totalGain += Math.min(Game.cookies * 0.03, Game.cookiesPs * 60 * 3);
           } else if (count && plantName === 'Queenbeet') {
-            totalGain += Math.min(
+            totalGain += Math.min(Game.cookies * 0.04, Game.cookiesPs * 60 * 60);
-              Game.cookies * 0.04,
-              Game.cookiesPs * 60 * 60,
-            );
           } else if (count && plantName === 'Duketater') {
-            totalGain += Math.min(
+            totalGain += Math.min(Game.cookies * 0.08, Game.cookiesPs * 60 * 120);
-              Game.cookies * 0.08,
-              Game.cookiesPs * 60 * 120,
-            );
           }
         }
       }
     }
-    l('CMTooltipBorder').appendChild(
+    l('CMTooltipBorder').appendChild(document.createTextNode(Beautify(totalGain)));
-      document.createTextNode(Beautify(totalGain)),
-    );
   } else l('CMTooltipArea').style.display = 'none';
 }

src/Disp/Tooltips/TypesOfTooltips/PantheonGods.js

@@ -1,6 +1,6 @@
 import { CacheGods } from '../../../Cache/VariablesAndData';
 import { CMOptions } from '../../../Config/VariablesAndData';
-import { Beautify } from '../../BeautifyAndFormatting/BeautifyFormatting';
+import Beautify from '../../BeautifyAndFormatting/Beautify';
 import { TooltipName, TooltipType } from '../../VariablesAndData';
 import * as Create from '../CreateTooltip';
 
@@ -22,15 +22,11 @@ export default function PantheonGods() {
     cps1.id = 'CMPantheonTooltipPosition1';
     if (CacheGods[GodID][0] !== 0) {
       cps1.textContent = Beautify(CacheGods[GodID][0]);
-      const increase = Math.round(
+      const increase = Math.round((CacheGods[GodID][0] / Game.cookiesPs) * 10000);
-        (CacheGods[GodID][0] / Game.cookiesPs) * 10000,
-      );
       if (Number.isFinite(increase) && increase !== 0) {
         cps1.textContent += ` (${increase / 100}% of income)`;
       } else {
-        cps1.textContent += ` (<0${
+        cps1.textContent += ` (<0${CMOptions.ScaleSeparator ? ',' : '.'}01% of income)`;
-          CMOptions.ScaleSeparator ? ',' : '.'
-        }01% of income)`;
       }
     } else cps1.textContent = 'No effect to CPS';
     tooltipBox.appendChild(cps1);
@@ -40,15 +36,11 @@ export default function PantheonGods() {
     cps2.id = 'CMPantheonTooltipPosition2';
     if (CacheGods[GodID][1] !== 0) {
       cps2.textContent = Beautify(CacheGods[GodID][1]);
-      const increase = Math.round(
+      const increase = Math.round((CacheGods[GodID][1] / Game.cookiesPs) * 10000);
-        (CacheGods[GodID][1] / Game.cookiesPs) * 10000,
-      );
       if (Number.isFinite(increase) && increase !== 0) {
         cps2.textContent += ` (${increase / 100}% of income)`;
       } else {
-        cps2.textContent += ` (<0${
+        cps2.textContent += ` (<0${CMOptions.ScaleSeparator ? ',' : '.'}01% of income)`;
-          CMOptions.ScaleSeparator ? ',' : '.'
-        }01% of income)`;
       }
     } else cps2.textContent = 'No effect to CPS';
     tooltipBox.appendChild(cps2);
@@ -58,15 +50,11 @@ export default function PantheonGods() {
     cps3.id = 'CMPantheonTooltipPosition2';
     if (CacheGods[GodID][2] !== 0) {
       cps3.textContent = Beautify(CacheGods[GodID][2]);
-      const increase = Math.round(
+      const increase = Math.round((CacheGods[GodID][2] / Game.cookiesPs) * 10000);
-        (CacheGods[GodID][2] / Game.cookiesPs) * 10000,
-      );
       if (Number.isFinite(increase) && increase !== 0) {
         cps3.textContent += ` (${increase / 100}% of income)`;
       } else {
-        cps3.textContent += ` (<0${
+        cps3.textContent += ` (<0${CMOptions.ScaleSeparator ? ',' : '.'}01% of income)`;
-          CMOptions.ScaleSeparator ? ',' : '.'
-        }01% of income)`;
       }
     } else cps3.textContent = 'No effect to CPS';
     tooltipBox.appendChild(cps3);

src/Disp/Tooltips/TypesOfTooltips/Upgrade.js

@@ -1,13 +1,8 @@
-import {
+import { CacheLastChoEgg, CacheUpgrades } from '../../../Cache/VariablesAndData';
-  CacheLastChoEgg,
-  CacheUpgrades,
-} from '../../../Cache/VariablesAndData';
 import { CMOptions } from '../../../Config/VariablesAndData';
-import {
+import Beautify from '../../BeautifyAndFormatting/Beautify';
-  Beautify,
+import FormatTime from '../../BeautifyAndFormatting/FormatTime';
-  FormatTime,
+import GetTimeColour from '../../BeautifyAndFormatting/GetTimeColour';
-  GetTimeColour,
-} from '../../BeautifyAndFormatting/BeautifyFormatting';
 import GetCPS from '../../HelperFunctions/GetCPS';
 import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank';
 import {
@@ -27,22 +22,15 @@ export default function Upgrade() {
   const tooltipBox = l('CMTooltipBorder');
   Create.TooltipCreateCalculationSection(tooltipBox);
 
-  TooltipBonusIncome =
+  TooltipBonusIncome = CacheUpgrades[Game.UpgradesInStore[TooltipName].name].bonus;
-    CacheUpgrades[Game.UpgradesInStore[TooltipName].name].bonus;
+  TooltipPrice = Game.Upgrades[Game.UpgradesInStore[TooltipName].name].getPrice();
-  TooltipPrice = Game.Upgrades[
+  TooltipBonusMouse = CacheUpgrades[Game.UpgradesInStore[TooltipName].name].bonusMouse;
-    Game.UpgradesInStore[TooltipName].name
-  ].getPrice();
-  TooltipBonusMouse =
-    CacheUpgrades[Game.UpgradesInStore[TooltipName].name].bonusMouse;
 
   if (CMOptions.TooltipBuildUpgrade === 1) {
     l('CMTooltipIncome').textContent = Beautify(TooltipBonusIncome, 2);
     const increase = Math.round((TooltipBonusIncome / Game.cookiesPs) * 10000);
     // Don't display certain parts of tooltip if not applicable
-    if (
+    if (l('CMTooltipIncome').textContent === '0' && (TooltipType === 'b' || TooltipType === 'u')) {
-      l('CMTooltipIncome').textContent === '0' &&
-      (TooltipType === 'b' || TooltipType === 'u')
-    ) {
       l('Bonus IncomeTitle').style.display = 'none';
       l('CMTooltipIncome').style.display = 'none';
       l('Payback PeriodTitle').style.display = 'none';
@@ -56,8 +44,7 @@ export default function Upgrade() {
         }01% of income)`;
       }
       l('CMTooltipBorder').className =
-        ColourTextPre +
+        ColourTextPre + CacheUpgrades[Game.UpgradesInStore[TooltipName].name].color;
-        CacheUpgrades[Game.UpgradesInStore[TooltipName].name].color;
       // If clicking power upgrade
       if (TooltipBonusMouse) {
         l('CMTooltipCookiePerClick').textContent = Beautify(TooltipBonusMouse);
@@ -66,9 +53,7 @@ export default function Upgrade() {
       }
       // If only a clicking power upgrade change PP to click-based period
       if (TooltipBonusIncome === 0 && TooltipBonusMouse) {
-        l('CMTooltipPP').textContent = `${Beautify(
+        l('CMTooltipPP').textContent = `${Beautify(TooltipPrice / TooltipBonusMouse)} Clicks`;
-          TooltipPrice / TooltipBonusMouse,
-        )} Clicks`;
         l('CMTooltipPP').style.color = 'white';
       } else {
         if (CMOptions.PPDisplayTime)
@@ -81,8 +66,7 @@ export default function Upgrade() {
             2,
           );
         l('CMTooltipPP').className =
-          ColourTextPre +
+          ColourTextPre + CacheUpgrades[Game.UpgradesInStore[TooltipName].name].color;
-          CacheUpgrades[Game.UpgradesInStore[TooltipName].name].color;
       }
     }
     const timeColour = GetTimeColour(
@@ -105,9 +89,7 @@ export default function Upgrade() {
       );
       const chocolate = document.createElement('div');
       chocolate.style.color = 'white';
-      chocolate.textContent = `${Beautify(Game.cookies * 0.05)} / ${Beautify(
+      chocolate.textContent = `${Beautify(Game.cookies * 0.05)} / ${Beautify(CacheLastChoEgg)}`;
-        CacheLastChoEgg,
-      )}`;
       l('CMTooltipBorder').appendChild(chocolate);
     }
   } else l('CMTooltipArea').style.display = 'none';

src/Disp/Tooltips/TypesOfTooltips/Warnings.js

@@ -2,18 +2,11 @@ import GetCPSBuffMult from '../../../Cache/CPS/GetCPSBuffMult';
 import { CacheEdifice, CacheLucky } from '../../../Cache/VariablesAndData';
 import ToggleToolWarnPos from '../../../Config/Toggles/ToggleToolWarnPos';
 import { CMOptions } from '../../../Config/VariablesAndData';
-
+import Beautify from '../../BeautifyAndFormatting/Beautify';
-import {
+import FormatTime from '../../BeautifyAndFormatting/FormatTime';
-  Beautify,
-  FormatTime,
-} from '../../BeautifyAndFormatting/BeautifyFormatting';
 import GetCPS from '../../HelperFunctions/GetCPS';
 import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank';
-import {
+import { TooltipBonusIncome, TooltipPrice, TooltipType } from '../../VariablesAndData';
-  TooltipBonusIncome,
-  TooltipPrice,
-  TooltipType,
-} from '../../VariablesAndData';
 import * as Create from '../CreateTooltip';
 
 /**
@@ -26,16 +19,10 @@ export default function Warnings() {
       ToggleToolWarnPos();
     }
 
-    if (CMOptions.ToolWarnPos === 0)
+    if (CMOptions.ToolWarnPos === 0) l('CMDispTooltipWarningParent').style.right = '0px';
-      l('CMDispTooltipWarningParent').style.right = '0px';
+    else l('CMDispTooltipWarningParent').style.top = `${l('tooltip').offsetHeight}px`;
-    else
-      l('CMDispTooltipWarningParent').style.top = `${
-        l('tooltip').offsetHeight
-      }px`;
 
-    l('CMDispTooltipWarningParent').style.width = `${
+    l('CMDispTooltipWarningParent').style.width = `${l('tooltip').offsetWidth - 6}px`;
-      l('tooltip').offsetWidth - 6
-    }px`;
 
     const amount = Game.cookies + GetWrinkConfigBank() - TooltipPrice;
     const bonusIncomeUsed = CMOptions.ToolWarnBon ? TooltipBonusIncome : 0;
@@ -51,72 +38,46 @@ export default function Warnings() {
         l('CMDispTooltipWarnLucky').style.display = '';
         l('CMDispTooltipWarnLuckyText').textContent = `${Beautify(
           limitLucky - amount,
-        )} (${FormatTime(
+        )} (${FormatTime((limitLucky - amount) / (GetCPS() + bonusIncomeUsed))})`;
-          (limitLucky - amount) / (GetCPS() + bonusIncomeUsed),
-        )})`;
       } else l('CMDispTooltipWarnLucky').style.display = 'none';
     } else l('CMDispTooltipWarnLucky').style.display = 'none';
 
     if (CMOptions.ToolWarnLuckyFrenzy === 1) {
       const limitLuckyFrenzy = limitLucky * 7;
-      if (
+      if (amount < limitLuckyFrenzy && (TooltipType !== 'b' || Game.buyMode === 1)) {
-        amount < limitLuckyFrenzy &&
-        (TooltipType !== 'b' || Game.buyMode === 1)
-      ) {
         l('CMDispTooltipWarnLuckyFrenzy').style.display = '';
         l('CMDispTooltipWarnLuckyFrenzyText').textContent = `${Beautify(
           limitLuckyFrenzy - amount,
-        )} (${FormatTime(
+        )} (${FormatTime((limitLuckyFrenzy - amount) / (GetCPS() + bonusIncomeUsed))})`;
-          (limitLuckyFrenzy - amount) / (GetCPS() + bonusIncomeUsed),
-        )})`;
       } else l('CMDispTooltipWarnLuckyFrenzy').style.display = 'none';
     } else l('CMDispTooltipWarnLuckyFrenzy').style.display = 'none';
 
     if (CMOptions.ToolWarnConjure === 1) {
       const limitConjure = limitLucky * 2;
-      if (
+      if (amount < limitConjure && (TooltipType !== 'b' || Game.buyMode === 1)) {
-        amount < limitConjure &&
-        (TooltipType !== 'b' || Game.buyMode === 1)
-      ) {
         l('CMDispTooltipWarnConjure').style.display = '';
         l('CMDispTooltipWarnConjureText').textContent = `${Beautify(
           limitConjure - amount,
-        )} (${FormatTime(
+        )} (${FormatTime((limitConjure - amount) / (GetCPS() + bonusIncomeUsed))})`;
-          (limitConjure - amount) / (GetCPS() + bonusIncomeUsed),
-        )})`;
       } else l('CMDispTooltipWarnConjure').style.display = 'none';
     } else l('CMDispTooltipWarnConjure').style.display = 'none';
 
     if (CMOptions.ToolWarnConjureFrenzy === 1) {
       const limitConjureFrenzy = limitLucky * 2 * 7;
-      if (
+      if (amount < limitConjureFrenzy && (TooltipType !== 'b' || Game.buyMode === 1)) {
-        amount < limitConjureFrenzy &&
-        (TooltipType !== 'b' || Game.buyMode === 1)
-      ) {
         l('CMDispTooltipWarnConjureFrenzy').style.display = '';
         l('CMDispTooltipWarnConjureFrenzyText').textContent = `${Beautify(
           limitConjureFrenzy - amount,
-        )} (${FormatTime(
+        )} (${FormatTime((limitConjureFrenzy - amount) / (GetCPS() + bonusIncomeUsed))})`;
-          (limitConjureFrenzy - amount) / (GetCPS() + bonusIncomeUsed),
-        )})`;
       } else l('CMDispTooltipWarnConjureFrenzy').style.display = 'none';
     } else l('CMDispTooltipWarnConjureFrenzy').style.display = 'none';
 
-    if (
+    if (CMOptions.ToolWarnEdifice === 1 && Game.Objects['Wizard tower'].minigameLoaded) {
-      CMOptions.ToolWarnEdifice === 1 &&
+      if (CacheEdifice && amount < CacheEdifice && (TooltipType !== 'b' || Game.buyMode === 1)) {
-      Game.Objects['Wizard tower'].minigameLoaded
-    ) {
-      if (
-        CacheEdifice &&
-        amount < CacheEdifice &&
-        (TooltipType !== 'b' || Game.buyMode === 1)
-      ) {
         l('CMDispTooltipWarnEdifice').style.display = '';
         l('CMDispTooltipWarnEdificeText').textContent = `${Beautify(
           CacheEdifice - amount,
-        )} (${FormatTime(
+        )} (${FormatTime((CacheEdifice - amount) / (GetCPS() + bonusIncomeUsed))})`;
-          (CacheEdifice - amount) / (GetCPS() + bonusIncomeUsed),
-        )})`;
       } else l('CMDispTooltipWarnEdifice').style.display = 'none';
     } else l('CMDispTooltipWarnEdifice').style.display = 'none';
 
@@ -133,8 +94,7 @@ export default function Warnings() {
         l('CMDispTooltipWarnUserText').textContent = `${Beautify(
           CMOptions.ToolWarnUser * GetCPS() - amount,
         )} (${FormatTime(
-          (CMOptions.ToolWarnUser * GetCPS() - amount) /
+          (CMOptions.ToolWarnUser * GetCPS() - amount) / (GetCPS() + bonusIncomeUsed),
-            (GetCPS() + bonusIncomeUsed),
         )})`;
       } else l('CMDispTooltipWarnUser').style.display = 'none';
     } else l('CMDispTooltipWarnUser').style.display = 'none';

src/Disp/Tooltips/TypesOfTooltips/WrinklerButton.js

@@ -1,8 +1,5 @@
-import {
+import { CacheWrinklersFattest, CacheWrinklersTotal } from '../../../Cache/VariablesAndData';
-  CacheWrinklersFattest,
+import Beautify from '../../BeautifyAndFormatting/Beautify';
-  CacheWrinklersTotal,
-} from '../../../Cache/VariablesAndData';
-import { Beautify } from '../../BeautifyAndFormatting/BeautifyFormatting';
 import { TooltipName } from '../../VariablesAndData';
 import * as Create from '../CreateTooltip';
 

src/Disp/Tooltips/UpdateTooltips.js

@@ -35,10 +35,7 @@ export default function UpdateTooltips() {
       HarvestAll();
     } else if (TooltipType === 'wb') {
       WrinklerButton();
-    } else if (
+    } else if (TooltipType === 'pag' || (TooltipType === 'pas' && TooltipName[1] !== -1)) {
-      TooltipType === 'pag' ||
-      (TooltipType === 'pas' && TooltipName[1] !== -1)
-    ) {
       PantheonGods();
     }
     Warnings();

src/Disp/Tooltips/WrinklerTooltips.js

@@ -1,6 +1,6 @@
 import { CMOptions } from '../../Config/VariablesAndData';
 import { SimObjects } from '../../Sim/VariablesAndData';
-import { Beautify } from '../BeautifyAndFormatting/BeautifyFormatting';
+import Beautify from '../BeautifyAndFormatting/Beautify';
 import {
   TooltipWrinkler,
   TooltipWrinklerArea,
@@ -20,10 +20,7 @@ export function CheckWrinklerTooltip() {
       const me = Game.wrinklers[i];
       if (me.phase > 0 && me.selected) {
         showingTooltip = true;
-        if (
+        if (TooltipWrinklerBeingShown[i] === 0 || TooltipWrinklerBeingShown[i] === undefined) {
-          TooltipWrinklerBeingShown[i] === 0 ||
-          TooltipWrinklerBeingShown[i] === undefined
-        ) {
           const placeholder = document.createElement('div');
           const wrinkler = document.createElement('div');
           wrinkler.style.minWidth = '120px';

src/Disp/VariablesAndData.js

@@ -23,7 +23,6 @@ export const ColourGray = 'Gray';
 export const ColourPink = 'Pink';
 export const ColourBrown = 'Brown';
 export const ColoursOrdering = [
-  ColourGray,
   ColourBlue,
   ColourGreen,
   ColourYellow,
@@ -32,6 +31,7 @@ export const ColoursOrdering = [
   ColourPurple,
   ColourPink,
   ColourBrown,
+  ColourGray,
 ];
 
 /**
@@ -73,11 +73,7 @@ export const TooltipText = [
     'The amount of cookies you would get from popping all wrinklers with Skruuia god in Diamond slot, selling all stock market goods, selling all buildings with Earth Shatterer and Reality Bending auras, and then buying Chocolate egg',
     '300px',
   ],
-  [
+  ['ChainNextLevelPlaceholder', 'Cheated cookies might break this formula', '250px'],
-    'ChainNextLevelPlaceholder',
-    'Cheated cookies might break this formula',
-    '250px',
-  ],
   [
     'FavouriteSettingPlaceholder',
     "Click to set this setting as favourite and show it in 'favourite' settings at the top of the Cookie Monster Settings",
@@ -101,7 +97,7 @@ export let TooltipWrinkler = -1; // eslint-disable-line prefer-const
 export let TooltipWrinklerBeingShown = []; // eslint-disable-line prefer-const
 
 export let CMLastAscendState;
-export let CMSayTime;
+export let CMSayTime = function () {}; // eslint-disable-line prefer-const
 
 /**
  * These are variables used to create various displays when the game is loaded on the "sell all" screen

src/InitSaveLoad/init.js

@@ -1,4 +1,4 @@
-import { VersionMajor, VersionMinor } from '../Data/Moddata';
+import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
 import CMDrawHook from '../Disp/DrawHook';
 import CMClickHook from '../Main/ClickHook';
 import InitializeCookieMonster from '../Main/Initialization';
@@ -22,9 +22,10 @@ export default function init() {
   }
   if (proceed) {
     InitializeCookieMonster();
+    Game.registerHook('click', CMClickHook);
     Game.registerHook('draw', CMDrawHook);
     Game.registerHook('logic', CMLoopHook);
-    Game.registerHook('click', CMClickHook);
+
     isInitializing = false; // eslint-disable-line no-unused-vars
   }
 }

src/InitSaveLoad/load.js

@@ -1,5 +1,5 @@
 import { LoadConfig } from '../Config/SaveLoadReload/SaveLoadReloadSettings';
-import { VersionMajor, VersionMinor } from '../Data/Moddata';
+import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
 import { FavouriteSettings } from '../Disp/VariablesAndData';
 import InitData from '../Sim/InitializeData/InitData';
 
@@ -11,8 +11,7 @@ export default function load(str) {
   const save = JSON.parse(str);
   InitData();
   // The if-statement is a failsafe for old saves
-  if (typeof save.favouriteSettings !== 'undefined')
+  if (typeof save.favouriteSettings !== 'undefined') FavouriteSettings = save.favouriteSettings; // eslint-disable-line no-unused-vars
-    FavouriteSettings = save.favouriteSettings; // eslint-disable-line no-unused-vars
   LoadConfig(save.settings);
   if (save.version !== `${VersionMajor}.${VersionMinor}`) {
     if (Game.prefs.popups)

src/InitSaveLoad/save.js

@@ -1,5 +1,5 @@
 import { CMOptions } from '../Config/VariablesAndData';
-import { VersionMajor, VersionMinor } from '../Data/Moddata';
+import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
 import { FavouriteSettings } from '../Disp/VariablesAndData';
 
 /**