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

Optional warning for Conjure Baked Goods

Browse Source
This commit is contained in:
Daniel van Noord
2020-11-23 23:20:48 +01:00
parent f8c1dd9308
commit 3c28df38c8
4 changed files with 92 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/Disp.js
View File

@@ -1248,6 +1248,7 @@ CM.Disp.AddMenuPref = function(title) {
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'));
@@ -1780,19 +1781,13 @@ CM.Disp.CreateTooltipWarn = function() {
CM.Disp.TooltipWarn.appendChild(create('CMDispTooltipWarnLucky', CM.Disp.colorRed, 'Warning: ', 'Purchase of this item will put you under the number of Cookies required for "Lucky!"', 'CMDispTooltipWarnLuckyText'));
CM.Disp.TooltipWarn.firstChild.style.marginBottom = '4px';
CM.Disp.TooltipWarn.appendChild(create('CMDispTooltipWarnLuckyFrenzy', CM.Disp.colorYellow, 'Warning: ', 'Purchase of this item will put you under the number of Cookies required for "Lucky!" (Frenzy)', 'CMDispTooltipWarnLuckyFrenzyText'));
CM.Disp.TooltipWarn.lastChild.style.marginBottom = '4px';
CM.Disp.TooltipWarn.appendChild(create('CMDispTooltipWarnConjure', CM.Disp.colorPurple, 'Warning: ', 'Purchase of this item will put you under the number of Cookies required for "Conjure Baked Goods"', 'CMDispTooltipWarnConjureText'));
l('tooltipAnchor').appendChild(CM.Disp.TooltipWarn);
}
CM.Disp.ToggleToolWarn = function() { // Pointless?
if (CM.Config.ToolWarn == 1) {
CM.Disp.TooltipWarn.style.display = 'block';
}
else {
CM.Disp.TooltipWarn.style.display = 'none';
}
}
CM.Disp.ToggleToolWarnPos = function() {
if (CM.Config.ToolWarnPos == 0) {
CM.Disp.TooltipWarn.style.top = 'auto';
@@ -2009,6 +2004,14 @@ CM.Disp.UpdateTooltip = function() {
l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color;
}
if (CM.Config.ToolWarnPos == 0) {
CM.Disp.TooltipWarn.style.right = '0px';
}
else {
CM.Disp.TooltipWarn.style.top = (l('tooltip').offsetHeight) + 'px';
}
CM.Disp.TooltipWarn.style.width = (l('tooltip').offsetWidth - 6) + 'px';
if (CM.Config.ToolWarnLucky == 1) {
CM.Disp.TooltipWarn.style.display = 'block';
var limitLucky = CM.Cache.Lucky;
@@ -2020,14 +2023,6 @@ CM.Disp.UpdateTooltip = function() {
var limitLuckyFrenzy = limitLucky * 7;
var amount = (Game.cookies + CM.Disp.GetWrinkConfigBank()) - price;
if ((amount < limitLucky || amount < limitLuckyFrenzy) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
if (CM.Config.ToolWarnPos == 0) {
CM.Disp.TooltipWarn.style.right = '0px';
}
else {
CM.Disp.TooltipWarn.style.top = (l('tooltip').offsetHeight) + 'px';
}
CM.Disp.TooltipWarn.style.width = (l('tooltip').offsetWidth - 6) + 'px';
if (amount < limitLucky) {
l('CMDispTooltipWarnLucky').style.display = '';
l('CMDispTooltipWarnLuckyText').textContent = Beautify(limitLucky - amount) + ' (' + CM.Disp.FormatTime((limitLucky - amount) / CM.Disp.GetCPS()) + ')';
@@ -2044,21 +2039,38 @@ CM.Disp.UpdateTooltip = function() {
l('CMDispTooltipWarnLuckyFrenzy').style.display = 'none';
}
}
else {
l('CMDispTooltipWarnLucky').style.display = 'none';
l('CMDispTooltipWarnLuckyFrenzy').style.display = 'none';
}
else {
l('CMDispTooltipWarnLucky').style.display = 'none';
l('CMDispTooltipWarnLuckyFrenzy').style.display = 'none';
}
if (CM.Config.ToolWarnConjure == 1) {
CM.Disp.TooltipWarn.style.display = 'block';
var limitLucky = CM.Cache.Lucky;
if (CM.Config.ToolWarnBon == 1) {
var bonusNoFren = bonus;
bonusNoFren /= CM.Sim.getCPSBuffMult();
limitLucky += ((bonusNoFren * 60 * 15) / 0.15);
}
var limitConjure = limitLucky * 2;
var amount = (Game.cookies + CM.Disp.GetWrinkConfigBank()) - price;
if ((amount < limitConjure) && (CM.Disp.tooltipType != 'b' || Game.buyMode == 1)) {
l('CMDispTooltipWarnConjure').style.display = '';
l('CMDispTooltipWarnConjureText').textContent = Beautify(limitConjure - amount) + ' (' + CM.Disp.FormatTime((limitConjure - amount) / CM.Disp.GetCPS()) + ')';
}
}
else {
CM.Disp.TooltipWarn.style.display = 'none';
l('CMDispTooltipWarnConjure').style.display = 'none';
}
}
else if (CM.Disp.tooltipType === 's') {
// Adding information about Sugar Lumps.
CM.Disp.TooltipWarn.style.display = 'none';
l('CMDispTooltipWarn').style.display = 'none';
l('CMDispTooltipWarnLuckyFrenzy').style.display = 'none';
l('CMDispTooltipWarnLucky').style.display = 'none';
l('CMDispTooltipWarnLuckyFrenzy').style.display = 'none';
l('CMDispTooltipWarnConjure').style.display = 'none';
if (CM.Config.TooltipLump === 1) {
l('CMTooltipArea').innerHTML = '';
@@ -2089,8 +2101,9 @@ CM.Disp.UpdateTooltip = function() {
}
else { // Grimoire
CM.Disp.TooltipWarn.style.display = 'none';
l('CMDispTooltipWarn').style.display = 'none';
l('CMDispTooltipWarnLucky').style.display = 'none';
l('CMDispTooltipWarnLuckyFrenzy').style.display = 'none';
l('CMDispTooltipWarnConjure').style.display = 'none';
var minigame = Game.Objects['Wizard tower'].minigame;
var spellCost = minigame.getSpellCost(minigame.spellsById[CM.Disp.tooltipName]);
@@ -2147,6 +2160,9 @@ CM.Disp.DrawTooltipWarn = function() {
l('CMDispTooltipWarnLucky').style.opacity = '0';
l('CMDispTooltipWarnLuckyFrenzy').style.opacity = '0';
}
if (CM.Config.ToolWarnConjure == 1) {
l('CMDispTooltipWarnConjure').style.opacity = '0';
}
}
CM.Disp.UpdateTooltipWarn = function() {
@@ -2154,6 +2170,9 @@ CM.Disp.UpdateTooltipWarn = function() {
l('CMDispTooltipWarnLucky').style.opacity = '1';
l('CMDispTooltipWarnLuckyFrenzy').style.opacity = '1';
}
if (CM.Config.ToolWarnConjure == 1 && l('tooltipAnchor').style.display != 'none' && l('CMTooltipArea') != null) {
l('CMDispTooltipWarnConjure').style.opacity = '1';
}
}
CM.Disp.AddWrinklerAreaDetect = function() {