Merge pull request #916 from CookieMonsterTeam/dev

Push hotfixes to master
CookieMonsterTeam · Sep 2, 2021 · ac7f630 · ac7f630
2 parents 60f19e5 + 2940d1c
commit ac7f630
Show file tree

Hide file tree

Showing 8 changed files with 319 additions and 249 deletions.
diff --git a/dist/CookieMonster.js b/dist/CookieMonster.js
diff --git a/dist/CookieMonster.js.map b/dist/CookieMonster.js.map
diff --git a/dist/CookieMonsterDev.js b/dist/CookieMonsterDev.js
diff --git a/dist/CookieMonsterDev.js.map b/dist/CookieMonsterDev.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,22 +46,22 @@
   "devDependencies": {
     "@types/chai": "^4.2.19",
     "@types/mocha": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.28.4",
-    "@typescript-eslint/parser": "^4.28.4",
+    "@typescript-eslint/eslint-plugin": "^4.30.0",
+    "@typescript-eslint/parser": "^4.30.0",
     "chai": "^4.3.4",
-    "eslint": "^7.31.0",
+    "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-import": "^2.24.2",
     "esm": "^3.2.25",
     "mocha": "^8.4.0",
     "npm-run-all": "^4.1.5",
     "prettier": "2.3.2",
-    "ts-loader": "^9.2.3",
-    "ts-node": "^10.0.0",
-    "typescript": "^4.3.4",
-    "webpack": "^5.45.1",
-    "webpack-cli": "^4.7.2"
+    "ts-loader": "^9.2.5",
+    "ts-node": "^10.2.1",
+    "typescript": "^4.4.2",
+    "webpack": "^5.51.2",
+    "webpack-cli": "^4.8.0"
   },
   "ccrepo": {
     "icon": [

diff --git a/src/Disp/Tooltips/Tooltip.js b/src/Disp/Tooltips/Tooltip.js
@@ -41,7 +41,7 @@ export function CreateTooltip(type, name) {
     // Adds amortization info to the list of info per building
     if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.TooltipAmor === 1) {
       const buildPrice = BuildingGetPrice(
-        Game.Objects[name],
+        name,
         Game.Objects[name].basePrice,
         0,
         Game.Objects[name].free,

diff --git a/src/Main/ReplaceGameFunctions/ReplaceNative.js b/src/Main/ReplaceGameFunctions/ReplaceNative.js
@@ -66,8 +66,8 @@ export default function ReplaceNative() {
   l('bigCookie').removeEventListener('click', Game.ClickCookie, false);
   l('bigCookie').addEventListener(
     'click',
-    () => {
-      FixMouseY(Game.ClickCookie);
+    (event) => {
+      FixMouseY(()=> Game.ClickCookie(event,0));
     },
     false,
   );