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

Merge pull request #788 from puggan/feature/paybackClicks

Browse Source 
Feature/payback clicks
This commit is contained in:
Daniël van Noord
2021-05-02 10:37:16 +02:00
committed by GitHub
parent 0f6cffc9bf 89952f20c2
commit 32f0572ab3
3 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/CookieMonsterDev.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/CookieMonsterDev.js.map vendored
View File

File diff suppressed because one or more lines are too long

7
src/Disp/Tooltips/TypesOfTooltips/Upgrade.js
View File

@@ -45,6 +45,8 @@ export default function Upgrade() {
} }
l('CMTooltipBorder').className = l('CMTooltipBorder').className =
ColourTextPre + CacheUpgrades[Game.UpgradesInStore[TooltipName].name].color; ColourTextPre + CacheUpgrades[Game.UpgradesInStore[TooltipName].name].color;
}
// If clicking power upgrade // If clicking power upgrade
if (TooltipBonusMouse) { if (TooltipBonusMouse) {
l('CMTooltipCookiePerClick').textContent = Beautify(TooltipBonusMouse); l('CMTooltipCookiePerClick').textContent = Beautify(TooltipBonusMouse);
@@ -52,9 +54,11 @@ export default function Upgrade() {
l('CMTooltipCookiePerClick').previousSibling.style.display = 'block'; l('CMTooltipCookiePerClick').previousSibling.style.display = 'block';
} }
// If only a clicking power upgrade change PP to click-based period // If only a clicking power upgrade change PP to click-based period
if (TooltipBonusIncome === 0 && TooltipBonusMouse) { if (!TooltipBonusIncome && TooltipBonusMouse) {
l('CMTooltipPP').textContent = `${Beautify(TooltipPrice / TooltipBonusMouse)} Clicks`; l('CMTooltipPP').textContent = `${Beautify(TooltipPrice / TooltipBonusMouse)} Clicks`;
l('CMTooltipPP').style.color = 'white'; l('CMTooltipPP').style.color = 'white';
l('Payback PeriodTitle').style.display = 'block';
l('CMTooltipPP').style.display = 'block';
} else { } else {
if (CMOptions.PPDisplayTime) if (CMOptions.PPDisplayTime)
l('CMTooltipPP').textContent = FormatTime( l('CMTooltipPP').textContent = FormatTime(
@@ -68,7 +72,6 @@ export default function Upgrade() {
l('CMTooltipPP').className = l('CMTooltipPP').className =
ColourTextPre + CacheUpgrades[Game.UpgradesInStore[TooltipName].name].color; ColourTextPre + CacheUpgrades[Game.UpgradesInStore[TooltipName].name].color;
} }
}
const timeColour = GetTimeColour( const timeColour = GetTimeColour(
(TooltipPrice - (Game.cookies + GetWrinkConfigBank())) / GetCPS(), (TooltipPrice - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),
); );