From 734ecdae1b2b0ebd0879e4ab0bcd6e248849dc03 Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Mon, 2 Jun 2014 16:09:10 -0400 Subject: [PATCH] Added back reset bonus income stat --- CookieMonster.js | 36 ++++++++++++++++++++++++++++++++---- src/Disp.js | 9 +++++---- src/Sim.js | 27 +++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 8 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index b2535f2..b31b068 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -836,11 +836,11 @@ CM.Disp.UpdateTitle = function() { } CM.Disp.AddMenu = function() { - var title = function(text) { + var title = function() { var div = document.createElement('div'); div.className = 'title'; div.style.color = CM.Disp.colorBlue; - div.textContent = text; + div.textContent = 'Cookie Monster Goodies'; return div; } var header = function(text) { @@ -857,7 +857,7 @@ CM.Disp.AddMenu = function() { if (Game.onMenu == 'prefs') { var frag = document.createDocumentFragment(); - frag.appendChild(title('Cookie Monster Goodies')); + frag.appendChild(title()); var listing = function(config) { var div = document.createElement('div'); @@ -976,7 +976,7 @@ CM.Disp.AddMenu = function() { div.appendChild(text); return div; } - stats.appendChild(title('Cookie Monster Goodies')); + stats.appendChild(title()); stats.appendChild(header('Lucky Cookies')); var luckyReqFrag = document.createDocumentFragment(); var luckyReqSpan = document.createElement('span'); @@ -1020,6 +1020,7 @@ CM.Disp.AddMenu = function() { stats.appendChild(listing('Heavenly Chips (CUR) : ', hcCurFrag)); stats.appendChild(listing('Cookies To Next Chip : ', document.createTextNode(Beautify(neededCook)))); stats.appendChild(listing('Time To Next Chip : ', document.createTextNode(CM.Disp.FormatTime(neededCook / (Game.cookiesPs * (1 - Game.cpsSucked)), 1)))); + stats.appendChild(listing('Reset Bonus Income : ', document.createTextNode(Beautify(CM.Sim.ResetBonus())))); if (Game.cpsSucked > 0) { stats.appendChild(header('Wrinklers')); var sucked = 0; @@ -1788,6 +1789,33 @@ CM.Sim.BuyUpgrades = function() { } } +CM.Sim.ResetBonus = function() { + 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'); + + CM.Sim.prestige = Game.HowMuchPrestige(Game.cookiesEarned + Game.cookiesReset); + + var lastAchievementsOwned = CM.Sim.AchievementsOwned; + + CM.Sim.CalculateGains(); + + if (lastAchievementsOwned != CM.Sim.AchievementsOwned) { + CM.Sim.CalculateGains(); + } + + return (CM.Sim.cookiesPs - Game.cookiesPs); +} + /********** * Footer * **********/ diff --git a/src/Disp.js b/src/Disp.js index 30f8b93..3b0e2cb 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -646,11 +646,11 @@ CM.Disp.UpdateTitle = function() { } CM.Disp.AddMenu = function() { - var title = function(text) { + var title = function() { var div = document.createElement('div'); div.className = 'title'; div.style.color = CM.Disp.colorBlue; - div.textContent = text; + div.textContent = 'Cookie Monster Goodies'; return div; } var header = function(text) { @@ -667,7 +667,7 @@ CM.Disp.AddMenu = function() { if (Game.onMenu == 'prefs') { var frag = document.createDocumentFragment(); - frag.appendChild(title('Cookie Monster Goodies')); + frag.appendChild(title()); var listing = function(config) { var div = document.createElement('div'); @@ -786,7 +786,7 @@ CM.Disp.AddMenu = function() { div.appendChild(text); return div; } - stats.appendChild(title('Cookie Monster Goodies')); + stats.appendChild(title()); stats.appendChild(header('Lucky Cookies')); var luckyReqFrag = document.createDocumentFragment(); var luckyReqSpan = document.createElement('span'); @@ -830,6 +830,7 @@ CM.Disp.AddMenu = function() { stats.appendChild(listing('Heavenly Chips (CUR) : ', hcCurFrag)); stats.appendChild(listing('Cookies To Next Chip : ', document.createTextNode(Beautify(neededCook)))); stats.appendChild(listing('Time To Next Chip : ', document.createTextNode(CM.Disp.FormatTime(neededCook / (Game.cookiesPs * (1 - Game.cpsSucked)), 1)))); + stats.appendChild(listing('Reset Bonus Income : ', document.createTextNode(Beautify(CM.Sim.ResetBonus())))); if (Game.cpsSucked > 0) { stats.appendChild(header('Wrinklers')); var sucked = 0; diff --git a/src/Sim.js b/src/Sim.js index c2af1fc..fb6b0c8 100644 --- a/src/Sim.js +++ b/src/Sim.js @@ -350,3 +350,30 @@ CM.Sim.BuyUpgrades = function() { } } +CM.Sim.ResetBonus = function() { + 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'); + + CM.Sim.prestige = Game.HowMuchPrestige(Game.cookiesEarned + Game.cookiesReset); + + var lastAchievementsOwned = CM.Sim.AchievementsOwned; + + CM.Sim.CalculateGains(); + + if (lastAchievementsOwned != CM.Sim.AchievementsOwned) { + CM.Sim.CalculateGains(); + } + + return (CM.Sim.cookiesPs - Game.cookiesPs); +} +