diff --git a/Combine.sh b/Combine.sh
old mode 100644
new mode 100755
diff --git a/CookieMonster.js b/CookieMonster.js
index 1e05231..9c9b1cf 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -1,22 +1,27 @@
/**********
* Header *
**********/
+RunCookieMonsterHeader = function() {
+ CM = {};
-CM = {};
+ CM.Backup = {};
-CM.Backup = {};
+ CM.Cache = {};
-CM.Cache = {};
+ CM.Config = {};
-CM.Config = {};
+ CM.ConfigData = {};
-CM.ConfigData = {};
+ CM.Data = {};
-CM.Data = {};
+ CM.Disp = {};
-CM.Disp = {};
+ CM.Sim = {};
+}
-CM.Sim = {};
+if (typeof CM == "undefined") {
+ RunCookieMonsterHeader();
+}
/*********
* Cache *
@@ -39,6 +44,7 @@ CM.Cache.NextNumber = function(base) {
CM.Cache.RemakeBuildingsPrices = function() {
for (var i in Game.Objects) {
+ CM.Cache.Objects[i].price = CM.Sim.BuildingGetPrice(Game.Objects[i], Game.Objects[i].basePrice, Game.Objects[i].amount, Game.Objects[i].free, 1);
CM.Cache.Objects10[i].price = CM.Sim.BuildingGetPrice(Game.Objects[i], Game.Objects[i].basePrice, Game.Objects[i].amount, Game.Objects[i].free, 10);
CM.Cache.Objects100[i].price = CM.Sim.BuildingGetPrice(Game.Objects[i], Game.Objects[i].basePrice, Game.Objects[i].amount, Game.Objects[i].free, 100);
}
@@ -67,8 +73,8 @@ CM.Cache.RemakeWrinkBank = function() {
if (Game.wrinklers[i].type==1) toSuck *= 3; // Shiny wrinklers
sucked *= toSuck;
if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
- if (Game.hasGod) {
- var godLvl = Game.hasGod('scorn');
+ if (CM.Sim.Objects.Temple.minigameLoaded) {
+ var godLvl = CM.Sim.hasGod('scorn');
if (godLvl == 1) sucked *= 1.15;
else if (godLvl == 2) sucked *= 1.1;
else if (godLvl == 3) sucked *= 1.05;
@@ -77,8 +83,8 @@ CM.Cache.RemakeWrinkBank = function() {
}
CM.Cache.WrinkBank = totalSucked;
CM.Cache.WrinkGodBank = totalSucked;
- if (Game.hasGod) {
- var godLvl = Game.hasGod('scorn');
+ if (CM.Sim.Objects.Temple.minigameLoaded) {
+ var godLvl = CM.Sim.hasGod('scorn');
if (godLvl == 2) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.1;
else if (godLvl == 3) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.05;
else if (godLvl != 1) CM.Cache.WrinkGodBank *= 1.15;
@@ -89,27 +95,113 @@ CM.Cache.RemakeBuildingsPP = function() {
CM.Cache.min = -1;
CM.Cache.max = -1;
CM.Cache.mid = -1;
- for (var i in CM.Cache.Objects) {
- //CM.Cache.Objects[i].pp = Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus;
- CM.Cache.Objects[i].pp = (Math.max(Game.Objects[i].getPrice() - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus);
- if (CM.Cache.min == -1 || CM.Cache.Objects[i].pp < CM.Cache.min) CM.Cache.min = CM.Cache.Objects[i].pp;
- if (CM.Cache.max == -1 || CM.Cache.Objects[i].pp > CM.Cache.max) CM.Cache.max = CM.Cache.Objects[i].pp;
- }
- CM.Cache.mid = ((CM.Cache.max - CM.Cache.min) / 2) + CM.Cache.min;
- for (var i in CM.Cache.Objects) {
- var color = '';
- if (CM.Cache.Objects[i].pp == CM.Cache.min) color = CM.Disp.colorGreen;
- else if (CM.Cache.Objects[i].pp == CM.Cache.max) color = CM.Disp.colorRed;
- else if (CM.Cache.Objects[i].pp > CM.Cache.mid) color = CM.Disp.colorOrange;
- else color = CM.Disp.colorYellow;
- CM.Cache.Objects[i].color = color;
+ // Calculate PP and colors when compared to purchase of single optimal building
+ if (CM.Config.ColorPPBulkMode == 0) {
+ for (var i in CM.Cache.Objects) {
+ //CM.Cache.Objects[i].pp = Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus;
+ if (Game.cookiesPs) {
+ CM.Cache.Objects[i].pp = (Math.max(Game.Objects[i].getPrice() - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus);
+ } else {
+ CM.Cache.Objects[i].pp = (Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus);
+ }
+ if (CM.Cache.min == -1 || CM.Cache.Objects[i].pp < CM.Cache.min) CM.Cache.min = CM.Cache.Objects[i].pp;
+ if (CM.Cache.max == -1 || CM.Cache.Objects[i].pp > CM.Cache.max) CM.Cache.max = CM.Cache.Objects[i].pp;
+ }
+ CM.Cache.mid = ((CM.Cache.max - CM.Cache.min) / 2) + CM.Cache.min;
+ for (var i in CM.Cache.Objects) {
+ var color = '';
+ if (CM.Cache.Objects[i].pp == CM.Cache.min) color = CM.Disp.colorGreen;
+ else if (CM.Cache.Objects[i].pp == CM.Cache.max) color = CM.Disp.colorRed;
+ else if (CM.Cache.Objects[i].pp > CM.Cache.mid) color = CM.Disp.colorOrange;
+ else color = CM.Disp.colorYellow;
+ CM.Cache.Objects[i].color = color;
+ }
+ // Buildings for 10 amount
+ CM.Cache.RemakeBuildingsOtherPP(10, 'Objects10');
+
+ // Buildings for 100 amount
+ CM.Cache.RemakeBuildingsOtherPP(100, 'Objects100');
+ }
+ // Calculate PP and colors when compared to purchase of selected bulk mode
+ else {
+ if (Game.buyBulk == 1) {
+ for (var i in CM.Cache.Objects) {
+ //CM.Cache.Objects[i].pp = Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus;
+ if (Game.cookiesPs) {
+ CM.Cache.Objects[i].pp = (Math.max(Game.Objects[i].getPrice() - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus);
+ } else {
+ CM.Cache.Objects[i].pp = (Game.Objects[i].getPrice() / CM.Cache.Objects[i].bonus);
+ }
+ if (CM.Cache.min == -1 || CM.Cache.Objects[i].pp < CM.Cache.min) CM.Cache.min = CM.Cache.Objects[i].pp;
+ if (CM.Cache.max == -1 || CM.Cache.Objects[i].pp > CM.Cache.max) CM.Cache.max = CM.Cache.Objects[i].pp;
+ }
+ CM.Cache.mid = ((CM.Cache.max - CM.Cache.min) / 2) + CM.Cache.min;
+ for (var i in CM.Cache.Objects) {
+ var color = '';
+ if (CM.Cache.Objects[i].pp == CM.Cache.min) color = CM.Disp.colorGreen;
+ else if (CM.Cache.Objects[i].pp == CM.Cache.max) color = CM.Disp.colorRed;
+ else if (CM.Cache.Objects[i].pp > CM.Cache.mid) color = CM.Disp.colorOrange;
+ else color = CM.Disp.colorYellow;
+ CM.Cache.Objects[i].color = color;
+ }
+ CM.Cache.RemakeBuildingsOtherPP(10, 'Objects10');
+ CM.Cache.RemakeBuildingsOtherPP(100, 'Objects100');
+ }
+ else if (Game.buyBulk == 10) {
+ for (var i in CM.Cache.Objects) {
+ if (Game.cookiesPs) {
+ CM.Cache.Objects10[i].pp = (Math.max(Game.Objects[i].bulkPrice - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (Game.Objects[i].bulkPrice / CM.Cache.Objects10[i].bonus);
+ } else {
+ CM.Cache.Objects10[i].pp = (Game.Objects[i].bulkPrice / CM.Cache.Objects10[i].bonus);
+ }
+ if (CM.Cache.min == -1 || CM.Cache.Objects10[i].pp < CM.Cache.min) CM.Cache.min = CM.Cache.Objects10[i].pp;
+ if (CM.Cache.max == -1 || CM.Cache.Objects10[i].pp > CM.Cache.max) CM.Cache.max = CM.Cache.Objects10[i].pp;
+ }
+ CM.Cache.mid = ((CM.Cache.max - CM.Cache.min) / 2) + CM.Cache.min;
+ for (var i in CM.Cache.Objects) {
+ var color = '';
+ if (CM.Cache.Objects10[i].pp == CM.Cache.min) color = CM.Disp.colorGreen;
+ else if (CM.Cache.Objects10[i].pp == CM.Cache.max) color = CM.Disp.colorRed;
+ else if (CM.Cache.Objects10[i].pp > CM.Cache.mid) color = CM.Disp.colorOrange;
+ else color = CM.Disp.colorYellow;
+ CM.Cache.Objects10[i].color = color;
+ }
+ CM.Cache.RemakeBuildingsOtherPP(1, 'Objects');
+ CM.Cache.RemakeBuildingsOtherPP(100, 'Objects100');
+ }
+ else if (Game.buyBulk == 100) {
+ for (var i in CM.Cache.Objects) {
+ if (Game.cookiesPs) {
+ CM.Cache.Objects100[i].pp = (Math.max(Game.Objects[i].bulkPrice - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (Game.Objects[i].bulkPrice / CM.Cache.Objects100[i].bonus);
+ } else {
+ CM.Cache.Objects100[i].pp = (Game.Objects[i].bulkPrice / CM.Cache.Objects100[i].bonus);
+ }
+ if (CM.Cache.min == -1 || CM.Cache.Objects100[i].pp < CM.Cache.min) CM.Cache.min = CM.Cache.Objects100[i].pp;
+ if (CM.Cache.max == -1 || CM.Cache.Objects100[i].pp > CM.Cache.max) CM.Cache.max = CM.Cache.Objects100[i].pp;
+ }
+ CM.Cache.mid = ((CM.Cache.max - CM.Cache.min) / 2) + CM.Cache.min;
+ for (var i in CM.Cache.Objects) {
+ var color = '';
+ if (CM.Cache.Objects100[i].pp == CM.Cache.min) color = CM.Disp.colorGreen;
+ else if (CM.Cache.Objects100[i].pp == CM.Cache.max) color = CM.Disp.colorRed;
+ else if (CM.Cache.Objects100[i].pp > CM.Cache.mid) color = CM.Disp.colorOrange;
+ else color = CM.Disp.colorYellow;
+ CM.Cache.Objects100[i].color = color;
+ }
+ CM.Cache.RemakeBuildingsOtherPP(1, 'Objects');
+ CM.Cache.RemakeBuildingsOtherPP(10, 'Objects10');
+ }
}
}
CM.Cache.RemakeUpgradePP = function() {
for (var i in CM.Cache.Upgrades) {
//CM.Cache.Upgrades[i].pp = Game.Upgrades[i].getPrice() / CM.Cache.Upgrades[i].bonus;
- CM.Cache.Upgrades[i].pp = (Math.max(Game.Upgrades[i].getPrice() - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (Game.Upgrades[i].getPrice() / CM.Cache.Upgrades[i].bonus);
+ if (Game.cookiesPs) {
+ CM.Cache.Upgrades[i].pp = (Math.max(Game.Upgrades[i].getPrice() - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (Game.Upgrades[i].getPrice() / CM.Cache.Upgrades[i].bonus);
+ } else {
+ CM.Cache.Upgrades[i].pp = (Game.Upgrades[i].getPrice() / CM.Cache.Upgrades[i].bonus);
+ }
if (isNaN(CM.Cache.Upgrades[i].pp)) CM.Cache.Upgrades[i].pp = Infinity;
var color = '';
if (CM.Cache.Upgrades[i].pp <= 0 || CM.Cache.Upgrades[i].pp == Infinity) color = CM.Disp.colorGray;
@@ -126,7 +218,11 @@ CM.Cache.RemakeUpgradePP = function() {
CM.Cache.RemakeBuildingsOtherPP = function(amount, target) {
for (var i in CM.Cache[target]) {
//CM.Cache[target][i].pp = CM.Cache[target][i].price / CM.Cache[target][i].bonus;
- CM.Cache[target][i].pp = (Math.max(CM.Cache[target][i].price - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (CM.Cache[target][i].price / CM.Cache[target][i].bonus);
+ if (Game.cookiesPs) {
+ CM.Cache[target][i].pp = (Math.max(CM.Cache[target][i].price - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (CM.Cache[target][i].price / CM.Cache[target][i].bonus);
+ } else {
+ CM.Cache[target][i].pp = (CM.Cache[target][i].price / CM.Cache[target][i].bonus);
+ }
var color = '';
if (CM.Cache[target][i].pp <= 0 || CM.Cache[target][i].pp == Infinity) color = CM.Disp.colorGray;
else if (CM.Cache[target][i].pp < CM.Cache.min) color = CM.Disp.colorBlue;
@@ -140,46 +236,90 @@ CM.Cache.RemakeBuildingsOtherPP = function(amount, target) {
}
CM.Cache.RemakePP = function() {
- // Buildings for 1 amount
+ // Buildings
CM.Cache.RemakeBuildingsPP();
// Upgrades
CM.Cache.RemakeUpgradePP();
+}
- // Buildings for 10 amount
- CM.Cache.RemakeBuildingsOtherPP(10, 'Objects10');
+CM.Cache.RemakeGoldenAndWrathCookiesMults = function() {
+ var goldenMult = 1;
+ var wrathMult = 1;
+ var mult = 1;
- // Buildings for 100 amount
- CM.Cache.RemakeBuildingsOtherPP(100, 'Objects100');
+ // Factor auras and upgrade in mults
+ if (CM.Sim.Has('Green yeast digestives')) mult *= 1.01;
+ if (CM.Sim.Has('Dragon fang')) mult *= 1.03;
+
+ goldenMult *= 1 + CM.Sim.auraMult('Ancestral Metamorphosis') * 0.1;
+ goldenMult *= CM.Sim.eff('goldenCookieGain');
+ wrathMult *= 1 + CM.Sim.auraMult('Unholy Dominion') * 0.1;
+ wrathMult *= CM.Sim.eff('wrathCookieGain');
+
+ // Calculate final golden and wrath multipliers
+ CM.Cache.GoldenCookiesMult = mult * goldenMult;
+ CM.Cache.WrathCookiesMult = mult * wrathMult;
+
+ // Calculate Dragon's Fortune multiplier adjustment:
+ // If Dragon's Fortune (or Reality Bending) aura is active and there are currently no golden cookies,
+ // compute a multiplier adjustment to apply on the current CPS to simulate 1 golden cookie on screen.
+ // Otherwise, the aura effect will be factored in the base CPS making the multiplier not requiring adjustment.
+ CM.Cache.DragonsFortuneMultAdjustment = 1;
+ if (Game.shimmerTypes.golden.n === 0) {
+ CM.Cache.DragonsFortuneMultAdjustment *= 1 + CM.Sim.auraMult('Dragon\'s Fortune') * 1.23;
+ }
}
CM.Cache.RemakeLucky = function() {
- CM.Cache.Lucky = (CM.Cache.NoGoldSwitchCookiesPS * 60 * 15) / 0.15;
- CM.Cache.Lucky /= CM.Sim.getCPSBuffMult();
- CM.Cache.LuckyReward = (CM.Cache.Lucky * 0.15) + 13;
+ var goldenMult = CM.Cache.GoldenCookiesMult;
+ var wrathMult = CM.Cache.WrathCookiesMult;
+
+ CM.Cache.Lucky = (CM.Cache.NoGoldSwitchCookiesPS * 900) / 0.15;
+ CM.Cache.Lucky *= CM.Cache.DragonsFortuneMultAdjustment;
+ var cpsBuffMult = CM.Sim.getCPSBuffMult();
+ if (cpsBuffMult > 0) {
+ CM.Cache.Lucky /= cpsBuffMult;
+ } else {
+ CM.Cache.Lucky = 0;
+ }
+ CM.Cache.LuckyReward = goldenMult * (CM.Cache.Lucky * 0.15) + 13;
+ CM.Cache.LuckyWrathReward = wrathMult * (CM.Cache.Lucky * 0.15) + 13;
CM.Cache.LuckyFrenzy = CM.Cache.Lucky * 7;
- CM.Cache.LuckyRewardFrenzy = (CM.Cache.LuckyFrenzy * 0.15) + 13;
+ CM.Cache.LuckyRewardFrenzy = goldenMult * (CM.Cache.LuckyFrenzy * 0.15) + 13;
+ CM.Cache.LuckyWrathRewardFrenzy = wrathMult * (CM.Cache.LuckyFrenzy * 0.15) + 13;
+ CM.Cache.Conjure = CM.Cache.Lucky * 2;
+ CM.Cache.ConjureReward = CM.Cache.Conjure * 0.15;
}
-CM.Cache.MaxChainMoni = function(digit, maxPayout) {
+CM.Cache.MaxChainMoni = function(digit, maxPayout, mult) {
var chain = 1 + Math.max(0, Math.ceil(Math.log(Game.cookies) / Math.LN10) - 10);
- var moni = Math.max(digit, Math.min(Math.floor(1 / 9 * Math.pow(10, chain) * digit), maxPayout));
- var nextMoni = Math.max(digit, Math.min(Math.floor(1 / 9 * Math.pow(10, chain + 1) * digit), maxPayout));
+ var moni = Math.max(digit, Math.min(Math.floor(1 / 9 * Math.pow(10, chain) * digit * mult), maxPayout));
+ var nextMoni = Math.max(digit, Math.min(Math.floor(1 / 9 * Math.pow(10, chain + 1) * digit * mult), maxPayout));
while (nextMoni < maxPayout) {
chain++;
- moni = Math.max(digit, Math.min(Math.floor(1 / 9 * Math.pow(10, chain) * digit), maxPayout));
- nextMoni = Math.max(digit, Math.min(Math.floor(1 / 9 * Math.pow(10, chain + 1) * digit), maxPayout));
+ moni = Math.max(digit, Math.min(Math.floor(1 / 9 * Math.pow(10, chain) * digit * mult), maxPayout));
+ nextMoni = Math.max(digit, Math.min(Math.floor(1 / 9 * Math.pow(10, chain + 1) * digit * mult), maxPayout));
}
return moni;
}
CM.Cache.RemakeChain = function() {
var maxPayout = CM.Cache.NoGoldSwitchCookiesPS * 60 * 60 * 6;
- maxPayout /= CM.Sim.getCPSBuffMult();
+ maxPayout *= CM.Cache.DragonsFortuneMultAdjustment;
+ var cpsBuffMult = CM.Sim.getCPSBuffMult();
+ if (cpsBuffMult > 0) {
+ maxPayout /= cpsBuffMult;
+ } else {
+ maxPayout = 0;
+ }
- CM.Cache.ChainReward = CM.Cache.MaxChainMoni(7, maxPayout);
+ var goldenMult = CM.Cache.GoldenCookiesMult;
+ var wrathMult = CM.Cache.WrathCookiesMult;
- CM.Cache.ChainWrathReward = CM.Cache.MaxChainMoni(6, maxPayout);
+ CM.Cache.ChainReward = CM.Cache.MaxChainMoni(7, maxPayout, goldenMult);
+
+ CM.Cache.ChainWrathReward = CM.Cache.MaxChainMoni(6, maxPayout, wrathMult);
if (maxPayout < CM.Cache.ChainReward) {
CM.Cache.Chain = 0;
@@ -194,9 +334,9 @@ CM.Cache.RemakeChain = function() {
CM.Cache.ChainWrath = CM.Cache.NextNumber(CM.Cache.ChainWrathReward) / 0.5;
}
- CM.Cache.ChainFrenzyReward = CM.Cache.MaxChainMoni(7, maxPayout * 7);
+ CM.Cache.ChainFrenzyReward = CM.Cache.MaxChainMoni(7, maxPayout * 7, goldenMult);
- CM.Cache.ChainFrenzyWrathReward = CM.Cache.MaxChainMoni(6, maxPayout * 7);
+ CM.Cache.ChainFrenzyWrathReward = CM.Cache.MaxChainMoni(6, maxPayout * 7, wrathMult);
if ((maxPayout * 7) < CM.Cache.ChainFrenzyReward) {
CM.Cache.ChainFrenzy = 0;
@@ -223,43 +363,19 @@ CM.Cache.RemakeSeaSpec = function() {
}
CM.Cache.RemakeSellForChoEgg = function() {
- if (Game.auraMult('Earth Shatterer') == 1.1) {
- var sellTotal = 0;
- for (var i in Game.Objects) {
- var me = Game.Objects[i];
- sellTotal += CM.Sim.BuildingSell(me, me.basePrice, me.amount, me.free, me.amount, 0);
- }
- }
- else {
- var highestBuilding = '';
- for (var i in Game.Objects) {
- if (Game.Objects[i].amount > 0) highestBuilding = i;
- }
- var secondHighBuild = '';
- if (Game.auraMult('Earth Shatterer') == 0 && highestBuilding != '') {
- if (Game.Objects[highestBuilding].amount > 1) {
- secondHighBuild = highestBuilding;
- }
- else {
- for (var i in Game.Objects) {
- if (i != highestBuilding && Game.Objects[i].amount > 0) secondHighBuild = i;
- }
- }
- }
-
- var sellTotal = 0;
- for (var i in Game.Objects) {
- var me = Game.Objects[i];
- var amount = me.amount;
- if (i == highestBuilding) {
- amount -= 1;
- }
- if (i == secondHighBuild) {
- amount -= 1;
- }
- sellTotal += CM.Sim.BuildingSell(me, me.basePrice, amount, me.free, amount, 1);
+ var sellTotal = 0;
+ // Compute cookies earned by selling stock market goods
+ if (Game.Objects.Bank.minigameLoaded) {
+ var marketGoods = Game.Objects.Bank.minigame.goods;
+ var goodsVal = 0;
+ for (var i in marketGoods) {
+ var marketGood = marketGoods[i];
+ goodsVal += marketGood.stock * marketGood.val;
}
+ sellTotal += goodsVal * Game.cookiesPsRawHighest;
}
+ // Compute cookies earned by selling all buildings with optimal auras (ES + RB)
+ sellTotal += CM.Sim.SellBuildingsForChoEgg();
CM.Cache.SellForChoEgg = sellTotal;
}
@@ -367,16 +483,41 @@ CM.Cache.UpdateAvgCPS = function() {
}
}
+CM.Cache.CalcMissingUpgrades = function() {
+ var currentMissingUpgrades = []
+ for (var i in CM.Cache.MissingUpgrades) {
+ if ((CM.Cache.MissingUpgrades[i].pool == "" || CM.Cache.MissingUpgrades[i].pool == "tech") && CM.Cache.MissingUpgrades[i].bought != 1) {
+ currentMissingUpgrades.push(CM.Cache.MissingUpgrades[i])
+ }
+ }
+ CM.Cache.MissingUpgrades = currentMissingUpgrades
+
+ var currentMissingCookies = []
+ for (var i in CM.Cache.MissingCookies) {
+ if (CM.Cache.MissingCookies[i].pool == "cookie" && CM.Cache.MissingCookies[i].bought != 1) {
+ currentMissingCookies.push(CM.Cache.MissingCookies[i])
+ }
+ }
+ CM.Cache.MissingCookies = currentMissingCookies
+}
+
CM.Cache.min = -1;
CM.Cache.max = -1;
CM.Cache.mid = -1;
CM.Cache.WrinkBank = -1;
CM.Cache.WrinkGodBank = -1;
+CM.Cache.GoldenCookiesMult = 1;
+CM.Cache.WrathCookiesMult = 1;
+CM.Cache.DragonsFortuneMultAdjustment = 1;
CM.Cache.NoGoldSwitchCookiesPS = 0;
CM.Cache.Lucky = 0;
CM.Cache.LuckyReward = 0;
+CM.Cache.LuckyWrathReward = 0;
CM.Cache.LuckyFrenzy = 0;
CM.Cache.LuckyRewardFrenzy = 0;
+CM.Cache.LuckyWrathRewardFrenzy = 0;
+CM.Cache.Conjure = 0;
+CM.Cache.ConjureReward = 0;
CM.Cache.SeaSpec = 0;
CM.Cache.Chain = 0;
CM.Cache.ChainWrath = 0;
@@ -403,6 +544,11 @@ CM.Cache.ClicksDiff;
CM.Cache.AvgCPS = -1;
CM.Cache.AvgCPSChoEgg = -1;
CM.Cache.AvgClicks = -1;
+CM.Cache.MissingUpgrades = Game.Upgrades;
+CM.Cache.MissingCookies = Game.Upgrades;
+CM.Cache.UpgradesOwned = -1;
+CM.Cache.MissingUpgradesString = null;
+CM.Cache.MissingCookiesString = null;
/**********
* Config *
@@ -457,7 +603,7 @@ CM.LoadConfig = function() {
if (mod) CM.SaveConfig(CM.Config);
CM.Loop(); // Do loop once
for (var i in CM.ConfigDefault) {
- if (i != 'StatsPref' && typeof CM.ConfigData[i].func !== 'undefined') {
+ if (i != 'StatsPref' && i != 'MenuPref' && typeof CM.ConfigData[i].func !== 'undefined') {
CM.ConfigData[i].func();
}
}
@@ -520,11 +666,51 @@ CM.ToggleStatsConfig = function(config) {
CM.SaveConfig(CM.Config);
}
+CM.ToggleMenuConfig = function(config) {
+ if (CM.Config.MenuPref[config] == 0) {
+ CM.Config.MenuPref[config]++;
+ }
+ else {
+ CM.Config.MenuPref[config]--;
+ }
+ CM.SaveConfig(CM.Config);
+}
+
+// Checks if the browsers has permissions to produce notifications
+// Should be triggered when Config related to Notifications is toggled on
+CM.CheckNotificationPermissions = function(ToggleOnOff) {
+ if (ToggleOnOff == 1) {
+ // Check if browser support Promise version of Notification Permissions
+ function checkNotificationPromise() {
+ try {
+ Notification.requestPermission().then();
+ } catch(e) {
+ return false;
+ }
+ return true;
+ }
+
+ // Check if the browser supports notifications and which type
+ if (!('Notification' in window)) {
+ console.log("This browser does not support notifications.");
+ }
+ else {
+ if(checkNotificationPromise()) {
+ Notification.requestPermission().then();
+ }
+ else {
+ Notification.requestPermission();
+ }
+ }
+ }
+}
+
CM.ConfigData.BotBar = {label: ['Bottom Bar OFF', 'Bottom Bar ON'], desc: 'Building Information', toggle: true, func: function() {CM.Disp.ToggleBotBar();}};
CM.ConfigData.TimerBar = {label: ['Timer Bar OFF', 'Timer Bar ON'], desc: 'Timers of Golden Cookie, Season Popup, Frenzy (Normal, Clot, Elder), Click Frenzy', toggle: true, func: function() {CM.Disp.ToggleTimerBar();}};
CM.ConfigData.TimerBarPos = {label: ['Timer Bar Position (Top Left)', 'Timer Bar Position (Bottom)'], desc: 'Placement of the Timer Bar', toggle: false, func: function() {CM.Disp.ToggleTimerBarPos();}};
CM.ConfigData.BuildColor = {label: ['Building Colors OFF', 'Building Colors ON'], desc: 'Color code buildings', toggle: true, func: function() {CM.Disp.UpdateBuildings();}};
-CM.ConfigData.BulkBuildColor = {label: ['Bulk Building Colors (Single Buildings Color)', 'Bulk Building Colors (Calculated Color)'], desc: 'Color code bulk buildings based on single buildings color or calculated bulk value color', toggle: false, func: function() {CM.Disp.UpdateBuildings();}};
+CM.ConfigData.BulkBuildColor = {label: ['Bulk Building Colors (Single Building Color)', 'Bulk Building Colors (Calculated Bulk Color)'], desc: 'Color code bulk buildings based on single buildings color or calculated bulk value color', toggle: false, func: function() {CM.Disp.UpdateBuildings();}};
+CM.ConfigData.ColorPPBulkMode = {label: ['Color of PP (Compared to Single)', 'Color of PP (Compared to Bulk)'], desc: 'Color PP-values based on comparison with single purchase or with selected bulk-buy mode', toggle: false};
CM.ConfigData.UpBarColor = {label: ['Upgrade Colors/Bar OFF', 'Upgrade Colors with Bar ON', 'Upgrade Colors without Bar ON'], desc: 'Color code upgrades and optionally add a counter bar', toggle: false, func: function() {CM.Disp.ToggleUpBarColor();}};
CM.ConfigData.Colors = {
desc: {
@@ -545,7 +731,8 @@ CM.ConfigData.CalcWrink = {label: ['Calculate with Wrinklers OFF', 'Calculate wi
CM.ConfigData.CPSMode = {label: ['Current Cookies Per Second', 'Average Cookies Per Second'], desc: 'Calculate times using current Cookies Per Second or average Cookies Per Second', toggle: false};
CM.ConfigData.AvgCPSHist = {label: ['Average CPS for past 10s', 'Average CPS for past 15s', 'Average CPS for past 30s', 'Average CPS for past 1m', 'Average CPS for past 5m', 'Average CPS for past 10m', 'Average CPS for past 15m', 'Average CPS for past 30m'], desc: 'How much time average Cookies Per Second should consider', toggle: false};
CM.ConfigData.AvgClicksHist = {label: ['Average Cookie Clicks for past 1s', 'Average Cookie Clicks for past 5s', 'Average Cookie Clicks for past 10s', 'Average Cookie Clicks for past 15s', 'Average Cookie Clicks for past 30s'], desc: 'How much time average Cookie Clicks should consider', toggle: false};
-CM.ConfigData.ToolWarnCautBon = {label: ['Calculate Tooltip Warning/Caution With Bonus CPS OFF', 'Calculate Tooltip Warning/Caution With Bonus CPS ON'], desc: 'Calculate the warning/caution with or without the bonus CPS you get from buying', toggle: true};
+CM.ConfigData.ToolWarnBon = {label: ['Calculate Tooltip Warning With Bonus CPS OFF', 'Calculate Tooltip Warning With Bonus CPS ON'], desc: 'Calculate the warning with or without the bonus CPS you get from buying', toggle: true};
+CM.ConfigData.GCNotification = {label: ['Golden Cookie Notification OFF', 'Golden Cookie Notification ON'], desc: 'Create a notification when Golden Cookie spawns', toggle: true, func: function () {CM.CheckNotificationPermissions(CM.Config.GCNotification);}};
CM.ConfigData.GCFlash = {label: ['Golden Cookie Flash OFF', 'Golden Cookie Flash ON'], desc: 'Flash screen on Golden Cookie', toggle: true};
CM.ConfigData.GCSound = {label: ['Golden Cookie Sound OFF', 'Golden Cookie Sound ON'], desc: 'Play a sound on Golden Cookie', toggle: true};
CM.ConfigData.GCVolume = {label: [], desc: 'Volume of the Golden Cookie sound'};
@@ -555,6 +742,7 @@ for (var i = 0; i < 101; i++) {
CM.ConfigData.GCSoundURL = {label: 'Golden Cookie Sound URL:', desc: 'URL of the sound to be played when a Golden Cookie spawns'};
CM.ConfigData.GCTimer = {label: ['Golden Cookie Timer OFF', 'Golden Cookie Timer ON'], desc: 'A timer on the Golden Cookie when it has been spawned', toggle: true, func: function() {CM.Disp.ToggleGCTimer();}};
CM.ConfigData.Favicon = {label: ['Favicon OFF', 'Favicon ON'], desc: 'Update favicon with Golden/Wrath Cookie', toggle: true, func: function() {CM.Disp.UpdateFavicon();}};
+CM.ConfigData.FortuneNotification = {label: ['Fortune Cookie Notification OFF', 'Fortune Cookie Notification ON'], desc: 'Create a notification when Fortune Cookie is on the Ticker', toggle: true, func: function () {CM.CheckNotificationPermissions(CM.Config.FortuneNotification);}};
CM.ConfigData.FortuneFlash = {label: ['Fortune Cookie Flash OFF', 'Fortune Cookie Flash ON'], desc: 'Flash screen on Fortune Cookie', toggle: true};
CM.ConfigData.FortuneSound = {label: ['Fortune Cookie Sound OFF', 'Fortune Cookie Sound ON'], desc: 'Play a sound on Fortune Cookie', toggle: true};
CM.ConfigData.FortuneVolume = {label: [], desc: 'Volume of the Fortune Cookie sound'};
@@ -562,6 +750,7 @@ for (var i = 0; i < 101; i++) {
CM.ConfigData.FortuneVolume.label[i] = i + '%';
}
CM.ConfigData.FortuneSoundURL = {label: 'Fortune Cookie Sound URL:', desc: 'URL of the sound to be played when the Ticker has a Fortune Cookie'};
+CM.ConfigData.SeaNotification = {label: ['Season Special Notification OFF', 'Season Special Notification ON'], desc: 'Create a notification on Season Popup', toggle: true, func: function () {CM.CheckNotificationPermissions(CM.Config.SeaNotification);}};
CM.ConfigData.SeaFlash = {label: ['Season Special Flash OFF', 'Season Special Flash ON'], desc: 'Flash screen on Season Popup', toggle: true};
CM.ConfigData.SeaSound = {label: ['Season Special Sound OFF', 'Season Special Sound ON'], desc: 'Play a sound on Season Popup', toggle: true};
CM.ConfigData.SeaVolume = {label: [], desc: 'Volume of the Season Special sound'};
@@ -576,15 +765,41 @@ for (var i = 0; i < 101; i++) {
CM.ConfigData.GardVolume.label[i] = i + '%';
}
CM.ConfigData.GardSoundURL = {label: 'Garden Tick Sound URL:', desc: 'URL of the sound to be played when the garden ticks'};
+CM.ConfigData.MagicNotification = {label: ['Magic Max Notification OFF', 'Magic Max Notification ON'], desc: 'Create a notification when magic reaches maximum', toggle: true, func: function () {CM.CheckNotificationPermissions(CM.Config.MagicNotification);}};
+CM.ConfigData.MagicFlash = {label: ['Magic Max Flash OFF', 'Magic Max Flash ON'], desc: 'Flash screen when magic reaches maximum', toggle: true};
+CM.ConfigData.MagicSound = {label: ['Magic Max Sound OFF', 'Magic Max Sound ON'], desc: 'Play a sound when magic reaches maximum', toggle: true};
+CM.ConfigData.MagicVolume = {label: [], desc: 'Volume of the Max Magic sound'};
+for (var i = 0; i < 101; i++) {
+ CM.ConfigData.MagicVolume.label[i] = i + '%';
+}
+CM.ConfigData.MagicSoundURL = {label: 'Magic Max Sound URL:', desc: 'URL of the sound to be played when magic reaches maxium'};
+CM.ConfigData.WrinklerNotification = {label: ['Wrinkler Notification OFF', 'Wrinkler Notification ON'], desc: 'Create a notification when a Wrinkler appears', toggle: true, func: function () {CM.CheckNotificationPermissions(CM.Config.WrinklerNotification);}};
+CM.ConfigData.WrinklerFlash = {label: ['Wrinkler Flash OFF', 'Wrinkler Flash ON'], desc: 'Flash screen when a Wrinkler appears', toggle: true};
+CM.ConfigData.WrinklerSound = {label: ['Wrinkler Sound OFF', 'Wrinkler Sound ON'], desc: 'Play a sound when a Wrinkler appears', toggle: true};
+CM.ConfigData.WrinklerVolume = {label: [], desc: 'Volume of the Wrinkler sound'};
+for (var i = 0; i < 101; i++) {
+ CM.ConfigData.WrinklerVolume.label[i] = i + '%';
+}
+CM.ConfigData.WrinklerSoundURL = {label: 'Wrinkler Sound URL:', desc: 'URL of the sound to be played when a Wrinkler appears'};
+CM.ConfigData.WrinklerMaxNotification = {label: ['Wrinkler Max Notification OFF', 'Wrinkler Max Notification ON'], desc: 'Create a notification when the maximum amount of Wrinklers has appeared', toggle: true, func: function () {CM.CheckNotificationPermissions(CM.Config.WrinklerMaxNotification);}};
+CM.ConfigData.WrinklerMaxFlash = {label: ['Wrinkler Max Flash OFF', 'Wrinkler Max Flash ON'], desc: 'Flash screen when the maximum amount of Wrinklers has appeared', toggle: true};
+CM.ConfigData.WrinklerMaxSound = {label: ['Wrinkler Max Sound OFF', 'Wrinkler Max Sound ON'], desc: 'Play a sound when the maximum amount of Wrinklers has appeared', toggle: true};
+CM.ConfigData.WrinklerMaxVolume = {label: [], desc: 'Volume of the Wrinkler Max sound'};
+for (var i = 0; i < 101; i++) {
+ CM.ConfigData.WrinklerMaxVolume.label[i] = i + '%';
+}
+CM.ConfigData.WrinklerMaxSoundURL = {label: 'Wrinkler Max Sound URL:', desc: 'URL of the sound to be played when the maximum amount of Wrinklers has appeared'};
CM.ConfigData.Title = {label: ['Title OFF', 'Title ON', 'Title Pinned Tab Highlight'], desc: 'Update title with Golden Cookie/Season Popup timers; pinned tab highlight only changes the title when a Golden Cookie/Season Popup spawns', toggle: true};
CM.ConfigData.TooltipBuildUp = {label: ['Buildings/Upgrades Tooltip Information OFF', 'Buildings/Upgrades Tooltip Information ON'], desc: 'Extra information in tooltip for buildings/upgrades', toggle: true};
CM.ConfigData.TooltipAmor = {label: ['Buildings Tooltip Amortization Information OFF', 'Buildings Tooltip Amortization Information ON'], desc: 'Add amortization information to buildings tooltip', toggle: true};
-CM.ConfigData.ToolWarnCaut = {label: ['Tooltip Warning/Caution OFF', 'Tooltip Warning/Caution ON'], desc: 'A warning/caution when buying if it will put the bank under the amount needed for max "Lucky!"/"Lucky!" (Frenzy) rewards', toggle: true, func: function() {CM.Disp.ToggleToolWarnCaut();}};
-CM.ConfigData.ToolWarnCautPos = {label: ['Tooltip Warning/Caution Position (Left)', 'Tooltip Warning/Caution Position (Bottom)'], desc: 'Placement of the warning/caution boxes', toggle: false, func: function() {CM.Disp.ToggleToolWarnCautPos();}};
+CM.ConfigData.ToolWarnLucky = {label: ['Tooltip Lucky Warning OFF', 'Tooltip Lucky Warning ON'], desc: 'A warning when buying if it will put the bank under the amount needed for max "Lucky!"/"Lucky!" (Frenzy) rewards', toggle: true};
+CM.ConfigData.ToolWarnConjure = {label: ['Tooltip Conjure Warning OFF', 'Tooltip Conjure Warning ON'], desc: 'A warning when buying if it will put the bank under the amount needed for max "Conjure Baked Goods" rewards', toggle: true};
+CM.ConfigData.ToolWarnPos = {label: ['Tooltip Warning Position (Left)', 'Tooltip Warning Position (Bottom)'], desc: 'Placement of the warning boxes', toggle: false, func: function() {CM.Disp.ToggleToolWarnPos();}};
CM.ConfigData.TooltipGrim = {label: ['Grimoire Tooltip Information OFF', 'Grimoire Tooltip Information ON'], desc: 'Extra information in tooltip for grimoire', toggle: true};
CM.ConfigData.ToolWrink = {label: ['Wrinkler Tooltip OFF', 'Wrinkler Tooltip ON'], desc: 'Shows the amount of cookies a wrinkler will give when popping it', toggle: true};
CM.ConfigData.TooltipLump = {label: ['Sugar Lump Tooltip OFF', 'Sugar Lump Tooltip ON'], desc: 'Shows the current Sugar Lump type in Sugar lump tooltip.', toggle: true};
CM.ConfigData.Stats = {label: ['Statistics OFF', 'Statistics ON'], desc: 'Extra Cookie Monster statistics!', toggle: true};
+CM.ConfigData.MissingUpgrades = {label: ['Missing Upgrades OFF', 'Missing Upgrades ON'], desc: 'Shows Missing upgrades in Stats Menu. This feature can be laggy for users with a low amount of unlocked achievements.', toggle: true};
CM.ConfigData.UpStats = {label: ['Statistics Update Rate (Default)', 'Statistics Update Rate (1s)'], desc: 'Default Game rate is once every 5 seconds', toggle: false};
CM.ConfigData.TimeFormat = {label: ['Time XXd, XXh, XXm, XXs', 'Time XX:XX:XX:XX:XX'], desc: 'Change the time format', toggle: false};
CM.ConfigData.SayTime = {label: ['Format Time OFF', 'Format Time ON'], desc: 'Change how time is displayed in statistics', toggle: true, func: function() {CM.Disp.ToggleSayTime();}};
@@ -765,51 +980,73 @@ CM.Disp.Beautify = function(num, frac) {
}
if (CM.Config.Scale == 3) {
- if (num >= 10) {
+ if (num >= 999999) {
var count = 0;
while (num >= 10) {
count++;
num /= 10;
}
- answer = Math.round(num * 1000) / 1000 + 'E+' + count;
+ answer = +(Math.round(num + "e+2") + "e-2") + 'E+' + count;
}
- else if (num < 1 && num != 0) {
+ else if (num < -999999 && num != 0) {
var count = 0;
while (num < 1) {
count++;
num *= 10;
}
- answer = Math.round(num * 1000) / 1000 + 'E-' + count;
+ answer = +(Math.round(num + "e+2") + "e-2") + 'E-' + count;
}
else {
- answer = Math.round(num * 1000) / 1000 + 'E+0';
+ answer = CM.Backup.Beautify(num, frac);
}
}
else if (CM.Config.Scale == 4) {
- if (num >= 1000) {
+ if (num >= 999999) {
var count = 0;
while (num >= 1000) {
count++;
num /= 1000;
}
- answer = Math.round(num * 1000) / 1000 + 'E+' + (count * 3);
+ answer = +(Math.round(num + "e+2") + "e-2") + 'E+' + (count * 3);
}
- else if (num < 1 && num != 0) {
+ else if (num < -999999 && num != 0) {
var count = 0;
while (num < 1) {
count++;
num *= 1000;
}
- answer = Math.round(num * 1000) / 1000 + 'E-' + (count * 3);
+ answer = +(Math.round(num + "e+2") + "e-2") + 'E-' + (count * 3);
}
else {
- answer = Math.round(num * 1000) / 1000 + 'E+0';
+ answer = CM.Backup.Beautify(num, frac);
}
}
else {
for (var i = (CM.Disp.shortScale.length - 1); i >= 0; i--) {
if (i < CM.Disp.metric.length && CM.Config.Scale == 1) {
- if (num >= Math.pow(1000, i + 2)) {
+ // Revert to Scientific Notation from e27
+ if (Math.log10(num) > 27) {
+ if (num >= 999999) {
+ var count = 0;
+ while (num >= 10) {
+ count++;
+ num /= 10;
+ }
+ answer = +(Math.round(num + "e+2") + "e-2") + 'E+' + count;
+ }
+ else if (num < -999999 && num != 0) {
+ var count = 0;
+ while (num < 1) {
+ count++;
+ num *= 10;
+ }
+ answer = +(Math.round(num + "e+2") + "e-2") + 'E-' + count;
+ }
+ else {
+ answer = CM.Backup.Beautify(num, frac);
+ }
+ }
+ else if (num >= Math.pow(1000, i + 2)) {
answer = (Math.round(num / Math.pow(1000, i + 1)) / 1000).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') + ' ' + CM.Disp.metric[i];
break;
}
@@ -883,10 +1120,40 @@ CM.Disp.CreateCssArea = function() {
l("upgrades").style["flex-wrap"] = "wrap";
}
+/**
+ * Extends the bottom bar (created by CM.Disp.CreateBotBar) with a column for the given building.
+ *
+ * This function is called by CM.Disp.CreateBotBar on initialization of Cookie Monster,
+ * and also in CM.Sim.CopyData if a new building (added by another mod) is discovered.
+ */
+CM.Disp.CreateBotBarBuildingColumn = function(buildingName) {
+ if(!CM.Disp.BotBar) {
+ CM.Disp.CreateBotBar();
+ return; // CreateBotBar will call this function again
+ }
+
+ var type = CM.Disp.BotBar.firstChild.firstChild.childNodes[0];
+ var bonus = CM.Disp.BotBar.firstChild.firstChild.childNodes[1];
+ var pp = CM.Disp.BotBar.firstChild.firstChild.childNodes[2];
+ var time = CM.Disp.BotBar.firstChild.firstChild.childNodes[3];
+
+ var i = buildingName;
+ var header = type.appendChild(document.createElement('td'));
+ header.appendChild(document.createTextNode((i.indexOf(' ') != -1 ? i.substring(0, i.indexOf(' ')) : i) + ' ('));
+
+ var span = header.appendChild(document.createElement('span'));
+ span.className = CM.Disp.colorTextPre + CM.Disp.colorBlue;
+
+ header.appendChild(document.createTextNode(')'));
+ bonus.appendChild(document.createElement('td'));
+ pp.appendChild(document.createElement('td'));
+ time.appendChild(document.createElement('td'));
+}
+
CM.Disp.CreateBotBar = function() {
CM.Disp.BotBar = document.createElement('div');
CM.Disp.BotBar.id = 'CMBotBar';
- CM.Disp.BotBar.style.height = '55px';
+ CM.Disp.BotBar.style.height = '69px';
CM.Disp.BotBar.style.width = '100%';
CM.Disp.BotBar.style.position = 'absolute';
CM.Disp.BotBar.style.display = 'none';
@@ -899,15 +1166,14 @@ CM.Disp.CreateBotBar = function() {
CM.Disp.BotBar.style.overflow = 'auto';
CM.Disp.BotBar.style.textShadow = '-1px 0 black, 0 1px black, 1px 0 black, 0 -1px black';
- var table = document.createElement('table');
+ var table = CM.Disp.BotBar.appendChild(document.createElement('table'));
table.style.width = '100%';
table.style.textAlign = 'center';
table.style.whiteSpace = 'nowrap';
// TODO figure a better way
//table.style.tableLayout = 'fixed';
//table.style.overflow = 'hidden';
- var tbody = document.createElement('tbody');
- table.appendChild(tbody);
+ var tbody = table.appendChild(document.createElement('tbody'));
var firstCol = function(text, color) {
var td = document.createElement('td');
@@ -917,36 +1183,20 @@ CM.Disp.CreateBotBar = function() {
return td;
}
- var type = document.createElement('tr');
+ var type = tbody.appendChild(document.createElement('tr'));
type.style.fontWeight = 'bold';
type.appendChild(firstCol(CM.VersionMajor + '.' + CM.VersionMinor, CM.Disp.colorYellow));
- tbody.appendChild(type);
- var bonus = document.createElement('tr');
+ var bonus = tbody.appendChild(document.createElement('tr'));
bonus.appendChild(firstCol('Bonus Income', CM.Disp.colorBlue));
- tbody.appendChild(bonus);
- var pp = document.createElement('tr');
+ var pp = tbody.appendChild(document.createElement('tr'));
pp.appendChild(firstCol('Payback Period', CM.Disp.colorBlue));
- tbody.appendChild(pp);
- var time = document.createElement('tr');
+ var time = tbody.appendChild(document.createElement('tr'));
time.appendChild(firstCol('Time Left', CM.Disp.colorBlue));
- tbody.appendChild(time);
for (var i in Game.Objects) {
- var header = document.createElement('td');
- header.appendChild(document.createTextNode((i.indexOf(' ') != -1 ? i.substring(0, i.indexOf(' ')) : i) + ' ('));
- var span = document.createElement('span');
- span.className = CM.Disp.colorTextPre + CM.Disp.colorBlue;
- header.appendChild(span);
- header.appendChild(document.createTextNode(')'));
- type.appendChild(header);
- bonus.appendChild(document.createElement('td'));
- pp.appendChild(document.createElement('td'));
- time.appendChild(document.createElement('td'));
-
+ CM.Disp.CreateBotBarBuildingColumn(i);
}
- CM.Disp.BotBar.appendChild(table);
-
l('wrapper').appendChild(CM.Disp.BotBar);
}
@@ -966,11 +1216,14 @@ CM.Disp.UpdateBotBarOther = function() {
var count = 0;
for (var i in CM.Cache.Objects) {
+ var target = 'Objects';
+ if (Game.buyBulk == 10) {target = 'Objects10';}
+ if (Game.buyBulk == 100) {target = 'Objects100';}
count++;
CM.Disp.BotBar.firstChild.firstChild.childNodes[0].childNodes[count].childNodes[1].textContent = Game.Objects[i].amount;
- CM.Disp.BotBar.firstChild.firstChild.childNodes[1].childNodes[count].textContent = Beautify(CM.Cache.Objects[i].bonus, 2);
- CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].className = CM.Disp.colorTextPre + CM.Cache.Objects[i].color;
- CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].textContent = Beautify(CM.Cache.Objects[i].pp, 2);
+ CM.Disp.BotBar.firstChild.firstChild.childNodes[1].childNodes[count].textContent = Beautify(CM.Cache[target][i].bonus, 2);
+ CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].className = CM.Disp.colorTextPre + CM.Cache[target][i].color;
+ CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].textContent = Beautify(CM.Cache[target][i].pp, 2);
}
}
}
@@ -1224,11 +1477,11 @@ CM.Disp.UpdateTimerBar = function() {
CM.Disp.UpdateBotTimerBarDisplay = function() {
if (CM.Config.BotBar == 1 && CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 1) {
CM.Disp.BotBar.style.bottom = '48px';
- l('game').style.bottom = '104px';
+ l('game').style.bottom = '118px';
}
else if (CM.Config.BotBar == 1) {
CM.Disp.BotBar.style.bottom = '0px';
- l('game').style.bottom = '56px';
+ l('game').style.bottom = '70px';
}
else if (CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 1) {
l('game').style.bottom = '48px';
@@ -1265,27 +1518,49 @@ CM.Disp.UpdateBuildings = function() {
}
else {
for (var i in CM.Cache.Objects) {
- l('productPrice' + Game.Objects[i].id).style.color = '';
+ var o = Game.Objects[i];
+ l('productPrice' + o.id).style.color = '';
+ /*
+ * Fix sell price displayed in the object in the store.
+ *
+ * The buildings sell price displayed by the game itself (without any mod) is incorrect.
+ * The following line of code fixes this issue, and can be safely removed when the game gets fixed.
+ *
+ * This issue is extensively detailed here: https://github.com/Aktanusa/CookieMonster/issues/359#issuecomment-735658262
+ */
+ l('productPrice' + o.id).innerHTML = Beautify(CM.Sim.BuildingSell(o, o.basePrice, o.amount, o.free, Game.buyBulk, 1));
}
}
// Build array of pointers, sort by pp, use array index (+2) as the grid row number
// (grid rows are 1-based indexing, and row 1 is the bulk buy/sell options)
- var arr = Object.keys(CM.Cache.Objects).map(k =>
- {
- var o = CM.Cache.Objects[k];
- o.name = k;
- o.id = Game.Objects[k].id;
- return o;
- });
+ if (Game.buyMode == 1 && CM.Config.SortBuildings) {
+ var arr = Object.keys(CM.Cache[target]).map(k =>
+ {
+ var o = CM.Cache[target][k];
+ o.name = k;
+ o.id = Game.Objects[k].id;
+ return o;
+ });
- if (CM.Config.SortBuildings)
- arr.sort((a, b) => a.pp - b.pp);
- else
+ arr.sort(function(a, b){ return (a.pp > b.pp ? 1 : (a.pp < b.pp ? -1 : 0)) });
+
+ for (var x = 0; x < arr.length; x++) {
+ Game.Objects[arr[x].name].l.style.gridRow = (x + 2) + "/" + (x + 2);
+ }
+ } else {
+ var arr = Object.keys(CM.Cache.Objects).map(k =>
+ {
+ var o = CM.Cache.Objects[k];
+ o.name = k;
+ o.id = Game.Objects[k].id;
+ return o;
+ });
arr.sort((a, b) => a.id - b.id);
-
- for (var x = 0; x < arr.length; x++)
- Game.Objects[arr[x].name].l.style.gridRow = (x + 2) + "/" + (x + 2);
+ for (var x = 0; x < arr.length; x++) {
+ Game.Objects[arr[x].name].l.style.gridRow = (x + 2) + "/" + (x + 2);
+ }
+ }
}
CM.Disp.CreateUpgradeBar = function() {
@@ -1500,18 +1775,25 @@ CM.Disp.PlaySound = function(url, sndConfig, volConfig) {
}
}
-/**
- * Needed for some of the functions to use the right object
- */
-CM.Disp.FindGoldenShimmer = function() {
- if (CM.Disp.lastGoldenCookieState) {
- for (var i in Game.shimmers) {
- if (Game.shimmers[i].spawnLead && Game.shimmers[i].type == 'golden') {
- CM.Disp.goldenShimmer = Game.shimmers[i];
- break;
- }
+CM.Disp.Notification = function(notifyConfig, title, message) {
+ if (CM.Config[notifyConfig] == 1 && document.visibilityState == 'hidden') {
+ var CookieIcon = 'https://orteil.dashnet.org/cookieclicker/favicon.ico'
+ var notification = new Notification(title, {body: message, badge: CookieIcon});
+ }
+}
+
+
+CM.Disp.FindShimmer = function() {
+ CM.Disp.currSpawnedGoldenCookieState = 0
+ CM.Disp.goldenShimmersByID = {}
+ for (var i in Game.shimmers) {
+ CM.Disp.goldenShimmersByID[Game.shimmers[i].id] = Game.shimmers[i]
+ if (Game.shimmers[i].spawnLead && Game.shimmers[i].type == 'golden') {
+ CM.Disp.spawnedGoldenShimmer = Game.shimmers[i];
+ CM.Disp.currSpawnedGoldenCookieState += 1;
}
}
+
}
CM.Disp.CreateFavicon = function() {
@@ -1523,8 +1805,8 @@ CM.Disp.CreateFavicon = function() {
}
CM.Disp.UpdateFavicon = function() {
- if (CM.Config.Favicon == 1 && CM.Disp.lastGoldenCookieState) {
- if (CM.Disp.goldenShimmer.wrath) {
+ if (CM.Config.Favicon == 1) {
+ if (CM.Disp.spawnedGoldenShimmer.wrath) {
CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
}
else {
@@ -1536,59 +1818,86 @@ CM.Disp.UpdateFavicon = function() {
}
}
-CM.Disp.CreateGCTimer = function() {
- CM.Disp.GCTimer = document.createElement('div');
- CM.Disp.GCTimer.style.width = '96px';
- CM.Disp.GCTimer.style.height = '96px';
- CM.Disp.GCTimer.style.display = 'none';
- CM.Disp.GCTimer.style.position = 'absolute';
- CM.Disp.GCTimer.style.zIndex = '10000000001';
- CM.Disp.GCTimer.style.textAlign = 'center';
- CM.Disp.GCTimer.style.lineHeight = '96px';
- CM.Disp.GCTimer.style.fontFamily = '\"Kavoon\", Georgia, serif';
- CM.Disp.GCTimer.style.fontSize = '35px';
- CM.Disp.GCTimer.style.cursor = 'pointer';
- CM.Disp.GCTimer.onclick = function () {CM.Disp.goldenShimmer.pop(); CM.Disp.GCTimer.style.display = 'none';};
- CM.Disp.GCTimer.onmouseover = function() {CM.Disp.goldenShimmer.l.style.filter = 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))'; CM.Disp.goldenShimmer.l.style.webkitFilter = 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))';};
- CM.Disp.GCTimer.onmouseout = function() {CM.Disp.goldenShimmer.l.style.filter = ''; CM.Disp.goldenShimmer.l.style.webkitFilter = '';};
+CM.Disp.CreateGCTimer = function(cookie) {
+ GCTimer = document.createElement('div');
+ GCTimer.id = 'GCTimer' + cookie.id
+ GCTimer.style.width = '96px';
+ GCTimer.style.height = '96px';
+ GCTimer.style.position = 'absolute';
+ GCTimer.style.zIndex = '10000000001';
+ GCTimer.style.textAlign = 'center';
+ GCTimer.style.lineHeight = '96px';
+ GCTimer.style.fontFamily = '\"Kavoon\", Georgia, serif';
+ GCTimer.style.fontSize = '35px';
+ GCTimer.style.cursor = 'pointer';
+ GCTimer.style.display = 'block';
+ GCTimer.style.left = cookie.l.style.left;
+ GCTimer.style.top = cookie.l.style.top;
+ GCTimer.onclick = function () {cookie.pop();};
+ GCTimer.onmouseover = function() {cookie.l.style.filter = 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))'; cookie.l.style.webkitFilter = 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))';};
+ GCTimer.onmouseout = function() {cookie.l.style.filter = ''; cookie.l.style.webkitFilter = '';};
- l('game').appendChild(CM.Disp.GCTimer);
+ CM.Disp.GCTimers[cookie.id] = GCTimer;
+ l('shimmers').appendChild(GCTimer);
}
CM.Disp.ToggleGCTimer = function() {
if (CM.Config.GCTimer == 1) {
if (CM.Disp.lastGoldenCookieState) {
- CM.Disp.GCTimer.style.display = 'block';
- CM.Disp.GCTimer.style.left = CM.Disp.goldenShimmer.l.style.left;
- CM.Disp.GCTimer.style.top = CM.Disp.goldenShimmer.l.style.top;
+ for (var i in CM.Disp.GCTimers) {
+ CM.Disp.GCTimers[i].style.display = 'block';
+ CM.Disp.GCTimers[i].style.left = CM.Disp.goldenShimmersByID[i].l.style.left;
+ CM.Disp.GCTimers[i].style.top = CM.Disp.goldenShimmersByID[i].l.style.top;
+ }
}
}
else {
- CM.Disp.GCTimer.style.display = 'none';
+ for (var i in CM.Disp.GCTimers) {
+ CM.Disp.GCTimers[i].style.display = 'none';
+ }
}
}
CM.Disp.CheckGoldenCookie = function() {
- if (CM.Disp.lastGoldenCookieState != Game.shimmerTypes['golden'].spawned) {
- CM.Disp.lastGoldenCookieState = Game.shimmerTypes['golden'].spawned;
- CM.Disp.FindGoldenShimmer();
- CM.Disp.UpdateFavicon();
- if (CM.Disp.lastGoldenCookieState) {
- if (CM.Config.GCTimer == 1) {
- CM.Disp.GCTimer.style.display = 'block';
- CM.Disp.GCTimer.style.left = CM.Disp.goldenShimmer.l.style.left;
- CM.Disp.GCTimer.style.top = CM.Disp.goldenShimmer.l.style.top;
- }
-
- CM.Disp.Flash(3, 'GCFlash');
- CM.Disp.PlaySound(CM.Config.GCSoundURL, 'GCSound', 'GCVolume');
+ CM.Disp.FindShimmer();
+ for (var i in CM.Disp.GCTimers) {
+ if (typeof CM.Disp.goldenShimmersByID[i] == "undefined") {
+ CM.Disp.GCTimers[i].parentNode.removeChild(CM.Disp.GCTimers[i]);
+ // TODO remove delete here
+ delete CM.Disp.GCTimers[i];
+ }
+ }
+ if (CM.Disp.lastGoldenCookieState != Game.shimmerTypes['golden'].n) {
+ CM.Disp.lastGoldenCookieState = Game.shimmerTypes['golden'].n;
+ if (CM.Disp.lastGoldenCookieState) {
+ if (CM.Disp.lastSpawnedGoldenCookieState < CM.Disp.currSpawnedGoldenCookieState) {
+ CM.Disp.Flash(3, 'GCFlash');
+ CM.Disp.PlaySound(CM.Config.GCSoundURL, 'GCSound', 'GCVolume');
+ CM.Disp.Notification('GCNotification', "Golden Cookie Spawned", "A Golden Cookie has spawned. Click it now!")
+ }
+ CM.Disp.lastSpawnedGoldenCookieState = CM.Disp.currSpawnedGoldenCookieState
+ CM.Disp.UpdateFavicon();
+
+ if (CM.Config.GCTimer == 1) {
+ for (var i in Game.shimmers) {
+ if (typeof CM.Disp.GCTimers[Game.shimmers[i].id] == "undefined") {
+ CM.Disp.CreateGCTimer(Game.shimmers[i]);
+ }
+ }
+ }
+ }
+ else if (CM.Config.GCTimer == 1) {
+ for (var i in CM.Disp.GCTimers) {
+ CM.Disp.GCTimers[i].style.display = 'none';
+ }
}
- else if (CM.Config.GCTimer == 1) CM.Disp.GCTimer.style.display = 'none';
}
else if (CM.Config.GCTimer == 1 && CM.Disp.lastGoldenCookieState) {
- CM.Disp.GCTimer.style.opacity = CM.Disp.goldenShimmer.l.style.opacity;
- CM.Disp.GCTimer.style.transform = CM.Disp.goldenShimmer.l.style.transform;
- CM.Disp.GCTimer.textContent = Math.ceil(CM.Disp.goldenShimmer.life / Game.fps);
+ for (var i in CM.Disp.GCTimers) {
+ CM.Disp.GCTimers[i].style.opacity = CM.Disp.goldenShimmersByID[i].l.style.opacity;
+ CM.Disp.GCTimers[i].style.transform = CM.Disp.goldenShimmersByID[i].l.style.transform;
+ CM.Disp.GCTimers[i].textContent = Math.ceil(CM.Disp.goldenShimmersByID[i].life / Game.fps);
+ }
}
}
@@ -1598,6 +1907,7 @@ CM.Disp.CheckTickerFortune = function() {
if (CM.Disp.lastTickerFortuneState) {
CM.Disp.Flash(3, 'FortuneFlash');
CM.Disp.PlaySound(CM.Config.FortuneSoundURL, 'FortuneSound', 'FortuneVolume');
+ CM.Disp.Notification('FortuneNotification', "Fortune Cookie found", "A Fortune Cookie has appeared on the Ticker.")
}
}
}
@@ -1616,6 +1926,7 @@ CM.Disp.CheckSeasonPopup = function() {
CM.Disp.Flash(3, 'SeaFlash');
CM.Disp.PlaySound(CM.Config.SeaSoundURL, 'SeaSound', 'SeaVolume');
+ CM.Disp.Notification('SeaNotification',"Reindeer sighted!", "A Reindeer has spawned. Click it now!")
}
}
}
@@ -1630,6 +1941,50 @@ CM.Disp.CheckGardenTick = function() {
}
}
+CM.Disp.CheckMagicMeter = function() {
+ if (Game.Objects['Wizard tower'].minigameLoaded && CM.Config.GrimoireBar == 1) {
+ var minigame = Game.Objects['Wizard tower'].minigame;
+ if (minigame.magic < minigame.magicM) {
+ CM.Disp.lastMagicBarFull = false;
+ }
+ else if (!CM.Disp.lastMagicBarFull) {
+ CM.Disp.lastMagicBarFull = true;
+ CM.Disp.Flash(3, 'MagicFlash');
+ CM.Disp.PlaySound(CM.Config.MagicSoundURL, 'MagicSound', 'MagicVolume');
+ CM.Disp.Notification('MagicNotification', "Magic Meter full", "Your Magic Meter is full. Cast a spell!")
+ }
+ }
+}
+
+CM.Disp.CheckWrinklerCount = function() {
+ if (Game.elderWrath > 0) {
+ var CurrentWrinklers = 0;
+ for (var i in Game.wrinklers) {
+ if (Game.wrinklers[i].phase == 2) CurrentWrinklers++;
+ }
+ if (CurrentWrinklers > CM.Disp.lastWrinklerCount) {
+ CM.Disp.lastWrinklerCount = CurrentWrinklers
+ if (CurrentWrinklers == Game.getWrinklersMax() && CM.Config.WrinklerMaxFlash) {
+ CM.Disp.Flash(3, 'WrinklerMaxFlash');
+ } else {
+ CM.Disp.Flash(3, 'WrinklerFlash');
+ }
+ if (CurrentWrinklers == Game.getWrinklersMax() && CM.Config.WrinklerMaxSound) {
+ CM.Disp.PlaySound(CM.Config.WrinklerMaxSoundURL, 'WrinklerMaxSound', 'WrinklerMaxVolume');
+ } else {
+ CM.Disp.PlaySound(CM.Config.WrinklerSoundURL, 'WrinklerSound', 'WrinklerVolume');
+ }
+ if (CurrentWrinklers == Game.getWrinklersMax() && CM.Config.WrinklerMaxNotification) {
+ CM.Disp.Notification('WrinklerMaxNotification', "Maximum Wrinklers Reached", "You have reached your maximum ammount of wrinklers")
+ } else {
+ CM.Disp.Notification('WrinklerNotification', "A Wrinkler appeared", "A new wrinkler has appeared")
+ }
+ } else {
+ CM.Disp.lastWrinklerCount = CurrentWrinklers
+ }
+ }
+}
+
CM.Disp.UpdateTitle = function() {
if (Game.OnAscend || CM.Config.Title == 0) {
document.title = CM.Cache.Title;
@@ -1642,11 +1997,11 @@ CM.Disp.UpdateTitle = function() {
var titleFC;
var titleSP;
if (CM.Disp.lastGoldenCookieState) {
- if (CM.Disp.goldenShimmer.wrath) {
- titleGC = '[W ' + Math.ceil(CM.Disp.goldenShimmer.life / Game.fps) + ']';
+ if (CM.Disp.spawnedGoldenShimmer.wrath) {
+ titleGC = '[W ' + Math.ceil(CM.Disp.spawnedGoldenShimmer.life / Game.fps) + ']';
}
else {
- titleGC = '[G ' + Math.ceil(CM.Disp.goldenShimmer.life / Game.fps) + ']';
+ titleGC = '[G ' + Math.ceil(CM.Disp.spawnedGoldenShimmer.life / Game.fps) + ']';
}
}
else if (!Game.Has('Golden switch [off]')) {
@@ -1681,11 +2036,11 @@ CM.Disp.UpdateTitle = function() {
var spawn = false;
if (CM.Disp.lastGoldenCookieState) {
spawn = true;
- if (CM.Disp.goldenShimmer.wrath) {
- str += '[W ' + Math.ceil(CM.Disp.goldenShimmer.life / Game.fps) + ']';
+ if (CM.Disp.spawnedGoldenShimmer.wrath) {
+ str += '[W ' + Math.ceil(CM.Disp.spawnedGoldenShimmer.life / Game.fps) + ']';
}
else {
- str += '[G ' + Math.ceil(CM.Disp.goldenShimmer.life / Game.fps) + ']';
+ str += '[G ' + Math.ceil(CM.Disp.spawnedGoldenShimmer.life / Game.fps) + ']';
}
}
if (CM.Disp.lastTickerFortuneState) {
@@ -1725,14 +2080,28 @@ CM.Disp.CreateTooltip = function(placeholder, text, minWidth) {
}
CM.Disp.AddMenuPref = function(title) {
- var header = function(text) {
+ var header = function(text, config) {
var div = document.createElement('div');
div.className = 'listing';
div.style.padding = '5px 16px';
div.style.opacity = '0.7';
div.style.fontSize = '17px';
div.style.fontFamily = '\"Kavoon\", Georgia, serif';
- div.textContent = text;
+ div.appendChild(document.createTextNode(text + ' '));
+ var span = document.createElement('span');
+ span.style.cursor = 'pointer';
+ span.style.display = 'inline-block';
+ span.style.height = '14px';
+ span.style.width = '14px';
+ span.style.borderRadius = '7px';
+ span.style.textAlign = 'center';
+ span.style.backgroundColor = '#C0C0C0';
+ span.style.color = 'black';
+ span.style.fontSize = '13px';
+ span.style.verticalAlign = 'middle';
+ span.textContent = CM.Config.MenuPref[config] ? '-' : '+';
+ span.onclick = function() {CM.ToggleMenuConfig(config); Game.UpdateMenu();};
+ div.appendChild(span);
return div;
}
@@ -1816,87 +2185,120 @@ CM.Disp.AddMenuPref = function(title) {
return div;
}
- frag.appendChild(header('Bars/Colors'));
- frag.appendChild(listing('BotBar'));
- frag.appendChild(listing('TimerBar'));
- frag.appendChild(listing('TimerBarPos'));
- frag.appendChild(listing('SortBuildings'));
- frag.appendChild(listing('SortUpgrades'));
- frag.appendChild(listing('BuildColor'));
- frag.appendChild(listing('BulkBuildColor'));
- frag.appendChild(listing('UpBarColor'));
- for (var i = 0; i < CM.Disp.colors.length; i++) {
- var div = document.createElement('div');
- div.className = 'listing';
- var input = document.createElement('input');
- input.id = CM.ConfigPrefix + 'Color' + CM.Disp.colors[i];
- input.className = 'option';
- input.style.width = '65px';
- input.setAttribute('value', CM.Config.Colors[CM.Disp.colors[i]]);
- div.appendChild(input);
- eval('var change = function() {CM.Config.Colors[\'' + CM.Disp.colors[i] + '\'] = l(CM.ConfigPrefix + \'Color\' + \'' + CM.Disp.colors[i] + '\').value; CM.Disp.UpdateColors(); CM.SaveConfig(CM.Config);}');
- var jscolorpicker = new jscolor.color(input, {hash: true, caps: false, pickerZIndex: 1000000, pickerPosition: 'right', onImmediateChange: change});
- var label = document.createElement('label');
- label.textContent = CM.ConfigData.Colors.desc[CM.Disp.colors[i]];
- div.appendChild(label);
- frag.appendChild(div);
+ frag.appendChild(header('Bars/Colors', 'BarsColors'));
+ if (CM.Config.MenuPref.BarsColors) {
+ frag.appendChild(listing('BotBar'));
+ frag.appendChild(listing('TimerBar'));
+ frag.appendChild(listing('TimerBarPos'));
+ frag.appendChild(listing('SortBuildings'));
+ frag.appendChild(listing('SortUpgrades'));
+ frag.appendChild(listing('BuildColor'));
+ frag.appendChild(listing('BulkBuildColor'));
+ frag.appendChild(listing('ColorPPBulkMode'));
+ frag.appendChild(listing('UpBarColor'));
+ for (var i = 0; i < CM.Disp.colors.length; i++) {
+ var div = document.createElement('div');
+ div.className = 'listing';
+ var input = document.createElement('input');
+ input.id = CM.ConfigPrefix + 'Color' + CM.Disp.colors[i];
+ input.className = 'option';
+ input.style.width = '65px';
+ input.setAttribute('value', CM.Config.Colors[CM.Disp.colors[i]]);
+ div.appendChild(input);
+ eval('var change = function() {CM.Config.Colors[\'' + CM.Disp.colors[i] + '\'] = l(CM.ConfigPrefix + \'Color\' + \'' + CM.Disp.colors[i] + '\').value; CM.Disp.UpdateColors(); CM.SaveConfig(CM.Config);}');
+ var jscolorpicker = new jscolor.color(input, {hash: true, caps: false, pickerZIndex: 1000000, pickerPosition: 'right', onImmediateChange: change});
+ var label = document.createElement('label');
+ label.textContent = CM.ConfigData.Colors.desc[CM.Disp.colors[i]];
+ div.appendChild(label);
+ frag.appendChild(div);
+ }
+ frag.appendChild(listing('UpgradeBarFixedPos'));
}
- frag.appendChild(listing('UpgradeBarFixedPos'));
- frag.appendChild(header('Calculation'));
- frag.appendChild(listing('CalcWrink'));
- frag.appendChild(listing('CPSMode'));
- frag.appendChild(listing('AvgCPSHist'));
- frag.appendChild(listing('AvgClicksHist'));
- frag.appendChild(listing('ToolWarnCautBon'));
+ frag.appendChild(header('Calculation', 'Calculation'));
+ if (CM.Config.MenuPref.Calculation) {
+ frag.appendChild(listing('CalcWrink'));
+ frag.appendChild(listing('CPSMode'));
+ frag.appendChild(listing('AvgCPSHist'));
+ frag.appendChild(listing('AvgClicksHist'));
+ frag.appendChild(listing('ToolWarnBon'));
+ }
- frag.appendChild(header('Notification'));
- frag.appendChild(listing('GCFlash'));
- frag.appendChild(listing('GCSound'));
- frag.appendChild(vol('GCVolume'));
- frag.appendChild(url('GCSoundURL'));
- frag.appendChild(listing('GCTimer'));
- frag.appendChild(listing('Favicon'));
- frag.appendChild(listing('FortuneFlash'));
- frag.appendChild(listing('FortuneSound'));
- frag.appendChild(vol('FortuneVolume'));
- frag.appendChild(url('FortuneSoundURL'));
- frag.appendChild(listing('SeaFlash'));
- frag.appendChild(listing('SeaSound'));
- frag.appendChild(vol('SeaVolume'));
- frag.appendChild(url('SeaSoundURL'));
- frag.appendChild(listing('GardFlash'));
- frag.appendChild(listing('GardSound'));
- frag.appendChild(vol('GardVolume'));
- frag.appendChild(url('GardSoundURL'));
- frag.appendChild(listing('Title'));
+ frag.appendChild(header('Notification', 'Notification'));
+ if (CM.Config.MenuPref.Notification) {
+ frag.appendChild(listing('GCNotification'));
+ frag.appendChild(listing('GCFlash'));
+ frag.appendChild(listing('GCSound'));
+ frag.appendChild(vol('GCVolume'));
+ frag.appendChild(url('GCSoundURL'));
+ frag.appendChild(listing('GCTimer'));
+ frag.appendChild(listing('Favicon'));
+ frag.appendChild(listing('FortuneNotification'));
+ frag.appendChild(listing('FortuneFlash'));
+ frag.appendChild(listing('FortuneSound'));
+ frag.appendChild(vol('FortuneVolume'));
+ frag.appendChild(url('FortuneSoundURL'));
+ frag.appendChild(listing('SeaNotification'));
+ frag.appendChild(listing('SeaFlash'));
+ frag.appendChild(listing('SeaSound'));
+ frag.appendChild(vol('SeaVolume'));
+ frag.appendChild(url('SeaSoundURL'));
+ frag.appendChild(listing('GardFlash'));
+ frag.appendChild(listing('GardSound'));
+ frag.appendChild(vol('GardVolume'));
+ frag.appendChild(url('GardSoundURL'));
+ frag.appendChild(listing('MagicNotification'));
+ frag.appendChild(listing('MagicFlash'));
+ frag.appendChild(listing('MagicSound'));
+ frag.appendChild(vol('MagicVolume'));
+ frag.appendChild(url('MagicSoundURL'));
+ frag.appendChild(listing('WrinklerNotification'));
+ frag.appendChild(listing('WrinklerFlash'));
+ frag.appendChild(listing('WrinklerSound'));
+ frag.appendChild(vol('WrinklerVolume'));
+ frag.appendChild(url('WrinklerSoundURL'));
+ frag.appendChild(listing('WrinklerMaxNotification'));
+ frag.appendChild(listing('WrinklerMaxFlash'));
+ frag.appendChild(listing('WrinklerMaxSound'));
+ frag.appendChild(vol('WrinklerMaxVolume'));
+ frag.appendChild(url('WrinklerMaxSoundURL'));
+ frag.appendChild(listing('Title'));
+ }
- frag.appendChild(header('Tooltip'));
- frag.appendChild(listing('TooltipBuildUp'));
- frag.appendChild(listing('TooltipAmor'));
- frag.appendChild(listing('ToolWarnCaut'));
- frag.appendChild(listing('ToolWarnCautPos'));
- frag.appendChild(listing('TooltipGrim'));
- frag.appendChild(listing('ToolWrink'));
- frag.appendChild(listing('TooltipLump'));
+ frag.appendChild(header('Tooltip', 'Tooltip'));
+ if (CM.Config.MenuPref.Tooltip) {
+ frag.appendChild(listing('TooltipBuildUp'));
+ frag.appendChild(listing('TooltipAmor'));
+ frag.appendChild(listing('ToolWarnLucky'));
+ frag.appendChild(listing('ToolWarnConjure'));
+ frag.appendChild(listing('ToolWarnPos'));
+ frag.appendChild(listing('TooltipGrim'));
+ frag.appendChild(listing('ToolWrink'));
+ frag.appendChild(listing('TooltipLump'));
+ }
- frag.appendChild(header('Statistics'));
- frag.appendChild(listing('Stats'));
- frag.appendChild(listing('UpStats'));
- frag.appendChild(listing('TimeFormat'));
- frag.appendChild(listing('SayTime'));
- frag.appendChild(listing('GrimoireBar'));
+ frag.appendChild(header('Statistics', 'Statistics'));
+ if (CM.Config.MenuPref.Statistics) {
+ frag.appendChild(listing('Stats'));
+ frag.appendChild(listing('MissingUpgrades'));
+ frag.appendChild(listing('UpStats'));
+ frag.appendChild(listing('TimeFormat'));
+ frag.appendChild(listing('SayTime'));
+ frag.appendChild(listing('GrimoireBar'));
+ }
- frag.appendChild(header('Other'));
- frag.appendChild(listing('Scale'));
- var resDef = document.createElement('div');
- resDef.className = 'listing';
- var resDefBut = document.createElement('a');
- resDefBut.className = 'option';
- resDefBut.onclick = function() {CM.RestoreDefault();};
- resDefBut.textContent = 'Restore Default';
- resDef.appendChild(resDefBut);
- frag.appendChild(resDef);
+ frag.appendChild(header('Other', 'Other'));
+ if (CM.Config.MenuPref.Other) {
+ frag.appendChild(listing('Scale'));
+ var resDef = document.createElement('div');
+ resDef.className = 'listing';
+ var resDefBut = document.createElement('a');
+ resDefBut.className = 'option';
+ resDefBut.onclick = function() {CM.RestoreDefault();};
+ resDefBut.textContent = 'Restore Default';
+ resDef.appendChild(resDefBut);
+ frag.appendChild(resDef);
+ }
l('menu').childNodes[2].insertBefore(frag, l('menu').childNodes[2].childNodes[l('menu').childNodes[2].childNodes.length - 1]);
@@ -2007,6 +2409,7 @@ CM.Disp.AddMenuStats = function(title) {
return frag;
}
+ var goldCookTooltip = CM.Sim.auraMult('Dragon\'s Fortune') ? 'GoldCookDragonsFortuneTooltipPlaceholder' : 'GoldCookTooltipPlaceholder';
stats.appendChild(header('Lucky Cookies', 'Lucky'));
if (CM.Config.StatsPref.Lucky) {
@@ -2014,28 +2417,13 @@ CM.Disp.AddMenuStats = function(title) {
var luckyTime = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Lucky) ? CM.Disp.FormatTime((CM.Cache.Lucky - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
var luckyColorFrenzy = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.LuckyFrenzy) ? CM.Disp.colorRed : CM.Disp.colorGreen;
var luckyTimeFrenzy = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.LuckyFrenzy) ? CM.Disp.FormatTime((CM.Cache.LuckyFrenzy - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
- var luckyCurBase = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 15) + 13;
+ var luckyCurBase = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * CM.Cache.DragonsFortuneMultAdjustment * 60 * 15) + 13;
var luckyRewardMax = CM.Cache.LuckyReward;
- var luckyRewardMaxWrath = CM.Cache.LuckyReward;
+ var luckyRewardMaxWrath = CM.Cache.LuckyWrathReward;
var luckyRewardFrenzyMax = CM.Cache.LuckyRewardFrenzy;
- var luckyRewardFrenzyMaxWrath = CM.Cache.LuckyRewardFrenzy;
- var luckyCur = luckyCurBase;
- var luckyCurWrath = luckyCurBase;
- // Old way
- if (Game.hasAura('Ancestral Metamorphosis')) {
- luckyRewardMax *= 1.1;
- luckyRewardFrenzyMax *= 1.1;
- luckyCur *= 1.1;
- }
- /*luckyRewardMax *= 1 + Game.auraMult('Ancestral Metamorphosis') * 0.1;
- luckyRewardFrenzyMax *= 1 + Game.auraMult('Ancestral Metamorphosis') * 0.1;
- luckyCur *= 1 + Game.auraMult('Ancestral Metamorphosis') * 0.1;*/
- // Old way
- if (Game.hasAura('Unholy Dominion')) {
- luckyRewardMaxWrath *= 1.1;
- luckyRewardFrenzyMaxWrath *= 1.1;
- luckyCurWrath *= 1.1;
- }
+ var luckyRewardFrenzyMaxWrath = CM.Cache.LuckyWrathRewardFrenzy;
+ var luckyCur = CM.Cache.GoldenCookiesMult * luckyCurBase;
+ var luckyCurWrath = CM.Cache.WrathCookiesMult * luckyCurBase;
var luckySplit = luckyRewardMax != luckyRewardMaxWrath;
var luckyReqFrag = document.createDocumentFragment();
@@ -2049,7 +2437,7 @@ CM.Disp.AddMenuStats = function(title) {
luckyReqSmall.textContent = ' (' + luckyTime + ')';
luckyReqFrag.appendChild(luckyReqSmall);
}
- stats.appendChild(listing(listingQuest('\"Lucky!\" Cookies Required', 'GoldCookTooltipPlaceholder'), luckyReqFrag));
+ stats.appendChild(listing(listingQuest('\"Lucky!\" Cookies Required', goldCookTooltip), luckyReqFrag));
var luckyReqFrenFrag = document.createDocumentFragment();
var luckyReqFrenSpan = document.createElement('span');
luckyReqFrenSpan.style.fontWeight = 'bold';
@@ -2061,10 +2449,10 @@ CM.Disp.AddMenuStats = function(title) {
luckyReqFrenSmall.textContent = ' (' + luckyTimeFrenzy + ')';
luckyReqFrenFrag.appendChild(luckyReqFrenSmall);
}
- stats.appendChild(listing(listingQuest('\"Lucky!\" Cookies Required (Frenzy)', 'GoldCookTooltipPlaceholder'), luckyReqFrenFrag));
- stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (MAX)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'), document.createTextNode(Beautify(luckyRewardMax) + (luckySplit ? (' / ' + Beautify(luckyRewardMaxWrath)) : ''))));
- stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (MAX) (Frenzy)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'), document.createTextNode(Beautify(luckyRewardFrenzyMax) + (luckySplit ? (' / ' + Beautify(luckyRewardFrenzyMaxWrath)) : ''))));
- stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (CUR)' + (luckySplit ? ' (Golden / Wrath)' : ''), 'GoldCookTooltipPlaceholder'), document.createTextNode(Beautify(luckyCur) + (luckySplit ? (' / ' + Beautify(luckyCurWrath)) : ''))));
+ stats.appendChild(listing(listingQuest('\"Lucky!\" Cookies Required (Frenzy)', goldCookTooltip), luckyReqFrenFrag));
+ stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (MAX)' + (luckySplit ? ' (Golden / Wrath)' : ''), goldCookTooltip), document.createTextNode(Beautify(luckyRewardMax) + (luckySplit ? (' / ' + Beautify(luckyRewardMaxWrath)) : ''))));
+ stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (MAX) (Frenzy)' + (luckySplit ? ' (Golden / Wrath)' : ''), goldCookTooltip), document.createTextNode(Beautify(luckyRewardFrenzyMax) + (luckySplit ? (' / ' + Beautify(luckyRewardFrenzyMaxWrath)) : ''))));
+ stats.appendChild(listing(listingQuest('\"Lucky!\" Reward (CUR)' + (luckySplit ? ' (Golden / Wrath)' : ''), goldCookTooltip), document.createTextNode(Beautify(luckyCur) + (luckySplit ? (' / ' + Beautify(luckyCurWrath)) : ''))));
}
stats.appendChild(header('Chain Cookies', 'Chain'));
@@ -2082,19 +2470,9 @@ CM.Disp.AddMenuStats = function(title) {
var chainWrathRewardMax = CM.Cache.ChainWrathReward;
var chainFrenzyRewardMax = CM.Cache.ChainFrenzyReward;
var chainFrenzyWrathRewardMax = CM.Cache.ChainFrenzyWrathReward;
- var chainCurMax = Math.min(CM.Cache.NoGoldSwitchCookiesPS * 60 * 60 * 6, (Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.5);
- var chainCur = CM.Cache.MaxChainMoni(7, chainCurMax);
- var chainCurWrath = CM.Cache.MaxChainMoni(6, chainCurMax);
- if (Game.hasAura('Ancestral Metamorphosis')) {
- chainRewardMax *= 1.1;
- chainFrenzyRewardMax *= 1.1;
- chainCur *= 1.1;
- }
- if (Game.hasAura('Unholy Dominion')) {
- chainWrathRewardMax *= 1.1;
- chainFrenzyWrathRewardMax *= 1.1;
- chainCurWrath *= 1.1;
- }
+ var chainCurMax = Math.min(CM.Cache.NoGoldSwitchCookiesPS * CM.Cache.DragonsFortuneMultAdjustment * 60 * 60 * 6, (Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.5);
+ var chainCur = CM.Cache.MaxChainMoni(7, chainCurMax, CM.Cache.GoldenCookiesMult);
+ var chainCurWrath = CM.Cache.MaxChainMoni(6, chainCurMax, CM.Cache.WrathCookiesMult);
var chainReqFrag = document.createDocumentFragment();
var chainReqSpan = document.createElement('span');
@@ -2107,7 +2485,7 @@ CM.Disp.AddMenuStats = function(title) {
chainReqSmall.textContent = ' (' + chainTime + ')';
chainReqFrag.appendChild(chainReqSmall);
}
- stats.appendChild(listing(listingQuest('\"Chain\" Cookies Required', 'GoldCookTooltipPlaceholder'), chainReqFrag));
+ stats.appendChild(listing(listingQuest('\"Chain\" Cookies Required', goldCookTooltip), chainReqFrag));
var chainWrathReqFrag = document.createDocumentFragment();
var chainWrathReqSpan = document.createElement('span');
chainWrathReqSpan.style.fontWeight = 'bold';
@@ -2119,7 +2497,7 @@ CM.Disp.AddMenuStats = function(title) {
chainWrathReqSmall.textContent = ' (' + chainWrathTime + ')';
chainWrathReqFrag.appendChild(chainWrathReqSmall);
}
- stats.appendChild(listing(listingQuest('\"Chain\" Cookies Required (Wrath)', 'GoldCookTooltipPlaceholder'), chainWrathReqFrag));
+ stats.appendChild(listing(listingQuest('\"Chain\" Cookies Required (Wrath)', goldCookTooltip), chainWrathReqFrag));
var chainReqFrenFrag = document.createDocumentFragment();
var chainReqFrenSpan = document.createElement('span');
chainReqFrenSpan.style.fontWeight = 'bold';
@@ -2131,7 +2509,7 @@ CM.Disp.AddMenuStats = function(title) {
chainReqFrenSmall.textContent = ' (' + chainTimeFrenzy + ')';
chainReqFrenFrag.appendChild(chainReqFrenSmall);
}
- stats.appendChild(listing(listingQuest('\"Chain\" Cookies Required (Frenzy)', 'GoldCookTooltipPlaceholder'), chainReqFrenFrag));
+ stats.appendChild(listing(listingQuest('\"Chain\" Cookies Required (Frenzy)', goldCookTooltip), chainReqFrenFrag));
var chainWrathReqFrenFrag = document.createDocumentFragment();
var chainWrathReqFrenFrag = document.createDocumentFragment();
var chainWrathReqFrenSpan = document.createElement('span');
@@ -2144,12 +2522,35 @@ CM.Disp.AddMenuStats = function(title) {
chainWrathReqFrenSmall.textContent = ' (' + chainWrathTimeFrenzy + ')';
chainWrathReqFrenFrag.appendChild(chainWrathReqFrenSmall);
}
- stats.appendChild(listing(listingQuest('\"Chain\" Cookies Required (Frenzy) (Wrath)', 'GoldCookTooltipPlaceholder'), chainWrathReqFrenFrag));
- stats.appendChild(listing(listingQuest('\"Chain\" Reward (MAX) (Golden / Wrath)', 'GoldCookTooltipPlaceholder'), document.createTextNode(Beautify(chainRewardMax) + ' / ' + Beautify(chainWrathRewardMax))));
- stats.appendChild(listing(listingQuest('\"Chain\" Reward (MAX) (Frenzy) (Golden / Wrath)', 'GoldCookTooltipPlaceholder'), document.createTextNode(Beautify(chainFrenzyRewardMax) + ' / ' + Beautify(chainFrenzyWrathRewardMax))));
- stats.appendChild(listing(listingQuest('\"Chain\" Reward (CUR) (Golden / Wrath)', 'GoldCookTooltipPlaceholder'), document.createTextNode(Beautify(chainCur) + ' / ' + Beautify(chainCurWrath))));
+ stats.appendChild(listing(listingQuest('\"Chain\" Cookies Required (Frenzy) (Wrath)', goldCookTooltip), chainWrathReqFrenFrag));
+ stats.appendChild(listing(listingQuest('\"Chain\" Reward (MAX) (Golden / Wrath)', goldCookTooltip), document.createTextNode(Beautify(chainRewardMax) + ' / ' + Beautify(chainWrathRewardMax))));
+ stats.appendChild(listing(listingQuest('\"Chain\" Reward (MAX) (Frenzy) (Golden / Wrath)', goldCookTooltip), document.createTextNode(Beautify(chainFrenzyRewardMax) + ' / ' + Beautify(chainFrenzyWrathRewardMax))));
+ stats.appendChild(listing(listingQuest('\"Chain\" Reward (CUR) (Golden / Wrath)', goldCookTooltip), document.createTextNode(Beautify(chainCur) + ' / ' + Beautify(chainCurWrath))));
}
+ stats.appendChild(header('Conjure Baked Goods', 'Conjure'));
+ if (CM.Config.StatsPref.Conjure) {
+ var conjureColor = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Conjure) ? CM.Disp.colorRed : CM.Disp.colorGreen;
+ var conjureCur = Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 30);
+ var conjureTime = ((Game.cookies + CM.Disp.GetWrinkConfigBank()) < CM.Cache.Conjure) ? CM.Disp.FormatTime((CM.Cache.Conjure - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()) : '';
+ var conjureRewardMax = CM.Cache.ConjureReward;
+
+ var conjureReqFrag = document.createDocumentFragment();
+ var conjureReqSpan = document.createElement('span');
+ conjureReqSpan.style.fontWeight = 'bold';
+ conjureReqSpan.className = CM.Disp.colorTextPre + conjureColor;
+ conjureReqSpan.textContent = Beautify(CM.Cache.Conjure);
+ conjureReqFrag.appendChild(conjureReqSpan);
+ if (conjureTime != '') {
+ var conjureReqSmall = document.createElement('small');
+ conjureReqSmall.textContent = ' (' + conjureTime + ')';
+ conjureReqFrag.appendChild(conjureReqSmall);
+ }
+ stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Cookies Required', 'GoldCookTooltipPlaceholder'), conjureReqFrag));
+ stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (MAX)', 'GoldCookTooltipPlaceholder'), document.createTextNode(Beautify(conjureRewardMax))));
+ stats.appendChild(listing(listingQuest('\"Conjure Baked Goods\" Reward (CUR)', 'GoldCookTooltipPlaceholder'), document.createTextNode(Beautify(conjureCur))));
+ }
+
var choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')); // Needs to be done for the checking below
stats.appendChild(header('Prestige', 'Prestige'));
@@ -2320,11 +2721,92 @@ CM.Disp.AddMenuStats = function(title) {
if (fortunes.length != 0) stats.appendChild(listing('Fortune Upgrades Left to Buy', createMissDisp(fortunes)));
}
stats.appendChild(listing('Missed Golden Cookies', document.createTextNode(Beautify(Game.missedGoldenClicks))));
+ if (Game.prefs.autosave) {
+ var timeTillAutosave = Math.min((Game.fps*60 - (Game.T%(Game.fps*60))) / Game.fps, !Game.OnAscend * 60)
+ stats.appendChild(listing('Seconds till autosave', document.createTextNode(Math.floor(timeTillAutosave))));
+ }
}
l('menu').insertBefore(stats, l('menu').childNodes[2]);
}
+CM.Disp.AddMissingUpgrades = function() {
+ if (CM.Cache.UpgradesOwned != Game.UpgradesOwned) {
+ CM.Cache.CalcMissingUpgrades();
+ CM.Cache.MissingUpgradesString = null;
+ CM.Cache.MissingCookiesString = null;
+ }
+
+ // Sort the lists of missing cookies & upgrades
+ var sortMap = function(a,b) {
+ if (a.order > b.order) return 1;
+ else if (a.order < b.order) return -1;
+ else return 0;
+ }
+ CM.Cache.MissingUpgrades.sort(sortMap);
+ CM.Cache.MissingCookies.sort(sortMap);;
+
+ // Find Upgrades-section of stats menu
+ var upgradesMenu = null;
+ for (var i = 0; i < l("menu").getElementsByClassName("subsection").length && upgradesMenu == null; i++)
+ {
+ if (l("menu").getElementsByClassName("subsection")[i].getElementsByClassName("title")[0].textContent === "Upgrades")
+ {
+ upgradesMenu = l("menu").getElementsByClassName("subsection")[i];
+ }
+ }
+
+ // This function creates div element from given object. It also adds tooltip for it.
+ var createUpgradeElement = function (me) {
+ return '' +
+ '
' +
+ '
' + Beautify(Math.round(me.getPrice())) + '
' +
+ '
' + me.name + '
' +
+ '
' + me.desc + '
'+Game.dragonAuras[aura].name+'
'+\
+ '
'+\
+ Game.dragonAuras[aura].desc+\
+ '
'+\
+ CM.\
+ '
' +
+ '
' +
+ '
' + Beautify(Math.round(me.getPrice())) + '
' +
+ '
' + me.name + '
' +
+ '
' + me.desc + '
'+Game.dragonAuras[aura].name+'
'+\
+ '
'+\
+ Game.dragonAuras[aura].desc+\
+ '
'+\
+ CM.\
+ '