Update dependencies and remove unneeded things. This allows building on node v22. Also rely on configs for eslint/prettier so CI and command line runs are guaranteed to be consistent.

This commit is contained in:
Kevin Radloff
2025-02-13 08:07:13 -05:00
committed by Daniël van Noord
parent 9e98208c19
commit a1aaa3de8f
145 changed files with 3775 additions and 5909 deletions

View File

@@ -10,16 +10,16 @@ jobs:
Check_linting_test_and_build:
runs-on: ubuntu-latest
env:
GITHUB_REGISTERY_PAT: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REGISTRY_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 12
node-version: 22
- name: Install dependencies
run: npm ci
- name: Run ESLint
run: npx eslint src
run: npx eslint
- name: Run Mocha tests
run: npx mocha
- name: Check if CookieMonsterDev.js is built correctly

View File

@@ -1,4 +1,3 @@
{
"recursive": true,
"require": ["esm"]
"recursive": true
}

2
.npmrc
View File

@@ -1,4 +1,4 @@
always-auth=true
registry=https://registry.npmjs.org/
@cookiemonsterteam:registry=https://npm.pkg.github.com
//npm.pkg.github.com/:_authToken=${GITHUB_REGISTERY_PAT}
//npm.pkg.github.com/:_authToken=${GITHUB_REGISTRY_PAT}

View File

@@ -9,7 +9,7 @@ repos:
- '--trailing-comma=all'
exclude: &build 'CookieMonster(Dev)?.js(.map)?'
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
exclude: *build

1
.prettierignore Normal file
View File

@@ -0,0 +1 @@
dist

View File

@@ -68,11 +68,11 @@ All suggestions are welcome, even the smallest ones.
Cookie Monster exposes some of the data it creates to the global scope. This data can be found in the `CookieMonsterData` object after loading Cookie Monster.
Currently we exposes relevant data for buildings and upgrades (PP, colour and bonus income). If you would like us to add any aditional data, please feel free to open an issue or create a PR doing so!
Currently we expose relevant data for buildings and upgrades (PP, colour and bonus income). If you would like us to add any additional data, please feel free to open an issue or create a PR doing so!
## Contributing
To contribute you can fork and clone the repository and run `npm install`. Note that you will need to authenticate to the GitHub Package Registery (see [this documentation](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-npm-registry#authenticating-to-github-packages)). After creating a Public Access Token you should export this variable to $GITHUB_REGISTERY_PAT as defined in `.npmrc`.
To contribute you can fork and clone the repository and run `npm install`. Note that you will need to authenticate to the GitHub Package Registry (see [this documentation](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-npm-registry#authenticating-to-github-packages)). After creating a Public Access Token you should export this variable to $GITHUB_REGISTRY_PAT as defined in `.npmrc`.
Please also remember to run `npm run build-dev` after saving all your changes to build the final `CookieMonsterDev.js` file.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

64
eslint.config.mjs Normal file
View File

@@ -0,0 +1,64 @@
import globals from 'globals';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import js from '@eslint/js';
import { FlatCompat } from '@eslint/eslintrc';
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});
export default [
{
ignores: [
'eslint.config.mjs',
'webpack.config.cjs',
'**/CookieMonster.user.js',
'dist/*',
'node_modules/*',
],
},
...compat.extends('airbnb-base', 'prettier'),
{
languageOptions: {
globals: {
...globals.browser,
Game: 'writable',
l: 'readonly',
b64_to_utf8: 'readonly',
utf8_to_b64: 'readonly',
BeautifyAll: 'readonly',
},
ecmaVersion: 'latest',
sourceType: 'module',
},
rules: {
'import/extensions': ['error', 'ignorePackages'],
'import/no-mutable-exports': 'off',
'no-import-assign': 'off',
'no-plusplus': [
'error',
{
allowForLoopAfterthoughts: true,
},
],
'func-names': 'off',
'prefer-destructuring': [
'error',
{
object: true,
array: false,
},
],
},
},
];

8478
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "@cookiemonsterteam/cookiemonster-mod",
"version": "2.031.10",
"version": "2.053.10",
"description": "Cookie Monster is an add-on that you can load into Cookie Clicker which offers a wide range of tools and statistics to enhance the game. It is not a cheat interface although it does offer helpers for golden cookies and such, everything can be toggled off at will to only leave how much information you want. This is a helper and everything is an option.",
"main": "CookieMonster.js",
"keywords": [
@@ -14,7 +14,7 @@
"build-dev": "run-s eslint test pack-prod",
"build-final": "run-s eslint test pack-final",
"build-test": "webpack",
"eslint": "eslint src test",
"eslint": "eslint",
"pack-prod": "webpack --env minimize",
"pack-final": "webpack --env minimize --env finalfile",
"test": "mocha"
@@ -43,21 +43,6 @@
"url": "https://github.com/CookieMonsterTeam/CookieMonster/issues"
},
"homepage": "https://github.com/CookieMonsterTeam/CookieMonster#readme",
"devDependencies": {
"@types/chai": "^4.3.4",
"@types/mocha": "^9.0.0",
"chai": "^4.3.7",
"eslint": "^8.36.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
"esm": "^3.2.25",
"mocha": "^8.4.0",
"npm-run-all": "^4.1.5",
"prettier": "2.8.7",
"webpack": "^5.76.1",
"webpack-cli": "^4.10.0"
},
"ccrepo": {
"icon": [
10,
@@ -65,8 +50,30 @@
],
"name": "Cookie Monster"
},
"type": "module",
"engines": {
"node": ">=18"
},
"dependencies": {
"@eastdesire/jscolor": "2.4.6",
"@cookiemonsterteam/cookiemonsterframework": "0.2.3"
"@cookiemonsterteam/cookiemonsterframework": "0.2.3",
"@eastdesire/jscolor": "^2.5.1",
"@eslint/compat": "^1.2.6",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.20.0",
"chai": "^4.3.7",
"eslint": "^9.20.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^10.0.1",
"globals": "^15.14.0",
"mocha": "^11.1.0",
"npm-run-all": "^4.1.5",
"prettier": "^3.5.0",
"webpack": "^5.97.1",
"webpack-cli": "^6.0.1"
},
"overrides": {
"eslint-config-airbnb-base": {
"eslint": "^9.20.0"
}
}
}

View File

@@ -1,11 +1,11 @@
import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData';
import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData.js';
import {
ChoEggDiff, // eslint-disable-line no-unused-vars
ClicksDiff, // eslint-disable-line no-unused-vars
CookiesDiff, // eslint-disable-line no-unused-vars
WrinkDiff, // eslint-disable-line no-unused-vars
WrinkFattestDiff, // eslint-disable-line no-unused-vars
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* @class

View File

@@ -1,5 +1,5 @@
import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData';
import FillCMDCache from '../FillCMDCache';
import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData.js';
import FillCMDCache from '../FillCMDCache.js';
import {
CacheAverageClicks,
CacheAverageCPS,
@@ -23,7 +23,7 @@ import {
CookiesDiff,
WrinkDiff,
WrinkFattestDiff,
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* This functions caches two variables related average CPS and Clicks
@@ -89,7 +89,6 @@ export default function CacheAvgCPS() {
CacheAverageGainBank + CacheAverageGainWrink + (choEgg ? CacheAverageGainChoEgg : 0);
} else CacheAvgCPSWithChoEgg = CacheAverageCPS;
// eslint-disable-next-line no-unused-vars
CacheAverageClicks = ClicksDiff.calcAverage(
ClickTimes[Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.AvgClicksHist],
);

View File

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

View File

@@ -1,6 +1,6 @@
import CalcNoGoldSwitchCPS from '../../Sim/Calculations/NoGoldenSwitchCalc';
import FillCMDCache from '../FillCMDCache';
import { CacheNoGoldSwitchCookiesPS } from '../VariablesAndData';
import CalcNoGoldSwitchCPS from '../../Sim/Calculations/NoGoldenSwitchCalc.js';
import FillCMDCache from '../FillCMDCache.js';
import { CacheNoGoldSwitchCookiesPS } from '../VariablesAndData.js';
/**
* This function calculates CPS without the Golden Switch as it might be needed in other functions

View File

@@ -1,6 +1,6 @@
import SellBuildingsForChoEgg from '../../Sim/SimulationEvents/SellBuildingForChoEgg';
import FillCMDCache from '../FillCMDCache';
import { CacheSellForChoEgg } from '../VariablesAndData';
import SellBuildingsForChoEgg from '../../Sim/SimulationEvents/SellBuildingForChoEgg.js';
import FillCMDCache from '../FillCMDCache.js';
import { CacheSellForChoEgg } from '../VariablesAndData.js';
/**
* This functions caches the reward for selling the Chocolate egg

View File

@@ -1,17 +1,17 @@
import { ClickTimes } from '../Disp/VariablesAndData';
import { CMAvgQueue, InitCookiesDiff } from './CPS/AverageQueue';
import CacheAvgCPS from './CPS/CPS';
import CacheDragonAuras from './Dragon/CacheDragonAuras';
import CachePP from './PP/PP';
import { CacheBuildingsPrices, CacheIncome } from './PriceAndIncome/PriceAndIncome';
import { CacheChain } from './Stats/ChainCookies';
import CacheHeavenlyChipsPS from './Stats/HeavenlyChips';
import CacheAllMissingUpgrades from './Stats/MissingUpgrades';
import CacheSeasonSpec from './Stats/Reindeer';
import { CacheGoldenAndWrathCookiesMults, CacheStatsCookies } from './Stats/Stats';
import AllAmountTillNextAchievement from './TillNextAchievement/AllAmountTillNextAchievement';
import { CacheAverageCookiesFromClicks, HeavenlyChipsDiff } from './VariablesAndData'; // eslint-disable-line no-unused-vars
import CacheWrinklers from './Wrinklers/Wrinklers';
import { ClickTimes } from '../Disp/VariablesAndData.js';
import { CMAvgQueue, InitCookiesDiff } from './CPS/AverageQueue.js';
import CacheAvgCPS from './CPS/CPS.js';
import CacheDragonAuras from './Dragon/CacheDragonAuras.js';
import CachePP from './PP/PP.js';
import { CacheBuildingsPrices, CacheIncome } from './PriceAndIncome/PriceAndIncome.js';
import { CacheChain } from './Stats/ChainCookies.js';
import CacheHeavenlyChipsPS from './Stats/HeavenlyChips.js';
import CacheAllMissingUpgrades from './Stats/MissingUpgrades.js';
import CacheSeasonSpec from './Stats/Reindeer.js';
import { CacheGoldenAndWrathCookiesMults, CacheStatsCookies } from './Stats/Stats.js';
import AllAmountTillNextAchievement from './TillNextAchievement/AllAmountTillNextAchievement.js';
import { CacheAverageCookiesFromClicks, HeavenlyChipsDiff } from './VariablesAndData.js'; // eslint-disable-line no-unused-vars
import CacheWrinklers from './Wrinklers/Wrinklers.js';
/**
* This functions runs all cache-functions to generate all "full" cache

View File

@@ -1,12 +1,12 @@
import FormatTime from '../Disp/BeautifyAndFormatting/FormatTime';
import GetCPS from '../Disp/HelperFunctions/GetCPS';
import CacheAvgCPS from './CPS/CPS';
import CacheCurrWrinklerCPS from './CPS/CurrWrinklerCPS';
import CachePP from './PP/PP';
import CacheHeavenlyChipsPS from './Stats/HeavenlyChips';
import AllAmountTillNextAchievement from './TillNextAchievement/AllAmountTillNextAchievement';
import { CacheTimeTillNextPrestige } from './VariablesAndData'; // eslint-disable-line no-unused-vars
import CacheWrinklers from './Wrinklers/Wrinklers';
import FormatTime from '../Disp/BeautifyAndFormatting/FormatTime.js';
import GetCPS from '../Disp/HelperFunctions/GetCPS.js';
import CacheAvgCPS from './CPS/CPS.js';
import CacheCurrWrinklerCPS from './CPS/CurrWrinklerCPS.js';
import CachePP from './PP/PP.js';
import CacheHeavenlyChipsPS from './Stats/HeavenlyChips.js';
import AllAmountTillNextAchievement from './TillNextAchievement/AllAmountTillNextAchievement.js';
import { CacheTimeTillNextPrestige } from './VariablesAndData.js'; // eslint-disable-line no-unused-vars
import CacheWrinklers from './Wrinklers/Wrinklers.js';
/**
* This functions caches variables that are needed every loop

View File

@@ -1,4 +1,4 @@
import { CacheDragonAura, CacheDragonAura2 } from '../VariablesAndData'; // eslint-disable-line no-unused-vars
import { CacheDragonAura, CacheDragonAura2 } from '../VariablesAndData.js'; // eslint-disable-line no-unused-vars
/**
* This functions caches the currently selected Dragon Auras

View File

@@ -1,10 +1,10 @@
/** Functions related to the Dragon */
import Beautify from '../../Disp/BeautifyAndFormatting/Beautify';
import CopyData from '../../Sim/SimulationData/CopyData';
import { SimDoSims, SimObjects } from '../../Sim/VariablesAndData';
import FillCMDCache from '../FillCMDCache';
import { CacheCostDragonUpgrade, CacheLastDragonLevel } from '../VariablesAndData'; // eslint-disable-line no-unused-vars
import Beautify from '../../Disp/BeautifyAndFormatting/Beautify.js';
import CopyData from '../../Sim/SimulationData/CopyData.js';
import { SimDoSims, SimObjects } from '../../Sim/VariablesAndData.js';
import FillCMDCache from '../FillCMDCache.js';
import { CacheCostDragonUpgrade, CacheLastDragonLevel } from '../VariablesAndData.js'; // eslint-disable-line no-unused-vars
/**
* This functions caches the current cost of upgrading the dragon level so it can be displayed in the tooltip

View File

@@ -1,7 +1,7 @@
import GetWrinkConfigBank from '../../Disp/HelperFunctions/GetWrinkConfigBank';
import { ColourGray } from '../../Disp/VariablesAndData';
import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
import FillCMDCache from '../FillCMDCache';
import GetWrinkConfigBank from '../../Disp/HelperFunctions/GetWrinkConfigBank.js';
import { ColourGray } from '../../Disp/VariablesAndData.js';
import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding.js';
import FillCMDCache from '../FillCMDCache.js';
import {
CacheMinPP,
CacheMinPPBulk,
@@ -9,8 +9,8 @@ import {
CacheObjects10,
CacheObjects100,
CachePPArray,
} from '../VariablesAndData';
import ColourOfPP from './ColourOfPP';
} from '../VariablesAndData.js';
import ColourOfPP from './ColourOfPP.js';
/**
* This functions caches the buildings of bulk-buy mode when PP is compared against optimal single-purchase building

View File

@@ -1,4 +1,4 @@
import GetCPS from '../../Disp/HelperFunctions/GetCPS';
import GetCPS from '../../Disp/HelperFunctions/GetCPS.js';
import {
ColourBlue,
ColourGray,
@@ -7,8 +7,8 @@ import {
ColourPurple,
ColourRed,
ColourYellow,
} from '../../Disp/VariablesAndData';
import { CacheMinPP, CachePPArray } from '../VariablesAndData';
} from '../../Disp/VariablesAndData.js';
import { CacheMinPP, CachePPArray } from '../VariablesAndData.js';
/**
* This functions return the colour assosciated with the given pp value

View File

@@ -1,9 +1,14 @@
/**
* Section: Functions related to caching PP */
import { CacheObjects1, CacheObjects10, CacheObjects100, CacheUpgrades } from '../VariablesAndData';
import CacheBuildingsPP from './Building';
import CacheUpgradePP from './Upgrade';
import {
CacheObjects1,
CacheObjects10,
CacheObjects100,
CacheUpgrades,
} from '../VariablesAndData.js';
import CacheBuildingsPP from './Building.js';
import CacheUpgradePP from './Upgrade.js';
/**
* This functions caches the PP of each building and upgrade and stores it in the cache

View File

@@ -1,6 +1,6 @@
import GetWrinkConfigBank from '../../Disp/HelperFunctions/GetWrinkConfigBank';
import { CacheUpgrades } from '../VariablesAndData';
import ColourOfPP from './ColourOfPP';
import GetWrinkConfigBank from '../../Disp/HelperFunctions/GetWrinkConfigBank.js';
import { CacheUpgrades } from '../VariablesAndData.js';
import ColourOfPP from './ColourOfPP.js';
/**
* This functions caches the PP of each building it saves all date in CM.Cache.Upgrades

View File

@@ -1,6 +1,6 @@
import CalculateChangeGod from '../../Sim/SimulationEvents/GodChange';
import FillCMDCache from '../FillCMDCache';
import { CacheGods } from '../VariablesAndData';
import CalculateChangeGod from '../../Sim/SimulationEvents/GodChange.js';
import FillCMDCache from '../FillCMDCache.js';
import { CacheGods } from '../VariablesAndData.js';
/**
* This functions caches the cps effect of each God in slot 1, 2 or 3

View File

@@ -1,9 +1,9 @@
/** Section: Functions related to caching income */
import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
import BuyBuildingsBonusIncome from '../../Sim/SimulationEvents/BuyBuildingBonusIncome';
import BuyUpgradesBonusIncome from '../../Sim/SimulationEvents/BuyUpgrades';
import FillCMDCache from '../FillCMDCache';
import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding.js';
import BuyBuildingsBonusIncome from '../../Sim/SimulationEvents/BuyBuildingBonusIncome.js';
import BuyUpgradesBonusIncome from '../../Sim/SimulationEvents/BuyUpgrades.js';
import FillCMDCache from '../FillCMDCache.js';
import {
CacheAverageGainBank,
CacheAverageGainWrink,
@@ -14,7 +14,7 @@ import {
CacheObjects100,
CacheObjectsNextAchievement,
CacheUpgrades,
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* This functions starts the calculation/simulation of the bonus income of buildings

View File

@@ -1,5 +1,5 @@
import GetCPSBuffMult from '../CPS/GetCPSBuffMult';
import FillCMDCache from '../FillCMDCache';
import GetCPSBuffMult from '../CPS/GetCPSBuffMult.js';
import FillCMDCache from '../FillCMDCache.js';
import {
CacheChainFrenzyMaxReward,
CacheChainFrenzyRequired,
@@ -17,7 +17,7 @@ import {
CacheGoldenCookiesMult,
CacheNoGoldSwitchCookiesPS,
CacheWrathCookiesMult,
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* This functions calculates the max possible payout given a set of variables

View File

@@ -1,10 +1,10 @@
import FillCMDCache from '../FillCMDCache';
import FillCMDCache from '../FillCMDCache.js';
import {
CacheHCPerSecond,
CacheLastHeavenlyCheck,
CacheLastHeavenlyChips,
HeavenlyChipsDiff,
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* This functions caches the heavenly chips per second in the last five seconds

View File

@@ -1,9 +1,9 @@
import { crateMissing } from '../../Disp/MenuSections/Statistics/CreateMissingUpgrades';
import { crateMissing } from '../../Disp/MenuSections/Statistics/CreateMissingUpgrades.js';
import {
CacheMissingUpgrades, // eslint-disable-line no-unused-vars
CacheMissingUpgradesCookies, // eslint-disable-line no-unused-vars
CacheMissingUpgradesPrestige, // eslint-disable-line no-unused-vars
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* This functions caches variables related to missing upgrades
@@ -35,12 +35,10 @@ export default function CacheAllMissingUpgrades() {
let str = '';
str += crateMissing(me);
/* eslint-disable no-unused-vars */
if (me.pool === 'prestige') CacheMissingUpgradesPrestige += str;
else if (me.pool === 'cookie') CacheMissingUpgradesCookies += str;
else if (me.pool !== 'toggle' && me.pool !== 'unused' && me.pool !== 'debug')
CacheMissingUpgrades += str;
/* eslint-enable no-unused-vars */
}
});
}

View File

@@ -1,5 +1,5 @@
import FillCMDCache from '../FillCMDCache';
import { CacheSeaSpec } from '../VariablesAndData';
import FillCMDCache from '../FillCMDCache.js';
import { CacheSeaSpec } from '../VariablesAndData.js';
/**
* This functions caches the reward of popping a reindeer

View File

@@ -1,8 +1,8 @@
/** Functions related to Caching stats */
import SimHas from '../../Sim/ReplacedGameFunctions/SimHas';
import GetCPSBuffMult from '../CPS/GetCPSBuffMult';
import FillCMDCache from '../FillCMDCache';
import SimHas from '../../Sim/ReplacedGameFunctions/SimHas.js';
import GetCPSBuffMult from '../CPS/GetCPSBuffMult.js';
import FillCMDCache from '../FillCMDCache.js';
import {
CacheConjure,
CacheConjureReward,
@@ -18,7 +18,7 @@ import {
CacheLuckyWrathRewardFrenzy,
CacheNoGoldSwitchCookiesPS,
CacheWrathCookiesMult,
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* This functions caches variables related to the stats page

View File

@@ -1,7 +1,7 @@
import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
import FillCMDCache from '../FillCMDCache';
import { CacheObjectsNextAchievement } from '../VariablesAndData';
import IndividualAmountTillNextAchievement from './IndividualAmountTillNextAchievement';
import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding.js';
import FillCMDCache from '../FillCMDCache.js';
import { CacheObjectsNextAchievement } from '../VariablesAndData.js';
import IndividualAmountTillNextAchievement from './IndividualAmountTillNextAchievement.js';
/**
* This functions caches the amount of buildings needed till next achievement

View File

@@ -1,5 +1,5 @@
import BuyBuildingsBonusIncome from '../../Sim/SimulationEvents/BuyBuildingBonusIncome';
import { SimAchievementsOwned } from '../../Sim/VariablesAndData';
import BuyBuildingsBonusIncome from '../../Sim/SimulationEvents/BuyBuildingBonusIncome.js';
import { SimAchievementsOwned } from '../../Sim/VariablesAndData.js';
export default function IndividualAmountTillNextAchievement(building) {
const AchievementsAtStart = Game.AchievementsOwned;

View File

@@ -1,12 +1,12 @@
/** Caches data related to Wrinklers */
import { SimObjects } from '../../Sim/VariablesAndData';
import FillCMDCache from '../FillCMDCache';
import { SimObjects } from '../../Sim/VariablesAndData.js';
import FillCMDCache from '../FillCMDCache.js';
import {
CacheWrinklersFattest,
CacheWrinklersNormal,
CacheWrinklersTotal,
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* This functions caches data related to Wrinklers

View File

@@ -10,6 +10,7 @@ function CheckNotificationPermissions(ToggleOnOff) {
const checkNotificationPromise = function () {
try {
Notification.requestPermission().then();
// eslint-disable-next-line no-unused-vars
} catch (e) {
return false;
}

View File

@@ -1,6 +1,6 @@
/** Called by the "func" of individual settings */
import UpdateBackground from '../Disp/HelperFunctions/UpdateBackground';
import UpdateBackground from '../Disp/HelperFunctions/UpdateBackground.js';
/**
* This function changes the position of both the bottom and timer bar

View File

@@ -1,4 +1,4 @@
import { saveAndLoadingFunctions } from '@cookiemonsterteam/cookiemonsterframework/src/index';
import { saveAndLoadingFunctions } from '@cookiemonsterteam/cookiemonsterframework/src/index.js';
/** Functions related to toggling or changing an individual setting */

View File

@@ -1,5 +1,5 @@
import { UpdateBotBar } from '../../Disp/InfoBars/BottomBar';
import { UpdateBotTimerBarPosition } from '../SpecificToggles';
import { UpdateBotBar } from '../../Disp/InfoBars/BottomBar.js';
import { UpdateBotTimerBarPosition } from '../SpecificToggles.js';
/**
* This function toggle the bottom bar

View File

@@ -1,5 +1,5 @@
import { CMSayTime } from '../../Disp/VariablesAndData';
import { BackupFunctions } from '../../Main/VariablesAndData';
import { CMSayTime } from '../../Disp/VariablesAndData.js';
import { BackupFunctions } from '../../Main/VariablesAndData.js';
/**
* This function changes some of the time-displays in the game to be more detailed

View File

@@ -1,5 +1,5 @@
import { CacheGoldenShimmersByID } from '../../Cache/VariablesAndData';
import { GCTimers } from '../../Disp/VariablesAndData';
import { CacheGoldenShimmersByID } from '../../Cache/VariablesAndData.js';
import { GCTimers } from '../../Disp/VariablesAndData.js';
/**
* This function toggles GC Timers are visible

View File

@@ -1,4 +1,4 @@
import UpdateUpgrades from '../../Disp/BuildingsUpgrades/Upgrades';
import UpdateUpgrades from '../../Disp/BuildingsUpgrades/Upgrades.js';
/**
* This function toggles the upgrade bar and the colours of upgrades

View File

@@ -1,6 +1,6 @@
import init from './InitSaveLoad/init';
import load from './InitSaveLoad/load';
import save from './InitSaveLoad/save';
import init from './InitSaveLoad/init.js';
import load from './InitSaveLoad/load.js';
import save from './InitSaveLoad/save.js';
const CM = {
init,
@@ -10,7 +10,7 @@ const CM = {
if (typeof Steam !== 'undefined') {
// Need to add a delay for steam
setTimeout(function () {
setTimeout(() => {
Game.registerMod('CookieMonster', CM);
// Game.registerMod also calls CM.load() which calls the loop hook

View File

@@ -1,6 +1,6 @@
/** Data related directly to Cookie Monster */
export const VersionMajor = '2.052';
export const VersionMajor = '2.053';
export const VersionMinor = '10';
/** Information about Cookie Monster to be displayed in the info section */

View File

@@ -1,21 +1,21 @@
import { settingClasses } from '@cookiemonsterteam/cookiemonsterframework/src/index';
import { settingClasses } from '@cookiemonsterteam/cookiemonsterframework/src/index.js';
import CheckNotificationPermissions from '../Config/CheckNotificationPermissions';
import RefreshScale from '../Disp/HelperFunctions/RefreshScale';
import { SimDoSims } from '../Sim/VariablesAndData'; // eslint-disable-line no-unused-vars
import ToggleBotBar from '../Config/Toggles/ToggleBotBar';
import ToggleDetailedTime from '../Config/Toggles/ToggleDetailedTime';
import ToggleGCTimer from '../Config/Toggles/ToggleGCTimer';
import ToggleSectionHideButtons from '../Config/Toggles/ToggleSectionHideButtons';
import ToggleToolWarnPos from '../Config/Toggles/ToggleToolWarnPos';
import ToggleUpgradeBarAndColour from '../Config/Toggles/ToggleUpgradeBarAndColour';
import ToggleUpgradeBarFixedPos from '../Config/Toggles/ToggleUpgradeBarFixedPos';
import ToggleWrinklerButtons from '../Config/Toggles/ToggleWrinklerButtons';
import UpdateBuildings from '../Disp/BuildingsUpgrades/Buildings';
import { UpdateFavicon } from '../Disp/TabTitle/FavIcon';
import UpdateUpgradeSectionsHeight from '../Disp/BuildingsUpgrades/UpdateUpgradeSectionsHeight';
import UpdateUpgrades from '../Disp/BuildingsUpgrades/Upgrades';
import { ToggleTimerBar, ToggleTimerBarPos } from '../Config/SpecificToggles';
import CheckNotificationPermissions from '../Config/CheckNotificationPermissions.js';
import RefreshScale from '../Disp/HelperFunctions/RefreshScale.js';
import { SimDoSims } from '../Sim/VariablesAndData.js'; // eslint-disable-line no-unused-vars
import ToggleBotBar from '../Config/Toggles/ToggleBotBar.js';
import ToggleDetailedTime from '../Config/Toggles/ToggleDetailedTime.js';
import ToggleGCTimer from '../Config/Toggles/ToggleGCTimer.js';
import ToggleSectionHideButtons from '../Config/Toggles/ToggleSectionHideButtons.js';
import ToggleToolWarnPos from '../Config/Toggles/ToggleToolWarnPos.js';
import ToggleUpgradeBarAndColour from '../Config/Toggles/ToggleUpgradeBarAndColour.js';
import ToggleUpgradeBarFixedPos from '../Config/Toggles/ToggleUpgradeBarFixedPos.js';
import ToggleWrinklerButtons from '../Config/Toggles/ToggleWrinklerButtons.js';
import UpdateBuildings from '../Disp/BuildingsUpgrades/Buildings.js';
import { UpdateFavicon } from '../Disp/TabTitle/FavIcon.js';
import UpdateUpgradeSectionsHeight from '../Disp/BuildingsUpgrades/UpdateUpgradeSectionsHeight.js';
import UpdateUpgrades from '../Disp/BuildingsUpgrades/Upgrades.js';
import { ToggleTimerBar, ToggleTimerBarPos } from '../Config/SpecificToggles.js';
/** This includes all options of CookieMonster and their relevant data */
const settings = {

View File

@@ -1,7 +1,7 @@
/** General functions to format or beautify strings */
import { metric, shortScale, shortScaleAbbreviated } from '../../Data/Scales';
import { BackupFunctions } from '../../Main/VariablesAndData';
import { metric, shortScale, shortScaleAbbreviated } from '../../Data/Scales.js';
import { BackupFunctions } from '../../Main/VariablesAndData.js';
/**
* This function returns formats number based on the Scale setting

View File

@@ -1,5 +1,5 @@
import { ColourGreen, ColourOrange, ColourRed, ColourYellow } from '../VariablesAndData';
import FormatTime from './FormatTime';
import { ColourGreen, ColourOrange, ColourRed, ColourYellow } from '../VariablesAndData.js';
import FormatTime from './FormatTime.js';
/**
* This function returns the colour to be used for time-strings

View File

@@ -4,10 +4,10 @@ import {
CacheObjects10,
CacheObjects100,
CacheObjectsNextAchievement,
} from '../../Cache/VariablesAndData';
import BuildingSell from '../../Sim/SimulationEvents/SellBuilding';
import Beautify from '../BeautifyAndFormatting/Beautify';
import { ColoursOrdering, LastTargetBuildings } from '../VariablesAndData';
} from '../../Cache/VariablesAndData.js';
import BuildingSell from '../../Sim/SimulationEvents/SellBuilding.js';
import Beautify from '../BeautifyAndFormatting/Beautify.js';
import { ColoursOrdering, LastTargetBuildings } from '../VariablesAndData.js';
/**
* Section: Functions related to right column of the screen (buildings/upgrades)

View File

@@ -8,7 +8,7 @@ import {
ColourRed,
ColourTextPre,
ColourYellow,
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* This function creates the legend for the upgrade bar

View File

@@ -1,4 +1,4 @@
import { CacheUpgrades } from '../../Cache/VariablesAndData';
import { CacheUpgrades } from '../../Cache/VariablesAndData.js';
import {
ColourBackPre,
ColourBlue,
@@ -9,7 +9,7 @@ import {
ColourRed,
ColoursOrdering,
ColourYellow,
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* This function adjusts some things in the upgrades section

View File

@@ -1,10 +1,10 @@
/** Functions related to the Dragon */
import CacheDragonCost from '../../Cache/Dragon/Dragon';
import { CacheCostDragonUpgrade } from '../../Cache/VariablesAndData';
import CalculateChangeAura from '../../Sim/SimulationEvents/AuraChange';
import Beautify from '../BeautifyAndFormatting/Beautify';
import FormatTime from '../BeautifyAndFormatting/FormatTime';
import CacheDragonCost from '../../Cache/Dragon/Dragon.js';
import { CacheCostDragonUpgrade } from '../../Cache/VariablesAndData.js';
import CalculateChangeAura from '../../Sim/SimulationEvents/AuraChange.js';
import Beautify from '../BeautifyAndFormatting/Beautify.js';
import FormatTime from '../BeautifyAndFormatting/FormatTime.js';
/**
* This functions adds the two extra lines about CPS and time to recover to the aura picker infoscreen

View File

@@ -1,12 +1,12 @@
import ToggleWrinklerButtons from '../Config/Toggles/ToggleWrinklerButtons';
import UpdateBuildings from './BuildingsUpgrades/Buildings';
import UpdateUpgradeSectionsHeight from './BuildingsUpgrades/UpdateUpgradeSectionsHeight';
import UpdateUpgrades from './BuildingsUpgrades/Upgrades';
import { UpdateBotBar } from './InfoBars/BottomBar';
import { UpdateTimerBar } from './InfoBars/TimerBar';
import RefreshMenu from './MenuSections/Refreshmenu';
import UpdateTooltips from './Tooltips/UpdateTooltips';
import { CheckWrinklerTooltip, UpdateWrinklerTooltip } from './Tooltips/WrinklerTooltips';
import ToggleWrinklerButtons from '../Config/Toggles/ToggleWrinklerButtons.js';
import UpdateBuildings from './BuildingsUpgrades/Buildings.js';
import UpdateUpgradeSectionsHeight from './BuildingsUpgrades/UpdateUpgradeSectionsHeight.js';
import UpdateUpgrades from './BuildingsUpgrades/Upgrades.js';
import { UpdateBotBar } from './InfoBars/BottomBar.js';
import { UpdateTimerBar } from './InfoBars/TimerBar.js';
import RefreshMenu from './MenuSections/Refreshmenu.js';
import UpdateTooltips from './Tooltips/UpdateTooltips.js';
import { CheckWrinklerTooltip, UpdateWrinklerTooltip } from './Tooltips/WrinklerTooltips.js';
/**
* This function handles all custom drawing for the Game.Draw() function.

View File

@@ -1,6 +1,6 @@
/** Section: Functions related to the Golden Cookie Timers */
import { GCTimers } from '../VariablesAndData';
import { GCTimers } from '../VariablesAndData.js';
/**
* This function creates a new Golden Cookie Timer and appends it CM.Disp.GCTimers based on the id of the cookie

View File

@@ -3,7 +3,7 @@ import {
CacheCurrWrinklerCount,
CacheCurrWrinklerCPSMult,
CacheWrinklersFattest,
} from '../../Cache/VariablesAndData';
} from '../../Cache/VariablesAndData.js';
/**
* This function returns the cps as either current or average CPS depending on CM.Options.CPSMode

View File

@@ -5,7 +5,7 @@ import {
ColourPurple,
ColourRed,
ColourYellow,
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* This function returns Name and Colour as object for sugar lump type that is given as input param.

View File

@@ -1,4 +1,4 @@
import { CacheWrinklersFattest, CacheWrinklersTotal } from '../../Cache/VariablesAndData';
import { CacheWrinklersFattest, CacheWrinklersTotal } from '../../Cache/VariablesAndData.js';
/**
* This function returns the total amount stored in the Wrinkler Bank

View File

@@ -1,6 +1,6 @@
import UpdateBuildings from '../BuildingsUpgrades/Buildings';
import UpdateUpgrades from '../BuildingsUpgrades/Upgrades';
import { UpdateBotBar } from '../InfoBars/BottomBar';
import UpdateBuildings from '../BuildingsUpgrades/Buildings.js';
import UpdateUpgrades from '../BuildingsUpgrades/Upgrades.js';
import { UpdateBotBar } from '../InfoBars/BottomBar.js';
/**
* This function refreshes all numbers after a change in scale-setting

View File

@@ -1,7 +1,7 @@
import { ToggleTimerBar } from '../../Config/SpecificToggles';
import ToggleBotBar from '../../Config/Toggles/ToggleBotBar';
import { ToggleTimerBar } from '../../Config/SpecificToggles.js';
import ToggleBotBar from '../../Config/Toggles/ToggleBotBar.js';
import UpdateBackground from './UpdateBackground';
import UpdateBackground from './UpdateBackground.js';
/**
* This function disables and shows the bars created by CookieMonster when the game is "ascending"

View File

@@ -1,10 +1,10 @@
import UpdateBuildings from '../BuildingsUpgrades/Buildings';
import UpdateBuildings from '../BuildingsUpgrades/Buildings.js';
import {
ColourBackPre,
ColourBorderPre,
ColoursOrdering,
ColourTextPre,
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* This function changes/refreshes colours if the user has set new standard colours

View File

@@ -1,15 +1,15 @@
/** Functions related to the Bottom Bar */
import { CacheObjects1, CacheObjects10, CacheObjects100 } from '../../Cache/VariablesAndData';
import { VersionMajor, VersionMinor } from '../../Data/Moddata';
import Beautify from '../BeautifyAndFormatting/Beautify';
import FormatTime from '../BeautifyAndFormatting/FormatTime';
import GetTimeColour from '../BeautifyAndFormatting/GetTimeColour';
import { CacheObjects1, CacheObjects10, CacheObjects100 } from '../../Cache/VariablesAndData.js';
import { VersionMajor, VersionMinor } from '../../Data/Moddata.js';
import Beautify from '../BeautifyAndFormatting/Beautify.js';
import FormatTime from '../BeautifyAndFormatting/FormatTime.js';
import GetTimeColour from '../BeautifyAndFormatting/GetTimeColour.js';
import GetCPS from '../HelperFunctions/GetCPS';
import GetWrinkConfigBank from '../HelperFunctions/GetWrinkConfigBank';
import { ColourBlue, ColourTextPre, ColourYellow, LastTargetBotBar } from '../VariablesAndData';
import { CreateBotBarBuildingColumn } from './CreateDOMElements';
import GetCPS from '../HelperFunctions/GetCPS.js';
import GetWrinkConfigBank from '../HelperFunctions/GetWrinkConfigBank.js';
import { ColourBlue, ColourTextPre, ColourYellow, LastTargetBotBar } from '../VariablesAndData.js';
import { CreateBotBarBuildingColumn } from './CreateDOMElements.js';
/**
* This function creates the bottom bar and appends it to l('wrapper')

View File

@@ -1,6 +1,6 @@
/** Functions to create various DOM elements used by the Bars */
import { ColourBackPre, ColourBlue, ColourTextPre } from '../VariablesAndData';
import { ColourBackPre, ColourBlue, ColourTextPre } from '../VariablesAndData.js';
/**
* This function creates an indivudual timer for the timer bar

View File

@@ -1,6 +1,6 @@
/** Functions related to the Timer Bar */
import { UpdateBotTimerBarPosition } from '../../Config/SpecificToggles';
import { UpdateBotTimerBarPosition } from '../../Config/SpecificToggles.js';
import {
BuffColours,
ColourBackPre,
@@ -8,14 +8,14 @@ import {
ColourOrange,
ColourPurple,
LastNumberOfTimers,
} from '../VariablesAndData';
import { CreateTimer } from './CreateDOMElements';
} from '../VariablesAndData.js';
import { CreateTimer } from './CreateDOMElements.js';
import {
updateChanceTotal,
getChanceFinalDeer,
getChanceFinal,
updateChanceTotalDeer,
} from '../../Main/CheckStates/Probability';
} from '../../Main/CheckStates/Probability.js';
/**
* This function creates the TimerBar and appends it to l('wrapper')

View File

@@ -1,6 +1,6 @@
import { CacheWrinklersFattest } from '../../Cache/VariablesAndData';
import PopAllNormalWrinklers from '../HelperFunctions/PopWrinklers';
import { CreateTooltip } from '../Tooltips/Tooltip';
import { CacheWrinklersFattest } from '../../Cache/VariablesAndData.js';
import PopAllNormalWrinklers from '../HelperFunctions/PopWrinklers.js';
import { CreateTooltip } from '../Tooltips/Tooltip.js';
/**
* This function creates two objects at the bottom of the left column that allowing popping of wrinklers

View File

@@ -1,4 +1,4 @@
import { DispCSS } from '../VariablesAndData';
import { DispCSS } from '../VariablesAndData.js';
/**
* This function creates a CSS style that stores certain standard CSS classes used by CookieMonster

View File

@@ -1,5 +1,5 @@
import createMenuOptions from './createMenuOptions';
import AddMenuStats from './Statistics/AddStatsPage';
import createMenuOptions from './createMenuOptions.js';
import AddMenuStats from './Statistics/AddStatsPage.js';
/**
* This function adds the calll the functions to add extra info to the stats and options pages

View File

@@ -1,9 +1,9 @@
/** Main function to create the sections of Cookie Monster on the Statistics page */
import { AddMissingUpgrades } from './CreateMissingUpgrades';
import * as CreateSections from './CreateStatsSections';
import * as CreateElements from './CreateDOMElements';
import * as GameData from '../../../Data/Gamedata';
import { AddMissingUpgrades } from './CreateMissingUpgrades.js';
import * as CreateSections from './CreateStatsSections.js';
import * as CreateElements from './CreateDOMElements.js';
import * as GameData from '../../../Data/Gamedata.js';
import {
CacheAverageClicks,
@@ -12,12 +12,12 @@ import {
CacheWrinklersFattest,
CacheWrinklersNormal,
CacheWrinklersTotal,
} from '../../../Cache/VariablesAndData';
import PopAllNormalWrinklers from '../../HelperFunctions/PopWrinklers';
import { ClickTimes, CookieTimes } from '../../VariablesAndData';
import GetCPS from '../../HelperFunctions/GetCPS';
import Beautify from '../../BeautifyAndFormatting/Beautify';
import AddMissingAchievements from './CreateMissingAchievements';
} from '../../../Cache/VariablesAndData.js';
import PopAllNormalWrinklers from '../../HelperFunctions/PopWrinklers.js';
import { ClickTimes, CookieTimes } from '../../VariablesAndData.js';
import GetCPS from '../../HelperFunctions/GetCPS.js';
import Beautify from '../../BeautifyAndFormatting/Beautify.js';
import AddMissingAchievements from './CreateMissingAchievements.js';
/**
* This function adds stats created by CookieMonster to the stats page

View File

@@ -1,8 +1,8 @@
/** Section: Functions related to the creation of basic DOM elements page */
import { ToggleHeader } from '../../../Config/ToggleSetting';
import { ToggleHeader } from '../../../Config/ToggleSetting.js';
import { SimpleTooltipElements } from '../../VariablesAndData';
import { SimpleTooltipElements } from '../../VariablesAndData.js';
/**
* This function creates a header-object for the stats page

View File

@@ -4,7 +4,7 @@ import {
CacheMissingUpgrades,
CacheMissingUpgradesCookies,
CacheMissingUpgradesPrestige,
} from '../../../Cache/VariablesAndData';
} from '../../../Cache/VariablesAndData.js';
/**
* This function creates the missing upgrades sections for prestige, normal and cookie upgrades
@@ -13,8 +13,7 @@ export function AddMissingUpgrades() {
l('menu').childNodes.forEach((menuSection) => {
if (menuSection.children[0]) {
if (menuSection.children[0].innerHTML === 'Prestige' && CacheMissingUpgradesPrestige) {
const prestigeUpgradesMissing =
CacheMissingUpgradesPrestige.match(new RegExp('div', 'g') || []).length / 2;
const prestigeUpgradesMissing = CacheMissingUpgradesPrestige.match(/div/g || []).length / 2;
const title = document.createElement('div');
title.id = 'CMMissingUpgradesPrestigeTitle';
title.className = 'listing';
@@ -30,8 +29,7 @@ export function AddMissingUpgrades() {
menuSection.appendChild(upgrades);
} else if (menuSection.children[0].innerHTML === 'Upgrades') {
if (CacheMissingUpgrades) {
const normalUpgradesMissing =
CacheMissingUpgrades.match(new RegExp('div', 'g') || []).length / 2;
const normalUpgradesMissing = CacheMissingUpgrades.match(/div/g || []).length / 2;
const title = document.createElement('div');
title.id = 'CMMissingUpgradesTitle';
title.className = 'listing';
@@ -54,8 +52,7 @@ export function AddMissingUpgrades() {
);
}
if (CacheMissingUpgradesCookies) {
const cookieUpgradesMissing =
CacheMissingUpgradesCookies.match(new RegExp('div', 'g') || []).length / 2;
const cookieUpgradesMissing = CacheMissingUpgradesCookies.match(/div/g || []).length / 2;
const title = document.createElement('div');
title.id = 'CMMissingUpgradesCookiesTitle';
title.className = 'listing';

View File

@@ -1,7 +1,7 @@
/** Functions to create the individual sections of the Statistics page */
import * as GameData from '../../../Data/Gamedata';
import { MaxChainCookieReward } from '../../../Cache/Stats/ChainCookies';
import * as GameData from '../../../Data/Gamedata.js';
import { MaxChainCookieReward } from '../../../Cache/Stats/ChainCookies.js';
import {
CacheAvgCPSWithChoEgg,
CacheCentEgg,
@@ -35,20 +35,20 @@ import {
CacheSeaSpec,
CacheWrathCookiesMult,
CacheWrinklersTotal,
} from '../../../Cache/VariablesAndData';
import ResetBonus from '../../../Sim/SimulationEvents/ResetAscension';
import CalculateLuckyLevels from '../../HelperFunctions/CalculateLuckyLevels';
import GetCPS from '../../HelperFunctions/GetCPS';
import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank';
import { ColourGreen, ColourRed, ColourTextPre } from '../../VariablesAndData';
} from '../../../Cache/VariablesAndData.js';
import ResetBonus from '../../../Sim/SimulationEvents/ResetAscension.js';
import CalculateLuckyLevels from '../../HelperFunctions/CalculateLuckyLevels.js';
import GetCPS from '../../HelperFunctions/GetCPS.js';
import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank.js';
import { ColourGreen, ColourRed, ColourTextPre } from '../../VariablesAndData.js';
import {
StatsListing,
StatsHeader,
StatsMissDisp,
StatsMissDispListing,
} from './CreateDOMElements';
import Beautify from '../../BeautifyAndFormatting/Beautify';
import FormatTime from '../../BeautifyAndFormatting/FormatTime';
} from './CreateDOMElements.js';
import Beautify from '../../BeautifyAndFormatting/Beautify.js';
import FormatTime from '../../BeautifyAndFormatting/FormatTime.js';
/**
* This function creates the "Lucky" section of the stats page

View File

@@ -1,5 +1,5 @@
import { menuFunctions } from '@cookiemonsterteam/cookiemonsterframework';
import { LatestReleaseNotes, ModDescription } from '../../Data/Moddata';
import { LatestReleaseNotes, ModDescription } from '../../Data/Moddata.js';
/**
* Creates the <div> to be added to the Info section

View File

@@ -1,8 +1,8 @@
import { menuFunctions as mF } from '@cookiemonsterteam/cookiemonsterframework';
import { ConfigGroups, ConfigGroupsNotification } from '../../Data/Sectionheaders';
import settings from '../../Data/settings';
import UpdateColours from '../HelperFunctions/UpdateColours';
import RefreshScale from '../HelperFunctions/RefreshScale';
import { ConfigGroups, ConfigGroupsNotification } from '../../Data/Sectionheaders.js';
import settings from '../../Data/settings.js';
import UpdateColours from '../HelperFunctions/UpdateColours.js';
import RefreshScale from '../HelperFunctions/RefreshScale.js';
/**
* Creates the <div> to be added to the Options section

View File

@@ -1,5 +1,5 @@
import { CacheSpawnedGoldenShimmer } from '../../Cache/VariablesAndData';
import { LastGoldenCookieState } from '../../Main/VariablesAndData';
import { CacheSpawnedGoldenShimmer } from '../../Cache/VariablesAndData.js';
import { LastGoldenCookieState } from '../../Main/VariablesAndData.js';
/**
* This function creates the Favicon, it is called by CM.Main.DelayInit()

View File

@@ -1,9 +1,9 @@
/** Functions related to updating the tab in the browser's tab-bar */
import { CacheSeasonPopShimmer, CacheSpawnedGoldenShimmer } from '../../Cache/VariablesAndData';
import { CacheSeasonPopShimmer, CacheSpawnedGoldenShimmer } from '../../Cache/VariablesAndData.js';
import { LastSeasonPopupState, LastTickerFortuneState } from '../../Main/VariablesAndData';
import { Title } from '../VariablesAndData';
import { LastSeasonPopupState, LastTickerFortuneState } from '../../Main/VariablesAndData.js';
import { Title } from '../VariablesAndData.js';
/**
* This function updates the tab title

View File

@@ -2,8 +2,8 @@ import {
CacheHCPerSecond,
CacheLastHeavenlyChips,
CacheTimeTillNextPrestige,
} from '../../Cache/VariablesAndData';
import Beautify from '../BeautifyAndFormatting/Beautify';
} from '../../Cache/VariablesAndData.js';
import Beautify from '../BeautifyAndFormatting/Beautify.js';
/**
* This function creates a header object for tooltips.

View File

@@ -7,7 +7,7 @@ import {
ColourYellow,
ColourPurple,
TooltipType,
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/** Creates various sections of tooltips */

View File

@@ -1,8 +1,8 @@
import UpdateTooltips from './UpdateTooltips';
import { SimpleTooltipElements, TooltipName, TooltipType } from '../VariablesAndData'; // eslint-disable-line no-unused-vars
import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
import GetTimeColour from '../BeautifyAndFormatting/GetTimeColour';
import Beautify from '../BeautifyAndFormatting/Beautify';
import UpdateTooltips from './UpdateTooltips.js';
import { SimpleTooltipElements, TooltipName, TooltipType } from '../VariablesAndData.js'; // eslint-disable-line no-unused-vars
import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding.js';
import GetTimeColour from '../BeautifyAndFormatting/GetTimeColour.js';
import Beautify from '../BeautifyAndFormatting/Beautify.js';
/** All general functions related to creating and updating tooltips */

View File

@@ -1,26 +1,26 @@
import ColourOfPP from '../../../Cache/PP/ColourOfPP';
import ColourOfPP from '../../../Cache/PP/ColourOfPP.js';
import {
CacheObjects1,
CacheObjects10,
CacheObjects100,
CacheObjectsNextAchievement,
} from '../../../Cache/VariablesAndData';
} from '../../../Cache/VariablesAndData.js';
import BuyBuildingsBonusIncome from '../../../Sim/SimulationEvents/BuyBuildingBonusIncome';
import { SimObjects } from '../../../Sim/VariablesAndData';
import Beautify from '../../BeautifyAndFormatting/Beautify';
import FormatTime from '../../BeautifyAndFormatting/FormatTime';
import GetTimeColour from '../../BeautifyAndFormatting/GetTimeColour';
import GetCPS from '../../HelperFunctions/GetCPS';
import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank';
import BuyBuildingsBonusIncome from '../../../Sim/SimulationEvents/BuyBuildingBonusIncome.js';
import { SimObjects } from '../../../Sim/VariablesAndData.js';
import Beautify from '../../BeautifyAndFormatting/Beautify.js';
import FormatTime from '../../BeautifyAndFormatting/FormatTime.js';
import GetTimeColour from '../../BeautifyAndFormatting/GetTimeColour.js';
import GetCPS from '../../HelperFunctions/GetCPS.js';
import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank.js';
import {
ColourTextPre,
LastTargetTooltipBuilding,
TooltipBonusIncome,
TooltipName,
TooltipPrice,
} from '../../VariablesAndData';
import * as Create from '../CreateTooltip';
} from '../../VariablesAndData.js';
import * as Create from '../CreateTooltip.js';
/**
* This function adds extra info to the Building tooltips

View File

@@ -1,6 +1,6 @@
import Beautify from '../../BeautifyAndFormatting/Beautify';
import { TooltipName } from '../../VariablesAndData';
import * as Create from '../CreateTooltip';
import Beautify from '../../BeautifyAndFormatting/Beautify.js';
import { TooltipName } from '../../VariablesAndData.js';
import * as Create from '../CreateTooltip.js';
/**
* This function adds extra info to the Garden plots tooltips

View File

@@ -1,8 +1,8 @@
import Beautify from '../../BeautifyAndFormatting/Beautify';
import GetTimeColour from '../../BeautifyAndFormatting/GetTimeColour';
import CalculateGrimoireRefillTime from '../../HelperFunctions/CalculateGrimoireRefillTime';
import { ColourTextPre, TooltipName } from '../../VariablesAndData';
import * as Create from '../CreateTooltip';
import Beautify from '../../BeautifyAndFormatting/Beautify.js';
import GetTimeColour from '../../BeautifyAndFormatting/GetTimeColour.js';
import CalculateGrimoireRefillTime from '../../HelperFunctions/CalculateGrimoireRefillTime.js';
import { ColourTextPre, TooltipName } from '../../VariablesAndData.js';
import * as Create from '../CreateTooltip.js';
/**
* This function adds extra info to the Grimoire tooltips

View File

@@ -1,5 +1,5 @@
import Beautify from '../../BeautifyAndFormatting/Beautify';
import * as Create from '../CreateTooltip';
import Beautify from '../../BeautifyAndFormatting/Beautify.js';
import * as Create from '../CreateTooltip.js';
/**
* This function adds extra info to the Garden Harvest All tooltip

View File

@@ -1,7 +1,7 @@
import { CacheGods } from '../../../Cache/VariablesAndData';
import Beautify from '../../BeautifyAndFormatting/Beautify';
import { TooltipName, TooltipType } from '../../VariablesAndData';
import * as Create from '../CreateTooltip';
import { CacheGods } from '../../../Cache/VariablesAndData.js';
import Beautify from '../../BeautifyAndFormatting/Beautify.js';
import { TooltipName, TooltipType } from '../../VariablesAndData.js';
import * as Create from '../CreateTooltip.js';
/**
* This function adds extra info to the Pantheon Gods tooltip

View File

@@ -1,4 +1,4 @@
import Beautify from '../../BeautifyAndFormatting/Beautify';
import Beautify from '../../BeautifyAndFormatting/Beautify.js';
import {
TooltipName,
ColourTextPre,
@@ -8,9 +8,9 @@ import {
ColourRed,
ColourPurple,
ColourGray,
} from '../../VariablesAndData';
import CalculateStockNextExpectedValue from '../../HelperFunctions/CalculateStockNextExpectedValue';
import * as Create from '../CreateTooltip';
} from '../../VariablesAndData.js';
import CalculateStockNextExpectedValue from '../../HelperFunctions/CalculateStockNextExpectedValue.js';
import * as Create from '../CreateTooltip.js';
/**
* This function adds extra info to the stock market
@@ -63,7 +63,9 @@ export default function StockMarket() {
Game.Objects.Bank.level,
Game.auraMult('Supreme Intellect'),
);
expectedNextValue.textContent = `$${Beautify(expectedValue) + (expectedValue < stock.val ? '\u25bc' : '\u25b2')}`;
expectedNextValue.textContent = `$${
Beautify(expectedValue) + (expectedValue < stock.val ? '\u25bc' : '\u25b2')
}`;
const expectedNextValueColour = expectedValue < stock.val ? ColourRed : ColourGreen;
expectedNextValue.className = ColourTextPre + expectedNextValueColour;

View File

@@ -1,6 +1,6 @@
import GetLumpColour from '../../HelperFunctions/GetLumpColour';
import { ColourTextPre } from '../../VariablesAndData';
import * as Create from '../CreateTooltip';
import GetLumpColour from '../../HelperFunctions/GetLumpColour.js';
import { ColourTextPre } from '../../VariablesAndData.js';
import * as Create from '../CreateTooltip.js';
/**
* This function adds extra info to the Sugar Lump tooltip
* It adds to the additional information to l('CMTooltipArea')

View File

@@ -1,18 +1,18 @@
import { CacheLastChoEgg, CacheUpgrades } from '../../../Cache/VariablesAndData';
import { CacheLastChoEgg, CacheUpgrades } from '../../../Cache/VariablesAndData.js';
import Beautify from '../../BeautifyAndFormatting/Beautify';
import FormatTime from '../../BeautifyAndFormatting/FormatTime';
import GetTimeColour from '../../BeautifyAndFormatting/GetTimeColour';
import GetCPS from '../../HelperFunctions/GetCPS';
import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank';
import Beautify from '../../BeautifyAndFormatting/Beautify.js';
import FormatTime from '../../BeautifyAndFormatting/FormatTime.js';
import GetTimeColour from '../../BeautifyAndFormatting/GetTimeColour.js';
import GetCPS from '../../HelperFunctions/GetCPS.js';
import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank.js';
import {
ColourTextPre,
TooltipBonusIncome,
TooltipBonusMouse,
TooltipName,
TooltipPrice,
} from '../../VariablesAndData';
import * as Create from '../CreateTooltip';
} from '../../VariablesAndData.js';
import * as Create from '../CreateTooltip.js';
/**
* This function adds extra info to the Upgrade tooltips

View File

@@ -1,12 +1,12 @@
import GetCPSBuffMult from '../../../Cache/CPS/GetCPSBuffMult';
import { CacheEdifice, CacheLucky } from '../../../Cache/VariablesAndData';
import ToggleToolWarnPos from '../../../Config/Toggles/ToggleToolWarnPos';
import Beautify from '../../BeautifyAndFormatting/Beautify';
import FormatTime from '../../BeautifyAndFormatting/FormatTime';
import GetCPS from '../../HelperFunctions/GetCPS';
import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank';
import { TooltipBonusIncome, TooltipPrice, TooltipType } from '../../VariablesAndData';
import * as Create from '../CreateTooltip';
import GetCPSBuffMult from '../../../Cache/CPS/GetCPSBuffMult.js';
import { CacheEdifice, CacheLucky } from '../../../Cache/VariablesAndData.js';
import ToggleToolWarnPos from '../../../Config/Toggles/ToggleToolWarnPos.js';
import Beautify from '../../BeautifyAndFormatting/Beautify.js';
import FormatTime from '../../BeautifyAndFormatting/FormatTime.js';
import GetCPS from '../../HelperFunctions/GetCPS.js';
import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank.js';
import { TooltipBonusIncome, TooltipPrice, TooltipType } from '../../VariablesAndData.js';
import * as Create from '../CreateTooltip.js';
/**
* This function updates the warnings section of the building and upgrade tooltips

View File

@@ -1,7 +1,7 @@
import { CacheWrinklersFattest, CacheWrinklersNormal } from '../../../Cache/VariablesAndData';
import Beautify from '../../BeautifyAndFormatting/Beautify';
import { TooltipName } from '../../VariablesAndData';
import * as Create from '../CreateTooltip';
import { CacheWrinklersFattest, CacheWrinklersNormal } from '../../../Cache/VariablesAndData.js';
import Beautify from '../../BeautifyAndFormatting/Beautify.js';
import { TooltipName } from '../../VariablesAndData.js';
import * as Create from '../CreateTooltip.js';
/**
* This function adds extra info to the wrinkler button tooltip

View File

@@ -1,16 +1,16 @@
import CopyData from '../../Sim/SimulationData/CopyData';
import { TooltipName, TooltipType } from '../VariablesAndData';
import * as Create from './CreateTooltip';
import Building from './TypesOfTooltips/Building';
import GardenPlots from './TypesOfTooltips/GardenPlots';
import StockMarket from './TypesOfTooltips/StockMarket';
import Grimoire from './TypesOfTooltips/Grimoire';
import HarvestAll from './TypesOfTooltips/HarvestAll';
import PantheonGods from './TypesOfTooltips/PantheonGods';
import SugarLump from './TypesOfTooltips/SugarLump';
import Upgrade from './TypesOfTooltips/Upgrade';
import Warnings from './TypesOfTooltips/Warnings';
import WrinklerButton from './TypesOfTooltips/WrinklerButton';
import CopyData from '../../Sim/SimulationData/CopyData.js';
import { TooltipName, TooltipType } from '../VariablesAndData.js';
import * as Create from './CreateTooltip.js';
import Building from './TypesOfTooltips/Building.js';
import GardenPlots from './TypesOfTooltips/GardenPlots.js';
import StockMarket from './TypesOfTooltips/StockMarket.js';
import Grimoire from './TypesOfTooltips/Grimoire.js';
import HarvestAll from './TypesOfTooltips/HarvestAll.js';
import PantheonGods from './TypesOfTooltips/PantheonGods.js';
import SugarLump from './TypesOfTooltips/SugarLump.js';
import Upgrade from './TypesOfTooltips/Upgrade.js';
import Warnings from './TypesOfTooltips/Warnings.js';
import WrinklerButton from './TypesOfTooltips/WrinklerButton.js';
/**
* This function updates the sections of the tooltips created by CookieMonster

View File

@@ -1,10 +1,10 @@
import { SimObjects } from '../../Sim/VariablesAndData';
import Beautify from '../BeautifyAndFormatting/Beautify';
import { SimObjects } from '../../Sim/VariablesAndData.js';
import Beautify from '../BeautifyAndFormatting/Beautify.js';
import {
TooltipWrinkler,
TooltipWrinklerArea,
TooltipWrinklerBeingShown,
} from '../VariablesAndData';
} from '../VariablesAndData.js';
/**
* This function checks and create a tooltip for the wrinklers

View File

@@ -1,4 +1,4 @@
import toggleBuildingLock from './toggleBuildingLock';
import toggleBuildingLock from './toggleBuildingLock.js';
/**
* This function adds a lock button to the "building view" in the middle section

View File

@@ -1,10 +1,10 @@
import { initFunctions } from '@cookiemonsterteam/cookiemonsterframework';
import { VersionMajor, VersionMinor } from '../Data/Moddata';
import CMDrawHook from '../Disp/DrawHook';
import CMClickHook from '../Main/ClickHook';
import InitializeCookieMonster from '../Main/Initialization';
import CMLoopHook from '../Main/LoopHook';
import load from './load';
import { VersionMajor, VersionMinor } from '../Data/Moddata.js';
import CMDrawHook from '../Disp/DrawHook.js';
import CMClickHook from '../Main/ClickHook.js';
import InitializeCookieMonster from '../Main/Initialization.js';
import CMLoopHook from '../Main/LoopHook.js';
import load from './load.js';
/**
* This creates a init function for the CM object. Per Game code/comments:

View File

@@ -1,11 +1,11 @@
import { saveAndLoadingFunctions } from '@cookiemonsterteam/cookiemonsterframework/src/index';
import { saveAndLoadingFunctions } from '@cookiemonsterteam/cookiemonsterframework/src/index.js';
import headers from '../Data/headers';
import { VersionMajor, VersionMinor } from '../Data/Moddata';
import settings from '../Data/settings';
import UpdateColours from '../Disp/HelperFunctions/UpdateColours';
import CMLoopHook from '../Main/LoopHook';
import InitData from '../Sim/InitializeData/InitData';
import headers from '../Data/headers.js';
import { VersionMajor, VersionMinor } from '../Data/Moddata.js';
import settings from '../Data/settings.js';
import UpdateColours from '../Disp/HelperFunctions/UpdateColours.js';
import CMLoopHook from '../Main/LoopHook.js';
import InitData from '../Sim/InitializeData/InitData.js';
/**
* This creates a load function to the CM object. Per Game code/comments:

View File

@@ -1,4 +1,4 @@
import { VersionMajor, VersionMinor } from '../Data/Moddata';
import { VersionMajor, VersionMinor } from '../Data/Moddata.js';
/**
* This creates a save function to the CM object. Per Game code/comments:

View File

@@ -1,5 +1,5 @@
import { notificationsFunctions as nF } from '@cookiemonsterteam/cookiemonsterframework/src/index';
import { LastGardenNextStep } from '../VariablesAndData';
import { notificationsFunctions as nF } from '@cookiemonsterteam/cookiemonsterframework/src/index.js';
import { LastGardenNextStep } from '../VariablesAndData.js';
/**
* This function checks if a garden tick has happened

View File

@@ -1,14 +1,17 @@
import { notificationsFunctions as nF } from '@cookiemonsterteam/cookiemonsterframework/src/index';
import { CacheSpawnedGoldenShimmer, CacheGoldenShimmersByID } from '../../Cache/VariablesAndData'; // eslint-disable-line no-unused-vars
import CreateGCTimer from '../../Disp/GoldenCookieTimers/GoldenCookieTimers';
import { UpdateFavicon } from '../../Disp/TabTitle/FavIcon';
import { GCTimers } from '../../Disp/VariablesAndData';
import { notificationsFunctions as nF } from '@cookiemonsterteam/cookiemonsterframework/src/index.js';
import {
CacheSpawnedGoldenShimmer, // eslint-disable-line no-unused-vars
CacheGoldenShimmersByID,
} from '../../Cache/VariablesAndData.js';
import CreateGCTimer from '../../Disp/GoldenCookieTimers/GoldenCookieTimers.js';
import { UpdateFavicon } from '../../Disp/TabTitle/FavIcon.js';
import { GCTimers } from '../../Disp/VariablesAndData.js';
import {
CurrSpawnedGoldenCookieState,
LastGoldenCookieState,
LastSpawnedGoldenCookieState,
} from '../VariablesAndData';
import { resetChanceTotal } from './Probability';
} from '../VariablesAndData.js';
import { resetChanceTotal } from './Probability.js';
/**
* Auxilirary function that finds all currently spawned shimmers.

View File

@@ -1,5 +1,5 @@
import { notificationsFunctions as nF } from '@cookiemonsterteam/cookiemonsterframework/src/index';
import { LastMagicBarFull } from '../VariablesAndData';
import { notificationsFunctions as nF } from '@cookiemonsterteam/cookiemonsterframework/src/index.js';
import { LastMagicBarFull } from '../VariablesAndData.js';
/**
* This function checks if the magic meter is full

View File

@@ -1,7 +1,7 @@
import { notificationsFunctions as nF } from '@cookiemonsterteam/cookiemonsterframework/src/index';
import { CacheSeasonPopShimmer } from '../../Cache/VariablesAndData'; // eslint-disable-line no-unused-vars
import { LastSeasonPopupState } from '../VariablesAndData';
import { resetChanceTotalDeer } from './Probability';
import { notificationsFunctions as nF } from '@cookiemonsterteam/cookiemonsterframework/src/index.js';
import { CacheSeasonPopShimmer } from '../../Cache/VariablesAndData.js'; // eslint-disable-line no-unused-vars
import { LastSeasonPopupState } from '../VariablesAndData.js';
import { resetChanceTotalDeer } from './Probability.js';
/**
* This function checks if there is reindeer that has spawned

View File

@@ -1,5 +1,5 @@
import { notificationsFunctions as nF } from '@cookiemonsterteam/cookiemonsterframework/src/index';
import { LastTickerFortuneState } from '../VariablesAndData';
import { notificationsFunctions as nF } from '@cookiemonsterteam/cookiemonsterframework/src/index.js';
import { LastTickerFortuneState } from '../VariablesAndData.js';
/**
* This function checks if there is a fortune cookie on the ticker

View File

@@ -1,5 +1,5 @@
import { notificationsFunctions as nF } from '@cookiemonsterteam/cookiemonsterframework/src/index';
import { LastWrinklerCount } from '../VariablesAndData';
import { notificationsFunctions as nF } from '@cookiemonsterteam/cookiemonsterframework/src/index.js';
import { LastWrinklerCount } from '../VariablesAndData.js';
/**
* This function checks if any new Wrinklers have popped up

View File

@@ -1,4 +1,4 @@
import { CacheAverageCookiesFromClicks } from '../Cache/VariablesAndData';
import { CacheAverageCookiesFromClicks } from '../Cache/VariablesAndData.js';
export default function CMClickHook() {
// Add cookies from click to array that stores average

Some files were not shown because too many files have changed in this diff Show More