From 71a4407da8711a94d61e6ae3046436e0ac5485f1 Mon Sep 17 00:00:00 2001 From: Daniel van Noord Date: Tue, 1 Dec 2020 13:38:49 +0100 Subject: [PATCH] Added cookies to be gained/lost to conjure tooltip --- CookieMonster.js | 22 +++++++++++++++++++++- src/Disp.js | 22 +++++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index 9282fff..b376bff 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -3194,7 +3194,8 @@ CM.Disp.UpdateTooltip = function() { l('CMTooltipArea').appendChild(lumpTooltip); } } - else { // Grimoire + else if (CM.Disp.tooltipType === 'g') { + // Grimoire CM.Disp.TooltipWarn.style.display = 'none'; l('CMDispTooltipWarnLucky').style.display = 'none'; l('CMDispTooltipWarnLuckyFrenzy').style.display = 'none'; @@ -3240,6 +3241,25 @@ CM.Disp.UpdateTooltip = function() { recover.className = CM.Disp.colorTextPre + recoverColor.color; } + // Extra information when spell is Conjure Baked Goods (Name == 0) + if (CM.Disp.tooltipName == 0) { + tooltip.appendChild(header('Cookies to be gained/lost')); + var conjure = document.createElement('div'); + conjure.id = 'CMTooltipConjure'; + tooltip.appendChild(conjure); + var reward = document.createElement('span'); + reward.style.color = "#33FF00" + reward.textContent = Beautify(Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 30), 2) + conjure.appendChild(reward) + var seperator = document.createElement('span'); + seperator.textContent = ' / ' + conjure.appendChild(seperator) + var loss = document.createElement('span'); + loss.style.color = "red" + loss.textContent = Beautify((CM.Cache.NoGoldSwitchCookiesPS * 60 * 15), 2); + conjure.appendChild(loss) + } + l('CMTooltipArea').appendChild(tooltip); } } diff --git a/src/Disp.js b/src/Disp.js index 84b37d9..3676db4 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -2398,7 +2398,8 @@ CM.Disp.UpdateTooltip = function() { l('CMTooltipArea').appendChild(lumpTooltip); } } - else { // Grimoire + else if (CM.Disp.tooltipType === 'g') { + // Grimoire CM.Disp.TooltipWarn.style.display = 'none'; l('CMDispTooltipWarnLucky').style.display = 'none'; l('CMDispTooltipWarnLuckyFrenzy').style.display = 'none'; @@ -2444,6 +2445,25 @@ CM.Disp.UpdateTooltip = function() { recover.className = CM.Disp.colorTextPre + recoverColor.color; } + // Extra information when spell is Conjure Baked Goods (Name == 0) + if (CM.Disp.tooltipName == 0) { + tooltip.appendChild(header('Cookies to be gained/lost')); + var conjure = document.createElement('div'); + conjure.id = 'CMTooltipConjure'; + tooltip.appendChild(conjure); + var reward = document.createElement('span'); + reward.style.color = "#33FF00" + reward.textContent = Beautify(Math.min((Game.cookies + CM.Disp.GetWrinkConfigBank()) * 0.15, CM.Cache.NoGoldSwitchCookiesPS * 60 * 30), 2) + conjure.appendChild(reward) + var seperator = document.createElement('span'); + seperator.textContent = ' / ' + conjure.appendChild(seperator) + var loss = document.createElement('span'); + loss.style.color = "red" + loss.textContent = Beautify((CM.Cache.NoGoldSwitchCookiesPS * 60 * 15), 2); + conjure.appendChild(loss) + } + l('CMTooltipArea').appendChild(tooltip); } }