From 941ccfeb79a9907dd5c2d41e9bf7daedd5d86a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?= <13665637+DanielNoord@users.noreply.github.com> Date: Sun, 2 May 2021 11:44:27 +0200 Subject: [PATCH] Updated ESLint to 7.25.0 --- package-lock.json | 14 +++---- package.json | 2 +- src/Cache/CPS/AverageQueue.js | 20 +++++----- src/Cache/CPS/CPS.js | 10 ++--- src/Cache/CPS/CurrWrinklerCPS.js | 6 +-- src/Cache/CPS/NoGoldSwitchCPS.js | 4 +- src/Cache/CPS/SellChoEgg.js | 4 +- src/Cache/CacheInit.js | 6 +-- src/Cache/CacheLoop.js | 4 +- src/Cache/Dragon/CacheDragonAuras.js | 6 +-- src/Cache/Dragon/Dragon.js | 4 +- src/Cache/PP/Building.js | 4 +- src/Cache/PriceAndIncome/PriceAndIncome.js | 4 +- src/Cache/Stats/ChainCookies.js | 32 +++++++-------- src/Cache/Stats/HeavenlyChips.js | 4 +- src/Cache/Stats/MissingUpgrades.js | 6 +-- src/Cache/Stats/Reindeer.js | 4 +- src/Cache/Stats/Stats.js | 24 +++++------ src/Cache/Wrinklers/Wrinklers.js | 8 ++-- src/Data/SettingsData.js | 4 +- src/Disp/Tooltips/Tooltip.js | 6 +-- src/InitSaveLoad/init.js | 4 +- src/InitSaveLoad/load.js | 4 +- src/Main/CheckStates/GoldenCookie.js | 4 +- src/Main/CheckStates/Season.js | 4 +- src/Main/Initialization.js | 8 ++-- .../ReplaceGameElements/NativeGrimoire.js | 4 +- src/Main/ReplaceGameElements/Tooltips.js | 4 +- .../ReplaceGameFunctions/ReplaceNative.js | 14 +++---- src/Main/WrinklerArea/AddDetectArea.js | 4 +- src/Sim/Calculations/CalculateGains.js | 8 ++-- src/Sim/SimulationData/CopyData.js | 40 +++++++++---------- src/Sim/SimulationData/SimWin.js | 4 +- src/Sim/SimulationEvents/AuraChange.js | 4 +- src/Sim/SimulationEvents/BuyUpgrades.js | 4 +- src/Sim/SimulationEvents/GodChange.js | 2 +- src/Sim/SimulationEvents/ResetAscension.js | 4 +- .../SimulationEvents/SellBuildingForChoEgg.js | 4 +- 38 files changed, 148 insertions(+), 148 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39a28b9..8bebada 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@typescript-eslint/eslint-plugin": "^4.22.0", "@typescript-eslint/parser": "^4.21.0", "chai": "^4.3.4", - "eslint": "^7.23.0", + "eslint": "^7.25.0", "eslint-config-airbnb-base": "^14.2.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-import": "^2.22.1", @@ -1310,9 +1310,9 @@ } }, "node_modules/eslint": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz", - "integrity": "sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz", + "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==", "dev": true, "dependencies": { "@babel/code-frame": "7.12.11", @@ -5667,9 +5667,9 @@ "dev": true }, "eslint": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz", - "integrity": "sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==", + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz", + "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==", "dev": true, "requires": { "@babel/code-frame": "7.12.11", diff --git a/package.json b/package.json index f8aba8e..fdc6d60 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@typescript-eslint/eslint-plugin": "^4.22.0", "@typescript-eslint/parser": "^4.21.0", "chai": "^4.3.4", - "eslint": "^7.23.0", + "eslint": "^7.25.0", "eslint-config-airbnb-base": "^14.2.1", "eslint-config-prettier": "^8.3.0", "eslint-plugin-import": "^2.22.1", diff --git a/src/Cache/CPS/AverageQueue.js b/src/Cache/CPS/AverageQueue.js index 76f3ede..4f1d75f 100644 --- a/src/Cache/CPS/AverageQueue.js +++ b/src/Cache/CPS/AverageQueue.js @@ -1,10 +1,10 @@ import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData'; import { - ChoEggDiff, - ClicksDiff, - CookiesDiff, - WrinkDiff, - WrinkFattestDiff, + ChoEggDiff, // eslint-disable-line no-unused-vars + ClicksDiff, // eslint-disable-line no-unused-vars + CookiesDiff, // eslint-disable-line no-unused-vars + WrinkDiff, // eslint-disable-line no-unused-vars + WrinkFattestDiff, // eslint-disable-line no-unused-vars } from '../VariablesAndData'; /** @@ -60,9 +60,9 @@ export class CMAvgQueue { * Called by CM.Cache.InitCache() */ export function InitCookiesDiff() { - CookiesDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars - WrinkDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars - WrinkFattestDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars - ChoEggDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars - ClicksDiff = new CMAvgQueue(ClickTimes[ClickTimes.length - 1]); // eslint-disable-line no-unused-vars + CookiesDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); + WrinkDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); + WrinkFattestDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); + ChoEggDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); + ClicksDiff = new CMAvgQueue(ClickTimes[ClickTimes.length - 1]); } diff --git a/src/Cache/CPS/CPS.js b/src/Cache/CPS/CPS.js index db3b33a..0bdfd03 100644 --- a/src/Cache/CPS/CPS.js +++ b/src/Cache/CPS/CPS.js @@ -1,20 +1,20 @@ import { CMOptions } from '../../Config/VariablesAndData'; import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData'; import { - CacheAverageClicks, + CacheAverageClicks, // eslint-disable-line no-unused-vars CacheAverageCPS, CacheAverageGainBank, CacheAverageGainChoEgg, CacheAverageGainWrink, CacheAverageGainWrinkFattest, - CacheAvgCPSWithChoEgg, + CacheAvgCPSWithChoEgg, // eslint-disable-line no-unused-vars CacheLastChoEgg, CacheLastClicks, CacheLastCookies, CacheLastCPSCheck, CacheLastWrinkCookies, CacheLastWrinkFattestCookies, - CacheRealCookiesEarned, + CacheRealCookiesEarned, // eslint-disable-line no-unused-vars CacheSellForChoEgg, CacheWrinklersFattest, CacheWrinklersTotal, @@ -39,7 +39,7 @@ export default function CacheAvgCPS() { if ((Game.T / Game.fps) % 1 === 0) { let choEggTotal = Game.cookies + CacheSellForChoEgg; if (Game.cpsSucked > 0) choEggTotal += CacheWrinklersTotal; - CacheRealCookiesEarned = Math.max(Game.cookiesEarned, choEggTotal); // eslint-disable-line no-unused-vars + CacheRealCookiesEarned = Math.max(Game.cookiesEarned, choEggTotal); choEggTotal *= 0.05; // Add recent gains to AvgQueue's @@ -81,7 +81,7 @@ export default function CacheAvgCPS() { if (choEgg || CMOptions.CalcWrink === 0) { CacheAvgCPSWithChoEgg = CacheAverageGainBank + CacheAverageGainWrink + (choEgg ? CacheAverageGainChoEgg : 0); - } else CacheAvgCPSWithChoEgg = CacheAverageCPS; // eslint-disable-line no-unused-vars + } else CacheAvgCPSWithChoEgg = CacheAverageCPS; // eslint-disable-next-line no-unused-vars CacheAverageClicks = ClicksDiff.calcAverage(ClickTimes[CMOptions.AvgClicksHist]); diff --git a/src/Cache/CPS/CurrWrinklerCPS.js b/src/Cache/CPS/CurrWrinklerCPS.js index 5bdd4cf..2ff4e95 100644 --- a/src/Cache/CPS/CurrWrinklerCPS.js +++ b/src/Cache/CPS/CurrWrinklerCPS.js @@ -1,5 +1,5 @@ import { SimObjects } from '../../Sim/VariablesAndData'; -import { CacheCurrWrinklerCount, CacheCurrWrinklerCPSMult } from '../VariablesAndData'; +import { CacheCurrWrinklerCount, CacheCurrWrinklerCPSMult } from '../VariablesAndData'; // eslint-disable-line no-unused-vars /** * This functions caches the current Wrinkler CPS multiplier @@ -19,8 +19,8 @@ export default function CacheCurrWrinklerCPS() { else if (godLvl === 2) godMult *= 1.1; else if (godLvl === 3) godMult *= 1.05; } - CacheCurrWrinklerCount = count; // eslint-disable-line no-unused-vars - CacheCurrWrinklerCPSMult = // eslint-disable-line no-unused-vars + CacheCurrWrinklerCount = count; + CacheCurrWrinklerCPSMult = count * (count * 0.05 * 1.1) * (Game.Has('Sacrilegious corruption') * 0.05 + 1) * diff --git a/src/Cache/CPS/NoGoldSwitchCPS.js b/src/Cache/CPS/NoGoldSwitchCPS.js index f0cd5bc..afb77ef 100644 --- a/src/Cache/CPS/NoGoldSwitchCPS.js +++ b/src/Cache/CPS/NoGoldSwitchCPS.js @@ -1,5 +1,5 @@ import CalcNoGoldSwitchCPS from '../../Sim/Calculations/NoGoldenSwitchCalc'; -import { CacheNoGoldSwitchCookiesPS } from '../VariablesAndData'; +import { CacheNoGoldSwitchCookiesPS } from '../VariablesAndData'; // eslint-disable-line no-unused-vars /** * This function calculates CPS without the Golden Switch as it might be needed in other functions @@ -9,5 +9,5 @@ import { CacheNoGoldSwitchCookiesPS } from '../VariablesAndData'; export default function CacheNoGoldSwitchCPS() { if (Game.Has('Golden switch [off]')) { CacheNoGoldSwitchCookiesPS = CalcNoGoldSwitchCPS(); - } else CacheNoGoldSwitchCookiesPS = Game.cookiesPs; // eslint-disable-line no-unused-vars + } else CacheNoGoldSwitchCookiesPS = Game.cookiesPs; } diff --git a/src/Cache/CPS/SellChoEgg.js b/src/Cache/CPS/SellChoEgg.js index e3222e2..7c3803a 100644 --- a/src/Cache/CPS/SellChoEgg.js +++ b/src/Cache/CPS/SellChoEgg.js @@ -1,5 +1,5 @@ import SellBuildingsForChoEgg from '../../Sim/SimulationEvents/SellBuildingForChoEgg'; -import { CacheSellForChoEgg } from '../VariablesAndData'; +import { CacheSellForChoEgg } from '../VariablesAndData'; // eslint-disable-line no-unused-vars /** * This functions caches the reward for selling the Chocolate egg @@ -20,5 +20,5 @@ export default function CacheSellAllForChoEgg() { } // Compute cookies earned by selling all buildings with optimal auras (ES + RB) sellTotal += SellBuildingsForChoEgg(); - CacheSellForChoEgg = sellTotal; // eslint-disable-line no-unused-vars + CacheSellForChoEgg = sellTotal; } diff --git a/src/Cache/CacheInit.js b/src/Cache/CacheInit.js index e3d8319..398a2f8 100644 --- a/src/Cache/CacheInit.js +++ b/src/Cache/CacheInit.js @@ -10,7 +10,7 @@ import CacheAllMissingUpgrades from './Stats/MissingUpgrades'; import CacheSeasonSpec from './Stats/Reindeer'; import { CacheGoldenAndWrathCookiesMults, CacheStatsCookies } from './Stats/Stats'; import AllAmountTillNextAchievement from './TillNextAchievement/AllAmountTillNextAchievement'; -import { CacheAverageCookiesFromClicks, HeavenlyChipsDiff } from './VariablesAndData'; +import { CacheAverageCookiesFromClicks, HeavenlyChipsDiff } from './VariablesAndData'; // eslint-disable-line no-unused-vars import CacheWrinklers from './Wrinklers/Wrinklers'; /** @@ -26,8 +26,8 @@ export default function InitCache() { CacheSeasonSpec(); InitCookiesDiff(); /** Used by CM.Cache.CacheHeavenlyChipsPS() */ - HeavenlyChipsDiff = new CMAvgQueue(5); // eslint-disable-line no-unused-vars - CacheAverageCookiesFromClicks = new CMAvgQueue(ClickTimes[ClickTimes.length - 1] * 20); // eslint-disable-line no-unused-vars + HeavenlyChipsDiff = new CMAvgQueue(5); + CacheAverageCookiesFromClicks = new CMAvgQueue(ClickTimes[ClickTimes.length - 1] * 20); CacheHeavenlyChipsPS(); AllAmountTillNextAchievement(); CacheAvgCPS(); diff --git a/src/Cache/CacheLoop.js b/src/Cache/CacheLoop.js index acd798c..f54613b 100644 --- a/src/Cache/CacheLoop.js +++ b/src/Cache/CacheLoop.js @@ -4,7 +4,7 @@ import CacheAvgCPS from './CPS/CPS'; import CacheCurrWrinklerCPS from './CPS/CurrWrinklerCPS'; import CachePP from './PP/PP'; import CacheHeavenlyChipsPS from './Stats/HeavenlyChips'; -import { CacheTimeTillNextPrestige } from './VariablesAndData'; +import { CacheTimeTillNextPrestige } from './VariablesAndData'; // eslint-disable-line no-unused-vars import CacheWrinklers from './Wrinklers/Wrinklers'; /** @@ -25,5 +25,5 @@ export default function LoopCache() { Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) + 1, ) - (Game.cookiesEarned + Game.cookiesReset); - CacheTimeTillNextPrestige = FormatTime(cookiesToNext / GetCPS()); // eslint-disable-line no-unused-vars + CacheTimeTillNextPrestige = FormatTime(cookiesToNext / GetCPS()); } diff --git a/src/Cache/Dragon/CacheDragonAuras.js b/src/Cache/Dragon/CacheDragonAuras.js index 32ef632..9ba4def 100644 --- a/src/Cache/Dragon/CacheDragonAuras.js +++ b/src/Cache/Dragon/CacheDragonAuras.js @@ -1,9 +1,9 @@ -import { CacheDragonAura, CacheDragonAura2 } from '../VariablesAndData'; +import { CacheDragonAura, CacheDragonAura2 } from '../VariablesAndData'; // eslint-disable-line no-unused-vars /** * This functions caches the currently selected Dragon Auras */ export default function CacheDragonAuras() { - CacheDragonAura = Game.dragonAura; // eslint-disable-line no-unused-vars - CacheDragonAura2 = Game.dragonAura2; // eslint-disable-line no-unused-vars + CacheDragonAura = Game.dragonAura; + CacheDragonAura2 = Game.dragonAura2; } diff --git a/src/Cache/Dragon/Dragon.js b/src/Cache/Dragon/Dragon.js index d466442..991d242 100644 --- a/src/Cache/Dragon/Dragon.js +++ b/src/Cache/Dragon/Dragon.js @@ -3,7 +3,7 @@ import Beautify from '../../Disp/BeautifyAndFormatting/Beautify'; import CopyData from '../../Sim/SimulationData/CopyData'; import { SimDoSims, SimObjects } from '../../Sim/VariablesAndData'; -import { CacheCostDragonUpgrade, CacheLastDragonLevel } from '../VariablesAndData'; +import { CacheCostDragonUpgrade, CacheLastDragonLevel } from '../VariablesAndData'; // eslint-disable-line no-unused-vars /** * This functions caches the current cost of upgrading the dragon level so it can be displayed in the tooltip @@ -56,7 +56,7 @@ export default function CacheDragonCost() { cost += price; SimObjects[target].amount -= 1; } - CacheCostDragonUpgrade = `Cost to rebuy: ${Beautify(cost)}`; // eslint-disable-line no-unused-vars + CacheCostDragonUpgrade = `Cost to rebuy: ${Beautify(cost)}`; }); } } diff --git a/src/Cache/PP/Building.js b/src/Cache/PP/Building.js index ba44113..c7e519b 100644 --- a/src/Cache/PP/Building.js +++ b/src/Cache/PP/Building.js @@ -2,7 +2,7 @@ import { CMOptions } from '../../Config/VariablesAndData'; import GetWrinkConfigBank from '../../Disp/HelperFunctions/GetWrinkConfigBank'; import { ColourGray } from '../../Disp/VariablesAndData'; import { - CacheMinPP, + CacheMinPP, // eslint-disable-line no-unused-vars CacheObjects1, CacheObjects10, CacheObjects100, @@ -67,7 +67,7 @@ export default function CacheBuildingsPP() { } } } - CacheMinPP = CachePPArray[CMOptions.PPExcludeTop][indexOfMin]; // eslint-disable-line no-unused-vars + CacheMinPP = CachePPArray[CMOptions.PPExcludeTop][indexOfMin]; CacheColour(CacheObjects1, 1); CacheColour(CacheObjects10, 10); diff --git a/src/Cache/PriceAndIncome/PriceAndIncome.js b/src/Cache/PriceAndIncome/PriceAndIncome.js index cc6208b..22e4f21 100644 --- a/src/Cache/PriceAndIncome/PriceAndIncome.js +++ b/src/Cache/PriceAndIncome/PriceAndIncome.js @@ -8,7 +8,7 @@ import { CacheAverageGainBank, CacheAverageGainWrink, CacheAverageGainWrinkFattest, - CacheDoRemakeBuildPrices, + CacheDoRemakeBuildPrices, // eslint-disable-line no-unused-vars CacheObjects1, CacheObjects10, CacheObjects100, @@ -28,7 +28,7 @@ function CacheBuildingIncome(amount) { result[i] = {}; result[i].bonus = BuyBuildingsBonusIncome(i, amount); if (amount !== 1) { - CacheDoRemakeBuildPrices = 1; // eslint-disable-line no-unused-vars + CacheDoRemakeBuildPrices = 1; } }); return result; diff --git a/src/Cache/Stats/ChainCookies.js b/src/Cache/Stats/ChainCookies.js index 1b81723..145a8f2 100644 --- a/src/Cache/Stats/ChainCookies.js +++ b/src/Cache/Stats/ChainCookies.js @@ -1,17 +1,17 @@ import GetCPSBuffMult from '../CPS/GetCPSBuffMult'; import { CacheChainFrenzyMaxReward, - CacheChainFrenzyRequired, - CacheChainFrenzyRequiredNext, + CacheChainFrenzyRequired, // eslint-disable-line no-unused-vars + CacheChainFrenzyRequiredNext, // eslint-disable-line no-unused-vars CacheChainFrenzyWrathMaxReward, - CacheChainFrenzyWrathRequired, - CacheChainFrenzyWrathRequiredNext, + CacheChainFrenzyWrathRequired, // eslint-disable-line no-unused-vars + CacheChainFrenzyWrathRequiredNext, // eslint-disable-line no-unused-vars CacheChainMaxReward, - CacheChainRequired, - CacheChainRequiredNext, + CacheChainRequired, // eslint-disable-line no-unused-vars + CacheChainRequiredNext, // eslint-disable-line no-unused-vars CacheChainWrathMaxReward, - CacheChainWrathRequired, - CacheChainWrathRequiredNext, + CacheChainWrathRequired, // eslint-disable-line no-unused-vars + CacheChainWrathRequiredNext, // eslint-disable-line no-unused-vars CacheDragonsFortuneMultAdjustment, CacheGoldenCookiesMult, CacheNoGoldSwitchCookiesPS, @@ -72,21 +72,21 @@ export function CacheChain() { else maxPayout = 0; CacheChainMaxReward = MaxChainCookieReward(7, maxPayout, CacheGoldenCookiesMult); - CacheChainRequired = (CacheChainMaxReward[1] * 2) / CacheGoldenCookiesMult; // eslint-disable-line no-unused-vars - CacheChainRequiredNext = CacheChainMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment; // eslint-disable-line no-unused-vars + CacheChainRequired = (CacheChainMaxReward[1] * 2) / CacheGoldenCookiesMult; + CacheChainRequiredNext = CacheChainMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment; CacheChainWrathMaxReward = MaxChainCookieReward(6, maxPayout, CacheWrathCookiesMult); - CacheChainWrathRequired = (CacheChainWrathMaxReward[1] * 2) / CacheWrathCookiesMult; // eslint-disable-line no-unused-vars - CacheChainWrathRequiredNext = // eslint-disable-line no-unused-vars + CacheChainWrathRequired = (CacheChainWrathMaxReward[1] * 2) / CacheWrathCookiesMult; + CacheChainWrathRequiredNext = CacheChainWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment; CacheChainFrenzyMaxReward = MaxChainCookieReward(7, maxPayout * 7, CacheGoldenCookiesMult); - CacheChainFrenzyRequired = (CacheChainFrenzyMaxReward[1] * 2) / CacheGoldenCookiesMult; // eslint-disable-line no-unused-vars - CacheChainFrenzyRequiredNext = // eslint-disable-line no-unused-vars + CacheChainFrenzyRequired = (CacheChainFrenzyMaxReward[1] * 2) / CacheGoldenCookiesMult; + CacheChainFrenzyRequiredNext = CacheChainFrenzyMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment; CacheChainFrenzyWrathMaxReward = MaxChainCookieReward(6, maxPayout * 7, CacheWrathCookiesMult); - CacheChainFrenzyWrathRequired = (CacheChainFrenzyWrathMaxReward[1] * 2) / CacheWrathCookiesMult; // eslint-disable-line no-unused-vars - CacheChainFrenzyWrathRequiredNext = // eslint-disable-line no-unused-vars + CacheChainFrenzyWrathRequired = (CacheChainFrenzyWrathMaxReward[1] * 2) / CacheWrathCookiesMult; + CacheChainFrenzyWrathRequiredNext = CacheChainFrenzyWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment; } diff --git a/src/Cache/Stats/HeavenlyChips.js b/src/Cache/Stats/HeavenlyChips.js index 17b071a..1279bce 100644 --- a/src/Cache/Stats/HeavenlyChips.js +++ b/src/Cache/Stats/HeavenlyChips.js @@ -1,5 +1,5 @@ import { - CacheHCPerSecond, + CacheHCPerSecond, // eslint-disable-line no-unused-vars CacheLastHeavenlyCheck, CacheLastHeavenlyChips, HeavenlyChipsDiff, @@ -30,6 +30,6 @@ export default function CacheHeavenlyChipsPS() { CacheLastHeavenlyChips = ascendNowToGet; // Get average gain over period of 5 seconds - CacheHCPerSecond = HeavenlyChipsDiff.calcAverage(5); // eslint-disable-line no-unused-vars + CacheHCPerSecond = HeavenlyChipsDiff.calcAverage(5); } } diff --git a/src/Cache/Stats/MissingUpgrades.js b/src/Cache/Stats/MissingUpgrades.js index e6eec50..2be2806 100644 --- a/src/Cache/Stats/MissingUpgrades.js +++ b/src/Cache/Stats/MissingUpgrades.js @@ -1,8 +1,8 @@ import { crateMissing } from '../../Disp/MenuSections/Statistics/CreateMissingUpgrades'; import { - CacheMissingUpgrades, - CacheMissingUpgradesCookies, - CacheMissingUpgradesPrestige, + CacheMissingUpgrades, // eslint-disable-line no-unused-vars + CacheMissingUpgradesCookies, // eslint-disable-line no-unused-vars + CacheMissingUpgradesPrestige, // eslint-disable-line no-unused-vars } from '../VariablesAndData'; /** diff --git a/src/Cache/Stats/Reindeer.js b/src/Cache/Stats/Reindeer.js index f4142d0..ce9915d 100644 --- a/src/Cache/Stats/Reindeer.js +++ b/src/Cache/Stats/Reindeer.js @@ -1,4 +1,4 @@ -import { CacheSeaSpec } from '../VariablesAndData'; +import { CacheSeaSpec } from '../VariablesAndData'; // eslint-disable-line no-unused-vars /** * This functions caches the reward of popping a reindeer @@ -11,6 +11,6 @@ export default function CacheSeasonSpec() { if (Game.hasBuff('Elder frenzy')) val *= 0.5; if (Game.hasBuff('Frenzy')) val *= 0.75; CacheSeaSpec = Math.max(25, val); - if (Game.Has('Ho ho ho-flavored frosting')) CacheSeaSpec *= 2; // eslint-disable-line no-unused-vars + if (Game.Has('Ho ho ho-flavored frosting')) CacheSeaSpec *= 2; } } diff --git a/src/Cache/Stats/Stats.js b/src/Cache/Stats/Stats.js index ce39109..556fa5d 100644 --- a/src/Cache/Stats/Stats.js +++ b/src/Cache/Stats/Stats.js @@ -4,17 +4,17 @@ import SimHas from '../../Sim/ReplacedGameFunctions/SimHas'; import GetCPSBuffMult from '../CPS/GetCPSBuffMult'; import { CacheConjure, - CacheConjureReward, + CacheConjureReward, // eslint-disable-line no-unused-vars CacheDragonsFortuneMultAdjustment, CacheEdifice, - CacheEdificeBuilding, + CacheEdificeBuilding, // eslint-disable-line no-unused-vars CacheGoldenCookiesMult, CacheLucky, CacheLuckyFrenzy, - CacheLuckyReward, - CacheLuckyRewardFrenzy, - CacheLuckyWrathReward, - CacheLuckyWrathRewardFrenzy, + CacheLuckyReward, // eslint-disable-line no-unused-vars + CacheLuckyRewardFrenzy, // eslint-disable-line no-unused-vars + CacheLuckyWrathReward, // eslint-disable-line no-unused-vars + CacheLuckyWrathRewardFrenzy, // eslint-disable-line no-unused-vars CacheNoGoldSwitchCookiesPS, CacheWrathCookiesMult, } from '../VariablesAndData'; @@ -28,13 +28,13 @@ export function CacheStatsCookies() { const cpsBuffMult = GetCPSBuffMult(); if (cpsBuffMult > 0) CacheLucky /= cpsBuffMult; else CacheLucky = 0; - CacheLuckyReward = CacheGoldenCookiesMult * (CacheLucky * 0.15) + 13; // eslint-disable-line no-unused-vars - CacheLuckyWrathReward = CacheWrathCookiesMult * (CacheLucky * 0.15) + 13; // eslint-disable-line no-unused-vars + CacheLuckyReward = CacheGoldenCookiesMult * (CacheLucky * 0.15) + 13; + CacheLuckyWrathReward = CacheWrathCookiesMult * (CacheLucky * 0.15) + 13; CacheLuckyFrenzy = CacheLucky * 7; - CacheLuckyRewardFrenzy = CacheGoldenCookiesMult * (CacheLuckyFrenzy * 0.15) + 13; // eslint-disable-line no-unused-vars - CacheLuckyWrathRewardFrenzy = CacheWrathCookiesMult * (CacheLuckyFrenzy * 0.15) + 13; // eslint-disable-line no-unused-vars + CacheLuckyRewardFrenzy = CacheGoldenCookiesMult * (CacheLuckyFrenzy * 0.15) + 13; + CacheLuckyWrathRewardFrenzy = CacheWrathCookiesMult * (CacheLuckyFrenzy * 0.15) + 13; CacheConjure = CacheLucky * 2; - CacheConjureReward = CacheConjure * 0.15; // eslint-disable-line no-unused-vars + CacheConjureReward = CacheConjure * 0.15; CacheEdifice = 0; let max = 0; @@ -50,7 +50,7 @@ export function CacheStatsCookies() { Game.Objects[i].price * 2 > CacheEdifice ) { CacheEdifice = Game.Objects[i].price * 2; - CacheEdificeBuilding = i; // eslint-disable-line no-unused-vars + CacheEdificeBuilding = i; } }); } diff --git a/src/Cache/Wrinklers/Wrinklers.js b/src/Cache/Wrinklers/Wrinklers.js index 3963b91..2b94206 100644 --- a/src/Cache/Wrinklers/Wrinklers.js +++ b/src/Cache/Wrinklers/Wrinklers.js @@ -3,8 +3,8 @@ import { SimObjects } from '../../Sim/VariablesAndData'; import { CacheWrinklersFattest, - CacheWrinklersNormal, - CacheWrinklersTotal, + CacheWrinklersNormal, // eslint-disable-line no-unused-vars + CacheWrinklersTotal, // eslint-disable-line no-unused-vars } from '../VariablesAndData'; /** @@ -31,9 +31,9 @@ export default function CacheWrinklers() { else if (godLvl === 2) sucked *= 1.1; else if (godLvl === 3) sucked *= 1.05; } - CacheWrinklersTotal += sucked; // eslint-disable-line no-unused-vars + CacheWrinklersTotal += sucked; if (Game.wrinklers[i].type === 0) { - CacheWrinklersNormal += sucked; // eslint-disable-line no-unused-vars + CacheWrinklersNormal += sucked; if (sucked > CacheWrinklersFattest[0]) CacheWrinklersFattest = [sucked, i]; } } diff --git a/src/Data/SettingsData.js b/src/Data/SettingsData.js index 7e8cc76..8ce7816 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; }, ), diff --git a/src/Disp/Tooltips/Tooltip.js b/src/Disp/Tooltips/Tooltip.js index 577912c..29f4883 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/InitSaveLoad/init.js b/src/InitSaveLoad/init.js index a743350..e7f14b8 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 bc53f54..ebfcebb 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 2773ccf..6eeb591 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 b521dd2..12751c3 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 05f7435..4ba08fd 100644 --- a/src/Main/Initialization.js +++ b/src/Main/Initialization.js @@ -12,12 +12,12 @@ 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'; /** @@ -29,7 +29,7 @@ export default function InitializeCookieMonster() { 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 +54,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/ReplaceGameElements/NativeGrimoire.js b/src/Main/ReplaceGameElements/NativeGrimoire.js index b30f7e8..ca58376 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 09952fd..d35e661 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 d28ecb1..2285121 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 fdf5520..7b50b75 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 9d46954..c793ee5 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 3d6cdc6..3545c32 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 58a3d1e..c2fc90a 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 6564aad..5127639 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 23fee71..f074212 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 86198ac..012990b 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 5b3bcec..fc785d4 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 1bbfedb..911b1c3 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