From b4e2236fb7d83523a1a61d323bf70985d93aa1a4 Mon Sep 17 00:00:00 2001 From: Daniel van Noord Date: Sun, 27 Dec 2020 14:11:21 +0100 Subject: [PATCH] Fixed #88 --- CookieMonster.js | 13 ++++++++++++- src/Disp.js | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index c8215fd..6ad740f 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -1511,7 +1511,10 @@ CM.Disp.UpdateBotBar = function() { CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].textContent = Beautify(CM.Cache[target][i].pp, 2); var timeColor = CM.Disp.GetTimeColor((Game.Objects[i].bulkPrice - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()); CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].className = CM.Disp.colorTextPre + timeColor.color; - CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].textContent = timeColor.text; + if (timeColor.text == "Done!" && Game.cookies < Game.Objects[i].bulkPrice) { + CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].textContent = timeColor.text + " (with Wrink)"; + } + else CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].textContent = timeColor.text; } } } @@ -2599,6 +2602,10 @@ CM.Disp.UpdateTooltipBuilding = function() { l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; var timeColor = CM.Disp.GetTimeColor((CM.Disp.TooltipPrice - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()); l('CMTooltipTime').textContent = timeColor.text; + if (timeColor.text == "Done!" && Game.cookies < CM.Cache[target][CM.Disp.tooltipName].price) { + l('CMTooltipTime').textContent = timeColor.text + " (with Wrink)"; + } + else l('CMTooltipTime').textContent = timeColor.text; l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color; } @@ -2658,6 +2665,10 @@ CM.Disp.UpdateTooltipUpgrade = function() { } var timeColor = CM.Disp.GetTimeColor((CM.Disp.TooltipPrice - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()); l('CMTooltipTime').textContent = timeColor.text; + if (timeColor.text == "Done!" && Game.cookies < Game.UpgradesInStore[CM.Disp.tooltipName].getPrice()) { + l('CMTooltipTime').textContent = timeColor.text + " (with Wrink)"; + } + else l('CMTooltipTime').textContent = timeColor.text; l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color; // Add extra info to Chocolate egg tooltip diff --git a/src/Disp.js b/src/Disp.js index 52f5eeb..bb4bac8 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -395,7 +395,10 @@ CM.Disp.UpdateBotBar = function() { CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].textContent = Beautify(CM.Cache[target][i].pp, 2); var timeColor = CM.Disp.GetTimeColor((Game.Objects[i].bulkPrice - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()); CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].className = CM.Disp.colorTextPre + timeColor.color; - CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].textContent = timeColor.text; + if (timeColor.text == "Done!" && Game.cookies < Game.Objects[i].bulkPrice) { + CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].textContent = timeColor.text + " (with Wrink)"; + } + else CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].textContent = timeColor.text; } } } @@ -1483,6 +1486,10 @@ CM.Disp.UpdateTooltipBuilding = function() { l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; var timeColor = CM.Disp.GetTimeColor((CM.Disp.TooltipPrice - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()); l('CMTooltipTime').textContent = timeColor.text; + if (timeColor.text == "Done!" && Game.cookies < CM.Cache[target][CM.Disp.tooltipName].price) { + l('CMTooltipTime').textContent = timeColor.text + " (with Wrink)"; + } + else l('CMTooltipTime').textContent = timeColor.text; l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color; } @@ -1542,6 +1549,10 @@ CM.Disp.UpdateTooltipUpgrade = function() { } var timeColor = CM.Disp.GetTimeColor((CM.Disp.TooltipPrice - (Game.cookies + CM.Disp.GetWrinkConfigBank())) / CM.Disp.GetCPS()); l('CMTooltipTime').textContent = timeColor.text; + if (timeColor.text == "Done!" && Game.cookies < Game.UpgradesInStore[CM.Disp.tooltipName].getPrice()) { + l('CMTooltipTime').textContent = timeColor.text + " (with Wrink)"; + } + else l('CMTooltipTime').textContent = timeColor.text; l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color; // Add extra info to Chocolate egg tooltip