Compare commits
28 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
902c866f18 | ||
|
|
f6164a9b85 | ||
|
|
07253531ef | ||
|
|
5689ffb36e | ||
|
|
3ec7b67c24 | ||
|
|
23abe72564 | ||
|
|
5266d8e4dc | ||
|
|
ebd0e929e2 | ||
|
|
fcd4d9e0fc | ||
|
|
41cd7688ea | ||
|
|
00e0b179a3 | ||
|
|
2600ec040b | ||
|
|
3190d18d23 | ||
|
|
38b3c503fc | ||
|
|
71388411b5 | ||
|
|
67eac9fde2 | ||
|
|
bd0cd9900d | ||
|
|
4ad6cc9fe0 | ||
|
|
e59b69e3f2 | ||
|
|
78df5491a0 | ||
|
|
de0d148dd0 | ||
|
|
f9b4dd4ada | ||
|
|
0f8b5b7da7 | ||
|
|
7295e0ea76 | ||
|
|
010e065dd7 | ||
|
|
816c566442 | ||
|
|
f32b1d5685 | ||
|
|
9df807a4ae |
@@ -1,2 +1,2 @@
|
||||
#!/bin/sh
|
||||
cat src/*.js > CookieMonster.js
|
||||
cat ./src/Header.js ./src/Cache.js ./src/Config.js ./src/Data.js ./src/Disp.js ./src/Main.js ./src/Sim.js ./src/Footer.js > CookieMonster.js
|
||||
|
||||
321
CookieMonster.js
321
CookieMonster.js
@@ -25,7 +25,7 @@ CM.Sim = {};
|
||||
CM.Cache.AddQueue = function() {
|
||||
CM.Cache.Queue = document.createElement('script');
|
||||
CM.Cache.Queue.type = 'text/javascript';
|
||||
CM.Cache.Queue.setAttribute('src', 'http://aktanusa.github.io/CookieMonster/queue/queue.js');
|
||||
CM.Cache.Queue.setAttribute('src', 'https://aktanusa.github.io/CookieMonster/queue/queue.js');
|
||||
document.head.appendChild(CM.Cache.Queue);
|
||||
}
|
||||
|
||||
@@ -185,13 +185,13 @@ CM.Cache.RemakeChain = function() {
|
||||
CM.Cache.Chain = 0;
|
||||
}
|
||||
else {
|
||||
CM.Cache.Chain = CM.Cache.NextNumber(CM.Cache.ChainReward) / 0.25;
|
||||
CM.Cache.Chain = CM.Cache.NextNumber(CM.Cache.ChainReward) / 0.5;
|
||||
}
|
||||
if (maxPayout < CM.Cache.ChainWrathReward) {
|
||||
CM.Cache.ChainWrath = 0;
|
||||
}
|
||||
else {
|
||||
CM.Cache.ChainWrath = CM.Cache.NextNumber(CM.Cache.ChainWrathReward) / 0.25;
|
||||
CM.Cache.ChainWrath = CM.Cache.NextNumber(CM.Cache.ChainWrathReward) / 0.5;
|
||||
}
|
||||
|
||||
CM.Cache.ChainFrenzyReward = CM.Cache.MaxChainMoni(7, maxPayout * 7);
|
||||
@@ -202,13 +202,13 @@ CM.Cache.RemakeChain = function() {
|
||||
CM.Cache.ChainFrenzy = 0;
|
||||
}
|
||||
else {
|
||||
CM.Cache.ChainFrenzy = CM.Cache.NextNumber(CM.Cache.ChainFrenzyReward) / 0.25;
|
||||
CM.Cache.ChainFrenzy = CM.Cache.NextNumber(CM.Cache.ChainFrenzyReward) / 0.5;
|
||||
}
|
||||
if ((maxPayout * 7) < CM.Cache.ChainFrenzyWrathReward) {
|
||||
CM.Cache.ChainFrenzyWrath = 0;
|
||||
}
|
||||
else {
|
||||
CM.Cache.ChainFrenzyWrath = CM.Cache.NextNumber(CM.Cache.ChainFrenzyWrathReward) / 0.25;
|
||||
CM.Cache.ChainFrenzyWrath = CM.Cache.NextNumber(CM.Cache.ChainFrenzyWrathReward) / 0.5;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -529,7 +529,7 @@ CM.ConfigData.SeaSoundURL = {label: 'Season Special Sound URL:', desc: 'URL of t
|
||||
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.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.Favicon = {label: ['Favicon OFF', 'Favicon ON'], desc: 'Update favicon with Golden/Wrath Cookie', toggle: true, func: function() {CM.Disp.UpdateFavicon();}};
|
||||
CM.ConfigData.Tooltip = {label: ['Tooltip Information OFF', 'Tooltip Information ON'], desc: 'Extra information in tooltip for buildings/upgrades', toggle: true};
|
||||
CM.ConfigData.Tooltip = {label: ['Tooltip Information OFF', 'Tooltip Information ON'], desc: 'Extra information in tooltip for buildings/upgrades/grimoire', toggle: true};
|
||||
CM.ConfigData.TooltipAmor = {label: ['Tooltip Amortization Information OFF', '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();}};
|
||||
@@ -703,7 +703,7 @@ CM.Disp.GetConfigDisplay = function(config) {
|
||||
CM.Disp.AddJscolor = function() {
|
||||
CM.Disp.Jscolor = document.createElement('script');
|
||||
CM.Disp.Jscolor.type = 'text/javascript';
|
||||
CM.Disp.Jscolor.setAttribute('src', 'http://aktanusa.github.io/CookieMonster/jscolor/jscolor.js');
|
||||
CM.Disp.Jscolor.setAttribute('src', 'https://aktanusa.github.io/CookieMonster/jscolor/jscolor.js');
|
||||
document.head.appendChild(CM.Disp.Jscolor);
|
||||
}
|
||||
|
||||
@@ -734,6 +734,9 @@ CM.Disp.CreateBotBar = function() {
|
||||
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);
|
||||
|
||||
@@ -1301,10 +1304,10 @@ CM.Disp.CreateFavicon = function() {
|
||||
CM.Disp.UpdateFavicon = function() {
|
||||
if (CM.Config.Favicon == 1 && CM.Disp.lastGoldenCookieState) {
|
||||
if (CM.Disp.goldenShimmer.wrath) {
|
||||
CM.Disp.Favicon.href = 'http://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
|
||||
CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
|
||||
}
|
||||
else {
|
||||
CM.Disp.Favicon.href = 'http://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
|
||||
CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -1453,7 +1456,7 @@ CM.Disp.UpdateTitle = function() {
|
||||
|
||||
CM.Disp.CollectWrinklers = function() {
|
||||
for (var i in Game.wrinklers) {
|
||||
if (Game.wrinklers[i].sucked > 0) {
|
||||
if (Game.wrinklers[i].sucked > 0 && Game.wrinklers[i].type == 0) {
|
||||
Game.wrinklers[i].hp = 0;
|
||||
}
|
||||
}
|
||||
@@ -1757,7 +1760,7 @@ 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.25);
|
||||
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')) {
|
||||
@@ -1858,7 +1861,7 @@ CM.Disp.AddMenuStats = function(title) {
|
||||
var popAllFrag = document.createDocumentFragment();
|
||||
popAllFrag.appendChild(document.createTextNode(Beautify(CM.Cache.WrinkBank) + ' '));
|
||||
var popAllA = document.createElement('a');
|
||||
popAllA.textContent = 'Pop All';
|
||||
popAllA.textContent = 'Pop All Normal';
|
||||
popAllA.className = 'option';
|
||||
popAllA.onclick = function() { CM.Disp.CollectWrinklers(); };
|
||||
popAllFrag.appendChild(popAllA);
|
||||
@@ -2047,7 +2050,7 @@ CM.Disp.CreateTooltipWarnCaut = function() {
|
||||
l('tooltipAnchor').appendChild(CM.Disp.TooltipWarnCaut);
|
||||
}
|
||||
|
||||
CM.Disp.ToggleToolWarnCaut = function() {
|
||||
CM.Disp.ToggleToolWarnCaut = function() { // Pointless?
|
||||
if (CM.Config.ToolWarnCaut == 1) {
|
||||
CM.Disp.TooltipWarnCaut.style.display = 'block';
|
||||
}
|
||||
@@ -2202,86 +2205,93 @@ CM.Disp.Tooltip = function(type, name) {
|
||||
}
|
||||
|
||||
CM.Disp.UpdateTooltip = function() {
|
||||
if (l('tooltipAnchor').style.display != 'none' && l('CMTooltipArea') != null) {
|
||||
if (l('tooltipAnchor').style.display != 'none') {
|
||||
|
||||
if (CM.Disp.tooltipType == 'b' || CM.Disp.tooltipType == 'u') {
|
||||
// Error checking
|
||||
if (CM.Disp.tooltipType == 'u' && (typeof Game.UpgradesInStore[CM.Disp.tooltipName] === 'undefined' || typeof CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name] === 'undefined')) {
|
||||
return;
|
||||
}
|
||||
var price;
|
||||
var bonus;
|
||||
if (CM.Disp.tooltipType == 'b') {
|
||||
var target = '';
|
||||
if (Game.buyMode == 1 && Game.buyBulk == 10) {
|
||||
target = 'Objects10';
|
||||
price = CM.Cache[target][CM.Disp.tooltipName].price;
|
||||
if (l('CMTooltipArea') != null) {
|
||||
if (CM.Disp.tooltipType == 'b' || CM.Disp.tooltipType == 'u') {
|
||||
// Error checking
|
||||
if (CM.Disp.tooltipType == 'u' && (typeof Game.UpgradesInStore[CM.Disp.tooltipName] === 'undefined' || typeof CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name] === 'undefined')) {
|
||||
return;
|
||||
}
|
||||
else if (Game.buyMode == 1 && Game.buyBulk == 100) {
|
||||
target = 'Objects100';
|
||||
price = CM.Cache[target][CM.Disp.tooltipName].price;
|
||||
}
|
||||
else {
|
||||
target = 'Objects';
|
||||
price = Game.Objects[CM.Disp.tooltipName].getPrice();
|
||||
}
|
||||
bonus = CM.Cache[target][CM.Disp.tooltipName].bonus;
|
||||
if (CM.Config.Tooltip == 1 && Game.buyMode == 1) {
|
||||
l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color;
|
||||
l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2);
|
||||
l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color;
|
||||
}
|
||||
}
|
||||
else { // Upgrades
|
||||
bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus;
|
||||
price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice();
|
||||
if (CM.Config.Tooltip == 1) {
|
||||
l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color;
|
||||
l('CMTooltipPP').textContent = Beautify(CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].pp, 2);
|
||||
l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color;
|
||||
}
|
||||
}
|
||||
if (CM.Config.Tooltip == 1 && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
|
||||
l('CMTooltipIncome').textContent = Beautify(bonus, 2);
|
||||
|
||||
var increase = Math.round(bonus / Game.cookiesPs * 10000);
|
||||
if (isFinite(increase) && increase != 0) {
|
||||
l('CMTooltipIncome').textContent += ' (' + (increase / 100) + '% of income)';
|
||||
}
|
||||
|
||||
var timeColor = CM.Disp.GetTimeColor(price, (Game.cookies + CM.Disp.GetWrinkConfigBank()), CM.Disp.GetCPS());
|
||||
l('CMTooltipTime').textContent = timeColor.text;
|
||||
l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color;
|
||||
}
|
||||
|
||||
if (CM.Config.ToolWarnCaut == 1) {
|
||||
var warn = CM.Cache.Lucky;
|
||||
if (CM.Config.ToolWarnCautBon == 1) {
|
||||
var bonusNoFren = bonus;
|
||||
bonusNoFren /= CM.Sim.getCPSBuffMult();
|
||||
warn += ((bonusNoFren * 60 * 15) / 0.15);
|
||||
}
|
||||
var caut = warn * 7;
|
||||
var amount = (Game.cookies + CM.Disp.GetWrinkConfigBank()) - price;
|
||||
if ((amount < warn || amount < caut) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
|
||||
if (CM.Config.ToolWarnCautPos == 0) {
|
||||
CM.Disp.TooltipWarnCaut.style.right = '0px';
|
||||
var price;
|
||||
var bonus;
|
||||
if (CM.Disp.tooltipType == 'b') {
|
||||
var target = '';
|
||||
if (Game.buyMode == 1 && Game.buyBulk == 10) {
|
||||
target = 'Objects10';
|
||||
price = CM.Cache[target][CM.Disp.tooltipName].price;
|
||||
}
|
||||
else if (Game.buyMode == 1 && Game.buyBulk == 100) {
|
||||
target = 'Objects100';
|
||||
price = CM.Cache[target][CM.Disp.tooltipName].price;
|
||||
}
|
||||
else {
|
||||
CM.Disp.TooltipWarnCaut.style.top = (l('tooltip').offsetHeight) + 'px';
|
||||
target = 'Objects';
|
||||
price = Game.Objects[CM.Disp.tooltipName].getPrice();
|
||||
}
|
||||
CM.Disp.TooltipWarnCaut.style.width = (l('tooltip').offsetWidth - 6) + 'px';
|
||||
bonus = CM.Cache[target][CM.Disp.tooltipName].bonus;
|
||||
if (CM.Config.Tooltip == 1 && Game.buyMode == 1) {
|
||||
l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color;
|
||||
l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2);
|
||||
l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color;
|
||||
}
|
||||
}
|
||||
else { // Upgrades
|
||||
bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus;
|
||||
price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice();
|
||||
if (CM.Config.Tooltip == 1) {
|
||||
l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color;
|
||||
l('CMTooltipPP').textContent = Beautify(CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].pp, 2);
|
||||
l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color;
|
||||
}
|
||||
}
|
||||
if (CM.Config.Tooltip == 1 && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
|
||||
l('CMTooltipIncome').textContent = Beautify(bonus, 2);
|
||||
|
||||
if (amount < warn) {
|
||||
l('CMDispTooltipWarn').style.display = '';
|
||||
l('CMDispTooltipWarnText').textContent = Beautify(warn - amount) + ' (' + CM.Disp.FormatTime((warn - amount) / CM.Disp.GetCPS()) + ')';
|
||||
l('CMDispTooltipCaut').style.display = '';
|
||||
l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
|
||||
var increase = Math.round(bonus / Game.cookiesPs * 10000);
|
||||
if (isFinite(increase) && increase != 0) {
|
||||
l('CMTooltipIncome').textContent += ' (' + (increase / 100) + '% of income)';
|
||||
}
|
||||
else if (amount < caut) {
|
||||
l('CMDispTooltipCaut').style.display = '';
|
||||
l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
|
||||
var timeColor = CM.Disp.GetTimeColor(price, (Game.cookies + CM.Disp.GetWrinkConfigBank()), CM.Disp.GetCPS());
|
||||
l('CMTooltipTime').textContent = timeColor.text;
|
||||
l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color;
|
||||
}
|
||||
|
||||
if (CM.Config.ToolWarnCaut == 1) {
|
||||
CM.Disp.TooltipWarnCaut.style.display = 'block';
|
||||
var warn = CM.Cache.Lucky;
|
||||
if (CM.Config.ToolWarnCautBon == 1) {
|
||||
var bonusNoFren = bonus;
|
||||
bonusNoFren /= CM.Sim.getCPSBuffMult();
|
||||
warn += ((bonusNoFren * 60 * 15) / 0.15);
|
||||
}
|
||||
var caut = warn * 7;
|
||||
var amount = (Game.cookies + CM.Disp.GetWrinkConfigBank()) - price;
|
||||
if ((amount < warn || amount < caut) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
|
||||
if (CM.Config.ToolWarnCautPos == 0) {
|
||||
CM.Disp.TooltipWarnCaut.style.right = '0px';
|
||||
}
|
||||
else {
|
||||
CM.Disp.TooltipWarnCaut.style.top = (l('tooltip').offsetHeight) + 'px';
|
||||
}
|
||||
CM.Disp.TooltipWarnCaut.style.width = (l('tooltip').offsetWidth - 6) + 'px';
|
||||
|
||||
if (amount < warn) {
|
||||
l('CMDispTooltipWarn').style.display = '';
|
||||
l('CMDispTooltipWarnText').textContent = Beautify(warn - amount) + ' (' + CM.Disp.FormatTime((warn - amount) / CM.Disp.GetCPS()) + ')';
|
||||
l('CMDispTooltipCaut').style.display = '';
|
||||
l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
|
||||
}
|
||||
else if (amount < caut) {
|
||||
l('CMDispTooltipCaut').style.display = '';
|
||||
l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
}
|
||||
else {
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
l('CMDispTooltipCaut').style.display = 'none';
|
||||
}
|
||||
}
|
||||
else {
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
@@ -2289,57 +2299,60 @@ CM.Disp.UpdateTooltip = function() {
|
||||
}
|
||||
}
|
||||
else {
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
l('CMDispTooltipCaut').style.display = 'none';
|
||||
CM.Disp.TooltipWarnCaut.style.display = 'none';
|
||||
}
|
||||
}
|
||||
else { // Grimoire
|
||||
CM.Disp.TooltipWarnCaut.style.display = 'none';
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
l('CMDispTooltipCaut').style.display = 'none';
|
||||
|
||||
var minigame = Game.Objects['Wizard tower'].minigame;
|
||||
var spellCost = minigame.getSpellCost(minigame.spellsById[CM.Disp.tooltipName]);
|
||||
|
||||
if (CM.Config.Tooltip == 1 && spellCost <= minigame.magicM) {
|
||||
l('CMTooltipArea').innerHTML = '';
|
||||
|
||||
l('tooltip').firstChild.style.paddingBottom = '4px';
|
||||
var tooltip = document.createElement('div');
|
||||
tooltip.style.border = '1px solid';
|
||||
tooltip.style.padding = '4px';
|
||||
tooltip.style.margin = '0px -4px';
|
||||
tooltip.id = 'CMTooltipBorder';
|
||||
tooltip.className = CM.Disp.colorTextPre + CM.Disp.colorGray;
|
||||
|
||||
var header = function(text) {
|
||||
var div = document.createElement('div');
|
||||
div.style.fontWeight = 'bold';
|
||||
div.className = CM.Disp.colorTextPre + CM.Disp.colorBlue;
|
||||
div.textContent = text;
|
||||
return div;
|
||||
}
|
||||
|
||||
tooltip.appendChild(header('Time Left'));
|
||||
var time = document.createElement('div');
|
||||
time.id = 'CMTooltipTime';
|
||||
tooltip.appendChild(time);
|
||||
var timeColor = CM.Disp.GetTimeColor(spellCost, minigame.magic, undefined, CM.Disp.CalculateGrimoireRefillTime(minigame.magic, minigame.magicM, spellCost));
|
||||
time.textContent = timeColor.text;
|
||||
time.className = CM.Disp.colorTextPre + timeColor.color;
|
||||
|
||||
if (spellCost <= minigame.magic) {
|
||||
tooltip.appendChild(header('Recover Time'));
|
||||
var recover = document.createElement('div');
|
||||
recover.id = 'CMTooltipRecover';
|
||||
tooltip.appendChild(recover);
|
||||
var recoverColor = CM.Disp.GetTimeColor(minigame.magic, Math.max(0, minigame.magic - spellCost), undefined, CM.Disp.CalculateGrimoireRefillTime(Math.max(0, minigame.magic - spellCost), minigame.magicM, minigame.magic));
|
||||
recover.textContent = recoverColor.text;
|
||||
recover.className = CM.Disp.colorTextPre + recoverColor.color;
|
||||
}
|
||||
|
||||
l('CMTooltipArea').appendChild(tooltip);
|
||||
}
|
||||
}
|
||||
}
|
||||
else { // Grimoire
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
l('CMDispTooltipCaut').style.display = 'none';
|
||||
|
||||
var minigame = Game.Objects['Wizard tower'].minigame;
|
||||
var spellCost = minigame.getSpellCost(minigame.spellsById[CM.Disp.tooltipName]);
|
||||
|
||||
if (CM.Config.Tooltip == 1 && spellCost <= minigame.magicM) {
|
||||
l('CMTooltipArea').innerHTML = '';
|
||||
|
||||
l('tooltip').firstChild.style.paddingBottom = '4px';
|
||||
var tooltip = document.createElement('div');
|
||||
tooltip.style.border = '1px solid';
|
||||
tooltip.style.padding = '4px';
|
||||
tooltip.style.margin = '0px -4px';
|
||||
tooltip.id = 'CMTooltipBorder';
|
||||
tooltip.className = CM.Disp.colorTextPre + CM.Disp.colorGray;
|
||||
|
||||
var header = function(text) {
|
||||
var div = document.createElement('div');
|
||||
div.style.fontWeight = 'bold';
|
||||
div.className = CM.Disp.colorTextPre + CM.Disp.colorBlue;
|
||||
div.textContent = text;
|
||||
return div;
|
||||
}
|
||||
|
||||
tooltip.appendChild(header('Time Left'));
|
||||
var time = document.createElement('div');
|
||||
time.id = 'CMTooltipTime';
|
||||
tooltip.appendChild(time);
|
||||
var timeColor = CM.Disp.GetTimeColor(spellCost, minigame.magic, undefined, CM.Disp.CalculateGrimoireRefillTime(minigame.magic, minigame.magicM, spellCost));
|
||||
time.textContent = timeColor.text;
|
||||
time.className = CM.Disp.colorTextPre + timeColor.color;
|
||||
|
||||
if (spellCost <= minigame.magic) {
|
||||
tooltip.appendChild(header('Recover Time'));
|
||||
var recover = document.createElement('div');
|
||||
recover.id = 'CMTooltipRecover';
|
||||
tooltip.appendChild(recover);
|
||||
var recoverColor = CM.Disp.GetTimeColor(minigame.magic, Math.max(0, minigame.magic - spellCost), undefined, CM.Disp.CalculateGrimoireRefillTime(Math.max(0, minigame.magic - spellCost), minigame.magicM, minigame.magic));
|
||||
recover.textContent = recoverColor.text;
|
||||
recover.className = CM.Disp.colorTextPre + recoverColor.color;
|
||||
}
|
||||
|
||||
l('CMTooltipArea').appendChild(tooltip);
|
||||
}
|
||||
else {
|
||||
CM.Disp.TooltipWarnCaut.style.display = 'none';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2718,11 +2731,11 @@ CM.DelayInit = function() {
|
||||
CM.Disp.CreateFavicon();
|
||||
CM.Disp.CreateGCTimer();
|
||||
CM.Disp.CreateTooltip('GoldCookTooltipPlaceholder', 'Calculated with Golden Switch off', '200px');
|
||||
CM.Disp.CreateTooltip('PrestMaxTooltipPlaceholder', 'The MAX prestige is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '370px');
|
||||
CM.Disp.CreateTooltip('PrestMaxTooltipPlaceholder', 'The MAX prestige is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamond slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '370px');
|
||||
CM.Disp.CreateTooltip('NextPrestTooltipPlaceholder', 'Calculated with cookies gained from wrinklers and Chocolate egg', '200px');
|
||||
CM.Disp.CreateTooltip('HeavenChipMaxTooltipPlaceholder', 'The MAX heavenly chips is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '390px');
|
||||
CM.Disp.CreateTooltip('HeavenChipMaxTooltipPlaceholder', 'The MAX heavenly chips is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamond slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '390px');
|
||||
CM.Disp.CreateTooltip('ResetTooltipPlaceholder', 'The bonus income you would get from new prestige levels unlocked at 100% of its potential and from reset achievements if you have the same buildings/upgrades after reset', '370px');
|
||||
CM.Disp.CreateTooltip('ChoEggTooltipPlaceholder', 'The amount of cookies you would get from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and then buying Chocolate egg', '360px');
|
||||
CM.Disp.CreateTooltip('ChoEggTooltipPlaceholder', 'The amount of cookies you would get from popping all wrinklers with Skruuia god in Diamond slot, selling all buildings with Earth Shatterer aura, and then buying Chocolate egg', '360px');
|
||||
CM.Disp.CreateTooltipWarnCaut();
|
||||
CM.Disp.AddTooltipBuild();
|
||||
CM.Disp.AddTooltipGrimoire();
|
||||
@@ -2745,11 +2758,11 @@ CM.DelayInit = function() {
|
||||
CM.HasReplaceNativeGrimoireLaunch = false;
|
||||
CM.HasReplaceNativeGrimoireDraw = false;
|
||||
|
||||
CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 0, AvgClicksHist: 0, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, TimeFormat: 0, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}};
|
||||
CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 0, AvgClicksHist: 0, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'https://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'https://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, TimeFormat: 0, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}};
|
||||
CM.ConfigPrefix = 'CMConfig';
|
||||
|
||||
CM.VersionMajor = '2.0042';
|
||||
CM.VersionMinor = '2';
|
||||
CM.VersionMajor = '2.0106';
|
||||
CM.VersionMinor = '1';
|
||||
|
||||
/*******
|
||||
* Sim *
|
||||
@@ -2787,7 +2800,7 @@ CM.Sim.BuildingSell = function(basePrice, start, free, amount, emuAura) {
|
||||
if (Game.Has('Santa\'s dominion')) price*=0.99;
|
||||
if (Game.Has('Faberge egg')) price*=0.99;
|
||||
if (Game.Has('Divine discount')) price*=0.99;
|
||||
if (Game.hasAura('Fierce Hoarder')) price*=0.98;
|
||||
if (Game.hasAura('Fierce Hoarder')) price *= 0.98;
|
||||
if (Game.hasAura('Earth Shatterer') || emuAura) {
|
||||
price *= 0.85;
|
||||
}
|
||||
@@ -2916,6 +2929,9 @@ CM.Sim.CalculateGains = function() {
|
||||
|
||||
if (Game.ascensionMode != 1) mult += parseFloat(CM.Sim.prestige) * 0.01 * CM.Sim.heavenlyPower * CM.Sim.GetHeavenlyMultiplier();
|
||||
|
||||
// TODO Store minigame buffs?
|
||||
mult *= Game.eff('cps');
|
||||
|
||||
var cookieMult = 0;
|
||||
for (var i in Game.cookieUpgrades) {
|
||||
var me = Game.cookieUpgrades[i];
|
||||
@@ -2956,7 +2972,7 @@ CM.Sim.CalculateGains = function() {
|
||||
|
||||
var godLvl = Game.hasGod('industry');
|
||||
if (godLvl == 1) buildMult *= 1.1;
|
||||
else if (godLvl == 2) buildMult *= 1.05;
|
||||
else if (godLvl == 2) buildMult *= 1.06;
|
||||
else if (godLvl == 3) buildMult *= 1.03;
|
||||
|
||||
var godLvl = Game.hasGod('labor');
|
||||
@@ -2982,9 +2998,12 @@ CM.Sim.CalculateGains = function() {
|
||||
if (Game.hasGod) {
|
||||
var godLvl = Game.hasGod('mother');
|
||||
if (godLvl == 1) milkMult *= 1.1;
|
||||
else if (godLvl == 2) milkMult *= 1.06;
|
||||
else if (godLvl == 2) milkMult *= 1.05;
|
||||
else if (godLvl == 3) milkMult *= 1.03;
|
||||
}
|
||||
// TODO Store minigame buffs?
|
||||
milkMult *= Game.eff('milk');
|
||||
|
||||
if (CM.Sim.Has('Kitten helpers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult);
|
||||
if (CM.Sim.Has('Kitten workers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.125 * milkMult);
|
||||
if (CM.Sim.Has('Kitten engineers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.15 * milkMult);
|
||||
@@ -2994,7 +3013,8 @@ CM.Sim.CalculateGains = function() {
|
||||
if (CM.Sim.Has('Kitten specialists')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
|
||||
if (CM.Sim.Has('Kitten experts')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
|
||||
if (CM.Sim.Has('Kitten consultants')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
|
||||
if (CM.Sim.Has('Kitten assistants to the regional manager')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
|
||||
if (CM.Sim.Has('Kitten assistants to the regional manager')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.175 * milkMult);
|
||||
if (CM.Sim.Has('Kitten marketeers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.15 * milkMult);
|
||||
if (CM.Sim.Has('Kitten angels')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult);
|
||||
|
||||
var eggMult = 1;
|
||||
@@ -3019,12 +3039,15 @@ CM.Sim.CalculateGains = function() {
|
||||
}
|
||||
mult *= eggMult;
|
||||
|
||||
// TODO Store lumps?
|
||||
if (CM.Sim.Has('Sugar baking')) mult *= (1 + Math.min(100, Game.lumps) * 0.01);
|
||||
|
||||
if (CM.Sim.hasAura('Radiant Appetite')) mult *= 2;
|
||||
|
||||
if (Game.hasAura('Dragon\'s Fortune')) {
|
||||
var n = Game.shimmerTypes['golden'].n;
|
||||
for (var i = 0; i < n; i++) {
|
||||
mult *= 2.11;
|
||||
mult *= 2.23;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3099,6 +3122,9 @@ CM.Sim.CheckOtherAchiev = function() {
|
||||
if (minAmount >= 200) CM.Sim.Win('Bicentennial');
|
||||
if (minAmount >= 250) CM.Sim.Win('Bicentennial and a half');
|
||||
if (minAmount >= 300) CM.Sim.Win('Tricentennial');
|
||||
if (minAmount >= 350) CM.Sim.Win('Tricentennial and a half');
|
||||
if (minAmount >= 400) CM.Sim.Win('Quadricentennial');
|
||||
if (minAmount >= 450) CM.Sim.Win('Quadricentennial and a half');
|
||||
|
||||
if (buildingsOwned >= 100) CM.Sim.Win('Builder');
|
||||
if (buildingsOwned >= 500) CM.Sim.Win('Architect');
|
||||
@@ -3251,6 +3277,11 @@ CM.Sim.ResetBonus = function(possiblePresMax) {
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000) CM.Sim.Win('Obliterate');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000) CM.Sim.Win('Negative void');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000000) CM.Sim.Win('To crumbs, you say?');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000000000) CM.Sim.Win('You get nothing');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000000000000) CM.Sim.Win('Humble rebeginnings');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000000000000000) CM.Sim.Win('The end of the world');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000000000000000000) CM.Sim.Win('Oh, you\'re back');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000000000000000000000) CM.Sim.Win('Lazarus');
|
||||
|
||||
CM.Sim.Upgrades['Heavenly chip secret'].bought = 1;
|
||||
CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1;
|
||||
|
||||
22
README.md
22
README.md
@@ -54,7 +54,7 @@ Copy this code and save it as a bookmark. Paste it in the URL section. To activa
|
||||
|
||||
```javascript
|
||||
javascript: (function () {
|
||||
Game.LoadMod('http://aktanusa.github.io/CookieMonster/CookieMonster.js');
|
||||
Game.LoadMod('https://aktanusa.github.io/CookieMonster/CookieMonster.js');
|
||||
}());
|
||||
```
|
||||
|
||||
@@ -64,7 +64,7 @@ For beta, use the following instead:
|
||||
|
||||
```javascript
|
||||
javascript: (function () {
|
||||
Game.LoadMod('http://aktanusa.github.io/CookieMonster/CookieMonsterBeta.js');
|
||||
Game.LoadMod('https://aktanusa.github.io/CookieMonster/CookieMonsterBeta.js');
|
||||
}());
|
||||
```
|
||||
|
||||
@@ -81,14 +81,16 @@ If you'd rather use the addon as a script via per example *Greasemonkey* or *Tam
|
||||
// @grant none
|
||||
// ==/UserScript==
|
||||
|
||||
(function() {
|
||||
var code = "(" + (function() {
|
||||
var checkReady = setInterval(function() {
|
||||
if (typeof Game.ready !== 'undefined' && Game.ready) {
|
||||
Game.LoadMod('http://aktanusa.github.io/CookieMonster/CookieMonster.js');
|
||||
Game.LoadMod('https://aktanusa.github.io/CookieMonster/CookieMonster.js');
|
||||
clearInterval(checkReady);
|
||||
}
|
||||
}, 1000);
|
||||
})();
|
||||
}).toString() + ")()";
|
||||
|
||||
window.eval(code);
|
||||
```
|
||||
If you are using the beta, use this instead:
|
||||
|
||||
@@ -101,14 +103,16 @@ If you are using the beta, use this instead:
|
||||
// @grant none
|
||||
// ==/UserScript==
|
||||
|
||||
(function() {
|
||||
var code = "(" + (function() {
|
||||
var checkReady = setInterval(function() {
|
||||
if (typeof Game.ready !== 'undefined' && Game.ready) {
|
||||
Game.LoadMod('http://aktanusa.github.io/CookieMonster/CookieMonsterBeta.js');
|
||||
Game.LoadMod('https://aktanusa.github.io/CookieMonster/CookieMonsterBeta.js');
|
||||
clearInterval(checkReady);
|
||||
}
|
||||
}, 1000);
|
||||
})();
|
||||
}).toString() + ")()";
|
||||
|
||||
window.eval(code);
|
||||
```
|
||||
|
||||
# Bugs and suggestions
|
||||
@@ -129,7 +133,7 @@ All suggestions are welcome, even the smallest ones.
|
||||
|
||||
# Contributors
|
||||
|
||||
* **[Raving_Kumquat](http://cookieclicker.wikia.com/wiki/User:Raving_Kumquat)**: Original author
|
||||
* **[Raving_Kumquat](https://cookieclicker.wikia.com/wiki/User:Raving_Kumquat)**: Original author
|
||||
* **[Maxime Fabre](https://github.com/Anahkiasen)**: Previous maintainer
|
||||
* **[Alderi Tokori](http://forum.dashnet.org/profile/Alderi)**: ROI calculations (unused now)
|
||||
* **[Alhifar](https://github.com/Alhifar)**: Missed Golden Cookie Stat
|
||||
|
||||
10
src/Cache.js
10
src/Cache.js
@@ -5,7 +5,7 @@
|
||||
CM.Cache.AddQueue = function() {
|
||||
CM.Cache.Queue = document.createElement('script');
|
||||
CM.Cache.Queue.type = 'text/javascript';
|
||||
CM.Cache.Queue.setAttribute('src', 'http://aktanusa.github.io/CookieMonster/queue/queue.js');
|
||||
CM.Cache.Queue.setAttribute('src', 'https://aktanusa.github.io/CookieMonster/queue/queue.js');
|
||||
document.head.appendChild(CM.Cache.Queue);
|
||||
}
|
||||
|
||||
@@ -165,13 +165,13 @@ CM.Cache.RemakeChain = function() {
|
||||
CM.Cache.Chain = 0;
|
||||
}
|
||||
else {
|
||||
CM.Cache.Chain = CM.Cache.NextNumber(CM.Cache.ChainReward) / 0.25;
|
||||
CM.Cache.Chain = CM.Cache.NextNumber(CM.Cache.ChainReward) / 0.5;
|
||||
}
|
||||
if (maxPayout < CM.Cache.ChainWrathReward) {
|
||||
CM.Cache.ChainWrath = 0;
|
||||
}
|
||||
else {
|
||||
CM.Cache.ChainWrath = CM.Cache.NextNumber(CM.Cache.ChainWrathReward) / 0.25;
|
||||
CM.Cache.ChainWrath = CM.Cache.NextNumber(CM.Cache.ChainWrathReward) / 0.5;
|
||||
}
|
||||
|
||||
CM.Cache.ChainFrenzyReward = CM.Cache.MaxChainMoni(7, maxPayout * 7);
|
||||
@@ -182,13 +182,13 @@ CM.Cache.RemakeChain = function() {
|
||||
CM.Cache.ChainFrenzy = 0;
|
||||
}
|
||||
else {
|
||||
CM.Cache.ChainFrenzy = CM.Cache.NextNumber(CM.Cache.ChainFrenzyReward) / 0.25;
|
||||
CM.Cache.ChainFrenzy = CM.Cache.NextNumber(CM.Cache.ChainFrenzyReward) / 0.5;
|
||||
}
|
||||
if ((maxPayout * 7) < CM.Cache.ChainFrenzyWrathReward) {
|
||||
CM.Cache.ChainFrenzyWrath = 0;
|
||||
}
|
||||
else {
|
||||
CM.Cache.ChainFrenzyWrath = CM.Cache.NextNumber(CM.Cache.ChainFrenzyWrathReward) / 0.25;
|
||||
CM.Cache.ChainFrenzyWrath = CM.Cache.NextNumber(CM.Cache.ChainFrenzyWrathReward) / 0.5;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -137,7 +137,7 @@ CM.ConfigData.SeaSoundURL = {label: 'Season Special Sound URL:', desc: 'URL of t
|
||||
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.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.Favicon = {label: ['Favicon OFF', 'Favicon ON'], desc: 'Update favicon with Golden/Wrath Cookie', toggle: true, func: function() {CM.Disp.UpdateFavicon();}};
|
||||
CM.ConfigData.Tooltip = {label: ['Tooltip Information OFF', 'Tooltip Information ON'], desc: 'Extra information in tooltip for buildings/upgrades', toggle: true};
|
||||
CM.ConfigData.Tooltip = {label: ['Tooltip Information OFF', 'Tooltip Information ON'], desc: 'Extra information in tooltip for buildings/upgrades/grimoire', toggle: true};
|
||||
CM.ConfigData.TooltipAmor = {label: ['Tooltip Amortization Information OFF', '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();}};
|
||||
|
||||
269
src/Disp.js
269
src/Disp.js
@@ -153,7 +153,7 @@ CM.Disp.GetConfigDisplay = function(config) {
|
||||
CM.Disp.AddJscolor = function() {
|
||||
CM.Disp.Jscolor = document.createElement('script');
|
||||
CM.Disp.Jscolor.type = 'text/javascript';
|
||||
CM.Disp.Jscolor.setAttribute('src', 'http://aktanusa.github.io/CookieMonster/jscolor/jscolor.js');
|
||||
CM.Disp.Jscolor.setAttribute('src', 'https://aktanusa.github.io/CookieMonster/jscolor/jscolor.js');
|
||||
document.head.appendChild(CM.Disp.Jscolor);
|
||||
}
|
||||
|
||||
@@ -184,6 +184,9 @@ CM.Disp.CreateBotBar = function() {
|
||||
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);
|
||||
|
||||
@@ -751,10 +754,10 @@ CM.Disp.CreateFavicon = function() {
|
||||
CM.Disp.UpdateFavicon = function() {
|
||||
if (CM.Config.Favicon == 1 && CM.Disp.lastGoldenCookieState) {
|
||||
if (CM.Disp.goldenShimmer.wrath) {
|
||||
CM.Disp.Favicon.href = 'http://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
|
||||
CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
|
||||
}
|
||||
else {
|
||||
CM.Disp.Favicon.href = 'http://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
|
||||
CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -903,7 +906,7 @@ CM.Disp.UpdateTitle = function() {
|
||||
|
||||
CM.Disp.CollectWrinklers = function() {
|
||||
for (var i in Game.wrinklers) {
|
||||
if (Game.wrinklers[i].sucked > 0) {
|
||||
if (Game.wrinklers[i].sucked > 0 && Game.wrinklers[i].type == 0) {
|
||||
Game.wrinklers[i].hp = 0;
|
||||
}
|
||||
}
|
||||
@@ -1207,7 +1210,7 @@ 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.25);
|
||||
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')) {
|
||||
@@ -1308,7 +1311,7 @@ CM.Disp.AddMenuStats = function(title) {
|
||||
var popAllFrag = document.createDocumentFragment();
|
||||
popAllFrag.appendChild(document.createTextNode(Beautify(CM.Cache.WrinkBank) + ' '));
|
||||
var popAllA = document.createElement('a');
|
||||
popAllA.textContent = 'Pop All';
|
||||
popAllA.textContent = 'Pop All Normal';
|
||||
popAllA.className = 'option';
|
||||
popAllA.onclick = function() { CM.Disp.CollectWrinklers(); };
|
||||
popAllFrag.appendChild(popAllA);
|
||||
@@ -1497,7 +1500,7 @@ CM.Disp.CreateTooltipWarnCaut = function() {
|
||||
l('tooltipAnchor').appendChild(CM.Disp.TooltipWarnCaut);
|
||||
}
|
||||
|
||||
CM.Disp.ToggleToolWarnCaut = function() {
|
||||
CM.Disp.ToggleToolWarnCaut = function() { // Pointless?
|
||||
if (CM.Config.ToolWarnCaut == 1) {
|
||||
CM.Disp.TooltipWarnCaut.style.display = 'block';
|
||||
}
|
||||
@@ -1652,86 +1655,93 @@ CM.Disp.Tooltip = function(type, name) {
|
||||
}
|
||||
|
||||
CM.Disp.UpdateTooltip = function() {
|
||||
if (l('tooltipAnchor').style.display != 'none' && l('CMTooltipArea') != null) {
|
||||
if (l('tooltipAnchor').style.display != 'none') {
|
||||
|
||||
if (CM.Disp.tooltipType == 'b' || CM.Disp.tooltipType == 'u') {
|
||||
// Error checking
|
||||
if (CM.Disp.tooltipType == 'u' && (typeof Game.UpgradesInStore[CM.Disp.tooltipName] === 'undefined' || typeof CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name] === 'undefined')) {
|
||||
return;
|
||||
}
|
||||
var price;
|
||||
var bonus;
|
||||
if (CM.Disp.tooltipType == 'b') {
|
||||
var target = '';
|
||||
if (Game.buyMode == 1 && Game.buyBulk == 10) {
|
||||
target = 'Objects10';
|
||||
price = CM.Cache[target][CM.Disp.tooltipName].price;
|
||||
if (l('CMTooltipArea') != null) {
|
||||
if (CM.Disp.tooltipType == 'b' || CM.Disp.tooltipType == 'u') {
|
||||
// Error checking
|
||||
if (CM.Disp.tooltipType == 'u' && (typeof Game.UpgradesInStore[CM.Disp.tooltipName] === 'undefined' || typeof CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name] === 'undefined')) {
|
||||
return;
|
||||
}
|
||||
else if (Game.buyMode == 1 && Game.buyBulk == 100) {
|
||||
target = 'Objects100';
|
||||
price = CM.Cache[target][CM.Disp.tooltipName].price;
|
||||
}
|
||||
else {
|
||||
target = 'Objects';
|
||||
price = Game.Objects[CM.Disp.tooltipName].getPrice();
|
||||
}
|
||||
bonus = CM.Cache[target][CM.Disp.tooltipName].bonus;
|
||||
if (CM.Config.Tooltip == 1 && Game.buyMode == 1) {
|
||||
l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color;
|
||||
l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2);
|
||||
l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color;
|
||||
}
|
||||
}
|
||||
else { // Upgrades
|
||||
bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus;
|
||||
price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice();
|
||||
if (CM.Config.Tooltip == 1) {
|
||||
l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color;
|
||||
l('CMTooltipPP').textContent = Beautify(CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].pp, 2);
|
||||
l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color;
|
||||
}
|
||||
}
|
||||
if (CM.Config.Tooltip == 1 && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
|
||||
l('CMTooltipIncome').textContent = Beautify(bonus, 2);
|
||||
|
||||
var increase = Math.round(bonus / Game.cookiesPs * 10000);
|
||||
if (isFinite(increase) && increase != 0) {
|
||||
l('CMTooltipIncome').textContent += ' (' + (increase / 100) + '% of income)';
|
||||
}
|
||||
|
||||
var timeColor = CM.Disp.GetTimeColor(price, (Game.cookies + CM.Disp.GetWrinkConfigBank()), CM.Disp.GetCPS());
|
||||
l('CMTooltipTime').textContent = timeColor.text;
|
||||
l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color;
|
||||
}
|
||||
|
||||
if (CM.Config.ToolWarnCaut == 1) {
|
||||
var warn = CM.Cache.Lucky;
|
||||
if (CM.Config.ToolWarnCautBon == 1) {
|
||||
var bonusNoFren = bonus;
|
||||
bonusNoFren /= CM.Sim.getCPSBuffMult();
|
||||
warn += ((bonusNoFren * 60 * 15) / 0.15);
|
||||
}
|
||||
var caut = warn * 7;
|
||||
var amount = (Game.cookies + CM.Disp.GetWrinkConfigBank()) - price;
|
||||
if ((amount < warn || amount < caut) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
|
||||
if (CM.Config.ToolWarnCautPos == 0) {
|
||||
CM.Disp.TooltipWarnCaut.style.right = '0px';
|
||||
var price;
|
||||
var bonus;
|
||||
if (CM.Disp.tooltipType == 'b') {
|
||||
var target = '';
|
||||
if (Game.buyMode == 1 && Game.buyBulk == 10) {
|
||||
target = 'Objects10';
|
||||
price = CM.Cache[target][CM.Disp.tooltipName].price;
|
||||
}
|
||||
else if (Game.buyMode == 1 && Game.buyBulk == 100) {
|
||||
target = 'Objects100';
|
||||
price = CM.Cache[target][CM.Disp.tooltipName].price;
|
||||
}
|
||||
else {
|
||||
CM.Disp.TooltipWarnCaut.style.top = (l('tooltip').offsetHeight) + 'px';
|
||||
target = 'Objects';
|
||||
price = Game.Objects[CM.Disp.tooltipName].getPrice();
|
||||
}
|
||||
CM.Disp.TooltipWarnCaut.style.width = (l('tooltip').offsetWidth - 6) + 'px';
|
||||
bonus = CM.Cache[target][CM.Disp.tooltipName].bonus;
|
||||
if (CM.Config.Tooltip == 1 && Game.buyMode == 1) {
|
||||
l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color;
|
||||
l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2);
|
||||
l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color;
|
||||
}
|
||||
}
|
||||
else { // Upgrades
|
||||
bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus;
|
||||
price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice();
|
||||
if (CM.Config.Tooltip == 1) {
|
||||
l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color;
|
||||
l('CMTooltipPP').textContent = Beautify(CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].pp, 2);
|
||||
l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color;
|
||||
}
|
||||
}
|
||||
if (CM.Config.Tooltip == 1 && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
|
||||
l('CMTooltipIncome').textContent = Beautify(bonus, 2);
|
||||
|
||||
if (amount < warn) {
|
||||
l('CMDispTooltipWarn').style.display = '';
|
||||
l('CMDispTooltipWarnText').textContent = Beautify(warn - amount) + ' (' + CM.Disp.FormatTime((warn - amount) / CM.Disp.GetCPS()) + ')';
|
||||
l('CMDispTooltipCaut').style.display = '';
|
||||
l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
|
||||
var increase = Math.round(bonus / Game.cookiesPs * 10000);
|
||||
if (isFinite(increase) && increase != 0) {
|
||||
l('CMTooltipIncome').textContent += ' (' + (increase / 100) + '% of income)';
|
||||
}
|
||||
else if (amount < caut) {
|
||||
l('CMDispTooltipCaut').style.display = '';
|
||||
l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
|
||||
var timeColor = CM.Disp.GetTimeColor(price, (Game.cookies + CM.Disp.GetWrinkConfigBank()), CM.Disp.GetCPS());
|
||||
l('CMTooltipTime').textContent = timeColor.text;
|
||||
l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color;
|
||||
}
|
||||
|
||||
if (CM.Config.ToolWarnCaut == 1) {
|
||||
CM.Disp.TooltipWarnCaut.style.display = 'block';
|
||||
var warn = CM.Cache.Lucky;
|
||||
if (CM.Config.ToolWarnCautBon == 1) {
|
||||
var bonusNoFren = bonus;
|
||||
bonusNoFren /= CM.Sim.getCPSBuffMult();
|
||||
warn += ((bonusNoFren * 60 * 15) / 0.15);
|
||||
}
|
||||
var caut = warn * 7;
|
||||
var amount = (Game.cookies + CM.Disp.GetWrinkConfigBank()) - price;
|
||||
if ((amount < warn || amount < caut) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
|
||||
if (CM.Config.ToolWarnCautPos == 0) {
|
||||
CM.Disp.TooltipWarnCaut.style.right = '0px';
|
||||
}
|
||||
else {
|
||||
CM.Disp.TooltipWarnCaut.style.top = (l('tooltip').offsetHeight) + 'px';
|
||||
}
|
||||
CM.Disp.TooltipWarnCaut.style.width = (l('tooltip').offsetWidth - 6) + 'px';
|
||||
|
||||
if (amount < warn) {
|
||||
l('CMDispTooltipWarn').style.display = '';
|
||||
l('CMDispTooltipWarnText').textContent = Beautify(warn - amount) + ' (' + CM.Disp.FormatTime((warn - amount) / CM.Disp.GetCPS()) + ')';
|
||||
l('CMDispTooltipCaut').style.display = '';
|
||||
l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
|
||||
}
|
||||
else if (amount < caut) {
|
||||
l('CMDispTooltipCaut').style.display = '';
|
||||
l('CMDispTooltipCautText').textContent = Beautify(caut - amount) + ' (' + CM.Disp.FormatTime((caut - amount) / CM.Disp.GetCPS()) + ')';
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
}
|
||||
else {
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
l('CMDispTooltipCaut').style.display = 'none';
|
||||
}
|
||||
}
|
||||
else {
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
@@ -1739,57 +1749,60 @@ CM.Disp.UpdateTooltip = function() {
|
||||
}
|
||||
}
|
||||
else {
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
l('CMDispTooltipCaut').style.display = 'none';
|
||||
CM.Disp.TooltipWarnCaut.style.display = 'none';
|
||||
}
|
||||
}
|
||||
else { // Grimoire
|
||||
CM.Disp.TooltipWarnCaut.style.display = 'none';
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
l('CMDispTooltipCaut').style.display = 'none';
|
||||
|
||||
var minigame = Game.Objects['Wizard tower'].minigame;
|
||||
var spellCost = minigame.getSpellCost(minigame.spellsById[CM.Disp.tooltipName]);
|
||||
|
||||
if (CM.Config.Tooltip == 1 && spellCost <= minigame.magicM) {
|
||||
l('CMTooltipArea').innerHTML = '';
|
||||
|
||||
l('tooltip').firstChild.style.paddingBottom = '4px';
|
||||
var tooltip = document.createElement('div');
|
||||
tooltip.style.border = '1px solid';
|
||||
tooltip.style.padding = '4px';
|
||||
tooltip.style.margin = '0px -4px';
|
||||
tooltip.id = 'CMTooltipBorder';
|
||||
tooltip.className = CM.Disp.colorTextPre + CM.Disp.colorGray;
|
||||
|
||||
var header = function(text) {
|
||||
var div = document.createElement('div');
|
||||
div.style.fontWeight = 'bold';
|
||||
div.className = CM.Disp.colorTextPre + CM.Disp.colorBlue;
|
||||
div.textContent = text;
|
||||
return div;
|
||||
}
|
||||
|
||||
tooltip.appendChild(header('Time Left'));
|
||||
var time = document.createElement('div');
|
||||
time.id = 'CMTooltipTime';
|
||||
tooltip.appendChild(time);
|
||||
var timeColor = CM.Disp.GetTimeColor(spellCost, minigame.magic, undefined, CM.Disp.CalculateGrimoireRefillTime(minigame.magic, minigame.magicM, spellCost));
|
||||
time.textContent = timeColor.text;
|
||||
time.className = CM.Disp.colorTextPre + timeColor.color;
|
||||
|
||||
if (spellCost <= minigame.magic) {
|
||||
tooltip.appendChild(header('Recover Time'));
|
||||
var recover = document.createElement('div');
|
||||
recover.id = 'CMTooltipRecover';
|
||||
tooltip.appendChild(recover);
|
||||
var recoverColor = CM.Disp.GetTimeColor(minigame.magic, Math.max(0, minigame.magic - spellCost), undefined, CM.Disp.CalculateGrimoireRefillTime(Math.max(0, minigame.magic - spellCost), minigame.magicM, minigame.magic));
|
||||
recover.textContent = recoverColor.text;
|
||||
recover.className = CM.Disp.colorTextPre + recoverColor.color;
|
||||
}
|
||||
|
||||
l('CMTooltipArea').appendChild(tooltip);
|
||||
}
|
||||
}
|
||||
}
|
||||
else { // Grimoire
|
||||
l('CMDispTooltipWarn').style.display = 'none';
|
||||
l('CMDispTooltipCaut').style.display = 'none';
|
||||
|
||||
var minigame = Game.Objects['Wizard tower'].minigame;
|
||||
var spellCost = minigame.getSpellCost(minigame.spellsById[CM.Disp.tooltipName]);
|
||||
|
||||
if (CM.Config.Tooltip == 1 && spellCost <= minigame.magicM) {
|
||||
l('CMTooltipArea').innerHTML = '';
|
||||
|
||||
l('tooltip').firstChild.style.paddingBottom = '4px';
|
||||
var tooltip = document.createElement('div');
|
||||
tooltip.style.border = '1px solid';
|
||||
tooltip.style.padding = '4px';
|
||||
tooltip.style.margin = '0px -4px';
|
||||
tooltip.id = 'CMTooltipBorder';
|
||||
tooltip.className = CM.Disp.colorTextPre + CM.Disp.colorGray;
|
||||
|
||||
var header = function(text) {
|
||||
var div = document.createElement('div');
|
||||
div.style.fontWeight = 'bold';
|
||||
div.className = CM.Disp.colorTextPre + CM.Disp.colorBlue;
|
||||
div.textContent = text;
|
||||
return div;
|
||||
}
|
||||
|
||||
tooltip.appendChild(header('Time Left'));
|
||||
var time = document.createElement('div');
|
||||
time.id = 'CMTooltipTime';
|
||||
tooltip.appendChild(time);
|
||||
var timeColor = CM.Disp.GetTimeColor(spellCost, minigame.magic, undefined, CM.Disp.CalculateGrimoireRefillTime(minigame.magic, minigame.magicM, spellCost));
|
||||
time.textContent = timeColor.text;
|
||||
time.className = CM.Disp.colorTextPre + timeColor.color;
|
||||
|
||||
if (spellCost <= minigame.magic) {
|
||||
tooltip.appendChild(header('Recover Time'));
|
||||
var recover = document.createElement('div');
|
||||
recover.id = 'CMTooltipRecover';
|
||||
tooltip.appendChild(recover);
|
||||
var recoverColor = CM.Disp.GetTimeColor(minigame.magic, Math.max(0, minigame.magic - spellCost), undefined, CM.Disp.CalculateGrimoireRefillTime(Math.max(0, minigame.magic - spellCost), minigame.magicM, minigame.magic));
|
||||
recover.textContent = recoverColor.text;
|
||||
recover.className = CM.Disp.colorTextPre + recoverColor.color;
|
||||
}
|
||||
|
||||
l('CMTooltipArea').appendChild(tooltip);
|
||||
}
|
||||
else {
|
||||
CM.Disp.TooltipWarnCaut.style.display = 'none';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
12
src/Main.js
12
src/Main.js
@@ -220,11 +220,11 @@ CM.DelayInit = function() {
|
||||
CM.Disp.CreateFavicon();
|
||||
CM.Disp.CreateGCTimer();
|
||||
CM.Disp.CreateTooltip('GoldCookTooltipPlaceholder', 'Calculated with Golden Switch off', '200px');
|
||||
CM.Disp.CreateTooltip('PrestMaxTooltipPlaceholder', 'The MAX prestige is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '370px');
|
||||
CM.Disp.CreateTooltip('PrestMaxTooltipPlaceholder', 'The MAX prestige is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamond slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '370px');
|
||||
CM.Disp.CreateTooltip('NextPrestTooltipPlaceholder', 'Calculated with cookies gained from wrinklers and Chocolate egg', '200px');
|
||||
CM.Disp.CreateTooltip('HeavenChipMaxTooltipPlaceholder', 'The MAX heavenly chips is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '390px');
|
||||
CM.Disp.CreateTooltip('HeavenChipMaxTooltipPlaceholder', 'The MAX heavenly chips is calculated with the cookies gained from popping all wrinklers with Skruuia god in Diamond slot, selling all buildings with Earth Shatterer aura, and buying Chocolate egg', '390px');
|
||||
CM.Disp.CreateTooltip('ResetTooltipPlaceholder', 'The bonus income you would get from new prestige levels unlocked at 100% of its potential and from reset achievements if you have the same buildings/upgrades after reset', '370px');
|
||||
CM.Disp.CreateTooltip('ChoEggTooltipPlaceholder', 'The amount of cookies you would get from popping all wrinklers with Skruuia god in Diamind slot, selling all buildings with Earth Shatterer aura, and then buying Chocolate egg', '360px');
|
||||
CM.Disp.CreateTooltip('ChoEggTooltipPlaceholder', 'The amount of cookies you would get from popping all wrinklers with Skruuia god in Diamond slot, selling all buildings with Earth Shatterer aura, and then buying Chocolate egg', '360px');
|
||||
CM.Disp.CreateTooltipWarnCaut();
|
||||
CM.Disp.AddTooltipBuild();
|
||||
CM.Disp.AddTooltipGrimoire();
|
||||
@@ -247,9 +247,9 @@ CM.DelayInit = function() {
|
||||
CM.HasReplaceNativeGrimoireLaunch = false;
|
||||
CM.HasReplaceNativeGrimoireDraw = false;
|
||||
|
||||
CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 0, AvgClicksHist: 0, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, TimeFormat: 0, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}};
|
||||
CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, BulkBuildColor: 0, UpBarColor: 1, CalcWrink: 0, CPSMode: 1, AvgCPSHist: 0, AvgClicksHist: 0, ToolWarnCautBon: 0, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'https://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'https://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Favicon: 1, Tooltip: 1, TooltipAmor: 0, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, TimeFormat: 0, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513'}};
|
||||
CM.ConfigPrefix = 'CMConfig';
|
||||
|
||||
CM.VersionMajor = '2.0042';
|
||||
CM.VersionMinor = '2';
|
||||
CM.VersionMajor = '2.0106';
|
||||
CM.VersionMinor = '1';
|
||||
|
||||
|
||||
28
src/Sim.js
28
src/Sim.js
@@ -34,7 +34,7 @@ CM.Sim.BuildingSell = function(basePrice, start, free, amount, emuAura) {
|
||||
if (Game.Has('Santa\'s dominion')) price*=0.99;
|
||||
if (Game.Has('Faberge egg')) price*=0.99;
|
||||
if (Game.Has('Divine discount')) price*=0.99;
|
||||
if (Game.hasAura('Fierce Hoarder')) price*=0.98;
|
||||
if (Game.hasAura('Fierce Hoarder')) price *= 0.98;
|
||||
if (Game.hasAura('Earth Shatterer') || emuAura) {
|
||||
price *= 0.85;
|
||||
}
|
||||
@@ -163,6 +163,9 @@ CM.Sim.CalculateGains = function() {
|
||||
|
||||
if (Game.ascensionMode != 1) mult += parseFloat(CM.Sim.prestige) * 0.01 * CM.Sim.heavenlyPower * CM.Sim.GetHeavenlyMultiplier();
|
||||
|
||||
// TODO Store minigame buffs?
|
||||
mult *= Game.eff('cps');
|
||||
|
||||
var cookieMult = 0;
|
||||
for (var i in Game.cookieUpgrades) {
|
||||
var me = Game.cookieUpgrades[i];
|
||||
@@ -203,7 +206,7 @@ CM.Sim.CalculateGains = function() {
|
||||
|
||||
var godLvl = Game.hasGod('industry');
|
||||
if (godLvl == 1) buildMult *= 1.1;
|
||||
else if (godLvl == 2) buildMult *= 1.05;
|
||||
else if (godLvl == 2) buildMult *= 1.06;
|
||||
else if (godLvl == 3) buildMult *= 1.03;
|
||||
|
||||
var godLvl = Game.hasGod('labor');
|
||||
@@ -229,9 +232,12 @@ CM.Sim.CalculateGains = function() {
|
||||
if (Game.hasGod) {
|
||||
var godLvl = Game.hasGod('mother');
|
||||
if (godLvl == 1) milkMult *= 1.1;
|
||||
else if (godLvl == 2) milkMult *= 1.06;
|
||||
else if (godLvl == 2) milkMult *= 1.05;
|
||||
else if (godLvl == 3) milkMult *= 1.03;
|
||||
}
|
||||
// TODO Store minigame buffs?
|
||||
milkMult *= Game.eff('milk');
|
||||
|
||||
if (CM.Sim.Has('Kitten helpers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult);
|
||||
if (CM.Sim.Has('Kitten workers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.125 * milkMult);
|
||||
if (CM.Sim.Has('Kitten engineers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.15 * milkMult);
|
||||
@@ -241,7 +247,8 @@ CM.Sim.CalculateGains = function() {
|
||||
if (CM.Sim.Has('Kitten specialists')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
|
||||
if (CM.Sim.Has('Kitten experts')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
|
||||
if (CM.Sim.Has('Kitten consultants')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
|
||||
if (CM.Sim.Has('Kitten assistants to the regional manager')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.2 * milkMult);
|
||||
if (CM.Sim.Has('Kitten assistants to the regional manager')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.175 * milkMult);
|
||||
if (CM.Sim.Has('Kitten marketeers')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.15 * milkMult);
|
||||
if (CM.Sim.Has('Kitten angels')) mult *= (1 + (CM.Sim.AchievementsOwned / 25) * 0.1 * milkMult);
|
||||
|
||||
var eggMult = 1;
|
||||
@@ -266,12 +273,15 @@ CM.Sim.CalculateGains = function() {
|
||||
}
|
||||
mult *= eggMult;
|
||||
|
||||
// TODO Store lumps?
|
||||
if (CM.Sim.Has('Sugar baking')) mult *= (1 + Math.min(100, Game.lumps) * 0.01);
|
||||
|
||||
if (CM.Sim.hasAura('Radiant Appetite')) mult *= 2;
|
||||
|
||||
if (Game.hasAura('Dragon\'s Fortune')) {
|
||||
var n = Game.shimmerTypes['golden'].n;
|
||||
for (var i = 0; i < n; i++) {
|
||||
mult *= 2.11;
|
||||
mult *= 2.23;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -346,6 +356,9 @@ CM.Sim.CheckOtherAchiev = function() {
|
||||
if (minAmount >= 200) CM.Sim.Win('Bicentennial');
|
||||
if (minAmount >= 250) CM.Sim.Win('Bicentennial and a half');
|
||||
if (minAmount >= 300) CM.Sim.Win('Tricentennial');
|
||||
if (minAmount >= 350) CM.Sim.Win('Tricentennial and a half');
|
||||
if (minAmount >= 400) CM.Sim.Win('Quadricentennial');
|
||||
if (minAmount >= 450) CM.Sim.Win('Quadricentennial and a half');
|
||||
|
||||
if (buildingsOwned >= 100) CM.Sim.Win('Builder');
|
||||
if (buildingsOwned >= 500) CM.Sim.Win('Architect');
|
||||
@@ -498,6 +511,11 @@ CM.Sim.ResetBonus = function(possiblePresMax) {
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000) CM.Sim.Win('Obliterate');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000) CM.Sim.Win('Negative void');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000000) CM.Sim.Win('To crumbs, you say?');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000000000) CM.Sim.Win('You get nothing');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000000000000) CM.Sim.Win('Humble rebeginnings');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000000000000000) CM.Sim.Win('The end of the world');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000000000000000000) CM.Sim.Win('Oh, you\'re back');
|
||||
if (Game.cookiesEarned >= 1000000000000000000000000000000000000000000000000) CM.Sim.Win('Lazarus');
|
||||
|
||||
CM.Sim.Upgrades['Heavenly chip secret'].bought = 1;
|
||||
CM.Sim.Upgrades['Heavenly cookie stand'].bought = 1;
|
||||
|
||||
Reference in New Issue
Block a user