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

Added cookies till achievement in building tooltip

Browse Source
This commit is contained in:
Daniel van Noord
2020-12-01 16:10:12 +01:00
parent 0bebb12808
commit cb6b97a269
3 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
CookieMonster.js
View File

@@ -3035,8 +3035,15 @@ CM.Disp.Tooltip = function(type, name) {
tooltip.appendChild(pp); tooltip.appendChild(pp);
tooltip.appendChild(header('Time Left')); tooltip.appendChild(header('Time Left'));
var time = document.createElement('div'); var time = document.createElement('div');
time.style.marginBottom = '4px';
time.id = 'CMTooltipTime'; time.id = 'CMTooltipTime';
tooltip.appendChild(time); tooltip.appendChild(time);
if (type == 'b') {
tooltip.appendChild(header('Production left till next achievement'));
var production = document.createElement('div');
production.id = 'CMTooltipProduction';
tooltip.appendChild(production);
}
area.appendChild(tooltip); area.appendChild(tooltip);
} }
@@ -3080,6 +3087,19 @@ CM.Disp.UpdateTooltip = function() {
l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2); l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2);
l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color;
} }
if (CM.Config.TooltipBuildUp) {
for (var i in Game.Objects[CM.Disp.tooltipName].productionAchievs) {
if (!CM.Sim.Has(Game.Objects[CM.Disp.tooltipName].productionAchievs[i].achiev.name)) {
var nextProductionAchiev = Game.Objects[CM.Disp.tooltipName].productionAchievs[i]
break
}
}
if (typeof nextProductionAchiev != "undefined") {
l('CMTooltipProduction').className = "ProdAchievement" + CM.Disp.tooltipName;
l('CMTooltipProduction').textContent = Beautify(nextProductionAchiev.pow - CM.Sim.Objects[CM.Disp.tooltipName].totalCookies, 15);
l('CMTooltipProduction').style.color = "white";
}
}
} }
else { // Upgrades else { // Upgrades
bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus; bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus;
@@ -4013,6 +4033,7 @@ CM.Sim.CopyData = function() {
} }
you.amount = me.amount; you.amount = me.amount;
you.level = me.level; you.level = me.level;
you.totalCookies = me.totalCookies;
if (me.minigameLoaded) you.minigameLoaded = me.minigameLoaded; you.minigame = me.minigame; if (me.minigameLoaded) you.minigameLoaded = me.minigameLoaded; you.minigame = me.minigame;
} }

20
src/Disp.js
View File

@@ -2210,8 +2210,15 @@ CM.Disp.Tooltip = function(type, name) {
tooltip.appendChild(pp); tooltip.appendChild(pp);
tooltip.appendChild(header('Time Left')); tooltip.appendChild(header('Time Left'));
var time = document.createElement('div'); var time = document.createElement('div');
time.style.marginBottom = '4px';
time.id = 'CMTooltipTime'; time.id = 'CMTooltipTime';
tooltip.appendChild(time); tooltip.appendChild(time);
if (type == 'b') {
tooltip.appendChild(header('Production left till next achievement'));
var production = document.createElement('div');
production.id = 'CMTooltipProduction';
tooltip.appendChild(production);
}
area.appendChild(tooltip); area.appendChild(tooltip);
} }
@@ -2255,6 +2262,19 @@ CM.Disp.UpdateTooltip = function() {
l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2); l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2);
l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color;
} }
if (CM.Config.TooltipBuildUp) {
for (var i in Game.Objects[CM.Disp.tooltipName].productionAchievs) {
if (!CM.Sim.Has(Game.Objects[CM.Disp.tooltipName].productionAchievs[i].achiev.name)) {
var nextProductionAchiev = Game.Objects[CM.Disp.tooltipName].productionAchievs[i]
break
}
}
if (typeof nextProductionAchiev != "undefined") {
l('CMTooltipProduction').className = "ProdAchievement" + CM.Disp.tooltipName;
l('CMTooltipProduction').textContent = Beautify(nextProductionAchiev.pow - CM.Sim.Objects[CM.Disp.tooltipName].totalCookies, 15);
l('CMTooltipProduction').style.color = "white";
}
}
} }
else { // Upgrades else { // Upgrades
bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus; bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus;

1
src/Sim.js
View File

@@ -222,6 +222,7 @@ CM.Sim.CopyData = function() {
} }
you.amount = me.amount; you.amount = me.amount;
you.level = me.level; you.level = me.level;
you.totalCookies = me.totalCookies;
if (me.minigameLoaded) you.minigameLoaded = me.minigameLoaded; you.minigame = me.minigame; if (me.minigameLoaded) you.minigameLoaded = me.minigameLoaded; you.minigame = me.minigame;
} }