From d909f593a72d23d259ece023a81081aef07f44fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?= <13665637+DanielNoord@users.noreply.github.com> Date: Fri, 30 Apr 2021 20:18:30 +0200 Subject: [PATCH] Fix prettier installation #774 --- .eslintrc.json | 34 +-- .prettierrc.json | 1 + package-lock.json | 264 ++++++------------ package.json | 5 +- src/Config/Toggles/ToggleFavourites.js | 4 +- src/Disp/BuildingsUpgrades/Buildings.js | 12 +- src/Disp/BuildingsUpgrades/Upgrades.js | 6 +- .../Initialization/CreateWrinklerButton.js | 8 +- .../Statistics/CreateMissingAchievements.js | 6 +- src/Disp/Notifications/Flash.js | 6 +- .../ReplaceGameElements/TooltipGrimoire.js | 4 +- .../ReplaceGameElements/TooltipUpgrades.js | 4 +- src/Main/ReplaceGameElements/Tooltips.js | 26 +- .../ReplaceGameFunctions/ReplaceNative.js | 2 +- 14 files changed, 124 insertions(+), 258 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 4567807..b56396c 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -11,24 +11,15 @@ "BeautifyAll": "readonly", "PlaySound": "readonly" }, - "extends": [ - "airbnb-base", - "plugin:prettier/recommended" - ], + "extends": ["airbnb-base", "prettier"], "parserOptions": { "ecmaVersion": 12 }, - "plugins": [ - "@typescript-eslint" - ], + "plugins": ["@typescript-eslint"], "overrides": [ { - "files": [ - "src/**/*.{ts,tsx}" - ], - "extends": [ - "plugin:@typescript-eslint/recommended" - ], + "files": ["src/**/*.{ts,tsx}"], + "extends": ["plugin:@typescript-eslint/recommended"], "parser": "@typescript-eslint/parser", "rules": { "import/extensions": "off", // To allow importing .ts without errors @@ -36,11 +27,7 @@ } } ], - "ignorePatterns": [ - "*CookieMonster*.js", - "dist/*", - "node_modules/*" - ], + "ignorePatterns": ["*CookieMonster*.js", "dist/*", "node_modules/*"], "rules": { "import/no-mutable-exports": "off", // We need to this throughout Cookie Monster "no-plusplus": [ @@ -56,15 +43,6 @@ "object": true, "array": false } - ], // Importing arrays and then destructuring them seems to fail - "max-len": [ - 1, - { - "code": 100, - "ignoreComments": true, - "ignoreStrings": true, - "ignoreTemplateLiterals": true - } - ] + ] // Importing arrays and then destructuring them seems to fail } } diff --git a/.prettierrc.json b/.prettierrc.json index a20502b..5e2863a 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,4 +1,5 @@ { + "printWidth": 100, "singleQuote": true, "trailingComma": "all" } diff --git a/package-lock.json b/package-lock.json index 11d0aee..aa31695 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,14 +14,11 @@ "devDependencies": { "@types/chai": "^4.2.16", "@types/mocha": "^8.2.2", - "@typescript-eslint/eslint-plugin": "^4.21.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.1.0", - "eslint-plugin-import": "^2.22.1", - "eslint-plugin-prettier": "^3.3.1", + "eslint-config-prettier": "^8.3.0", "esm": "^3.2.25", "mocha": "^8.3.2", "npm-run-all": "^4.1.5", @@ -265,7 +262,8 @@ "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", - "dev": true + "dev": true, + "peer": true }, "node_modules/@types/mocha": { "version": "8.2.2", @@ -279,62 +277,6 @@ "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==", "dev": true }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz", - "integrity": "sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==", - "dev": true, - "dependencies": { - "@typescript-eslint/experimental-utils": "4.22.0", - "@typescript-eslint/scope-manager": "4.22.0", - "debug": "^4.1.1", - "functional-red-black-tree": "^1.0.1", - "lodash": "^4.17.15", - "regexpp": "^3.0.0", - "semver": "^7.3.2", - "tsutils": "^3.17.1" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^4.0.0", - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/experimental-utils": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz", - "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.22.0", - "@typescript-eslint/types": "4.22.0", - "@typescript-eslint/typescript-estree": "4.22.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^2.0.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "*" - } - }, "node_modules/@typescript-eslint/parser": { "version": "4.22.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz", @@ -748,6 +690,7 @@ "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz", "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -776,6 +719,7 @@ "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz", "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.0", "define-properties": "^1.1.3", @@ -1071,6 +1015,7 @@ "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -1420,9 +1365,9 @@ } }, "node_modules/eslint-config-prettier": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz", - "integrity": "sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz", + "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==", "dev": true, "bin": { "eslint-config-prettier": "bin/cli.js" @@ -1436,6 +1381,7 @@ "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", "dev": true, + "peer": true, "dependencies": { "debug": "^2.6.9", "resolve": "^1.13.1" @@ -1446,6 +1392,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "peer": true, "dependencies": { "ms": "2.0.0" } @@ -1454,13 +1401,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "dev": true, + "peer": true }, "node_modules/eslint-module-utils": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", "dev": true, + "peer": true, "dependencies": { "debug": "^2.6.9", "pkg-dir": "^2.0.0" @@ -1474,6 +1423,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "peer": true, "dependencies": { "ms": "2.0.0" } @@ -1482,13 +1432,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "dev": true, + "peer": true }, "node_modules/eslint-plugin-import": { "version": "2.22.1", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz", "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==", "dev": true, + "peer": true, "dependencies": { "array-includes": "^3.1.1", "array.prototype.flat": "^1.2.3", @@ -1516,6 +1468,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "peer": true, "dependencies": { "ms": "2.0.0" } @@ -1525,6 +1478,7 @@ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", "dev": true, + "peer": true, "dependencies": { "esutils": "^2.0.2", "isarray": "^1.0.0" @@ -1537,28 +1491,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "node_modules/eslint-plugin-prettier": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz", - "integrity": "sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==", "dev": true, - "dependencies": { - "prettier-linter-helpers": "^1.0.0" - }, - "engines": { - "node": ">=6.0.0" - }, - "peerDependencies": { - "eslint": ">=5.0.0", - "prettier": ">=1.13.0" - }, - "peerDependenciesMeta": { - "eslint-config-prettier": { - "optional": true - } - } + "peer": true }, "node_modules/eslint-scope": { "version": "5.1.1", @@ -1749,12 +1683,6 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, - "node_modules/fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", - "dev": true - }, "node_modules/fast-glob": { "version": "3.2.5", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", @@ -3159,6 +3087,7 @@ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz", "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -3366,6 +3295,7 @@ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, + "peer": true, "dependencies": { "find-up": "^2.1.0" }, @@ -3378,6 +3308,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, + "peer": true, "dependencies": { "locate-path": "^2.0.0" }, @@ -3390,6 +3321,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, + "peer": true, "dependencies": { "p-locate": "^2.0.0", "path-exists": "^3.0.0" @@ -3403,6 +3335,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, + "peer": true, "dependencies": { "p-try": "^1.0.0" }, @@ -3415,6 +3348,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, + "peer": true, "dependencies": { "p-limit": "^1.1.0" }, @@ -3427,6 +3361,7 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -3436,6 +3371,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -3461,18 +3397,6 @@ "node": ">=10.13.0" } }, - "node_modules/prettier-linter-helpers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", - "dev": true, - "dependencies": { - "fast-diff": "^1.1.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -3551,6 +3475,7 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, + "peer": true, "dependencies": { "find-up": "^2.0.0", "read-pkg": "^2.0.0" @@ -3564,6 +3489,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, + "peer": true, "dependencies": { "locate-path": "^2.0.0" }, @@ -3576,6 +3502,7 @@ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, + "peer": true, "dependencies": { "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", @@ -3591,6 +3518,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, + "peer": true, "dependencies": { "p-locate": "^2.0.0", "path-exists": "^3.0.0" @@ -3604,6 +3532,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, + "peer": true, "dependencies": { "p-try": "^1.0.0" }, @@ -3616,6 +3545,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, + "peer": true, "dependencies": { "p-limit": "^1.1.0" }, @@ -3628,6 +3558,7 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -3637,6 +3568,7 @@ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, + "peer": true, "dependencies": { "error-ex": "^1.2.0" }, @@ -3649,6 +3581,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -3658,6 +3591,7 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, + "peer": true, "dependencies": { "pify": "^2.0.0" }, @@ -3670,6 +3604,7 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true, + "peer": true, "engines": { "node": ">=0.10.0" } @@ -3679,6 +3614,7 @@ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, + "peer": true, "dependencies": { "load-json-file": "^2.0.0", "normalize-package-data": "^2.3.2", @@ -4367,6 +4303,7 @@ "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", "dev": true, + "peer": true, "dependencies": { "@types/json5": "^0.0.29", "json5": "^1.0.1", @@ -4379,6 +4316,7 @@ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, + "peer": true, "dependencies": { "minimist": "^1.2.0" }, @@ -5076,7 +5014,8 @@ "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", - "dev": true + "dev": true, + "peer": true }, "@types/mocha": { "version": "8.2.2", @@ -5090,36 +5029,6 @@ "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==", "dev": true }, - "@typescript-eslint/eslint-plugin": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz", - "integrity": "sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==", - "dev": true, - "requires": { - "@typescript-eslint/experimental-utils": "4.22.0", - "@typescript-eslint/scope-manager": "4.22.0", - "debug": "^4.1.1", - "functional-red-black-tree": "^1.0.1", - "lodash": "^4.17.15", - "regexpp": "^3.0.0", - "semver": "^7.3.2", - "tsutils": "^3.17.1" - } - }, - "@typescript-eslint/experimental-utils": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz", - "integrity": "sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.22.0", - "@typescript-eslint/types": "4.22.0", - "@typescript-eslint/typescript-estree": "4.22.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^2.0.0" - } - }, "@typescript-eslint/parser": { "version": "4.22.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz", @@ -5443,6 +5352,7 @@ "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz", "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==", "dev": true, + "peer": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -5462,6 +5372,7 @@ "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz", "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==", "dev": true, + "peer": true, "requires": { "call-bind": "^1.0.0", "define-properties": "^1.1.3", @@ -5687,7 +5598,8 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", - "dev": true + "dev": true, + "peer": true }, "core-util-is": { "version": "1.0.2", @@ -5947,9 +5859,9 @@ } }, "eslint-config-prettier": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz", - "integrity": "sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz", + "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==", "dev": true, "requires": {} }, @@ -5958,6 +5870,7 @@ "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", "dev": true, + "peer": true, "requires": { "debug": "^2.6.9", "resolve": "^1.13.1" @@ -5968,6 +5881,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "peer": true, "requires": { "ms": "2.0.0" } @@ -5976,7 +5890,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "dev": true, + "peer": true } } }, @@ -5985,6 +5900,7 @@ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", "dev": true, + "peer": true, "requires": { "debug": "^2.6.9", "pkg-dir": "^2.0.0" @@ -5995,6 +5911,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "peer": true, "requires": { "ms": "2.0.0" } @@ -6003,7 +5920,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "dev": true, + "peer": true } } }, @@ -6012,6 +5930,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz", "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==", "dev": true, + "peer": true, "requires": { "array-includes": "^3.1.1", "array.prototype.flat": "^1.2.3", @@ -6033,6 +5952,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "peer": true, "requires": { "ms": "2.0.0" } @@ -6042,6 +5962,7 @@ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", "dev": true, + "peer": true, "requires": { "esutils": "^2.0.2", "isarray": "^1.0.0" @@ -6051,19 +5972,11 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "dev": true, + "peer": true } } }, - "eslint-plugin-prettier": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz", - "integrity": "sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==", - "dev": true, - "requires": { - "prettier-linter-helpers": "^1.0.0" - } - }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -6203,12 +6116,6 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, - "fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", - "dev": true - }, "fast-glob": { "version": "3.2.5", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", @@ -7258,6 +7165,7 @@ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz", "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==", "dev": true, + "peer": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", @@ -7399,6 +7307,7 @@ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, + "peer": true, "requires": { "find-up": "^2.1.0" }, @@ -7408,6 +7317,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, + "peer": true, "requires": { "locate-path": "^2.0.0" } @@ -7417,6 +7327,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, + "peer": true, "requires": { "p-locate": "^2.0.0", "path-exists": "^3.0.0" @@ -7427,6 +7338,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, + "peer": true, "requires": { "p-try": "^1.0.0" } @@ -7436,6 +7348,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, + "peer": true, "requires": { "p-limit": "^1.1.0" } @@ -7444,13 +7357,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true + "dev": true, + "peer": true }, "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true + "dev": true, + "peer": true } } }, @@ -7466,15 +7381,6 @@ "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", "dev": true }, - "prettier-linter-helpers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", - "dev": true, - "requires": { - "fast-diff": "^1.1.2" - } - }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -7541,6 +7447,7 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, + "peer": true, "requires": { "find-up": "^2.0.0", "read-pkg": "^2.0.0" @@ -7551,6 +7458,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, + "peer": true, "requires": { "locate-path": "^2.0.0" } @@ -7560,6 +7468,7 @@ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, + "peer": true, "requires": { "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", @@ -7572,6 +7481,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, + "peer": true, "requires": { "p-locate": "^2.0.0", "path-exists": "^3.0.0" @@ -7582,6 +7492,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, + "peer": true, "requires": { "p-try": "^1.0.0" } @@ -7591,6 +7502,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, + "peer": true, "requires": { "p-limit": "^1.1.0" } @@ -7599,13 +7511,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true + "dev": true, + "peer": true }, "parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, + "peer": true, "requires": { "error-ex": "^1.2.0" } @@ -7614,13 +7528,15 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true + "dev": true, + "peer": true }, "path-type": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, + "peer": true, "requires": { "pify": "^2.0.0" } @@ -7629,13 +7545,15 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true + "dev": true, + "peer": true }, "read-pkg": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, + "peer": true, "requires": { "load-json-file": "^2.0.0", "normalize-package-data": "^2.3.2", @@ -8134,6 +8052,7 @@ "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", "dev": true, + "peer": true, "requires": { "@types/json5": "^0.0.29", "json5": "^1.0.1", @@ -8146,6 +8065,7 @@ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, + "peer": true, "requires": { "minimist": "^1.2.0" } diff --git a/package.json b/package.json index e4856a4..00cc578 100644 --- a/package.json +++ b/package.json @@ -47,14 +47,11 @@ "devDependencies": { "@types/chai": "^4.2.16", "@types/mocha": "^8.2.2", - "@typescript-eslint/eslint-plugin": "^4.21.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.1.0", - "eslint-plugin-import": "^2.22.1", - "eslint-plugin-prettier": "^3.3.1", + "eslint-config-prettier": "^8.3.0", "esm": "^3.2.25", "mocha": "^8.3.2", "npm-run-all": "^4.1.5", diff --git a/src/Config/Toggles/ToggleFavourites.js b/src/Config/Toggles/ToggleFavourites.js index bc6d0bb..32f1010 100644 --- a/src/Config/Toggles/ToggleFavourites.js +++ b/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) { - return ele !== config; - }); + FavouriteSettings = FavouriteSettings.filter((ele) => ele !== config); else FavouriteSettings.push(config); } diff --git a/src/Disp/BuildingsUpgrades/Buildings.js b/src/Disp/BuildingsUpgrades/Buildings.js index 766705a..afa13ee 100644 --- a/src/Disp/BuildingsUpgrades/Buildings.js +++ b/src/Disp/BuildingsUpgrades/Buildings.js @@ -70,16 +70,14 @@ export default function UpdateBuildings() { return o; }); - arr.sort(function (a, b) { - return ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary + arr.sort((a, b) => ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary ColoursOrdering.indexOf(b.color) ? 1 : ColoursOrdering.indexOf(a.color) < ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary ? -1 : a.pp < b.pp ? -1 - : 0; - }); + : 0); } else if (CMOptions.SortBuildings === 2) { arr = Object.keys(target).map((k) => { const o = target[k]; @@ -88,16 +86,14 @@ export default function UpdateBuildings() { return o; }); - arr.sort(function (a, b) { - return ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary + arr.sort((a, b) => ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary ColoursOrdering.indexOf(b.color) ? 1 : ColoursOrdering.indexOf(a.color) < ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary ? -1 : a.pp < b.pp ? -1 - : 0; - }); + : 0); } for (let x = 0; x < arr.length; x++) { diff --git a/src/Disp/BuildingsUpgrades/Upgrades.js b/src/Disp/BuildingsUpgrades/Upgrades.js index d3076b2..d1f6e9c 100644 --- a/src/Disp/BuildingsUpgrades/Upgrades.js +++ b/src/Disp/BuildingsUpgrades/Upgrades.js @@ -79,15 +79,13 @@ export default function UpdateUpgrades() { } if (CMOptions.SortUpgrades) { - arr.sort(function (a, b) { - return ColoursOrdering.indexOf(a.color) > ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary + arr.sort((a, b) => ColoursOrdering.indexOf(a.color) > ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary ? 1 : ColoursOrdering.indexOf(a.color) < ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary ? -1 : a.pp < b.pp ? -1 - : 0; - }); + : 0); } else { arr.sort((a, b) => a.price - b.price); } diff --git a/src/Disp/Initialization/CreateWrinklerButton.js b/src/Disp/Initialization/CreateWrinklerButton.js index f4b2beb..5d8a7db 100644 --- a/src/Disp/Initialization/CreateWrinklerButton.js +++ b/src/Disp/Initialization/CreateWrinklerButton.js @@ -20,9 +20,7 @@ export default function CreateWrinklerButtons() { Game.tooltip.dynamic = 1; Game.tooltip.draw( this, - function () { - return CreateTooltip('wb', 'PopAll'); - }, + () => CreateTooltip('wb', 'PopAll'), 'this', ); Game.tooltip.wobble(); @@ -43,9 +41,7 @@ export default function CreateWrinklerButtons() { Game.tooltip.dynamic = 1; Game.tooltip.draw( this, - function () { - return CreateTooltip('wb', 'PopFattest'); - }, + () => CreateTooltip('wb', 'PopFattest'), 'this', ); Game.tooltip.wobble(); diff --git a/src/Disp/MenuSections/Statistics/CreateMissingAchievements.js b/src/Disp/MenuSections/Statistics/CreateMissingAchievements.js index 848bd54..e29dac6 100644 --- a/src/Disp/MenuSections/Statistics/CreateMissingAchievements.js +++ b/src/Disp/MenuSections/Statistics/CreateMissingAchievements.js @@ -68,13 +68,11 @@ export default function AddMissingAchievements() { Game.tooltip.dynamic = 1; Game.tooltip.draw( this, - function () { - return (function () { + () => (function () { return CrateTooltipLockedAchievements( Game.AchievementsById[id], ); - })(); - }, + })(), 'top', ); Game.tooltip.wobble(); diff --git a/src/Disp/Notifications/Flash.js b/src/Disp/Notifications/Flash.js index d66e0c4..73d0cec 100644 --- a/src/Disp/Notifications/Flash.js +++ b/src/Disp/Notifications/Flash.js @@ -21,17 +21,17 @@ export default function Flash(mode, config, forced) { 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'; diff --git a/src/Main/ReplaceGameElements/TooltipGrimoire.js b/src/Main/ReplaceGameElements/TooltipGrimoire.js index 37f7617..30db55f 100644 --- a/src/Main/ReplaceGameElements/TooltipGrimoire.js +++ b/src/Main/ReplaceGameElements/TooltipGrimoire.js @@ -14,9 +14,7 @@ export default function ReplaceTooltipGrimoire() { Game.tooltip.dynamic = 1; Game.tooltip.draw( this, - function () { - return CreateTooltip('g', `${i}`); - }, + () => CreateTooltip('g', `${i}`), 'this', ); Game.tooltip.wobble(); diff --git a/src/Main/ReplaceGameElements/TooltipUpgrades.js b/src/Main/ReplaceGameElements/TooltipUpgrades.js index 5f01554..ff2c6bf 100644 --- a/src/Main/ReplaceGameElements/TooltipUpgrades.js +++ b/src/Main/ReplaceGameElements/TooltipUpgrades.js @@ -17,9 +17,7 @@ export default function ReplaceTooltipUpgrade() { Game.tooltip.dynamic = 1; Game.tooltip.draw( this, - function () { - return CreateTooltip('u', `${i}`); - }, + () => CreateTooltip('u', `${i}`), 'store', ); Game.tooltip.wobble(); diff --git a/src/Main/ReplaceGameElements/Tooltips.js b/src/Main/ReplaceGameElements/Tooltips.js index a0594bd..3463549 100644 --- a/src/Main/ReplaceGameElements/Tooltips.js +++ b/src/Main/ReplaceGameElements/Tooltips.js @@ -21,9 +21,7 @@ function ReplaceTooltipBuild() { Game.tooltip.dynamic = 1; Game.tooltip.draw( this, - function () { - return CreateTooltip('b', `${i}`); - }, + () => CreateTooltip('b', `${i}`), 'store', ); Game.tooltip.wobble(); @@ -42,9 +40,7 @@ function ReplaceTooltipLump() { Game.tooltip.dynamic = 1; Game.tooltip.draw( this, - function () { - return CreateTooltip('s', 'Lump'); - }, + () => CreateTooltip('s', 'Lump'), 'this', ); Game.tooltip.wobble(); @@ -61,9 +57,7 @@ function ReplaceTooltipGarden() { Game.tooltip.dynamic = 1; Game.tooltip.draw( this, - function () { - return CreateTooltip('ha', 'HarvestAllButton'); - }, + () => CreateTooltip('ha', 'HarvestAllButton'), 'this', ); Game.tooltip.wobble(); @@ -75,9 +69,7 @@ function ReplaceTooltipGarden() { Game.tooltip.dynamic = 1; Game.tooltip.draw( this, - function () { - return CreateTooltip('p', [`${coords[0]}`, `${coords[2]}`]); - }, + () => CreateTooltip('p', [`${coords[0]}`, `${coords[2]}`]), 'this', ); Game.tooltip.wobble(); @@ -93,9 +85,7 @@ function ReplaceTooltipPantheon() { Game.tooltip.dynamic = 1; Game.tooltip.draw( this, - function () { - return CreateTooltip('pag', i); - }, + () => CreateTooltip('pag', i), 'this', ); Game.tooltip.wobble(); @@ -106,12 +96,10 @@ function ReplaceTooltipPantheon() { Game.tooltip.dynamic = 1; Game.tooltip.draw( this, - function () { - return CreateTooltip('pas', [ + () => CreateTooltip('pas', [ i, Game.Objects.Temple.minigame.slot[i], - ]); - }, + ]), 'this', ); Game.tooltip.wobble(); diff --git a/src/Main/ReplaceGameFunctions/ReplaceNative.js b/src/Main/ReplaceGameFunctions/ReplaceNative.js index a5826c1..bc020a7 100644 --- a/src/Main/ReplaceGameFunctions/ReplaceNative.js +++ b/src/Main/ReplaceGameFunctions/ReplaceNative.js @@ -69,7 +69,7 @@ export default function ReplaceNative() { l('bigCookie').removeEventListener('click', Game.ClickCookie, false); l('bigCookie').addEventListener( 'click', - function () { + () => { FixMouseY(Game.ClickCookie); }, false,