/** Latest releasenotes of Cookie Monster to be displayed in the info section */
export const LatestReleaseNotes = `
-We have moved Cookie Monster to a new location!
-Please update the link you are using to load Cookie Monster to https://cookiemonsterteam.github.io/CookieMonster/dist/CookieMonster.js and let everybody know this is the new place to find Cookie Monster!
-These are the release notes for the latest update (v 2.031.8).
-
This update implements the following functions:
-- The tooltip of buildings now shows how many buildings need to be bought before a new achievement is reached and the cost and PP of this
-- New setting to force the upgrades sections to always show all available upgrades, stopping them from collapsing and expanding
+- For developers: we now expose some data calculated by Cookie Monster to the global scope. You can access it through the CookieMonsterData object
+- The column with the most optimal building now has a green coloured indicator whenever colour coding is turned on
+- The current season in the seasons statistics section is now displayed with green text for easier identification
+- New option to show a timer bar that counts down till next autosave
+- New option to sort buildings based on the "cost till next achievement"
+- Added extra information about achievements in statistics page
This update fixes the following bugs:
-- Settings menu now correctly updates after changing a setting
-- Fixed incorrect calculation of dates in rare cases
-- Remove golden cookie timers when you ascend
+- Fixed a bug where ignoring certain buildings in rare cases did not create a "most optimal building"
+- Fixed some issues related to "left till achievement"
+- Fixed some cases where upgrades and buildings were not correctly sorted
+- Fixed the tooltip of "Pop all normal wrinklers" displaying an incorrect reward when Shiny's are present
`;
diff --git a/src/Data/SettingsData.js b/src/Data/SettingsData.js
index 7e8cc76b..87c0189d 100644
--- a/src/Data/SettingsData.js
+++ b/src/Data/SettingsData.js
@@ -14,7 +14,7 @@ import UpdateUpgradeSectionsHeight from '../Disp/BuildingsUpgrades/UpdateUpgrade
import UpdateUpgrades from '../Disp/BuildingsUpgrades/Upgrades';
import RefreshScale from '../Disp/HelperFunctions/RefreshScale';
import { UpdateFavicon } from '../Disp/TabTitle/FavIcon';
-import { SimDoSims } from '../Sim/VariablesAndData';
+import { SimDoSims } from '../Sim/VariablesAndData'; // eslint-disable-line no-unused-vars
import SettingColours from './SettingClasses/SettingColours.ts';
import SettingInputNumber from './SettingClasses/SettingInputNumber.ts';
import SettingStandard from './SettingClasses/SettingStandard.ts';
@@ -70,7 +70,7 @@ const Config = {
'Calculate times and average Cookies Per Second with (only the single non-shiny fattest) wrinklers',
true,
() => {
- SimDoSims = true; // eslint-disable-line no-unused-vars
+ SimDoSims = true;
},
),
@@ -274,6 +274,13 @@ const Config = {
'Overlay on timers displaying seconds and/or percentage left',
true,
),
+ AutosaveTimerBar: new SettingStandard(
+ 'bool',
+ 'BarsDisplay',
+ ['Autosave timer bar OFF', 'Autosave timer bar ON'],
+ 'Show a timer counting down till next autosave in the timer bar',
+ true,
+ ),
UpBarColour: new SettingStandard(
'bool',
'BarsDisplay',
@@ -301,8 +308,9 @@ const Config = {
'Sort buildings: default',
'Sort buildings: PP of x1 purchase',
'Sort buildings: PP of selected bulk mode',
+ 'Sort buildings: price until next achievement',
],
- 'Sort the display of buildings in either default order or by PP',
+ 'Sort the display of buildings in default order, by PP, or until next achievement',
false,
() => {
UpdateBuildings();
@@ -339,7 +347,7 @@ const Config = {
'bool',
'BarsDisplay',
['Grimoire magic meter timer OFF', 'Grimoire magic meter timer ON'],
- 'A timer on how long before the Grimoire magic meter is full',
+ 'A timer overlay showing how long till the Grimoire magic meter is full',
true,
),
GCTimer: new SettingStandard(
diff --git a/src/Data/SettingsDefault.ts b/src/Data/SettingsDefault.ts
index 20b15fc6..dfea5fcb 100644
--- a/src/Data/SettingsDefault.ts
+++ b/src/Data/SettingsDefault.ts
@@ -31,6 +31,7 @@ const ConfigDefault: {
TimerBar: 1,
TimerBarPos: 0,
TimerBarOverlay: 2,
+ AutosaveTimerBar: 0,
UpBarColour: 1,
UpgradeBarFixedPos: 1,
SortBuildings: 0,
@@ -134,6 +135,7 @@ const ConfigDefault: {
Prestige: 1,
Wrink: 1,
Sea: 1,
+ Achievs: 1,
Misc: 1,
InfoTab: 1,
},
diff --git a/src/Disp/BuildingsUpgrades/Buildings.js b/src/Disp/BuildingsUpgrades/Buildings.js
index bf43652e..f49fd145 100644
--- a/src/Disp/BuildingsUpgrades/Buildings.js
+++ b/src/Disp/BuildingsUpgrades/Buildings.js
@@ -1,4 +1,10 @@
-import { CacheObjects1, CacheObjects10, CacheObjects100 } from '../../Cache/VariablesAndData';
+import {
+ CacheMinPPBulk,
+ CacheObjects1,
+ CacheObjects10,
+ CacheObjects100,
+ CacheObjectsNextAchievement,
+} from '../../Cache/VariablesAndData';
import { CMOptions } from '../../Config/VariablesAndData';
import BuildingSell from '../../Sim/SimulationEvents/SellBuilding';
import Beautify from '../BeautifyAndFormatting/Beautify';
@@ -24,11 +30,17 @@ export default function UpdateBuildings() {
else if (target === 10) target = CacheObjects10;
else if (target === 100) target = CacheObjects100;
+ // Remove colour if applied
+ l(`storeBulk1`).style.removeProperty('color');
+ l(`storeBulk10`).style.removeProperty('color');
+ l(`storeBulk100`).style.removeProperty('color');
+
if (Game.buyMode === 1) {
if (CMOptions.BuildColour === 1) {
Object.keys(target).forEach((i) => {
l(`productPrice${Game.Objects[i].id}`).style.color = CMOptions[`Colour${target[i].color}`];
});
+ l(`storeBulk${CacheMinPPBulk}`).style.color = CMOptions.ColourGreen;
} else {
Object.keys(Game.Objects).forEach((i) => {
l(`productPrice${Game.Objects[i].id}`).style.removeProperty('color');
@@ -52,62 +64,69 @@ export default function UpdateBuildings() {
});
}
- // Build array of pointers, sort by pp, use array index (+2) as the grid row number
- // (grid rows are 1-based indexing, and row 1 is the bulk buy/sell options)
- // This regulates sorting of buildings
- if (Game.buyMode === 1 && CMOptions.SortBuildings) {
- let arr;
- if (CMOptions.SortBuildings === 1) {
- arr = Object.keys(CacheObjects1).map((k) => {
- const o = CacheObjects1[k];
- o.name = k;
- o.id = Game.Objects[k].id;
- return o;
- });
-
- arr.sort((a, b) =>
- ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary
- ColoursOrdering.indexOf(b.color)
- ? 1
- : ColoursOrdering.indexOf(a.color) < ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
- ? -1
- : a.pp < b.pp
- ? -1
- : 0,
- );
- } else if (CMOptions.SortBuildings === 2) {
- arr = Object.keys(target).map((k) => {
- const o = target[k];
- o.name = k;
- o.id = Game.Objects[k].id;
- return o;
- });
-
- arr.sort((a, b) =>
- ColoursOrdering.indexOf(a.color) > // eslint-disable-line no-nested-ternary
- ColoursOrdering.indexOf(b.color)
- ? 1
- : ColoursOrdering.indexOf(a.color) < ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
- ? -1
- : a.pp < b.pp
- ? -1
- : 0,
- );
- }
-
- for (let x = 0; x < arr.length; x++) {
- Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
- }
- } else {
- const arr = Object.keys(CacheObjects1).map((k) => {
- const o = CacheObjects1[k];
+ // Build array of pointers and sort according to the user's configured sort option.
+ // This regulates sorting of buildings.
+ let arr;
+ if (Game.buyMode !== 1 || !CMOptions.SortBuildings) {
+ arr = Object.keys(CacheObjects1).map(k => {
+ const o = {};
o.name = k;
o.id = Game.Objects[k].id;
return o;
});
+ // Sort using default order.
arr.sort((a, b) => a.id - b.id);
- for (let x = 0; x < arr.length; x++) {
- Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
- }
+ } else if (CMOptions.SortBuildings === 1) {
+ arr = Object.keys(CacheObjects1).map(k => {
+ const o = {};
+ o.name = k;
+ o.pp = CacheObjects1[k].pp;
+ o.color = CacheObjects1[k].color;
+ return o;
+ });
+ // Sort by pp colour group, then by pp.
+ arr.sort((a, b) =>
+ ColoursOrdering.indexOf(a.color) === ColoursOrdering.indexOf(b.color)
+ ? a.pp - b.pp
+ : ColoursOrdering.indexOf(a.color) - ColoursOrdering.indexOf(b.color)
+ );
+ } else if (CMOptions.SortBuildings === 2) {
+ arr = Object.keys(target).map(k => {
+ const o = {};
+ o.name = k;
+ o.pp = target[k].pp;
+ o.color = target[k].color;
+ return o;
+ });
+ // Sort by pp colour group, then by pp.
+ arr.sort((a, b) =>
+ ColoursOrdering.indexOf(a.color) === ColoursOrdering.indexOf(b.color)
+ ? a.pp - b.pp
+ : ColoursOrdering.indexOf(a.color) - ColoursOrdering.indexOf(b.color)
+ );
+ } else if (CMOptions.SortBuildings === 3) {
+ arr = Object.keys(CacheObjectsNextAchievement).map(k => {
+ const o = {};
+ o.name = k;
+ o.id = Game.Objects[k].id;
+ o.amountUntilNext = CacheObjectsNextAchievement[k].AmountNeeded;
+ o.priceUntilNext = CacheObjectsNextAchievement[k].price;
+ return o;
+ });
+ // First, sort using default order.
+ arr.sort((a, b) => a.id - b.id);
+ // Sort by price until next achievement.
+ // Buildings that aren't within 100 of an achievement are placed at the end, still in
+ // default order relative to each other because sort() is guaranteed stable.
+ arr.sort((a, b) =>
+ (a.amountUntilNext !== 101 ? a.priceUntilNext : Infinity) -
+ (b.amountUntilNext !== 101 ? b.priceUntilNext : Infinity)
+ );
+ }
+
+ // Use array index (+2) as the grid row number.
+ // (grid rows are 1-based indexing, and row 1 is the bulk buy/sell options)
+ for (let x = 0; x < arr.length; x++) {
+ Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
}
}
diff --git a/src/Disp/BuildingsUpgrades/Upgrades.js b/src/Disp/BuildingsUpgrades/Upgrades.js
index 0477b0bd..0bdfad41 100644
--- a/src/Disp/BuildingsUpgrades/Upgrades.js
+++ b/src/Disp/BuildingsUpgrades/Upgrades.js
@@ -77,14 +77,11 @@ export default function UpdateUpgrades() {
}
if (CMOptions.SortUpgrades) {
+ // Sort by pp colour group, then by pp.
arr.sort((a, b) =>
- ColoursOrdering.indexOf(a.color) > ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
- ? 1
- : ColoursOrdering.indexOf(a.color) < ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
- ? -1
- : a.pp < b.pp
- ? -1
- : 0,
+ ColoursOrdering.indexOf(a.color) === ColoursOrdering.indexOf(b.color)
+ ? a.pp - b.pp
+ : ColoursOrdering.indexOf(a.color) - ColoursOrdering.indexOf(b.color)
);
} else {
arr.sort((a, b) => a.price - b.price);
diff --git a/src/Disp/InfoBars/TimerBar.js b/src/Disp/InfoBars/TimerBar.js
index 788f50d5..790dfebb 100644
--- a/src/Disp/InfoBars/TimerBar.js
+++ b/src/Disp/InfoBars/TimerBar.js
@@ -25,6 +25,12 @@ export function CreateTimerBar() {
TimerBar.style.fontWeight = 'bold';
TimerBar.style.backgroundColor = 'black';
+ // Create standard Autosave bar
+ const CMTimerBarAutosave = CreateTimer('CMTimerBarAutosave', 'Autosave', [
+ { id: 'CMTimerBarAutosaveBar', color: ColourPurple },
+ ]);
+ TimerBar.appendChild(CMTimerBarAutosave);
+
// Create standard Golden Cookie bar
const CMTimerBarGC = CreateTimer('CMTimerBarGC', 'Next Cookie', [
{ id: 'CMTimerBarGCMinBar', color: ColourGray },
@@ -56,6 +62,22 @@ export function UpdateTimerBar() {
const maxWidthOneBar = l('CMTimerBar').offsetWidth - 133;
let numberOfTimers = 0;
+ if (CMOptions.AutosaveTimerBar && Game.prefs.autosave) {
+ const timeTillNextAutosave =
+ (Game.fps * 60 - (Game.OnAscend ? 0 : Game.T % (Game.fps * 60))) / Game.fps;
+ l('CMTimerBarAutosave').style.display = '';
+ l('CMTimerBarAutosaveBar').style.width = `${Math.round(
+ (timeTillNextAutosave *
+ (maxWidthOneBar - Math.ceil(timeTillNextAutosave).toString().length * 8)) /
+ 60,
+ )}px`;
+ if (CMOptions.TimerBarOverlay >= 1) {
+ l('CMTimerBarAutosaveBar').textContent = Math.ceil(timeTillNextAutosave);
+ } else l('CMTimerBarAutosaveBar').textContent = '';
+ l('CMTimerBarAutosaveTime').textContent = Math.ceil(timeTillNextAutosave);
+ numberOfTimers += 1;
+ } else l('CMTimerBarAutosave').style.display = 'none';
+
// Regulates visibility of Golden Cookie timer
if (Game.shimmerTypes.golden.spawned === 0 && !Game.Has('Golden switch [off]')) {
l('CMTimerBarGC').style.display = '';
diff --git a/src/Disp/Initialization/CreateWrinklerButton.js b/src/Disp/Initialization/CreateWrinklerButton.js
index b3f03c3f..8c4c8936 100644
--- a/src/Disp/Initialization/CreateWrinklerButton.js
+++ b/src/Disp/Initialization/CreateWrinklerButton.js
@@ -18,7 +18,7 @@ export default function CreateWrinklerButtons() {
};
popAllA.onmouseover = function () {
Game.tooltip.dynamic = 1;
- Game.tooltip.draw(this, () => CreateTooltip('wb', 'PopAll'), 'this');
+ Game.tooltip.draw(this, () => CreateTooltip('wb', 'PopAllNormal'), 'this');
Game.tooltip.wobble();
};
l('sectionLeftExtra').children[0].append(popAllA);
diff --git a/src/Disp/MenuSections/Statistics/AddStatsPage.js b/src/Disp/MenuSections/Statistics/AddStatsPage.js
index 904ee901..5b957264 100644
--- a/src/Disp/MenuSections/Statistics/AddStatsPage.js
+++ b/src/Disp/MenuSections/Statistics/AddStatsPage.js
@@ -9,6 +9,7 @@ import { CMOptions } from '../../../Config/VariablesAndData';
import {
CacheAverageClicks,
CacheAverageCookiesFromClicks,
+ CacheObjectsNextAchievement,
CacheWrinklersFattest,
CacheWrinklersNormal,
CacheWrinklersTotal,
@@ -100,6 +101,22 @@ export default function AddMenuStats(title) {
stats.appendChild(CreateSections.SeasonSection());
+ stats.appendChild(CreateElements.StatsHeader('Achievements', 'Achievs'));
+ if (CMOptions.Header.Achievs) {
+ Object.keys(Game.Objects).forEach((i) => {
+ const ObjectsTillNext = CacheObjectsNextAchievement[i];
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ i,
+ ObjectsTillNext.AmountNeeded < 101
+ ? document.createTextNode(`Next achievement in ${ObjectsTillNext.AmountNeeded}, price: ${Beautify(ObjectsTillNext.price)}`)
+ : document.createTextNode('No new achievement for next 100 buildings'),
+ ),
+ );
+ });
+ }
+
stats.appendChild(CreateElements.StatsHeader('Miscellaneous', 'Misc'));
if (CMOptions.Header.Misc) {
stats.appendChild(
diff --git a/src/Disp/MenuSections/Statistics/CreateDOMElements.js b/src/Disp/MenuSections/Statistics/CreateDOMElements.js
index 2fba8253..98daaf7b 100644
--- a/src/Disp/MenuSections/Statistics/CreateDOMElements.js
+++ b/src/Disp/MenuSections/Statistics/CreateDOMElements.js
@@ -84,6 +84,28 @@ export function StatsListing(type, name, text, placeholder) {
return div;
}
+/**
+ * This function creates an stats-listing-object for the stats page for missing items displays
+ * It is called by CM.Disp.AddMenuStats()
+ * @param {string} type The type fo the listing
+ * @param {string} name The name of the option
+ * @param {object} text The text-object of the option
+ * @param {bool} current Whether the season of the item is the current season
+ * @returns {object} div The option object
+ */
+export function StatsMissDispListing(type, name, text, current) {
+ const div = document.createElement('div');
+ div.className = 'listing';
+
+ const listingName = document.createElement('b');
+ listingName.textContent = name;
+ if (current === true) listingName.style.color = CMOptions.ColourGreen;
+ div.appendChild(listingName);
+ div.appendChild(document.createTextNode(': '));
+ div.appendChild(text);
+ return div;
+}
+
/**
* This function creates a tooltip containing all missing holiday items contained in the list theMissDisp
* @param {list} theMissDisp A list of the missing holiday items
diff --git a/src/Disp/MenuSections/Statistics/CreateStatsSections.js b/src/Disp/MenuSections/Statistics/CreateStatsSections.js
index 84ff22dd..f82c481f 100644
--- a/src/Disp/MenuSections/Statistics/CreateStatsSections.js
+++ b/src/Disp/MenuSections/Statistics/CreateStatsSections.js
@@ -41,7 +41,12 @@ import ResetBonus from '../../../Sim/SimulationEvents/ResetAscension';
import GetCPS from '../../HelperFunctions/GetCPS';
import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank';
import { ColourGreen, ColourRed, ColourTextPre } from '../../VariablesAndData';
-import { StatsListing, StatsHeader, StatsMissDisp } from './CreateDOMElements';
+import {
+ StatsListing,
+ StatsHeader,
+ StatsMissDisp,
+ StatsMissDispListing,
+} from './CreateDOMElements';
import Beautify from '../../BeautifyAndFormatting/Beautify';
import FormatTime from '../../BeautifyAndFormatting/FormatTime';
@@ -697,10 +702,11 @@ export function SeasonSection() {
if (CMOptions.Header.Sea) {
if (missingHalloweenCookies.length !== 0) {
section.appendChild(
- StatsListing(
+ StatsMissDispListing(
'basic',
'Halloween cookies left to buy',
StatsMissDisp(missingHalloweenCookies),
+ Game.season === 'halloween',
),
);
let failRateHalloween = 0.95;
@@ -715,7 +721,7 @@ export function SeasonSection() {
}
const obtainedCookiesChance = missingHalloweenCookies.length / 7;
section.appendChild(
- StatsListing(
+ StatsMissDispListing(
'basic',
'Chance of receiving a cookie from wrinkler/shiny wrinkler',
document.createTextNode(
@@ -723,15 +729,17 @@ export function SeasonSection() {
(1 - failRateHalloween * 0.9) * obtainedCookiesChance * 100,
)}%`,
),
+ Game.season === 'halloween',
),
);
}
if (missingChristmasCookies.length !== 0) {
section.appendChild(
- StatsListing(
+ StatsMissDispListing(
'basic',
'Christmas cookies left to buy',
StatsMissDisp(missingChristmasCookies),
+ Game.season === 'christmas',
),
);
let failRateChristmas = 0.8;
@@ -746,21 +754,23 @@ export function SeasonSection() {
}
const obtainedCookiesChance = missingChristmasCookies.length / 7;
section.appendChild(
- StatsListing(
+ StatsMissDispListing(
'basic',
'Chance of receiving a cookie from reindeer',
document.createTextNode(
`${Beautify((1 - failRateChristmas) * obtainedCookiesChance * 100)}%`,
),
+ Game.season === 'christmas',
),
);
}
if (missingValentineCookies.length !== 0) {
section.appendChild(
- StatsListing(
+ StatsMissDispListing(
'basic',
'Valentine cookies left to buy',
StatsMissDisp(missingValentineCookies),
+ Game.season === 'valentines',
),
);
}
@@ -790,40 +800,53 @@ export function SeasonSection() {
};
if (missingNormalEggs.length !== 0) {
section.appendChild(
- StatsListing(
+ StatsMissDispListing(
'basic',
'Normal easter eggs left to unlock',
StatsMissDisp(missingNormalEggs),
+ Game.season === 'easter',
),
);
section.appendChild(
- StatsListing(
+ StatsMissDispListing(
'basic',
'Chance of receiving an egg from wrinkler/golden cookie',
document.createTextNode(
`${Beautify(dropRateEgg(0.98)[0] * 100)}% / ${Beautify(dropRateEgg(0.9)[0] * 100)}%`,
),
+ Game.season === 'easter',
),
);
}
if (missingRareEggs.length !== 0) {
section.appendChild(
- StatsListing('basic', 'Rare easter eggs left to unlock', StatsMissDisp(missingRareEggs)),
+ StatsMissDispListing(
+ 'basic',
+ 'Rare easter eggs left to unlock',
+ StatsMissDisp(missingRareEggs),
+ Game.season === 'easter',
+ ),
);
section.appendChild(
- StatsListing(
+ StatsMissDispListing(
'basic',
'Chance of receiving a rare egg from wrinkler/golden cookie',
document.createTextNode(
`${Beautify(dropRateEgg(0.98)[1] * 100)}% / ${Beautify(dropRateEgg(0.9)[1] * 100)}%`,
),
+ Game.season === 'easter',
),
);
}
if (Game.season === 'christmas')
section.appendChild(
- StatsListing('basic', 'Reindeer reward', document.createTextNode(Beautify(CacheSeaSpec))),
+ StatsMissDispListing(
+ 'basic',
+ 'Reindeer reward',
+ document.createTextNode(Beautify(CacheSeaSpec)),
+ true,
+ ),
);
if (choEgg) {
section.appendChild(
diff --git a/src/Disp/TabTitle/FavIcon.js b/src/Disp/TabTitle/FavIcon.js
index 227a4b2a..0e2f2187 100644
--- a/src/Disp/TabTitle/FavIcon.js
+++ b/src/Disp/TabTitle/FavIcon.js
@@ -20,7 +20,10 @@ export function CreateFavicon() {
export function UpdateFavicon() {
if (CMOptions.Favicon === 1 && LastGoldenCookieState > 0) {
if (CacheSpawnedGoldenShimmer.wrath)
- l('CMFavicon').href = 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
- else l('CMFavicon').href = 'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
+ l('CMFavicon').href =
+ 'https://CookieMonsterTeam.github.io/CookieMonster/favicon/wrathCookie.ico';
+ else
+ l('CMFavicon').href =
+ 'https://CookieMonsterTeam.github.io/CookieMonster/favicon/goldenCookie.ico';
} else l('CMFavicon').href = 'https://orteil.dashnet.org/cookieclicker/favicon.ico';
}
diff --git a/src/Disp/Tooltips/Tooltip.js b/src/Disp/Tooltips/Tooltip.js
index 577912c5..29f48836 100644
--- a/src/Disp/Tooltips/Tooltip.js
+++ b/src/Disp/Tooltips/Tooltip.js
@@ -1,5 +1,5 @@
import UpdateTooltips from './UpdateTooltips';
-import { SimpleTooltipElements, TooltipName, TooltipType } from '../VariablesAndData';
+import { SimpleTooltipElements, TooltipName, TooltipType } from '../VariablesAndData'; // eslint-disable-line no-unused-vars
import { CMOptions } from '../../Config/VariablesAndData';
import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
import GetTimeColour from '../BeautifyAndFormatting/GetTimeColour';
@@ -122,8 +122,8 @@ export function CreateTooltip(type, name) {
}
// Sets global variables used by CM.Disp.UpdateTooltip()
- TooltipType = type; // eslint-disable-line no-unused-vars
- TooltipName = name; // eslint-disable-line no-unused-vars
+ TooltipType = type;
+ TooltipName = name;
UpdateTooltips();
diff --git a/src/Disp/Tooltips/TypesOfTooltips/WrinklerButton.js b/src/Disp/Tooltips/TypesOfTooltips/WrinklerButton.js
index 3917b245..a95ae8c6 100644
--- a/src/Disp/Tooltips/TypesOfTooltips/WrinklerButton.js
+++ b/src/Disp/Tooltips/TypesOfTooltips/WrinklerButton.js
@@ -1,4 +1,4 @@
-import { CacheWrinklersFattest, CacheWrinklersTotal } from '../../../Cache/VariablesAndData';
+import { CacheWrinklersFattest, CacheWrinklersNormal } from '../../../Cache/VariablesAndData';
import Beautify from '../../BeautifyAndFormatting/Beautify';
import { TooltipName } from '../../VariablesAndData';
import * as Create from '../CreateTooltip';
@@ -13,8 +13,8 @@ export default function WrinklerButton() {
const WrinklerReward = document.createElement('div');
WrinklerReward.id = 'CMWrinklerReward';
- if (TooltipName === 'PopAll') {
- WrinklerReward.textContent = Beautify(CacheWrinklersTotal);
+ if (TooltipName === 'PopAllNormal') {
+ WrinklerReward.textContent = Beautify(CacheWrinklersNormal);
} else if (TooltipName === 'PopFattest') {
WrinklerReward.textContent = Beautify(CacheWrinklersFattest[0]);
}
diff --git a/src/InitSaveLoad/init.js b/src/InitSaveLoad/init.js
index a743350e..e7f14b84 100644
--- a/src/InitSaveLoad/init.js
+++ b/src/InitSaveLoad/init.js
@@ -3,7 +3,7 @@ import CMDrawHook from '../Disp/DrawHook';
import CMClickHook from '../Main/ClickHook';
import InitializeCookieMonster from '../Main/Initialization';
import CMLoopHook from '../Main/LoopHook';
-import { isInitializing } from './Variables';
+import { isInitializing } from './Variables'; // eslint-disable-line no-unused-vars
/**
* This creates a init function for the CM object. Per Game code/comments:
@@ -26,6 +26,6 @@ export default function init() {
Game.registerHook('draw', CMDrawHook);
Game.registerHook('logic', CMLoopHook);
- isInitializing = false; // eslint-disable-line no-unused-vars
+ isInitializing = false;
}
}
diff --git a/src/InitSaveLoad/load.js b/src/InitSaveLoad/load.js
index bc53f542..ebfcebba 100644
--- a/src/InitSaveLoad/load.js
+++ b/src/InitSaveLoad/load.js
@@ -1,6 +1,6 @@
import { LoadConfig } from '../Config/SaveLoadReload/SaveLoadReloadSettings';
import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
-import { FavouriteSettings } from '../Disp/VariablesAndData';
+import { FavouriteSettings } from '../Disp/VariablesAndData'; // eslint-disable-line no-unused-vars
import InitData from '../Sim/InitializeData/InitData';
/**
@@ -11,7 +11,7 @@ export default function load(str) {
const save = JSON.parse(str);
InitData();
// The if-statement is a failsafe for old saves
- if (typeof save.favouriteSettings !== 'undefined') FavouriteSettings = save.favouriteSettings; // eslint-disable-line no-unused-vars
+ if (typeof save.favouriteSettings !== 'undefined') FavouriteSettings = save.favouriteSettings;
LoadConfig(save.settings);
if (save.version !== `${VersionMajor}.${VersionMinor}`) {
if (Game.prefs.popups)
diff --git a/src/Main/CheckStates/GoldenCookie.js b/src/Main/CheckStates/GoldenCookie.js
index 2773ccfc..6eeb5915 100644
--- a/src/Main/CheckStates/GoldenCookie.js
+++ b/src/Main/CheckStates/GoldenCookie.js
@@ -1,4 +1,4 @@
-import { CacheSpawnedGoldenShimmer, CacheGoldenShimmersByID } from '../../Cache/VariablesAndData';
+import { CacheSpawnedGoldenShimmer, CacheGoldenShimmersByID } from '../../Cache/VariablesAndData'; // eslint-disable-line no-unused-vars
import { CMOptions } from '../../Config/VariablesAndData';
import CreateGCTimer from '../../Disp/GoldenCookieTimers/GoldenCookieTimers';
import Flash from '../../Disp/Notifications/Flash';
@@ -62,7 +62,7 @@ export default function CheckGoldenCookie() {
}
UpdateFavicon();
LastSpawnedGoldenCookieState = CurrSpawnedGoldenCookieState;
- if (CurrSpawnedGoldenCookieState === 0) CacheSpawnedGoldenShimmer = 0; // eslint-disable-line no-unused-vars
+ if (CurrSpawnedGoldenCookieState === 0) CacheSpawnedGoldenShimmer = 0;
} else if (CMOptions.GCTimer === 1 && LastGoldenCookieState) {
Object.keys(GCTimers).forEach((i) => {
GCTimers[i].style.opacity = CacheGoldenShimmersByID[i].l.style.opacity;
diff --git a/src/Main/CheckStates/Season.js b/src/Main/CheckStates/Season.js
index b521dd2c..12751c33 100644
--- a/src/Main/CheckStates/Season.js
+++ b/src/Main/CheckStates/Season.js
@@ -1,4 +1,4 @@
-import { CacheSeasonPopShimmer } from '../../Cache/VariablesAndData';
+import { CacheSeasonPopShimmer } from '../../Cache/VariablesAndData'; // eslint-disable-line no-unused-vars
import { CMOptions } from '../../Config/VariablesAndData';
import Flash from '../../Disp/Notifications/Flash';
import CreateNotification from '../../Disp/Notifications/Notification';
@@ -14,7 +14,7 @@ export default function CheckSeasonPopup() {
LastSeasonPopupState = Game.shimmerTypes.reindeer.spawned;
Object.keys(Game.shimmers).forEach((i) => {
if (Game.shimmers[i].spawnLead && Game.shimmers[i].type === 'reindeer') {
- CacheSeasonPopShimmer = Game.shimmers[i]; // eslint-disable-line no-unused-vars
+ CacheSeasonPopShimmer = Game.shimmers[i];
}
});
Flash(3, 'SeaFlash', false);
diff --git a/src/Main/Initialization.js b/src/Main/Initialization.js
index 05f7435c..8950f243 100644
--- a/src/Main/Initialization.js
+++ b/src/Main/Initialization.js
@@ -12,24 +12,27 @@ import UpdateBuildingUpgradeStyle from '../Disp/Initialization/UpdateBuildingUpg
import CreateFlashScreen from '../Disp/Initialization/FlashScreen';
import { CreateFavicon } from '../Disp/TabTitle/FavIcon';
import { CreateSimpleTooltip } from '../Disp/Tooltips/Tooltip';
-import { CMLastAscendState, TooltipText } from '../Disp/VariablesAndData';
+import { CMLastAscendState, TooltipText } from '../Disp/VariablesAndData'; // eslint-disable-line no-unused-vars
import InitData from '../Sim/InitializeData/InitData';
import ReplaceNativeGrimoire from './ReplaceGameElements/NativeGrimoire';
import ReplaceTooltips from './ReplaceGameElements/Tooltips';
import ReplaceNative from './ReplaceGameFunctions/ReplaceNative';
-import { LastModCount } from './VariablesAndData';
+import { LastModCount } from './VariablesAndData'; // eslint-disable-line no-unused-vars
import AddWrinklerAreaDetect from './WrinklerArea/AddDetectArea';
/**
* Initialization loop of Cookie Monster
*/
export default function InitializeCookieMonster() {
+ // Create global data object
+ window.CookieMonsterData = {};
+
InitData();
CacheStatsCookies();
InitCache();
// Stored to check if we need to re-initiliaze data
- LastModCount = Object.keys(Game.mods).length; // eslint-disable-line no-unused-vars
+ LastModCount = Object.keys(Game.mods).length;
// Creating visual elements
CreateCssArea();
@@ -54,7 +57,7 @@ export default function InitializeCookieMonster() {
Game.CalculateGains();
LoadConfig();
- CMLastAscendState = Game.OnAscend; // eslint-disable-line no-unused-vars
+ CMLastAscendState = Game.OnAscend;
if (Game.prefs.popups)
Game.Popup(`Cookie Monster version ${VersionMajor}.${VersionMinor} loaded!`);
diff --git a/src/Main/LoopHook.js b/src/Main/LoopHook.js
index 5da42205..1ed94b2a 100644
--- a/src/Main/LoopHook.js
+++ b/src/Main/LoopHook.js
@@ -42,8 +42,7 @@ export default function CMLoopHook() {
// CM.Sim.DoSims is set whenever CPS has changed
if (SimDoSims) {
- AllAmountTillNextAchievement();
-
+ AllAmountTillNextAchievement(true);
CacheIncome();
CacheNoGoldSwitchCPS(); // Needed first
diff --git a/src/Main/ReplaceGameElements/NativeGrimoire.js b/src/Main/ReplaceGameElements/NativeGrimoire.js
index b30f7e88..ca583763 100644
--- a/src/Main/ReplaceGameElements/NativeGrimoire.js
+++ b/src/Main/ReplaceGameElements/NativeGrimoire.js
@@ -3,7 +3,7 @@ import FormatTime from '../../Disp/BeautifyAndFormatting/FormatTime';
import CalculateGrimoireRefillTime from '../../Disp/HelperFunctions/CalculateGrimoireRefillTime';
import {
BackupGrimoireDraw,
- BackupGrimoireLaunch,
+ BackupGrimoireLaunch, // eslint-disable-line no-unused-vars
BackupGrimoireLaunchMod,
HasReplaceNativeGrimoireDraw,
HasReplaceNativeGrimoireLaunch,
@@ -35,7 +35,7 @@ function ReplaceNativeGrimoireDraw() {
function ReplaceNativeGrimoireLaunch() {
if (!HasReplaceNativeGrimoireLaunch && Game.Objects['Wizard tower'].minigameLoaded) {
const { minigame } = Game.Objects['Wizard tower'];
- BackupGrimoireLaunch = minigame.launch; // eslint-disable-line no-unused-vars
+ BackupGrimoireLaunch = minigame.launch;
BackupGrimoireLaunchMod = new Function( // eslint-disable-line no-new-func
`return ${minigame.launch
.toString()
diff --git a/src/Main/ReplaceGameElements/Tooltips.js b/src/Main/ReplaceGameElements/Tooltips.js
index 09952fd4..d35e6616 100644
--- a/src/Main/ReplaceGameElements/Tooltips.js
+++ b/src/Main/ReplaceGameElements/Tooltips.js
@@ -1,7 +1,7 @@
/** Functions related to replacing tooltips */
import { CreateTooltip } from '../../Disp/Tooltips/Tooltip';
-import { LoadMinigames, TooltipBuildBackup, TooltipLumpBackup } from '../VariablesAndData';
+import { LoadMinigames, TooltipBuildBackup, TooltipLumpBackup } from '../VariablesAndData'; // eslint-disable-line no-unused-vars
import ReplaceNativeGrimoire from './NativeGrimoire';
import ReplaceTooltipGrimoire from './TooltipGrimoire';
@@ -27,7 +27,7 @@ function ReplaceTooltipBuild() {
*/
function ReplaceTooltipLump() {
if (Game.canLumps()) {
- TooltipLumpBackup = l('lumps').onmouseover; // eslint-disable-line no-unused-vars
+ TooltipLumpBackup = l('lumps').onmouseover;
l('lumps').onmouseover = function () {
Game.tooltip.dynamic = 1;
Game.tooltip.draw(this, () => CreateTooltip('s', 'Lump'), 'this');
diff --git a/src/Main/ReplaceGameFunctions/ReplaceNative.js b/src/Main/ReplaceGameFunctions/ReplaceNative.js
index d28ecb1d..2285121d 100644
--- a/src/Main/ReplaceGameFunctions/ReplaceNative.js
+++ b/src/Main/ReplaceGameFunctions/ReplaceNative.js
@@ -7,13 +7,13 @@ import AddMenu from '../../Disp/MenuSections/AddMenus';
import UpdateTitle from '../../Disp/TabTitle/TabTitle';
import ReplaceAscendTooltip from '../../Disp/Tooltips/AscendButton';
import UpdateTooltipLocation from '../../Disp/Tooltips/PositionLocation';
-import { CMSayTime, Title } from '../../Disp/VariablesAndData';
-import { SimDoSims } from '../../Sim/VariablesAndData';
+import { CMSayTime, Title } from '../../Disp/VariablesAndData'; // eslint-disable-line no-unused-vars
+import { SimDoSims } from '../../Sim/VariablesAndData'; // eslint-disable-line no-unused-vars
import ReplaceTooltipUpgrade from '../ReplaceGameElements/TooltipUpgrades';
import {
BackupFunctions,
- CenturyDateAtBeginLoop,
- CycliusDateAtBeginLoop,
+ CenturyDateAtBeginLoop, // eslint-disable-line no-unused-vars
+ CycliusDateAtBeginLoop, // eslint-disable-line no-unused-vars
} from '../VariablesAndData';
import FixMouseY from './FixMouse';
@@ -29,9 +29,9 @@ export default function ReplaceNative() {
BackupFunctions.CalculateGains = Game.CalculateGains;
Game.CalculateGains = function () {
BackupFunctions.CalculateGains();
- SimDoSims = 1; // eslint-disable-line no-unused-vars
- CycliusDateAtBeginLoop = Date.now(); // eslint-disable-line no-unused-vars
- CenturyDateAtBeginLoop = Date.now(); // eslint-disable-line no-unused-vars
+ SimDoSims = 1;
+ CycliusDateAtBeginLoop = Date.now();
+ CenturyDateAtBeginLoop = Date.now();
};
BackupFunctions.tooltip = {};
diff --git a/src/Main/WrinklerArea/AddDetectArea.js b/src/Main/WrinklerArea/AddDetectArea.js
index fdf55202..7b50b753 100644
--- a/src/Main/WrinklerArea/AddDetectArea.js
+++ b/src/Main/WrinklerArea/AddDetectArea.js
@@ -1,4 +1,4 @@
-import { TooltipWrinklerArea, TooltipWrinklerBeingShown } from '../../Disp/VariablesAndData';
+import { TooltipWrinklerArea, TooltipWrinklerBeingShown } from '../../Disp/VariablesAndData'; // eslint-disable-line no-unused-vars
/**
* This function creates .onmouseover/out events that determine if the mouse is hovering-over a Wrinkler
@@ -9,7 +9,7 @@ export default function AddWrinklerAreaDetect() {
TooltipWrinklerArea = 1;
};
l('backgroundLeftCanvas').onmouseout = function () {
- TooltipWrinklerArea = 0; // eslint-disable-line no-unused-vars
+ TooltipWrinklerArea = 0;
Game.tooltip.hide();
Object.keys(Game.wrinklers).forEach((i) => {
TooltipWrinklerBeingShown[i] = 0;
diff --git a/src/Sim/Calculations/CalculateGains.js b/src/Sim/Calculations/CalculateGains.js
index 9d46954c..c793ee5d 100644
--- a/src/Sim/Calculations/CalculateGains.js
+++ b/src/Sim/Calculations/CalculateGains.js
@@ -10,8 +10,8 @@ import SimWin from '../SimulationData/SimWin';
import {
SimAchievementsOwned,
SimCookiesPs,
- SimCookiesPsRaw,
- SimEffs,
+ SimCookiesPsRaw, // eslint-disable-line no-unused-vars
+ SimEffs, // eslint-disable-line no-unused-vars
SimHeavenlyPower,
SimObjects,
SimPrestige,
@@ -38,7 +38,7 @@ export default function CalculateGains() {
});
}
});
- SimEffs = effs; // eslint-disable-line no-unused-vars
+ SimEffs = effs;
if (Game.ascensionMode !== 1)
mult += parseFloat(SimPrestige) * 0.01 * SimHeavenlyPower * SimGetHeavenlyMultiplier();
@@ -189,7 +189,7 @@ export default function CalculateGains() {
if (rawCookiesPs >= Game.CpsAchievements[i].threshold) SimWin(Game.CpsAchievements[i].name);
});
- SimCookiesPsRaw = rawCookiesPs; // eslint-disable-line no-unused-vars
+ SimCookiesPsRaw = rawCookiesPs;
const { n } = Game.shimmerTypes.golden;
const auraMult = SimAuraMult("Dragon's Fortune");
diff --git a/src/Sim/SimulationData/CopyData.js b/src/Sim/SimulationData/CopyData.js
index 3d6cdc64..3545c32d 100644
--- a/src/Sim/SimulationData/CopyData.js
+++ b/src/Sim/SimulationData/CopyData.js
@@ -6,18 +6,18 @@ import InitialBuildingData from '../InitializeData/InitialBuildingData';
import InitUpgrade from '../InitializeData/InitUpgrade';
import {
SimAchievements,
- SimAchievementsOwned,
- SimDragonAura,
- SimDragonAura2,
- SimGod1,
- SimGod2,
- SimGod3,
- SimHeavenlyPower,
+ SimAchievementsOwned, // eslint-disable-line no-unused-vars
+ SimDragonAura, // eslint-disable-line no-unused-vars
+ SimDragonAura2, // eslint-disable-line no-unused-vars
+ SimGod1, // eslint-disable-line no-unused-vars
+ SimGod2, // eslint-disable-line no-unused-vars
+ SimGod3, // eslint-disable-line no-unused-vars
+ SimHeavenlyPower, // eslint-disable-line no-unused-vars
SimObjects,
- SimPledges,
- SimPrestige,
+ SimPledges, // eslint-disable-line no-unused-vars
+ SimPrestige, // eslint-disable-line no-unused-vars
SimUpgrades,
- SimUpgradesOwned,
+ SimUpgradesOwned, // eslint-disable-line no-unused-vars
} from '../VariablesAndData';
/**
@@ -26,11 +26,11 @@ import {
*/
export default function CopyData() {
// Other variables
- SimUpgradesOwned = Game.UpgradesOwned; // eslint-disable-line no-unused-vars
- SimPledges = Game.pledges; // eslint-disable-line no-unused-vars
- SimAchievementsOwned = Game.AchievementsOwned; // eslint-disable-line no-unused-vars
- SimHeavenlyPower = Game.heavenlyPower; // eslint-disable-line no-unused-vars
- SimPrestige = Game.prestige; // eslint-disable-line no-unused-vars
+ SimUpgradesOwned = Game.UpgradesOwned;
+ SimPledges = Game.pledges;
+ SimAchievementsOwned = Game.AchievementsOwned;
+ SimHeavenlyPower = Game.heavenlyPower;
+ SimPrestige = Game.prestige;
// Buildings
Object.keys(Game.Objects).forEach((i) => {
@@ -49,9 +49,9 @@ export default function CopyData() {
you.free = me.free;
if (me.minigameLoaded) {
if (me.name === 'Temple') {
- SimGod1 = me.minigame.slot[0]; // eslint-disable-line no-unused-vars
- SimGod2 = me.minigame.slot[1]; // eslint-disable-line no-unused-vars
- SimGod3 = me.minigame.slot[2]; // eslint-disable-line no-unused-vars
+ SimGod1 = me.minigame.slot[0];
+ SimGod2 = me.minigame.slot[1];
+ SimGod3 = me.minigame.slot[2];
}
you.minigameLoaded = me.minigameLoaded;
you.minigame = me.minigame;
@@ -85,6 +85,6 @@ export default function CopyData() {
// Auras
CacheDragonAuras();
- SimDragonAura = CacheDragonAura; // eslint-disable-line no-unused-vars
- SimDragonAura2 = CacheDragonAura2; // eslint-disable-line no-unused-vars
+ SimDragonAura = CacheDragonAura;
+ SimDragonAura2 = CacheDragonAura2;
}
diff --git a/src/Sim/SimulationData/SimWin.js b/src/Sim/SimulationData/SimWin.js
index 58a3d1ef..c2fc90ab 100644
--- a/src/Sim/SimulationData/SimWin.js
+++ b/src/Sim/SimulationData/SimWin.js
@@ -1,4 +1,4 @@
-import { SimAchievements, SimAchievementsOwned } from '../VariablesAndData';
+import { SimAchievements, SimAchievementsOwned } from '../VariablesAndData'; // eslint-disable-line no-unused-vars
/**
* This function "wins" an achievement in the current sim data
@@ -10,7 +10,7 @@ export default function SimWin(what) {
if (SimAchievements[what]) {
if (SimAchievements[what].won === 0) {
SimAchievements[what].won = 1;
- if (Game.Achievements[what].pool !== 'shadow') SimAchievementsOwned += 1; // eslint-disable-line no-unused-vars
+ if (Game.Achievements[what].pool !== 'shadow') SimAchievementsOwned += 1;
}
}
}
diff --git a/src/Sim/SimulationEvents/AuraChange.js b/src/Sim/SimulationEvents/AuraChange.js
index 6564aad8..5127639f 100644
--- a/src/Sim/SimulationEvents/AuraChange.js
+++ b/src/Sim/SimulationEvents/AuraChange.js
@@ -4,7 +4,7 @@ import CheckOtherAchiev from '../Calculations/CheckOtherAchiev';
import CopyData from '../SimulationData/CopyData';
import {
SimAchievementsOwned,
- SimBuildingsOwned,
+ SimBuildingsOwned, // eslint-disable-line no-unused-vars
SimCookiesPs,
SimDragonAura,
SimDragonAura2,
@@ -32,7 +32,7 @@ export default function CalculateChangeAura(aura) {
if (Game.ObjectsById[i].amount > 0) {
const highestBuilding = SimObjects[Game.ObjectsById[i].name].name;
SimObjects[highestBuilding].amount -= 1;
- SimBuildingsOwned -= 1; // eslint-disable-line no-unused-vars
+ SimBuildingsOwned -= 1;
price =
SimObjects[highestBuilding].basePrice *
Game.priceIncrease **
diff --git a/src/Sim/SimulationEvents/BuyUpgrades.js b/src/Sim/SimulationEvents/BuyUpgrades.js
index 23fee710..f0742121 100644
--- a/src/Sim/SimulationEvents/BuyUpgrades.js
+++ b/src/Sim/SimulationEvents/BuyUpgrades.js
@@ -12,7 +12,7 @@ import {
SimObjects,
SimPledges,
SimUpgrades,
- SimUpgradesOwned,
+ SimUpgradesOwned, // eslint-disable-line no-unused-vars
} from '../VariablesAndData';
/**
@@ -122,7 +122,7 @@ export default function BuyUpgradesBonusIncome(upgrade) {
} else {
SimUpgrades[upgrade].bought = (SimUpgrades[upgrade].bought + 1) % 2;
}
- if (Game.CountsAsUpgradeOwned(Game.Upgrades[upgrade].pool)) SimUpgradesOwned += 1; // eslint-disable-line no-unused-vars
+ if (Game.CountsAsUpgradeOwned(Game.Upgrades[upgrade].pool)) SimUpgradesOwned += 1;
if (upgrade === 'Elder Pledge') {
SimPledges += 1;
diff --git a/src/Sim/SimulationEvents/GodChange.js b/src/Sim/SimulationEvents/GodChange.js
index 86198aca..012990bb 100644
--- a/src/Sim/SimulationEvents/GodChange.js
+++ b/src/Sim/SimulationEvents/GodChange.js
@@ -1,7 +1,7 @@
import CalculateGains from '../Calculations/CalculateGains';
import CheckOtherAchiev from '../Calculations/CheckOtherAchiev';
import CopyData from '../SimulationData/CopyData';
-import { SimAchievementsOwned, SimCookiesPs, SimGod1, SimGod2, SimGod3 } from '../VariablesAndData';
+import { SimAchievementsOwned, SimCookiesPs, SimGod1, SimGod2, SimGod3 } from '../VariablesAndData'; // eslint-disable-line no-unused-vars
/**
* This functions calculates the cps and cost of changing a Dragon Aura
diff --git a/src/Sim/SimulationEvents/ResetAscension.js b/src/Sim/SimulationEvents/ResetAscension.js
index 5b3bcec5..fc785d43 100644
--- a/src/Sim/SimulationEvents/ResetAscension.js
+++ b/src/Sim/SimulationEvents/ResetAscension.js
@@ -3,7 +3,7 @@ import CalculateGains from '../Calculations/CalculateGains';
import CheckOtherAchiev from '../Calculations/CheckOtherAchiev';
import CopyData from '../SimulationData/CopyData';
import SimWin from '../SimulationData/SimWin';
-import { SimAchievementsOwned, SimCookiesPs, SimPrestige, SimUpgrades } from '../VariablesAndData';
+import { SimAchievementsOwned, SimCookiesPs, SimPrestige, SimUpgrades } from '../VariablesAndData'; // eslint-disable-line no-unused-vars
/**
* This function calculates the cookies per click difference betwene current and after a ascension
@@ -76,7 +76,7 @@ export default function ResetBonus(newHeavenlyChips) {
const ResetCPS = SimCookiesPs - curCPS;
// Reset Pretige level after calculation as it is used in CM.Sim.CalculateGains() so can't be local
- SimPrestige = Game.prestige; // eslint-disable-line no-unused-vars
+ SimPrestige = Game.prestige;
return ResetCPS;
}
diff --git a/src/Sim/SimulationEvents/SellBuildingForChoEgg.js b/src/Sim/SimulationEvents/SellBuildingForChoEgg.js
index 1bbfedb3..911b1c34 100644
--- a/src/Sim/SimulationEvents/SellBuildingForChoEgg.js
+++ b/src/Sim/SimulationEvents/SellBuildingForChoEgg.js
@@ -1,5 +1,5 @@
import CopyData from '../SimulationData/CopyData';
-import { SimBuildingsOwned, SimDragonAura, SimDragonAura2, SimObjects } from '../VariablesAndData';
+import { SimBuildingsOwned, SimDragonAura, SimDragonAura2, SimObjects } from '../VariablesAndData'; // eslint-disable-line no-unused-vars
import BuildingSell from './SellBuilding';
/**
@@ -32,7 +32,7 @@ export default function SellBuildingsForChoEgg() {
}
});
SimObjects[highestBuilding].amount -= 1;
- SimBuildingsOwned -= 1; // eslint-disable-line no-unused-vars
+ SimBuildingsOwned -= 1;
}
// Get money made by selling all remaining buildings