From a13efd0c5b4832729916a747db512fed867fef81 Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Sun, 20 Oct 2019 17:43:12 -0400 Subject: [PATCH] Change to Version 2.022.1 and fixed for Version 2.022 of Cookie Clicker (Issues #276) --- CookieMonster.js | 9 +++++---- src/Main.js | 4 ++-- src/Sim.js | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index fc68285..204ec8a 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -3018,8 +3018,8 @@ CM.ConfigDefault = { }; CM.ConfigPrefix = 'CMConfig'; -CM.VersionMajor = '2.021'; -CM.VersionMinor = '2'; +CM.VersionMajor = '2.022'; +CM.VersionMinor = '1'; /******* * Sim * @@ -3088,8 +3088,9 @@ CM.Sim.BuildingSell = function(build, basePrice, start, free, amount, emuAura) { } CM.Sim.Has = function(what) { - if (Game.ascensionMode == 1 && Game.Upgrades[what].pool == 'prestige') return 0; - return (CM.Sim.Upgrades[what] ? CM.Sim.Upgrades[what].bought : 0); + var it = CM.Sim.Upgrades[what]; + if (Game.ascensionMode == 1 && (it.pool == 'prestige' || it.tier == 'fortune')) return 0; + return (it ? it.bought : 0); } diff --git a/src/Main.js b/src/Main.js index b5a582e..55c5de3 100644 --- a/src/Main.js +++ b/src/Main.js @@ -299,6 +299,6 @@ CM.ConfigDefault = { }; CM.ConfigPrefix = 'CMConfig'; -CM.VersionMajor = '2.021'; -CM.VersionMinor = '2'; +CM.VersionMajor = '2.022'; +CM.VersionMinor = '1'; diff --git a/src/Sim.js b/src/Sim.js index feed0f6..d2ea864 100644 --- a/src/Sim.js +++ b/src/Sim.js @@ -65,8 +65,9 @@ CM.Sim.BuildingSell = function(build, basePrice, start, free, amount, emuAura) { } CM.Sim.Has = function(what) { - if (Game.ascensionMode == 1 && Game.Upgrades[what].pool == 'prestige') return 0; - return (CM.Sim.Upgrades[what] ? CM.Sim.Upgrades[what].bought : 0); + var it = CM.Sim.Upgrades[what]; + if (Game.ascensionMode == 1 && (it.pool == 'prestige' || it.tier == 'fortune')) return 0; + return (it ? it.bought : 0); }