david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug with Reset Bonus Income stat, added average CPS stat with options, added average Cookie Clicks stat with options (Issue #10), added the option to calculate with Wrinkers (Issue #34), added the option to calculate with average CPS, and minor cleanup

Browse Source
This commit is contained in:
Aktanusa
2016-04-25 22:08:31 -04:00
parent 5d0958b63a
commit eb3c403fbd
7 changed files with 520 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/Sim.js
View File

@@ -415,6 +415,48 @@ CM.Sim.NoGoldSwitchCookiesPS = function() {
}
CM.Sim.ResetBonus = function(possiblePresMax) {
var lastAchievementsOwned = -1;
// Calculate CPS with all Heavenly upgrades
var curCPS = Game.cookiesPs;
if (CM.Sim.Upgrades['Heavenly chip secret'].bought == 0 || CM.Sim.Upgrades['Heavenly cookie stand'].bought == 0 || CM.Sim.Upgrades['Heavenly bakery'].bought == 0 || CM.Sim.Upgrades['Heavenly confectionery'].bought == 0 || CM.Sim.Upgrades['Heavenly key'].bought == 0) {
CM.Sim.CopyData();
if (CM.Sim.Upgrades['Heavenly chip secret'].bought == 0) {
CM.Sim.Upgrades['Heavenly chip secret'].bought = 1;
CM.Sim.UpgradesOwned++;
}
if (CM.Sim.Upgrades['Heavenly cookie stand'].bought == 0) {
CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1;
CM.Sim.UpgradesOwned++;
}
if (CM.Sim.Upgrades['Heavenly bakery'].bought == 0) {
CM.Sim.Upgrades['Heavenly bakery'].bought = 1;
CM.Sim.UpgradesOwned++;
}
if (CM.Sim.Upgrades['Heavenly confectionery'].bought == 0) {
CM.Sim.Upgrades['Heavenly confectionery'].bought = 1;
CM.Sim.UpgradesOwned++;
}
if (CM.Sim.Upgrades['Heavenly key'].bought == 0) {
CM.Sim.Upgrades['Heavenly key'].bought = 1;
CM.Sim.UpgradesOwned++;
CM.Sim.Win('Wholesome');
}
lastAchievementsOwned = CM.Sim.AchievementsOwned;
CM.Sim.CalculateGains();
CM.Sim.CheckOtherAchiev();
if (lastAchievementsOwned != CM.Sim.AchievementsOwned) {
CM.Sim.CalculateGains();
}
curCPS = CM.Sim.cookiesPs;
}
CM.Sim.CopyData();
if (Game.cookiesEarned >= 1000000) CM.Sim.Win('Sacrifice');
@@ -452,7 +494,7 @@ CM.Sim.ResetBonus = function(possiblePresMax) {
CM.Sim.prestige = possiblePresMax;
var lastAchievementsOwned = CM.Sim.AchievementsOwned;
lastAchievementsOwned = CM.Sim.AchievementsOwned;
CM.Sim.CalculateGains();
@@ -462,6 +504,6 @@ CM.Sim.ResetBonus = function(possiblePresMax) {
CM.Sim.CalculateGains();
}
return (CM.Sim.cookiesPs - Game.cookiesPs);
return (CM.Sim.cookiesPs - curCPS);
}