From b16510c6ed27771212be45c90479ba0a03634752 Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Fri, 18 Aug 2017 08:04:52 -0400 Subject: [PATCH] Optimize reset bonus calculation --- CookieMonster.js | 26 +++++++++++++++----------- src/Sim.js | 26 +++++++++++++++----------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 357f5c8..b5d0b7a 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -3069,20 +3069,24 @@ CM.Sim.ResetBonus = function(possiblePresMax) { var lastAchievementsOwned = -1; // Calculate CPS with all Heavenly upgrades - CM.Sim.CopyData(); - - CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; - CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; - CM.Sim.Upgrades['Heavenly bakery'].bought = 1; - CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; - CM.Sim.Upgrades['Heavenly key'].bought = 1; - - CM.Sim.CalculateGains(); - - var curCPS = CM.Sim.cookiesPs; + var curCPS = Game.cookiesPs; CM.Sim.CopyData(); + if (CM.Sim.Upgrades['Heavenly key'].bought == 0) { + CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; + CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; + CM.Sim.Upgrades['Heavenly bakery'].bought = 1; + CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; + CM.Sim.Upgrades['Heavenly key'].bought = 1; + + CM.Sim.CalculateGains(); + + curCPS = CM.Sim.cookiesPs; + + CM.Sim.CopyData(); + } + if (Game.cookiesEarned >= 1000000) CM.Sim.Win('Sacrifice'); if (Game.cookiesEarned >= 1000000000) CM.Sim.Win('Oblivion'); if (Game.cookiesEarned >= 1000000000000) CM.Sim.Win('From scratch'); diff --git a/src/Sim.js b/src/Sim.js index 856c7f9..8c8ef44 100644 --- a/src/Sim.js +++ b/src/Sim.js @@ -470,20 +470,24 @@ CM.Sim.ResetBonus = function(possiblePresMax) { var lastAchievementsOwned = -1; // Calculate CPS with all Heavenly upgrades - CM.Sim.CopyData(); - - CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; - CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; - CM.Sim.Upgrades['Heavenly bakery'].bought = 1; - CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; - CM.Sim.Upgrades['Heavenly key'].bought = 1; - - CM.Sim.CalculateGains(); - - var curCPS = CM.Sim.cookiesPs; + var curCPS = Game.cookiesPs; CM.Sim.CopyData(); + if (CM.Sim.Upgrades['Heavenly key'].bought == 0) { + CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; + CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; + CM.Sim.Upgrades['Heavenly bakery'].bought = 1; + CM.Sim.Upgrades['Heavenly confectionery'].bought = 1; + CM.Sim.Upgrades['Heavenly key'].bought = 1; + + CM.Sim.CalculateGains(); + + curCPS = CM.Sim.cookiesPs; + + CM.Sim.CopyData(); + } + if (Game.cookiesEarned >= 1000000) CM.Sim.Win('Sacrifice'); if (Game.cookiesEarned >= 1000000000) CM.Sim.Win('Oblivion'); if (Game.cookiesEarned >= 1000000000000) CM.Sim.Win('From scratch');