From 6917e3139af718246504ecebb023c24d035d48da Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Tue, 9 Feb 2016 11:55:28 -0500 Subject: [PATCH 1/5] Fixed bug where Caut/Warn Tooltip calculation with bonus CPS didn't use the new Lucky reward way --- CookieMonster.js | 2 +- src/Disp.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index d44ce66..a2ed2c6 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -1797,7 +1797,7 @@ CM.Disp.UpdateTooltip = function() { if (Game.frenzy > 0) { bonusNoFren /= Game.frenzyPower; } - warn += ((bonusNoFren * 60 * 20) / 0.1); + warn += ((bonusNoFren * 60 * 15) / 0.15); } var caut = warn * 7; var amount = Game.cookies - price; diff --git a/src/Disp.js b/src/Disp.js index f9bce46..924bd32 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -1459,7 +1459,7 @@ CM.Disp.UpdateTooltip = function() { if (Game.frenzy > 0) { bonusNoFren /= Game.frenzyPower; } - warn += ((bonusNoFren * 60 * 20) / 0.1); + warn += ((bonusNoFren * 60 * 15) / 0.15); } var caut = warn * 7; var amount = Game.cookies - price; From 5640cbb9c8bdbbbec3c68c4ecdcc70d3e9f3a8a8 Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Tue, 9 Feb 2016 11:56:37 -0500 Subject: [PATCH 2/5] Version change to 2.2 (forgot to do this first so previous commit is under this version) --- CookieMonster.js | 2 +- src/Main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index a2ed2c6..7ee4765 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -2148,7 +2148,7 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBar CM.ConfigPrefix = 'CMConfig'; CM.VersionMajor = '2'; -CM.VersionMinor = '1'; +CM.VersionMinor = '2'; /******* * Sim * diff --git a/src/Main.js b/src/Main.js index cc20cef..17adab5 100644 --- a/src/Main.js +++ b/src/Main.js @@ -167,5 +167,5 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBar CM.ConfigPrefix = 'CMConfig'; CM.VersionMajor = '2'; -CM.VersionMinor = '1'; +CM.VersionMinor = '2'; From f1a79cbaa3483bb55d14ec8c9e35a20648c7139f Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Tue, 9 Feb 2016 13:04:35 -0500 Subject: [PATCH 3/5] Hopefully to fix the crashing --- CookieMonster.js | 2 +- src/Main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 7ee4765..45333e9 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -2035,7 +2035,7 @@ CM.ReplaceNative = function() { Game.RebuildUpgrades = function() { CM.Backup.RebuildUpgrades(); CM.Disp.AddTooltipUpgrade(); - Game.recalculateGains = 1; + CM.Sim.DoSims = 1; } CM.Backup.UpdateMenu = Game.UpdateMenu; diff --git a/src/Main.js b/src/Main.js index 17adab5..17b94b1 100644 --- a/src/Main.js +++ b/src/Main.js @@ -54,7 +54,7 @@ CM.ReplaceNative = function() { Game.RebuildUpgrades = function() { CM.Backup.RebuildUpgrades(); CM.Disp.AddTooltipUpgrade(); - Game.recalculateGains = 1; + CM.Sim.DoSims = 1; } CM.Backup.UpdateMenu = Game.UpdateMenu; From 6e09c8dafbb6987ce503227f912c368a24abd64f Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Tue, 9 Feb 2016 13:45:42 -0500 Subject: [PATCH 4/5] Hopefully to fix the crashing (part 2) --- src/Main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Main.js b/src/Main.js index 17b94b1..5fad819 100644 --- a/src/Main.js +++ b/src/Main.js @@ -54,7 +54,7 @@ CM.ReplaceNative = function() { Game.RebuildUpgrades = function() { CM.Backup.RebuildUpgrades(); CM.Disp.AddTooltipUpgrade(); - CM.Sim.DoSims = 1; + Game.CalculateGains(); } CM.Backup.UpdateMenu = Game.UpdateMenu; From 348c47e1dc4ccf8c761d7d5c8d02d3a03ae6d2b2 Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Tue, 9 Feb 2016 13:46:50 -0500 Subject: [PATCH 5/5] Hopefully to fix the crashing (part 3) --- CookieMonster.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CookieMonster.js b/CookieMonster.js index 45333e9..20556f6 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -2035,7 +2035,7 @@ CM.ReplaceNative = function() { Game.RebuildUpgrades = function() { CM.Backup.RebuildUpgrades(); CM.Disp.AddTooltipUpgrade(); - CM.Sim.DoSims = 1; + Game.CalculateGains(); } CM.Backup.UpdateMenu = Game.UpdateMenu;