From a9dfcaab751bea7ff9f6f6ae0d4581823102038c Mon Sep 17 00:00:00 2001 From: Daniel van Noord Date: Tue, 26 Jan 2021 22:18:21 +0100 Subject: [PATCH] Tooltip with curr/max reward for plants #183 --- CookieMonster.js | 22 ++++++++++++++++++++++ src/Disp.js | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/CookieMonster.js b/CookieMonster.js index bd905c3..0ef00f2 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -2790,6 +2790,28 @@ CM.Disp.UpdateTooltipGrimoire = function() { */ CM.Disp.UpdateTooltipGardenPlots = function() { var minigame = Game.Objects['Farm'].minigame; + if (minigame.plot[CM.Disp.tooltipName[1]][CM.Disp.tooltipName[0]][0] != 0) { + var mature = minigame.plot[CM.Disp.tooltipName[1]][CM.Disp.tooltipName[0]][1] > minigame.plantsById[minigame.plot[CM.Disp.tooltipName[1]][CM.Disp.tooltipName[0]][0] - 1].matureBase; + var plantName = minigame.plantsById[minigame.plot[CM.Disp.tooltipName[1]][CM.Disp.tooltipName[0]][0] - 1].name; + l('CMTooltipBorder').appendChild(CM.Disp.TooltipCreateHeader('Reward (Current / Maximum)')); + var reward = document.createElement('div'); + reward.id = 'CMTooltipPlantReward'; + l('CMTooltipBorder').appendChild(reward); + if (plantName == "Bakeberry") { + l('CMTooltipPlantReward').textContent = (mature ? CM.Disp.Beautify(Math.min(Game.cookies * 0.03, Game.cookiesPs * 60 * 30)) : "0") + " / " + CM.Disp.Beautify(Game.cookiesPs * 60 * 30); + } + else if (plantName == "Chocoroot" || plantName == "White chocoroot") { + l('CMTooltipPlantReward').textContent = (mature ? CM.Disp.Beautify(Math.min(Game.cookies * 0.03, Game.cookiesPs * 60 * 3)) : "0") + " / " + CM.Disp.Beautify(Game.cookiesPs * 60 * 3); + } + else if (plantName == "Queenbeet") { + l('CMTooltipPlantReward').textContent = (mature ? CM.Disp.Beautify(Math.min(Game.cookies * 0.04, Game.cookiesPs * 60 * 60)) : "0") + " / " + CM.Disp.Beautify(Game.cookiesPs * 60 * 60); + } + else if (plantName == "Duketater") { + l('CMTooltipPlantReward').textContent = (mature ? CM.Disp.Beautify(Math.min(Game.cookies * 0.08, Game.cookiesPs * 60 * 120)) : "0") + " / " + CM.Disp.Beautify(Game.cookiesPs * 60 * 120); + } + else l('CMTooltipArea').style.display = "none"; + } + else l('CMTooltipArea').style.display = "none"; } /** diff --git a/src/Disp.js b/src/Disp.js index e96b144..91c757c 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -1607,6 +1607,28 @@ CM.Disp.UpdateTooltipGrimoire = function() { */ CM.Disp.UpdateTooltipGardenPlots = function() { var minigame = Game.Objects['Farm'].minigame; + if (minigame.plot[CM.Disp.tooltipName[1]][CM.Disp.tooltipName[0]][0] != 0) { + var mature = minigame.plot[CM.Disp.tooltipName[1]][CM.Disp.tooltipName[0]][1] > minigame.plantsById[minigame.plot[CM.Disp.tooltipName[1]][CM.Disp.tooltipName[0]][0] - 1].matureBase; + var plantName = minigame.plantsById[minigame.plot[CM.Disp.tooltipName[1]][CM.Disp.tooltipName[0]][0] - 1].name; + l('CMTooltipBorder').appendChild(CM.Disp.TooltipCreateHeader('Reward (Current / Maximum)')); + var reward = document.createElement('div'); + reward.id = 'CMTooltipPlantReward'; + l('CMTooltipBorder').appendChild(reward); + if (plantName == "Bakeberry") { + l('CMTooltipPlantReward').textContent = (mature ? CM.Disp.Beautify(Math.min(Game.cookies * 0.03, Game.cookiesPs * 60 * 30)) : "0") + " / " + CM.Disp.Beautify(Game.cookiesPs * 60 * 30); + } + else if (plantName == "Chocoroot" || plantName == "White chocoroot") { + l('CMTooltipPlantReward').textContent = (mature ? CM.Disp.Beautify(Math.min(Game.cookies * 0.03, Game.cookiesPs * 60 * 3)) : "0") + " / " + CM.Disp.Beautify(Game.cookiesPs * 60 * 3); + } + else if (plantName == "Queenbeet") { + l('CMTooltipPlantReward').textContent = (mature ? CM.Disp.Beautify(Math.min(Game.cookies * 0.04, Game.cookiesPs * 60 * 60)) : "0") + " / " + CM.Disp.Beautify(Game.cookiesPs * 60 * 60); + } + else if (plantName == "Duketater") { + l('CMTooltipPlantReward').textContent = (mature ? CM.Disp.Beautify(Math.min(Game.cookies * 0.08, Game.cookiesPs * 60 * 120)) : "0") + " / " + CM.Disp.Beautify(Game.cookiesPs * 60 * 120); + } + else l('CMTooltipArea').style.display = "none"; + } + else l('CMTooltipArea').style.display = "none"; } /**