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

Fixed to work with Version 2.016 of Cookie Clicker (Issue #224 & #225)

Browse Source
This commit is contained in:
Aktanusa
2018-10-27 20:37:27 -04:00
parent cd3061f2c4
commit 4a8c59a3e6
3 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
CookieMonster.js
View File

@@ -2219,7 +2219,7 @@ CM.Disp.Tooltip = function(type, name) {
} }
else if (type == 'u') { else if (type == 'u') {
if (!Game.UpgradesInStore[name]) return ''; if (!Game.UpgradesInStore[name]) return '';
l('tooltip').innerHTML = Game.crate(Game.UpgradesInStore[name], 'store', undefined, undefined, 1)(); l('tooltip').innerHTML = Game.crateTooltip(Game.UpgradesInStore[name], 'store');
} }
else { // Grimoire else { // Grimoire
l('tooltip').innerHTML = Game.Objects['Wizard tower'].minigame.spellTooltip(name)(); l('tooltip').innerHTML = Game.Objects['Wizard tower'].minigame.spellTooltip(name)();
@@ -2906,9 +2906,7 @@ CM.Sim.hasAura = function(what) {
return false; return false;
} }
eval('CM.Sim.GetTieredCpsMult = ' + Game.GetTieredCpsMult.toString().split('Game.Has').join('CM.Sim.Has').split('me.tieredUpgrades').join('Game.Objects[me.name].tieredUpgrades').split('me.synergies').join('Game.Objects[me.name].synergies').split('syn.buildingTie1.amount').join('CM.Sim.Objects[syn.buildingTie1.name].amount').split('syn.buildingTie2.amount').join('CM.Sim.Objects[syn.buildingTie2.name].amount')); eval('CM.Sim.GetTieredCpsMult = ' + Game.GetTieredCpsMult.toString().split('Game.Has').join('CM.Sim.Has').split('me.tieredUpgrades').join('Game.Objects[me.name].tieredUpgrades').split('me.synergies').join('Game.Objects[me.name].synergies').split('syn.buildingTie1.amount').join('CM.Sim.Objects[syn.buildingTie1.name].amount').split('syn.buildingTie2.amount').join('CM.Sim.Objects[syn.buildingTie2.name].amount').split('me.grandma').join('Game.Objects[me.name].grandma').split('me.id').join('Game.Objects[me.name].id').split('Game.Objects[\'Grandma\']').join('CM.Sim.Objects[\'Grandma\']'));
eval('CM.Sim.getGrandmaSynergyUpgradeMultiplier = ' + Game.getGrandmaSynergyUpgradeMultiplier.toString().split('Game.Objects[\'Grandma\']').join('CM.Sim.Objects[\'Grandma\']'));
CM.Sim.getCPSBuffMult = function() { CM.Sim.getCPSBuffMult = function() {
var mult = 1; var mult = 1;
@@ -2925,7 +2923,7 @@ CM.Sim.InitData = function() {
CM.Sim.Objects[i] = {}; CM.Sim.Objects[i] = {};
var me = Game.Objects[i]; var me = Game.Objects[i];
var you = CM.Sim.Objects[i]; var you = CM.Sim.Objects[i];
eval('you.cps = ' + me.cps.toString().split('Game.Has').join('CM.Sim.Has').split('Game.hasAura').join('CM.Sim.hasAura').split('Game.Objects').join('CM.Sim.Objects').split('Game.GetTieredCpsMult').join('CM.Sim.GetTieredCpsMult').split('Game.getGrandmaSynergyUpgradeMultiplier').join('CM.Sim.getGrandmaSynergyUpgradeMultiplier')); eval('you.cps = ' + me.cps.toString().split('Game.Has').join('CM.Sim.Has').split('Game.hasAura').join('CM.Sim.hasAura').split('Game.Objects').join('CM.Sim.Objects').split('Game.GetTieredCpsMult').join('CM.Sim.GetTieredCpsMult'));
// Below is needed for above eval! // Below is needed for above eval!
you.baseCps = me.baseCps; you.baseCps = me.baseCps;
you.name = me.name; you.name = me.name;
@@ -2987,6 +2985,8 @@ CM.Sim.CalculateGains = function() {
// TODO Store minigame buffs? // TODO Store minigame buffs?
mult *= Game.eff('cps'); mult *= Game.eff('cps');
if (CM.Sim.Has('Heralds') && Game.ascensionMode != 1) mult *= 1 + 0.01 * Game.heralds;
var cookieMult = 0; var cookieMult = 0;
for (var i in Game.cookieUpgrades) { for (var i in Game.cookieUpgrades) {
var me = Game.cookieUpgrades[i]; var me = Game.cookieUpgrades[i];
@@ -3129,13 +3129,17 @@ CM.Sim.CalculateGains = function() {
if (CM.Sim.Has('Golden switch [off]')) { if (CM.Sim.Has('Golden switch [off]')) {
var goldenSwitchMult = 1.5; var goldenSwitchMult = 1.5;
if (CM.Sim.Has('Residual luck')) { if (CM.Sim.Has('Residual luck')) {
var upgrades = ['Get lucky', 'Lucky day', 'Serendipity', 'Heavenly luck', 'Lasting fortune', 'Decisive fate', 'Lucky digit', 'Lucky number', 'Lucky payout']; var upgrades = Game.goldenCookieUpgrades;
for (var i in upgrades) { for (var i in upgrades) {
if (CM.Sim.Has(upgrades[i])) goldenSwitchMult += 0.1; if (CM.Sim.Has(upgrades[i])) goldenSwitchMult += 0.1;
} }
} }
mult *= goldenSwitchMult; mult *= goldenSwitchMult;
} }
if (CM.Sim.Has('Shimmering veil [off]')) mult *= 1.5;
// Removed debug upgrades
// Removed buffs
CM.Sim.cookiesPs *= mult; CM.Sim.cookiesPs *= mult;
@@ -3145,20 +3149,11 @@ CM.Sim.CalculateGains = function() {
CM.Sim.CheckOtherAchiev = function() { CM.Sim.CheckOtherAchiev = function() {
var grandmas = 0; var grandmas = 0;
if (CM.Sim.Has('Farmer grandmas')) grandmas++; for (var i in Game.GrandmaSynergies) {
if (CM.Sim.Has('Worker grandmas')) grandmas++; if (CM.Sim.Has(Game.GrandmaSynergies[i])) grandmas++;
if (CM.Sim.Has('Miner grandmas')) grandmas++; }
if (CM.Sim.Has('Cosmic grandmas')) grandmas++;
if (CM.Sim.Has('Transmuted grandmas')) grandmas++;
if (CM.Sim.Has('Altered grandmas')) grandmas++;
if (CM.Sim.Has('Grandmas\' grandmas')) grandmas++;
if (CM.Sim.Has('Antigrandmas')) grandmas++;
if (CM.Sim.Has('Rainbow grandmas')) grandmas++;
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'); if (!CM.Sim.HasAchiev('Elder') && grandmas >= 7) CM.Sim.Win('Elder');
if (!CM.Sim.HasAchiev('Veteran') && grandmas >= 14) CM.Sim.Win('Veteran');
var buildingsOwned = 0; var buildingsOwned = 0;
var mathematician = 1; var mathematician = 1;
@@ -3198,6 +3193,7 @@ CM.Sim.CheckOtherAchiev = function() {
if (CM.Sim.UpgradesOwned >= 200) CM.Sim.Win('Lord of Progress'); if (CM.Sim.UpgradesOwned >= 200) CM.Sim.Win('Lord of Progress');
if (buildingsOwned >= 3000 && CM.Sim.UpgradesOwned >= 300) CM.Sim.Win('Polymath'); if (buildingsOwned >= 3000 && CM.Sim.UpgradesOwned >= 300) CM.Sim.Win('Polymath');
if (buildingsOwned >= 4000 && CM.Sim.UpgradesOwned >= 400) CM.Sim.Win('Renaissance baker');
if (CM.Sim.Objects['Cursor'].amount + CM.Sim.Objects['Grandma'].amount >= 777) CM.Sim.Win('The elder scrolls'); if (CM.Sim.Objects['Cursor'].amount + CM.Sim.Objects['Grandma'].amount >= 777) CM.Sim.Win('The elder scrolls');

2
src/Disp.js
View File

@@ -1665,7 +1665,7 @@ CM.Disp.Tooltip = function(type, name) {
} }
else if (type == 'u') { else if (type == 'u') {
if (!Game.UpgradesInStore[name]) return ''; if (!Game.UpgradesInStore[name]) return '';
l('tooltip').innerHTML = Game.crate(Game.UpgradesInStore[name], 'store', undefined, undefined, 1)(); l('tooltip').innerHTML = Game.crateTooltip(Game.UpgradesInStore[name], 'store');
} }
else { // Grimoire else { // Grimoire
l('tooltip').innerHTML = Game.Objects['Wizard tower'].minigame.spellTooltip(name)(); l('tooltip').innerHTML = Game.Objects['Wizard tower'].minigame.spellTooltip(name)();

32
src/Sim.js
View File

@@ -85,9 +85,7 @@ CM.Sim.hasAura = function(what) {
return false; return false;
} }
eval('CM.Sim.GetTieredCpsMult = ' + Game.GetTieredCpsMult.toString().split('Game.Has').join('CM.Sim.Has').split('me.tieredUpgrades').join('Game.Objects[me.name].tieredUpgrades').split('me.synergies').join('Game.Objects[me.name].synergies').split('syn.buildingTie1.amount').join('CM.Sim.Objects[syn.buildingTie1.name].amount').split('syn.buildingTie2.amount').join('CM.Sim.Objects[syn.buildingTie2.name].amount')); eval('CM.Sim.GetTieredCpsMult = ' + Game.GetTieredCpsMult.toString().split('Game.Has').join('CM.Sim.Has').split('me.tieredUpgrades').join('Game.Objects[me.name].tieredUpgrades').split('me.synergies').join('Game.Objects[me.name].synergies').split('syn.buildingTie1.amount').join('CM.Sim.Objects[syn.buildingTie1.name].amount').split('syn.buildingTie2.amount').join('CM.Sim.Objects[syn.buildingTie2.name].amount').split('me.grandma').join('Game.Objects[me.name].grandma').split('me.id').join('Game.Objects[me.name].id').split('Game.Objects[\'Grandma\']').join('CM.Sim.Objects[\'Grandma\']'));
eval('CM.Sim.getGrandmaSynergyUpgradeMultiplier = ' + Game.getGrandmaSynergyUpgradeMultiplier.toString().split('Game.Objects[\'Grandma\']').join('CM.Sim.Objects[\'Grandma\']'));
CM.Sim.getCPSBuffMult = function() { CM.Sim.getCPSBuffMult = function() {
var mult = 1; var mult = 1;
@@ -104,7 +102,7 @@ CM.Sim.InitData = function() {
CM.Sim.Objects[i] = {}; CM.Sim.Objects[i] = {};
var me = Game.Objects[i]; var me = Game.Objects[i];
var you = CM.Sim.Objects[i]; var you = CM.Sim.Objects[i];
eval('you.cps = ' + me.cps.toString().split('Game.Has').join('CM.Sim.Has').split('Game.hasAura').join('CM.Sim.hasAura').split('Game.Objects').join('CM.Sim.Objects').split('Game.GetTieredCpsMult').join('CM.Sim.GetTieredCpsMult').split('Game.getGrandmaSynergyUpgradeMultiplier').join('CM.Sim.getGrandmaSynergyUpgradeMultiplier')); eval('you.cps = ' + me.cps.toString().split('Game.Has').join('CM.Sim.Has').split('Game.hasAura').join('CM.Sim.hasAura').split('Game.Objects').join('CM.Sim.Objects').split('Game.GetTieredCpsMult').join('CM.Sim.GetTieredCpsMult'));
// Below is needed for above eval! // Below is needed for above eval!
you.baseCps = me.baseCps; you.baseCps = me.baseCps;
you.name = me.name; you.name = me.name;
@@ -166,6 +164,8 @@ CM.Sim.CalculateGains = function() {
// TODO Store minigame buffs? // TODO Store minigame buffs?
mult *= Game.eff('cps'); mult *= Game.eff('cps');
if (CM.Sim.Has('Heralds') && Game.ascensionMode != 1) mult *= 1 + 0.01 * Game.heralds;
var cookieMult = 0; var cookieMult = 0;
for (var i in Game.cookieUpgrades) { for (var i in Game.cookieUpgrades) {
var me = Game.cookieUpgrades[i]; var me = Game.cookieUpgrades[i];
@@ -308,13 +308,17 @@ CM.Sim.CalculateGains = function() {
if (CM.Sim.Has('Golden switch [off]')) { if (CM.Sim.Has('Golden switch [off]')) {
var goldenSwitchMult = 1.5; var goldenSwitchMult = 1.5;
if (CM.Sim.Has('Residual luck')) { if (CM.Sim.Has('Residual luck')) {
var upgrades = ['Get lucky', 'Lucky day', 'Serendipity', 'Heavenly luck', 'Lasting fortune', 'Decisive fate', 'Lucky digit', 'Lucky number', 'Lucky payout']; var upgrades = Game.goldenCookieUpgrades;
for (var i in upgrades) { for (var i in upgrades) {
if (CM.Sim.Has(upgrades[i])) goldenSwitchMult += 0.1; if (CM.Sim.Has(upgrades[i])) goldenSwitchMult += 0.1;
} }
} }
mult *= goldenSwitchMult; mult *= goldenSwitchMult;
} }
if (CM.Sim.Has('Shimmering veil [off]')) mult *= 1.5;
// Removed debug upgrades
// Removed buffs
CM.Sim.cookiesPs *= mult; CM.Sim.cookiesPs *= mult;
@@ -324,20 +328,11 @@ CM.Sim.CalculateGains = function() {
CM.Sim.CheckOtherAchiev = function() { CM.Sim.CheckOtherAchiev = function() {
var grandmas = 0; var grandmas = 0;
if (CM.Sim.Has('Farmer grandmas')) grandmas++; for (var i in Game.GrandmaSynergies) {
if (CM.Sim.Has('Worker grandmas')) grandmas++; if (CM.Sim.Has(Game.GrandmaSynergies[i])) grandmas++;
if (CM.Sim.Has('Miner grandmas')) grandmas++; }
if (CM.Sim.Has('Cosmic grandmas')) grandmas++;
if (CM.Sim.Has('Transmuted grandmas')) grandmas++;
if (CM.Sim.Has('Altered grandmas')) grandmas++;
if (CM.Sim.Has('Grandmas\' grandmas')) grandmas++;
if (CM.Sim.Has('Antigrandmas')) grandmas++;
if (CM.Sim.Has('Rainbow grandmas')) grandmas++;
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'); if (!CM.Sim.HasAchiev('Elder') && grandmas >= 7) CM.Sim.Win('Elder');
if (!CM.Sim.HasAchiev('Veteran') && grandmas >= 14) CM.Sim.Win('Veteran');
var buildingsOwned = 0; var buildingsOwned = 0;
var mathematician = 1; var mathematician = 1;
@@ -377,6 +372,7 @@ CM.Sim.CheckOtherAchiev = function() {
if (CM.Sim.UpgradesOwned >= 200) CM.Sim.Win('Lord of Progress'); if (CM.Sim.UpgradesOwned >= 200) CM.Sim.Win('Lord of Progress');
if (buildingsOwned >= 3000 && CM.Sim.UpgradesOwned >= 300) CM.Sim.Win('Polymath'); if (buildingsOwned >= 3000 && CM.Sim.UpgradesOwned >= 300) CM.Sim.Win('Polymath');
if (buildingsOwned >= 4000 && CM.Sim.UpgradesOwned >= 400) CM.Sim.Win('Renaissance baker');
if (CM.Sim.Objects['Cursor'].amount + CM.Sim.Objects['Grandma'].amount >= 777) CM.Sim.Win('The elder scrolls'); if (CM.Sim.Objects['Cursor'].amount + CM.Sim.Objects['Grandma'].amount >= 777) CM.Sim.Win('The elder scrolls');