diff --git a/CookieMonster.js b/CookieMonster.js index d40019e..fe8236e 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -265,6 +265,7 @@ CM.Cache.UpdateAvgCPS = function() { if (Game.cpsSucked > 0) { choEggTotal += CM.Cache.WrinkGodBank; } + CM.Cache.RealCookiesEarned = Math.max(Game.cookiesEarned, choEggTotal); choEggTotal *= 0.05; if (CM.Cache.lastDate != -1) { @@ -377,6 +378,7 @@ CM.Cache.CentEgg = 0; CM.Cache.SellForChoEgg = 0; CM.Cache.Title = ''; CM.Cache.HadFierHoard = false; +CM.Cache.RealCookiesEarned = -1; CM.Cache.lastDate = -1; CM.Cache.lastCookies = -1; CM.Cache.lastWrinkCookies = -1; @@ -1832,8 +1834,8 @@ CM.Disp.AddMenuStats = function(title) { stats.appendChild(header('Prestige', 'Prestige')); if (CM.Config.StatsPref.Prestige) { - var possiblePresMax = Math.floor(Game.HowMuchPrestige(Game.cookiesEarned + Game.cookiesReset + CM.Cache.WrinkGodBank + (choEgg ? CM.Cache.lastChoEgg : 0))); - var neededCook = Game.HowManyCookiesReset(possiblePresMax + 1) - (Game.cookiesEarned + Game.cookiesReset + CM.Cache.WrinkGodBank + (choEgg ? CM.Cache.lastChoEgg : 0)); + var possiblePresMax = Math.floor(Game.HowMuchPrestige(CM.Cache.RealCookiesEarned + Game.cookiesReset + CM.Cache.WrinkGodBank + (choEgg ? CM.Cache.lastChoEgg : 0))); + var neededCook = Game.HowManyCookiesReset(possiblePresMax + 1) - (CM.Cache.RealCookiesEarned + Game.cookiesReset + CM.Cache.WrinkGodBank + (choEgg ? CM.Cache.lastChoEgg : 0)); stats.appendChild(listing(listingQuest('Prestige Level (CUR / MAX)', 'PrestMaxTooltipPlaceholder'), document.createTextNode(Beautify(Game.prestige) + ' / ' + Beautify(possiblePresMax)))); var cookiesNextFrag = document.createDocumentFragment(); @@ -3267,21 +3269,21 @@ CM.Sim.ResetBonus = function(possiblePresMax) { 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'); - if (Game.cookiesEarned >= 1000000000000000) CM.Sim.Win('Nihilism'); - if (Game.cookiesEarned >= 1000000000000000000) CM.Sim.Win('Dematerialize'); - if (Game.cookiesEarned >= 1000000000000000000000) CM.Sim.Win('Nil zero zilch'); - if (Game.cookiesEarned >= 1000000000000000000000000) CM.Sim.Win('Transcendence'); - if (Game.cookiesEarned >= 1000000000000000000000000000) CM.Sim.Win('Obliterate'); - if (Game.cookiesEarned >= 1000000000000000000000000000000) CM.Sim.Win('Negative void'); - if (Game.cookiesEarned >= 1000000000000000000000000000000000) CM.Sim.Win('To crumbs, you say?'); - if (Game.cookiesEarned >= 1000000000000000000000000000000000000) CM.Sim.Win('You get nothing'); - if (Game.cookiesEarned >= 1000000000000000000000000000000000000000) CM.Sim.Win('Humble rebeginnings'); - if (Game.cookiesEarned >= 1000000000000000000000000000000000000000000) CM.Sim.Win('The end of the world'); - if (Game.cookiesEarned >= 1000000000000000000000000000000000000000000000) CM.Sim.Win('Oh, you\'re back'); - if (Game.cookiesEarned >= 1000000000000000000000000000000000000000000000000) CM.Sim.Win('Lazarus'); + if (CM.Cache.RealCookiesEarned >= 1000000) CM.Sim.Win('Sacrifice'); + if (CM.Cache.RealCookiesEarned >= 1000000000) CM.Sim.Win('Oblivion'); + if (CM.Cache.RealCookiesEarned >= 1000000000000) CM.Sim.Win('From scratch'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000) CM.Sim.Win('Nihilism'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000) CM.Sim.Win('Dematerialize'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000) CM.Sim.Win('Nil zero zilch'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000) CM.Sim.Win('Transcendence'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000) CM.Sim.Win('Obliterate'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000) CM.Sim.Win('Negative void'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000000) CM.Sim.Win('To crumbs, you say?'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000000000) CM.Sim.Win('You get nothing'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000000000000) CM.Sim.Win('Humble rebeginnings'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000000000000000) CM.Sim.Win('The end of the world'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000000000000000000) CM.Sim.Win('Oh, you\'re back'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000000000000000000000) CM.Sim.Win('Lazarus'); CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1; diff --git a/src/Cache.js b/src/Cache.js index 47a1472..ebfa47b 100644 --- a/src/Cache.js +++ b/src/Cache.js @@ -245,6 +245,7 @@ CM.Cache.UpdateAvgCPS = function() { if (Game.cpsSucked > 0) { choEggTotal += CM.Cache.WrinkGodBank; } + CM.Cache.RealCookiesEarned = Math.max(Game.cookiesEarned, choEggTotal); choEggTotal *= 0.05; if (CM.Cache.lastDate != -1) { @@ -357,6 +358,7 @@ CM.Cache.CentEgg = 0; CM.Cache.SellForChoEgg = 0; CM.Cache.Title = ''; CM.Cache.HadFierHoard = false; +CM.Cache.RealCookiesEarned = -1; CM.Cache.lastDate = -1; CM.Cache.lastCookies = -1; CM.Cache.lastWrinkCookies = -1; diff --git a/src/Disp.js b/src/Disp.js index 418cd6d..fc4aeb3 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -1282,8 +1282,8 @@ CM.Disp.AddMenuStats = function(title) { stats.appendChild(header('Prestige', 'Prestige')); if (CM.Config.StatsPref.Prestige) { - var possiblePresMax = Math.floor(Game.HowMuchPrestige(Game.cookiesEarned + Game.cookiesReset + CM.Cache.WrinkGodBank + (choEgg ? CM.Cache.lastChoEgg : 0))); - var neededCook = Game.HowManyCookiesReset(possiblePresMax + 1) - (Game.cookiesEarned + Game.cookiesReset + CM.Cache.WrinkGodBank + (choEgg ? CM.Cache.lastChoEgg : 0)); + var possiblePresMax = Math.floor(Game.HowMuchPrestige(CM.Cache.RealCookiesEarned + Game.cookiesReset + CM.Cache.WrinkGodBank + (choEgg ? CM.Cache.lastChoEgg : 0))); + var neededCook = Game.HowManyCookiesReset(possiblePresMax + 1) - (CM.Cache.RealCookiesEarned + Game.cookiesReset + CM.Cache.WrinkGodBank + (choEgg ? CM.Cache.lastChoEgg : 0)); stats.appendChild(listing(listingQuest('Prestige Level (CUR / MAX)', 'PrestMaxTooltipPlaceholder'), document.createTextNode(Beautify(Game.prestige) + ' / ' + Beautify(possiblePresMax)))); var cookiesNextFrag = document.createDocumentFragment(); diff --git a/src/Sim.js b/src/Sim.js index 5338535..0da872e 100644 --- a/src/Sim.js +++ b/src/Sim.js @@ -501,21 +501,21 @@ CM.Sim.ResetBonus = function(possiblePresMax) { 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'); - if (Game.cookiesEarned >= 1000000000000000) CM.Sim.Win('Nihilism'); - if (Game.cookiesEarned >= 1000000000000000000) CM.Sim.Win('Dematerialize'); - if (Game.cookiesEarned >= 1000000000000000000000) CM.Sim.Win('Nil zero zilch'); - if (Game.cookiesEarned >= 1000000000000000000000000) CM.Sim.Win('Transcendence'); - if (Game.cookiesEarned >= 1000000000000000000000000000) CM.Sim.Win('Obliterate'); - if (Game.cookiesEarned >= 1000000000000000000000000000000) CM.Sim.Win('Negative void'); - if (Game.cookiesEarned >= 1000000000000000000000000000000000) CM.Sim.Win('To crumbs, you say?'); - if (Game.cookiesEarned >= 1000000000000000000000000000000000000) CM.Sim.Win('You get nothing'); - if (Game.cookiesEarned >= 1000000000000000000000000000000000000000) CM.Sim.Win('Humble rebeginnings'); - if (Game.cookiesEarned >= 1000000000000000000000000000000000000000000) CM.Sim.Win('The end of the world'); - if (Game.cookiesEarned >= 1000000000000000000000000000000000000000000000) CM.Sim.Win('Oh, you\'re back'); - if (Game.cookiesEarned >= 1000000000000000000000000000000000000000000000000) CM.Sim.Win('Lazarus'); + if (CM.Cache.RealCookiesEarned >= 1000000) CM.Sim.Win('Sacrifice'); + if (CM.Cache.RealCookiesEarned >= 1000000000) CM.Sim.Win('Oblivion'); + if (CM.Cache.RealCookiesEarned >= 1000000000000) CM.Sim.Win('From scratch'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000) CM.Sim.Win('Nihilism'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000) CM.Sim.Win('Dematerialize'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000) CM.Sim.Win('Nil zero zilch'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000) CM.Sim.Win('Transcendence'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000) CM.Sim.Win('Obliterate'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000) CM.Sim.Win('Negative void'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000000) CM.Sim.Win('To crumbs, you say?'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000000000) CM.Sim.Win('You get nothing'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000000000000) CM.Sim.Win('Humble rebeginnings'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000000000000000) CM.Sim.Win('The end of the world'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000000000000000000) CM.Sim.Win('Oh, you\'re back'); + if (CM.Cache.RealCookiesEarned >= 1000000000000000000000000000000000000000000000000) CM.Sim.Win('Lazarus'); CM.Sim.Upgrades['Heavenly chip secret'].bought = 1; CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1;