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

Merge pull request #549 from DanielNoord/todos

Browse Source 
Fixed number of TODOs
This commit is contained in:
DanielNoord
2021-01-31 21:43:20 +01:00
committed by GitHub
parent cdff551384 60859a774e
commit 0cd64198ed
6 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CookieMonster.js
View File

@@ -241,6 +241,7 @@ CM.Cache.InitCookiesDiff = function() {
* TODO: Check if this can be made more concise * TODO: Check if this can be made more concise
* @global {number} CM.Cache.AvgCPS Average cookies over time-period as defined by AvgCPSHist * @global {number} CM.Cache.AvgCPS Average cookies over time-period as defined by AvgCPSHist
* @global {number} CM.Cache.AverageClicks Average cookies from clicking over time-period as defined by AvgClicksHist * @global {number} CM.Cache.AverageClicks Average cookies from clicking over time-period as defined by AvgClicksHist
* @global {number} CM.Cache.AvgCPSChoEgg Average cookies from combination of normal CPS and average Chocolate Cookie CPS
*/ */
CM.Cache.UpdateAvgCPS = function() { CM.Cache.UpdateAvgCPS = function() {
var currDate = Math.floor(Date.now() / 1000); var currDate = Math.floor(Date.now() / 1000);
@@ -288,11 +289,10 @@ CM.Cache.UpdateAvgCPS = function() {
var choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')); var choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg'));
// TODO: Why and where is this used?
if (choEgg || CM.Options.CalcWrink == 0) { if (choEgg || CM.Options.CalcWrink == 0) {
CM.Cache.AvgCPSChoEgg = CM.Cache.AverageGainBank + CM.Cache.AverageGainWrink + (choEgg ? CM.Cache.AverageGainChoEgg : 0); CM.Cache.AvgCPSWithChoEgg = CM.Cache.AverageGainBank + CM.Cache.AverageGainWrink + (choEgg ? CM.Cache.AverageGainChoEgg : 0);
} }
else CM.Cache.AvgCPSChoEgg = CM.Cache.AvgCPS; else CM.Cache.AvgCPSWithChoEgg = CM.Cache.AvgCPS;
CM.Cache.AverageClicks = CM.Cache.ClicksDiff.calcAverage(CM.Disp.clickTimes[CM.Options.AvgClicksHist]); CM.Cache.AverageClicks = CM.Cache.ClicksDiff.calcAverage(CM.Disp.clickTimes[CM.Options.AvgClicksHist]);
} }
@@ -3914,7 +3914,7 @@ CM.Disp.CreateStatsPrestigeSection = function() {
var cookiesNextFrag = document.createDocumentFragment(); var cookiesNextFrag = document.createDocumentFragment();
cookiesNextFrag.appendChild(document.createTextNode(Beautify(neededCook))); cookiesNextFrag.appendChild(document.createTextNode(Beautify(neededCook)));
var cookiesNextSmall = document.createElement('small'); var cookiesNextSmall = document.createElement('small');
cookiesNextSmall.textContent = ' (' + (CM.Disp.FormatTime(neededCook / CM.Cache.AvgCPSChoEgg, 1)) + ')'; cookiesNextSmall.textContent = ' (' + (CM.Disp.FormatTime(neededCook / CM.Cache.AvgCPSWithChoEgg, 1)) + ')';
cookiesNextFrag.appendChild(cookiesNextSmall); cookiesNextFrag.appendChild(cookiesNextSmall);
section.appendChild(CM.Disp.CreateStatsListing("withTooltip", 'Cookies To Next Level', cookiesNextFrag, 'NextPrestTooltipPlaceholder')); section.appendChild(CM.Disp.CreateStatsListing("withTooltip", 'Cookies To Next Level', cookiesNextFrag, 'NextPrestTooltipPlaceholder'));
@@ -4473,8 +4473,7 @@ CM.Main.ReplaceTooltipGarden = function() {
}; };
/******** /********
* Section: Functions related to checking for changes in Minigames/GC's/Ticker * Section: Functions related to checking for changes in Minigames/GC's/Ticker */
* TODO: Possibly move this section */
/** /**
* Auxilirary function that finds all currently spawned shimmers. * Auxilirary function that finds all currently spawned shimmers.
@@ -4496,14 +4495,12 @@ CM.Main.FindShimmer = function() {
/** /**
* This function checks for changes in the amount of Golden Cookies * This function checks for changes in the amount of Golden Cookies
* It is called by CM.Loop * It is called by CM.Loop
* TODO: Remove the delete function, as it does not delete correctly and crowds CM.Disp.GCTimers
*/ */
CM.Main.CheckGoldenCookie = function() { CM.Main.CheckGoldenCookie = function() {
CM.Main.FindShimmer(); CM.Main.FindShimmer();
for (let i of Object.keys(CM.Disp.GCTimers)) { for (let i of Object.keys(CM.Disp.GCTimers)) {
if (typeof CM.Cache.goldenShimmersByID[i] == "undefined") { if (typeof CM.Cache.goldenShimmersByID[i] == "undefined") {
CM.Disp.GCTimers[i].parentNode.removeChild(CM.Disp.GCTimers[i]); CM.Disp.GCTimers[i].parentNode.removeChild(CM.Disp.GCTimers[i]);
// TODO remove delete here
delete CM.Disp.GCTimers[i]; delete CM.Disp.GCTimers[i];
} }
} }
@@ -5012,7 +5009,6 @@ CM.Sim.CalculateGains = function() {
else if (godLvl == 2) mult *= 1.1; else if (godLvl == 2) mult *= 1.1;
else if (godLvl == 3) mult *= 1.05; else if (godLvl == 3) mult *= 1.05;
// TODO: What does DateAges do?
godLvl = CM.Sim.hasGod('ages'); godLvl = CM.Sim.hasGod('ages');
if (godLvl == 1) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 3)) * Math.PI * 2); if (godLvl == 1) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 3)) * Math.PI * 2);
else if (godLvl == 2) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 12)) * Math.PI*2); else if (godLvl == 2) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 12)) * Math.PI*2);
@@ -5102,7 +5098,6 @@ CM.Sim.CalculateGains = function() {
} }
mult *= eggMult; mult *= eggMult;
// TODO Store lumps?
if (CM.Sim.Has('Sugar baking')) mult *= (1 + Math.min(100, Game.lumps) * 0.01); if (CM.Sim.Has('Sugar baking')) mult *= (1 + Math.min(100, Game.lumps) * 0.01);
//if (CM.Sim.hasAura('Radiant Appetite')) mult *= 2; //if (CM.Sim.hasAura('Radiant Appetite')) mult *= 2;
@@ -5662,7 +5657,6 @@ CM.Footer.AddJscolor = function() {
/** /**
* This functions starts the initizialization and register CookieMonster * This functions starts the initizialization and register CookieMonster
* It is called as the last function in this script's execution * It is called as the last function in this script's execution
* TODO: Make this async await
*/ */
if (!CM.isRunning) { if (!CM.isRunning) {
CM.Footer.AddJscolor(); CM.Footer.AddJscolor();
@@ -5673,6 +5667,6 @@ if (!CM.isRunning) {
clearInterval(delay); clearInterval(delay);
} }
}, 500); }, 500);
CM.isRunning = 1; CM.isRunning = 2;
} }

6
src/Cache.js
View File

@@ -209,6 +209,7 @@ CM.Cache.InitCookiesDiff = function() {
* TODO: Check if this can be made more concise * TODO: Check if this can be made more concise
* @global {number} CM.Cache.AvgCPS Average cookies over time-period as defined by AvgCPSHist * @global {number} CM.Cache.AvgCPS Average cookies over time-period as defined by AvgCPSHist
* @global {number} CM.Cache.AverageClicks Average cookies from clicking over time-period as defined by AvgClicksHist * @global {number} CM.Cache.AverageClicks Average cookies from clicking over time-period as defined by AvgClicksHist
* @global {number} CM.Cache.AvgCPSChoEgg Average cookies from combination of normal CPS and average Chocolate Cookie CPS
*/ */
CM.Cache.UpdateAvgCPS = function() { CM.Cache.UpdateAvgCPS = function() {
var currDate = Math.floor(Date.now() / 1000); var currDate = Math.floor(Date.now() / 1000);
@@ -256,11 +257,10 @@ CM.Cache.UpdateAvgCPS = function() {
var choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')); var choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg'));
// TODO: Why and where is this used?
if (choEgg || CM.Options.CalcWrink == 0) { if (choEgg || CM.Options.CalcWrink == 0) {
CM.Cache.AvgCPSChoEgg = CM.Cache.AverageGainBank + CM.Cache.AverageGainWrink + (choEgg ? CM.Cache.AverageGainChoEgg : 0); CM.Cache.AvgCPSWithChoEgg = CM.Cache.AverageGainBank + CM.Cache.AverageGainWrink + (choEgg ? CM.Cache.AverageGainChoEgg : 0);
} }
else CM.Cache.AvgCPSChoEgg = CM.Cache.AvgCPS; else CM.Cache.AvgCPSWithChoEgg = CM.Cache.AvgCPS;
CM.Cache.AverageClicks = CM.Cache.ClicksDiff.calcAverage(CM.Disp.clickTimes[CM.Options.AvgClicksHist]); CM.Cache.AverageClicks = CM.Cache.ClicksDiff.calcAverage(CM.Disp.clickTimes[CM.Options.AvgClicksHist]);
} }

2
src/Disp.js
View File

@@ -2757,7 +2757,7 @@ CM.Disp.CreateStatsPrestigeSection = function() {
var cookiesNextFrag = document.createDocumentFragment(); var cookiesNextFrag = document.createDocumentFragment();
cookiesNextFrag.appendChild(document.createTextNode(Beautify(neededCook))); cookiesNextFrag.appendChild(document.createTextNode(Beautify(neededCook)));
var cookiesNextSmall = document.createElement('small'); var cookiesNextSmall = document.createElement('small');
cookiesNextSmall.textContent = ' (' + (CM.Disp.FormatTime(neededCook / CM.Cache.AvgCPSChoEgg, 1)) + ')'; cookiesNextSmall.textContent = ' (' + (CM.Disp.FormatTime(neededCook / CM.Cache.AvgCPSWithChoEgg, 1)) + ')';
cookiesNextFrag.appendChild(cookiesNextSmall); cookiesNextFrag.appendChild(cookiesNextSmall);
section.appendChild(CM.Disp.CreateStatsListing("withTooltip", 'Cookies To Next Level', cookiesNextFrag, 'NextPrestTooltipPlaceholder')); section.appendChild(CM.Disp.CreateStatsListing("withTooltip", 'Cookies To Next Level', cookiesNextFrag, 'NextPrestTooltipPlaceholder'));

1
src/Footer.js
View File

@@ -63,7 +63,6 @@ CM.Footer.AddJscolor = function() {
/** /**
* This functions starts the initizialization and register CookieMonster * This functions starts the initizialization and register CookieMonster
* It is called as the last function in this script's execution * It is called as the last function in this script's execution
* TODO: Make this async await
*/ */
if (!CM.isRunning) { if (!CM.isRunning) {
CM.Footer.AddJscolor(); CM.Footer.AddJscolor();

5
src/Main.js
View File

@@ -325,8 +325,7 @@ CM.Main.ReplaceTooltipGarden = function() {
}; };
/******** /********
* Section: Functions related to checking for changes in Minigames/GC's/Ticker * Section: Functions related to checking for changes in Minigames/GC's/Ticker */
* TODO: Possibly move this section */
/** /**
* Auxilirary function that finds all currently spawned shimmers. * Auxilirary function that finds all currently spawned shimmers.
@@ -348,14 +347,12 @@ CM.Main.FindShimmer = function() {
/** /**
* This function checks for changes in the amount of Golden Cookies * This function checks for changes in the amount of Golden Cookies
* It is called by CM.Loop * It is called by CM.Loop
* TODO: Remove the delete function, as it does not delete correctly and crowds CM.Disp.GCTimers
*/ */
CM.Main.CheckGoldenCookie = function() { CM.Main.CheckGoldenCookie = function() {
CM.Main.FindShimmer(); CM.Main.FindShimmer();
for (let i of Object.keys(CM.Disp.GCTimers)) { for (let i of Object.keys(CM.Disp.GCTimers)) {
if (typeof CM.Cache.goldenShimmersByID[i] == "undefined") { if (typeof CM.Cache.goldenShimmersByID[i] == "undefined") {
CM.Disp.GCTimers[i].parentNode.removeChild(CM.Disp.GCTimers[i]); CM.Disp.GCTimers[i].parentNode.removeChild(CM.Disp.GCTimers[i]);
// TODO remove delete here
delete CM.Disp.GCTimers[i]; delete CM.Disp.GCTimers[i];
} }
} }

2
src/Sim.js
View File

@@ -324,7 +324,6 @@ CM.Sim.CalculateGains = function() {
else if (godLvl == 2) mult *= 1.1; else if (godLvl == 2) mult *= 1.1;
else if (godLvl == 3) mult *= 1.05; else if (godLvl == 3) mult *= 1.05;
// TODO: What does DateAges do?
godLvl = CM.Sim.hasGod('ages'); godLvl = CM.Sim.hasGod('ages');
if (godLvl == 1) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 3)) * Math.PI * 2); if (godLvl == 1) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 3)) * Math.PI * 2);
else if (godLvl == 2) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 12)) * Math.PI*2); else if (godLvl == 2) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 12)) * Math.PI*2);
@@ -414,7 +413,6 @@ CM.Sim.CalculateGains = function() {
} }
mult *= eggMult; mult *= eggMult;
// TODO Store lumps?
if (CM.Sim.Has('Sugar baking')) mult *= (1 + Math.min(100, Game.lumps) * 0.01); if (CM.Sim.Has('Sugar baking')) mult *= (1 + Math.min(100, Game.lumps) * 0.01);
//if (CM.Sim.hasAura('Radiant Appetite')) mult *= 2; //if (CM.Sim.hasAura('Radiant Appetite')) mult *= 2;