From f65749db50583712d22046eb5b85c5677f4ec0e0 Mon Sep 17 00:00:00 2001 From: Daniel van Noord Date: Fri, 4 Dec 2020 20:50:20 +0100 Subject: [PATCH 1/3] Fixed negative PP #406 --- CookieMonster.js | 8 ++++---- src/Sim.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index d1f554e..9210c3e 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -3951,11 +3951,11 @@ CM.Sim.hasGod=function(what) { CM.Sim.eff = function(name) { if (typeof CM.Sim.effs[name]==='undefined') { - CM.Sim.effs[name] = 1 - return CM.Sim.effs[name] + CM.Sim.effs[name] = 1; + return CM.Sim.effs[name]; } else { - return Game.effs[name]; + return CM.Sim.effs[name]; } } @@ -4089,7 +4089,7 @@ CM.Sim.CalculateGains = function() { var mult = 1; // Include minigame effects var effs={}; - for (var i in CM.Cache.Objects) { + for (var i in Game.Objects) { // TODO Store minigames and effects in Cache // Include possibility of new/modded building and new/modded minigames if (CM.Sim.Objects[i].minigameLoaded && CM.Sim.Objects[i].minigame.effs) { diff --git a/src/Sim.js b/src/Sim.js index 902cc7b..09b79ad 100644 --- a/src/Sim.js +++ b/src/Sim.js @@ -114,11 +114,11 @@ CM.Sim.hasGod=function(what) { CM.Sim.eff = function(name) { if (typeof CM.Sim.effs[name]==='undefined') { - CM.Sim.effs[name] = 1 - return CM.Sim.effs[name] + CM.Sim.effs[name] = 1; + return CM.Sim.effs[name]; } else { - return Game.effs[name]; + return CM.Sim.effs[name]; } } @@ -252,7 +252,7 @@ CM.Sim.CalculateGains = function() { var mult = 1; // Include minigame effects var effs={}; - for (var i in CM.Cache.Objects) { + for (var i in Game.Objects) { // TODO Store minigames and effects in Cache // Include possibility of new/modded building and new/modded minigames if (CM.Sim.Objects[i].minigameLoaded && CM.Sim.Objects[i].minigame.effs) { From a22ab829ec842cf106c896c9b0d24c7da0d912b5 Mon Sep 17 00:00:00 2001 From: Daniel van Noord Date: Fri, 4 Dec 2020 20:52:51 +0100 Subject: [PATCH 2/3] Fixed crash on selecting Sell mode #407 --- CookieMonster.js | 2 +- src/Disp.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 9210c3e..0e5addb 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -3106,7 +3106,7 @@ CM.Disp.UpdateTooltip = function() { l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2); l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; } - if (CM.Config.TooltipBuildUp) { + if (CM.Config.TooltipBuildUp && Game.buyMode == 1) { for (var i in Game.Objects[CM.Disp.tooltipName].productionAchievs) { if (!CM.Sim.HasAchiev(Game.Objects[CM.Disp.tooltipName].productionAchievs[i].achiev.name)) { var nextProductionAchiev = Game.Objects[CM.Disp.tooltipName].productionAchievs[i] diff --git a/src/Disp.js b/src/Disp.js index 154065c..2f3c8a8 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -2264,7 +2264,7 @@ CM.Disp.UpdateTooltip = function() { l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2); l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; } - if (CM.Config.TooltipBuildUp) { + if (CM.Config.TooltipBuildUp && Game.buyMode == 1) { for (var i in Game.Objects[CM.Disp.tooltipName].productionAchievs) { if (!CM.Sim.HasAchiev(Game.Objects[CM.Disp.tooltipName].productionAchievs[i].achiev.name)) { var nextProductionAchiev = Game.Objects[CM.Disp.tooltipName].productionAchievs[i] From 5c736b7790e9adb790d46f5ca8da5b95bfeca55c Mon Sep 17 00:00:00 2001 From: Daniel van Noord Date: Fri, 4 Dec 2020 20:55:44 +0100 Subject: [PATCH 3/3] Fix GC no longer updating --- CookieMonster.js | 1 + src/Disp.js | 1 + 2 files changed, 2 insertions(+) diff --git a/CookieMonster.js b/CookieMonster.js index 0e5addb..f62f924 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -1876,6 +1876,7 @@ CM.Disp.CheckGoldenCookie = function() { CM.Disp.Notification('GCNotification', "Golden Cookie Spawned", "A Golden Cookie has spawned. Click it now!") } CM.Disp.lastSpawnedGoldenCookieState = CM.Disp.currSpawnedGoldenCookieState + if (CM.Main.currSpawnedGoldenCookieState == 0) CM.Disp.spawnedGoldenShimmer = 0; CM.Disp.UpdateFavicon(); if (CM.Config.GCTimer == 1) { diff --git a/src/Disp.js b/src/Disp.js index 2f3c8a8..f769f1a 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -1034,6 +1034,7 @@ CM.Disp.CheckGoldenCookie = function() { CM.Disp.Notification('GCNotification', "Golden Cookie Spawned", "A Golden Cookie has spawned. Click it now!") } CM.Disp.lastSpawnedGoldenCookieState = CM.Disp.currSpawnedGoldenCookieState + if (CM.Main.currSpawnedGoldenCookieState == 0) CM.Disp.spawnedGoldenShimmer = 0; CM.Disp.UpdateFavicon(); if (CM.Config.GCTimer == 1) {