From 37107ae6212da830ebd85a1d07a4f287e492d372 Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Thu, 3 Aug 2017 23:18:33 -0400 Subject: [PATCH 1/4] Version change to 2.0034.4 --- CookieMonster.js | 2 +- src/Main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index c4ab20c..be1ad2b 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -2585,7 +2585,7 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkB CM.ConfigPrefix = 'CMConfig'; CM.VersionMajor = '2.0034'; -CM.VersionMinor = '3'; +CM.VersionMinor = '4'; /******* * Sim * diff --git a/src/Main.js b/src/Main.js index dd40822..d0f9b3d 100644 --- a/src/Main.js +++ b/src/Main.js @@ -204,5 +204,5 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkB CM.ConfigPrefix = 'CMConfig'; CM.VersionMajor = '2.0034'; -CM.VersionMinor = '3'; +CM.VersionMinor = '4'; From 6ac602a067039eabc3e5968806585f0668c8609c Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Thu, 3 Aug 2017 23:31:54 -0400 Subject: [PATCH 2/4] Fixed very minor bug in average CPS with Chocolate Egg and fixed negative average CPS (maybe?) --- CookieMonster.js | 8 +++++--- src/Cache.js | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index be1ad2b..d490a30 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -263,7 +263,7 @@ CM.Cache.UpdateAvgCPS = function() { if (CM.Cache.lastDate != -1) { var timeDiff = currDate - CM.Cache.lastDate var bankDiffAvg = Math.max(0, (Game.cookies - CM.Cache.lastCookies)) / timeDiff; - var wrinkDiffAvg = (CM.Cache.WrinkBank - CM.Cache.lastWrinkCookies) / timeDiff; + var wrinkDiffAvg = Math.max(0, (CM.Cache.WrinkBank - CM.Cache.lastWrinkCookies)) / timeDiff; var choEggDiffAvg = Math.max(0,(choEggTotal - CM.Cache.lastChoEgg)) / timeDiff; var clicksDiffAvg = (Game.cookieClicks - CM.Cache.lastClicks) / timeDiff; for (var i = 0; i < timeDiff; i++) { @@ -301,8 +301,10 @@ CM.Cache.UpdateAvgCPS = function() { } CM.Cache.AvgCPS = (totalGainBank + (CM.Config.CalcWrink ? totalGainWrink : 0)) / cpsLength; - if ((Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')) || CM.Config.CalcWrink == 0) { - CM.Cache.AvgCPSChoEgg = (totalGainBank + totalGainWrink + totalGainChoEgg) / cpsLength; + var choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')); + + if (choEgg || CM.Config.CalcWrink == 0) { + CM.Cache.AvgCPSChoEgg = (totalGainBank + totalGainWrink + (choEgg ? totalGainChoEgg : 0)) / cpsLength; } else { CM.Cache.AvgCPSChoEgg = CM.Cache.AvgCPS; diff --git a/src/Cache.js b/src/Cache.js index b516b27..8001792 100644 --- a/src/Cache.js +++ b/src/Cache.js @@ -243,7 +243,7 @@ CM.Cache.UpdateAvgCPS = function() { if (CM.Cache.lastDate != -1) { var timeDiff = currDate - CM.Cache.lastDate var bankDiffAvg = Math.max(0, (Game.cookies - CM.Cache.lastCookies)) / timeDiff; - var wrinkDiffAvg = (CM.Cache.WrinkBank - CM.Cache.lastWrinkCookies) / timeDiff; + var wrinkDiffAvg = Math.max(0, (CM.Cache.WrinkBank - CM.Cache.lastWrinkCookies)) / timeDiff; var choEggDiffAvg = Math.max(0,(choEggTotal - CM.Cache.lastChoEgg)) / timeDiff; var clicksDiffAvg = (Game.cookieClicks - CM.Cache.lastClicks) / timeDiff; for (var i = 0; i < timeDiff; i++) { @@ -281,8 +281,10 @@ CM.Cache.UpdateAvgCPS = function() { } CM.Cache.AvgCPS = (totalGainBank + (CM.Config.CalcWrink ? totalGainWrink : 0)) / cpsLength; - if ((Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')) || CM.Config.CalcWrink == 0) { - CM.Cache.AvgCPSChoEgg = (totalGainBank + totalGainWrink + totalGainChoEgg) / cpsLength; + var choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')); + + if (choEgg || CM.Config.CalcWrink == 0) { + CM.Cache.AvgCPSChoEgg = (totalGainBank + totalGainWrink + (choEgg ? totalGainChoEgg : 0)) / cpsLength; } else { CM.Cache.AvgCPSChoEgg = CM.Cache.AvgCPS; From 446f1e767c7eb7ca6162e8a15aacd70b71896943 Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Tue, 8 Aug 2017 16:22:06 -0400 Subject: [PATCH 3/4] Version change to 2.0042.1 --- CookieMonster.js | 4 ++-- src/Main.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index d490a30..b17a203 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -2586,8 +2586,8 @@ CM.DelayInit = function() { CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 2, AvgClicksHist: 2, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, TimeFormat: 0, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}}; CM.ConfigPrefix = 'CMConfig'; -CM.VersionMajor = '2.0034'; -CM.VersionMinor = '4'; +CM.VersionMajor = '2.0042'; +CM.VersionMinor = '1'; /******* * Sim * diff --git a/src/Main.js b/src/Main.js index d0f9b3d..7ff217d 100644 --- a/src/Main.js +++ b/src/Main.js @@ -203,6 +203,6 @@ CM.DelayInit = function() { CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 2, AvgClicksHist: 2, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, TimeFormat: 0, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}}; CM.ConfigPrefix = 'CMConfig'; -CM.VersionMajor = '2.0034'; -CM.VersionMinor = '4'; +CM.VersionMajor = '2.0042'; +CM.VersionMinor = '1'; From cad42578a949eb90d34e8fb51a7d340ebe56d065 Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Tue, 8 Aug 2017 20:40:52 -0400 Subject: [PATCH 4/4] Fixed to work with Version 2.0042 (Mostly) (Issue #134) --- CookieMonster.js | 15 +++++++++++++-- src/Sim.js | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index b17a203..029ee3a 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -2831,6 +2831,8 @@ CM.Sim.CalculateGains = function() { if (CM.Sim.Has('Kitten accountants')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult); if (CM.Sim.Has('Kitten specialists')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult); if (CM.Sim.Has('Kitten experts')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult); + if (CM.Sim.Has('Kitten consultants')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult); + if (CM.Sim.Has('Kitten assistants to the regional manager')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult); if (CM.Sim.Has('Kitten angels')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult); var eggMult = 1; @@ -2856,8 +2858,16 @@ CM.Sim.CalculateGains = function() { mult *= eggMult; if (CM.Sim.hasAura('Radiant Appetite')) mult *= 2; - + + if (Game.hasAura('Dragon\'s Fortune')) { + var n = Game.shimmerTypes['golden'].n; + for (var i = 0; i < n; i++) { + mult *= 2.11; + } + } + var rawCookiesPs = CM.Sim.cookiesPs * mult; + for (var i in Game.CpsAchievements) { if (rawCookiesPs >= Game.CpsAchievements[i].threshold) CM.Sim.Win(Game.CpsAchievements[i].name); } @@ -2889,7 +2899,7 @@ CM.Sim.CalculateGains = function() { }; CM.Sim.CheckOtherAchiev = function() { - var grandmas=0; + var grandmas = 0; if (CM.Sim.Has('Farmer grandmas')) grandmas++; if (CM.Sim.Has('Worker grandmas')) grandmas++; if (CM.Sim.Has('Miner grandmas')) grandmas++; @@ -2902,6 +2912,7 @@ CM.Sim.CheckOtherAchiev = function() { if (CM.Sim.Has('Banker grandmas')) grandmas++; if (CM.Sim.Has('Priestess grandmas')) grandmas++; if (CM.Sim.Has('Witch grandmas')) grandmas++; + if (CM.Sim.Has('Lucky grandmas')) grandmas++; if (!CM.Sim.HasAchiev('Elder') && grandmas >= 7) CM.Sim.Win('Elder'); var buildingsOwned = 0; diff --git a/src/Sim.js b/src/Sim.js index eaf68d6..80387bc 100644 --- a/src/Sim.js +++ b/src/Sim.js @@ -240,6 +240,8 @@ CM.Sim.CalculateGains = function() { if (CM.Sim.Has('Kitten accountants')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult); if (CM.Sim.Has('Kitten specialists')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult); if (CM.Sim.Has('Kitten experts')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult); + if (CM.Sim.Has('Kitten consultants')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult); + if (CM.Sim.Has('Kitten assistants to the regional manager')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult); if (CM.Sim.Has('Kitten angels')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult); var eggMult = 1; @@ -265,8 +267,16 @@ CM.Sim.CalculateGains = function() { mult *= eggMult; if (CM.Sim.hasAura('Radiant Appetite')) mult *= 2; - + + if (Game.hasAura('Dragon\'s Fortune')) { + var n = Game.shimmerTypes['golden'].n; + for (var i = 0; i < n; i++) { + mult *= 2.11; + } + } + var rawCookiesPs = CM.Sim.cookiesPs * mult; + for (var i in Game.CpsAchievements) { if (rawCookiesPs >= Game.CpsAchievements[i].threshold) CM.Sim.Win(Game.CpsAchievements[i].name); } @@ -298,7 +308,7 @@ CM.Sim.CalculateGains = function() { }; CM.Sim.CheckOtherAchiev = function() { - var grandmas=0; + var grandmas = 0; if (CM.Sim.Has('Farmer grandmas')) grandmas++; if (CM.Sim.Has('Worker grandmas')) grandmas++; if (CM.Sim.Has('Miner grandmas')) grandmas++; @@ -311,6 +321,7 @@ CM.Sim.CheckOtherAchiev = function() { if (CM.Sim.Has('Banker grandmas')) grandmas++; if (CM.Sim.Has('Priestess grandmas')) grandmas++; if (CM.Sim.Has('Witch grandmas')) grandmas++; + if (CM.Sim.Has('Lucky grandmas')) grandmas++; if (!CM.Sim.HasAchiev('Elder') && grandmas >= 7) CM.Sim.Win('Elder'); var buildingsOwned = 0;