Merge pull request #796 from DanielNoord/eslint
Updated ESLint to 7.25.0
This commit is contained in:
14
package-lock.json
generated
14
package-lock.json
generated
@@ -17,7 +17,7 @@
|
|||||||
"@typescript-eslint/eslint-plugin": "^4.22.0",
|
"@typescript-eslint/eslint-plugin": "^4.22.0",
|
||||||
"@typescript-eslint/parser": "^4.21.0",
|
"@typescript-eslint/parser": "^4.21.0",
|
||||||
"chai": "^4.3.4",
|
"chai": "^4.3.4",
|
||||||
"eslint": "^7.23.0",
|
"eslint": "^7.25.0",
|
||||||
"eslint-config-airbnb-base": "^14.2.1",
|
"eslint-config-airbnb-base": "^14.2.1",
|
||||||
"eslint-config-prettier": "^8.3.0",
|
"eslint-config-prettier": "^8.3.0",
|
||||||
"eslint-plugin-import": "^2.22.1",
|
"eslint-plugin-import": "^2.22.1",
|
||||||
@@ -1310,9 +1310,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/eslint": {
|
"node_modules/eslint": {
|
||||||
"version": "7.24.0",
|
"version": "7.25.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz",
|
||||||
"integrity": "sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==",
|
"integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/code-frame": "7.12.11",
|
"@babel/code-frame": "7.12.11",
|
||||||
@@ -5667,9 +5667,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"eslint": {
|
"eslint": {
|
||||||
"version": "7.24.0",
|
"version": "7.25.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz",
|
||||||
"integrity": "sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==",
|
"integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"@babel/code-frame": "7.12.11",
|
"@babel/code-frame": "7.12.11",
|
||||||
|
|||||||
@@ -48,7 +48,7 @@
|
|||||||
"@typescript-eslint/eslint-plugin": "^4.22.0",
|
"@typescript-eslint/eslint-plugin": "^4.22.0",
|
||||||
"@typescript-eslint/parser": "^4.21.0",
|
"@typescript-eslint/parser": "^4.21.0",
|
||||||
"chai": "^4.3.4",
|
"chai": "^4.3.4",
|
||||||
"eslint": "^7.23.0",
|
"eslint": "^7.25.0",
|
||||||
"eslint-config-airbnb-base": "^14.2.1",
|
"eslint-config-airbnb-base": "^14.2.1",
|
||||||
"eslint-config-prettier": "^8.3.0",
|
"eslint-config-prettier": "^8.3.0",
|
||||||
"eslint-plugin-import": "^2.22.1",
|
"eslint-plugin-import": "^2.22.1",
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData';
|
import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData';
|
||||||
import {
|
import {
|
||||||
ChoEggDiff,
|
ChoEggDiff, // eslint-disable-line no-unused-vars
|
||||||
ClicksDiff,
|
ClicksDiff, // eslint-disable-line no-unused-vars
|
||||||
CookiesDiff,
|
CookiesDiff, // eslint-disable-line no-unused-vars
|
||||||
WrinkDiff,
|
WrinkDiff, // eslint-disable-line no-unused-vars
|
||||||
WrinkFattestDiff,
|
WrinkFattestDiff, // eslint-disable-line no-unused-vars
|
||||||
} from '../VariablesAndData';
|
} from '../VariablesAndData';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -60,9 +60,9 @@ export class CMAvgQueue {
|
|||||||
* Called by CM.Cache.InitCache()
|
* Called by CM.Cache.InitCache()
|
||||||
*/
|
*/
|
||||||
export function InitCookiesDiff() {
|
export function InitCookiesDiff() {
|
||||||
CookiesDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars
|
CookiesDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]);
|
||||||
WrinkDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars
|
WrinkDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]);
|
||||||
WrinkFattestDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars
|
WrinkFattestDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]);
|
||||||
ChoEggDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]); // eslint-disable-line no-unused-vars
|
ChoEggDiff = new CMAvgQueue(CookieTimes[CookieTimes.length - 1]);
|
||||||
ClicksDiff = new CMAvgQueue(ClickTimes[ClickTimes.length - 1]); // eslint-disable-line no-unused-vars
|
ClicksDiff = new CMAvgQueue(ClickTimes[ClickTimes.length - 1]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +1,20 @@
|
|||||||
import { CMOptions } from '../../Config/VariablesAndData';
|
import { CMOptions } from '../../Config/VariablesAndData';
|
||||||
import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData';
|
import { ClickTimes, CookieTimes } from '../../Disp/VariablesAndData';
|
||||||
import {
|
import {
|
||||||
CacheAverageClicks,
|
CacheAverageClicks, // eslint-disable-line no-unused-vars
|
||||||
CacheAverageCPS,
|
CacheAverageCPS,
|
||||||
CacheAverageGainBank,
|
CacheAverageGainBank,
|
||||||
CacheAverageGainChoEgg,
|
CacheAverageGainChoEgg,
|
||||||
CacheAverageGainWrink,
|
CacheAverageGainWrink,
|
||||||
CacheAverageGainWrinkFattest,
|
CacheAverageGainWrinkFattest,
|
||||||
CacheAvgCPSWithChoEgg,
|
CacheAvgCPSWithChoEgg, // eslint-disable-line no-unused-vars
|
||||||
CacheLastChoEgg,
|
CacheLastChoEgg,
|
||||||
CacheLastClicks,
|
CacheLastClicks,
|
||||||
CacheLastCookies,
|
CacheLastCookies,
|
||||||
CacheLastCPSCheck,
|
CacheLastCPSCheck,
|
||||||
CacheLastWrinkCookies,
|
CacheLastWrinkCookies,
|
||||||
CacheLastWrinkFattestCookies,
|
CacheLastWrinkFattestCookies,
|
||||||
CacheRealCookiesEarned,
|
CacheRealCookiesEarned, // eslint-disable-line no-unused-vars
|
||||||
CacheSellForChoEgg,
|
CacheSellForChoEgg,
|
||||||
CacheWrinklersFattest,
|
CacheWrinklersFattest,
|
||||||
CacheWrinklersTotal,
|
CacheWrinklersTotal,
|
||||||
@@ -39,7 +39,7 @@ export default function CacheAvgCPS() {
|
|||||||
if ((Game.T / Game.fps) % 1 === 0) {
|
if ((Game.T / Game.fps) % 1 === 0) {
|
||||||
let choEggTotal = Game.cookies + CacheSellForChoEgg;
|
let choEggTotal = Game.cookies + CacheSellForChoEgg;
|
||||||
if (Game.cpsSucked > 0) choEggTotal += CacheWrinklersTotal;
|
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;
|
choEggTotal *= 0.05;
|
||||||
|
|
||||||
// Add recent gains to AvgQueue's
|
// Add recent gains to AvgQueue's
|
||||||
@@ -81,7 +81,7 @@ export default function CacheAvgCPS() {
|
|||||||
if (choEgg || CMOptions.CalcWrink === 0) {
|
if (choEgg || CMOptions.CalcWrink === 0) {
|
||||||
CacheAvgCPSWithChoEgg =
|
CacheAvgCPSWithChoEgg =
|
||||||
CacheAverageGainBank + CacheAverageGainWrink + (choEgg ? CacheAverageGainChoEgg : 0);
|
CacheAverageGainBank + CacheAverageGainWrink + (choEgg ? CacheAverageGainChoEgg : 0);
|
||||||
} else CacheAvgCPSWithChoEgg = CacheAverageCPS; // eslint-disable-line no-unused-vars
|
} else CacheAvgCPSWithChoEgg = CacheAverageCPS;
|
||||||
|
|
||||||
// eslint-disable-next-line no-unused-vars
|
// eslint-disable-next-line no-unused-vars
|
||||||
CacheAverageClicks = ClicksDiff.calcAverage(ClickTimes[CMOptions.AvgClicksHist]);
|
CacheAverageClicks = ClicksDiff.calcAverage(ClickTimes[CMOptions.AvgClicksHist]);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { SimObjects } from '../../Sim/VariablesAndData';
|
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
|
* 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 === 2) godMult *= 1.1;
|
||||||
else if (godLvl === 3) godMult *= 1.05;
|
else if (godLvl === 3) godMult *= 1.05;
|
||||||
}
|
}
|
||||||
CacheCurrWrinklerCount = count; // eslint-disable-line no-unused-vars
|
CacheCurrWrinklerCount = count;
|
||||||
CacheCurrWrinklerCPSMult = // eslint-disable-line no-unused-vars
|
CacheCurrWrinklerCPSMult =
|
||||||
count *
|
count *
|
||||||
(count * 0.05 * 1.1) *
|
(count * 0.05 * 1.1) *
|
||||||
(Game.Has('Sacrilegious corruption') * 0.05 + 1) *
|
(Game.Has('Sacrilegious corruption') * 0.05 + 1) *
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import CalcNoGoldSwitchCPS from '../../Sim/Calculations/NoGoldenSwitchCalc';
|
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
|
* 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() {
|
export default function CacheNoGoldSwitchCPS() {
|
||||||
if (Game.Has('Golden switch [off]')) {
|
if (Game.Has('Golden switch [off]')) {
|
||||||
CacheNoGoldSwitchCookiesPS = CalcNoGoldSwitchCPS();
|
CacheNoGoldSwitchCookiesPS = CalcNoGoldSwitchCPS();
|
||||||
} else CacheNoGoldSwitchCookiesPS = Game.cookiesPs; // eslint-disable-line no-unused-vars
|
} else CacheNoGoldSwitchCookiesPS = Game.cookiesPs;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import SellBuildingsForChoEgg from '../../Sim/SimulationEvents/SellBuildingForChoEgg';
|
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
|
* 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)
|
// Compute cookies earned by selling all buildings with optimal auras (ES + RB)
|
||||||
sellTotal += SellBuildingsForChoEgg();
|
sellTotal += SellBuildingsForChoEgg();
|
||||||
CacheSellForChoEgg = sellTotal; // eslint-disable-line no-unused-vars
|
CacheSellForChoEgg = sellTotal;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import CacheAllMissingUpgrades from './Stats/MissingUpgrades';
|
|||||||
import CacheSeasonSpec from './Stats/Reindeer';
|
import CacheSeasonSpec from './Stats/Reindeer';
|
||||||
import { CacheGoldenAndWrathCookiesMults, CacheStatsCookies } from './Stats/Stats';
|
import { CacheGoldenAndWrathCookiesMults, CacheStatsCookies } from './Stats/Stats';
|
||||||
import AllAmountTillNextAchievement from './TillNextAchievement/AllAmountTillNextAchievement';
|
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';
|
import CacheWrinklers from './Wrinklers/Wrinklers';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -26,8 +26,8 @@ export default function InitCache() {
|
|||||||
CacheSeasonSpec();
|
CacheSeasonSpec();
|
||||||
InitCookiesDiff();
|
InitCookiesDiff();
|
||||||
/** Used by CM.Cache.CacheHeavenlyChipsPS() */
|
/** Used by CM.Cache.CacheHeavenlyChipsPS() */
|
||||||
HeavenlyChipsDiff = new CMAvgQueue(5); // eslint-disable-line no-unused-vars
|
HeavenlyChipsDiff = new CMAvgQueue(5);
|
||||||
CacheAverageCookiesFromClicks = new CMAvgQueue(ClickTimes[ClickTimes.length - 1] * 20); // eslint-disable-line no-unused-vars
|
CacheAverageCookiesFromClicks = new CMAvgQueue(ClickTimes[ClickTimes.length - 1] * 20);
|
||||||
CacheHeavenlyChipsPS();
|
CacheHeavenlyChipsPS();
|
||||||
AllAmountTillNextAchievement();
|
AllAmountTillNextAchievement();
|
||||||
CacheAvgCPS();
|
CacheAvgCPS();
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import CacheAvgCPS from './CPS/CPS';
|
|||||||
import CacheCurrWrinklerCPS from './CPS/CurrWrinklerCPS';
|
import CacheCurrWrinklerCPS from './CPS/CurrWrinklerCPS';
|
||||||
import CachePP from './PP/PP';
|
import CachePP from './PP/PP';
|
||||||
import CacheHeavenlyChipsPS from './Stats/HeavenlyChips';
|
import CacheHeavenlyChipsPS from './Stats/HeavenlyChips';
|
||||||
import { CacheTimeTillNextPrestige } from './VariablesAndData';
|
import { CacheTimeTillNextPrestige } from './VariablesAndData'; // eslint-disable-line no-unused-vars
|
||||||
import CacheWrinklers from './Wrinklers/Wrinklers';
|
import CacheWrinklers from './Wrinklers/Wrinklers';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -25,5 +25,5 @@ export default function LoopCache() {
|
|||||||
Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) + 1,
|
Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) + 1,
|
||||||
) -
|
) -
|
||||||
(Game.cookiesEarned + Game.cookiesReset);
|
(Game.cookiesEarned + Game.cookiesReset);
|
||||||
CacheTimeTillNextPrestige = FormatTime(cookiesToNext / GetCPS()); // eslint-disable-line no-unused-vars
|
CacheTimeTillNextPrestige = FormatTime(cookiesToNext / GetCPS());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
* This functions caches the currently selected Dragon Auras
|
||||||
*/
|
*/
|
||||||
export default function CacheDragonAuras() {
|
export default function CacheDragonAuras() {
|
||||||
CacheDragonAura = Game.dragonAura; // eslint-disable-line no-unused-vars
|
CacheDragonAura = Game.dragonAura;
|
||||||
CacheDragonAura2 = Game.dragonAura2; // eslint-disable-line no-unused-vars
|
CacheDragonAura2 = Game.dragonAura2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
import Beautify from '../../Disp/BeautifyAndFormatting/Beautify';
|
import Beautify from '../../Disp/BeautifyAndFormatting/Beautify';
|
||||||
import CopyData from '../../Sim/SimulationData/CopyData';
|
import CopyData from '../../Sim/SimulationData/CopyData';
|
||||||
import { SimDoSims, SimObjects } from '../../Sim/VariablesAndData';
|
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
|
* 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;
|
cost += price;
|
||||||
SimObjects[target].amount -= 1;
|
SimObjects[target].amount -= 1;
|
||||||
}
|
}
|
||||||
CacheCostDragonUpgrade = `Cost to rebuy: ${Beautify(cost)}`; // eslint-disable-line no-unused-vars
|
CacheCostDragonUpgrade = `Cost to rebuy: ${Beautify(cost)}`;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { CMOptions } from '../../Config/VariablesAndData';
|
|||||||
import GetWrinkConfigBank from '../../Disp/HelperFunctions/GetWrinkConfigBank';
|
import GetWrinkConfigBank from '../../Disp/HelperFunctions/GetWrinkConfigBank';
|
||||||
import { ColourGray } from '../../Disp/VariablesAndData';
|
import { ColourGray } from '../../Disp/VariablesAndData';
|
||||||
import {
|
import {
|
||||||
CacheMinPP,
|
CacheMinPP, // eslint-disable-line no-unused-vars
|
||||||
CacheObjects1,
|
CacheObjects1,
|
||||||
CacheObjects10,
|
CacheObjects10,
|
||||||
CacheObjects100,
|
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(CacheObjects1, 1);
|
||||||
CacheColour(CacheObjects10, 10);
|
CacheColour(CacheObjects10, 10);
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
CacheAverageGainBank,
|
CacheAverageGainBank,
|
||||||
CacheAverageGainWrink,
|
CacheAverageGainWrink,
|
||||||
CacheAverageGainWrinkFattest,
|
CacheAverageGainWrinkFattest,
|
||||||
CacheDoRemakeBuildPrices,
|
CacheDoRemakeBuildPrices, // eslint-disable-line no-unused-vars
|
||||||
CacheObjects1,
|
CacheObjects1,
|
||||||
CacheObjects10,
|
CacheObjects10,
|
||||||
CacheObjects100,
|
CacheObjects100,
|
||||||
@@ -28,7 +28,7 @@ function CacheBuildingIncome(amount) {
|
|||||||
result[i] = {};
|
result[i] = {};
|
||||||
result[i].bonus = BuyBuildingsBonusIncome(i, amount);
|
result[i].bonus = BuyBuildingsBonusIncome(i, amount);
|
||||||
if (amount !== 1) {
|
if (amount !== 1) {
|
||||||
CacheDoRemakeBuildPrices = 1; // eslint-disable-line no-unused-vars
|
CacheDoRemakeBuildPrices = 1;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return result;
|
return result;
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
import GetCPSBuffMult from '../CPS/GetCPSBuffMult';
|
import GetCPSBuffMult from '../CPS/GetCPSBuffMult';
|
||||||
import {
|
import {
|
||||||
CacheChainFrenzyMaxReward,
|
CacheChainFrenzyMaxReward,
|
||||||
CacheChainFrenzyRequired,
|
CacheChainFrenzyRequired, // eslint-disable-line no-unused-vars
|
||||||
CacheChainFrenzyRequiredNext,
|
CacheChainFrenzyRequiredNext, // eslint-disable-line no-unused-vars
|
||||||
CacheChainFrenzyWrathMaxReward,
|
CacheChainFrenzyWrathMaxReward,
|
||||||
CacheChainFrenzyWrathRequired,
|
CacheChainFrenzyWrathRequired, // eslint-disable-line no-unused-vars
|
||||||
CacheChainFrenzyWrathRequiredNext,
|
CacheChainFrenzyWrathRequiredNext, // eslint-disable-line no-unused-vars
|
||||||
CacheChainMaxReward,
|
CacheChainMaxReward,
|
||||||
CacheChainRequired,
|
CacheChainRequired, // eslint-disable-line no-unused-vars
|
||||||
CacheChainRequiredNext,
|
CacheChainRequiredNext, // eslint-disable-line no-unused-vars
|
||||||
CacheChainWrathMaxReward,
|
CacheChainWrathMaxReward,
|
||||||
CacheChainWrathRequired,
|
CacheChainWrathRequired, // eslint-disable-line no-unused-vars
|
||||||
CacheChainWrathRequiredNext,
|
CacheChainWrathRequiredNext, // eslint-disable-line no-unused-vars
|
||||||
CacheDragonsFortuneMultAdjustment,
|
CacheDragonsFortuneMultAdjustment,
|
||||||
CacheGoldenCookiesMult,
|
CacheGoldenCookiesMult,
|
||||||
CacheNoGoldSwitchCookiesPS,
|
CacheNoGoldSwitchCookiesPS,
|
||||||
@@ -72,21 +72,21 @@ export function CacheChain() {
|
|||||||
else maxPayout = 0;
|
else maxPayout = 0;
|
||||||
|
|
||||||
CacheChainMaxReward = MaxChainCookieReward(7, maxPayout, CacheGoldenCookiesMult);
|
CacheChainMaxReward = MaxChainCookieReward(7, maxPayout, CacheGoldenCookiesMult);
|
||||||
CacheChainRequired = (CacheChainMaxReward[1] * 2) / CacheGoldenCookiesMult; // eslint-disable-line no-unused-vars
|
CacheChainRequired = (CacheChainMaxReward[1] * 2) / CacheGoldenCookiesMult;
|
||||||
CacheChainRequiredNext = CacheChainMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment; // eslint-disable-line no-unused-vars
|
CacheChainRequiredNext = CacheChainMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
|
||||||
|
|
||||||
CacheChainWrathMaxReward = MaxChainCookieReward(6, maxPayout, CacheWrathCookiesMult);
|
CacheChainWrathMaxReward = MaxChainCookieReward(6, maxPayout, CacheWrathCookiesMult);
|
||||||
CacheChainWrathRequired = (CacheChainWrathMaxReward[1] * 2) / CacheWrathCookiesMult; // eslint-disable-line no-unused-vars
|
CacheChainWrathRequired = (CacheChainWrathMaxReward[1] * 2) / CacheWrathCookiesMult;
|
||||||
CacheChainWrathRequiredNext = // eslint-disable-line no-unused-vars
|
CacheChainWrathRequiredNext =
|
||||||
CacheChainWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
|
CacheChainWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
|
||||||
|
|
||||||
CacheChainFrenzyMaxReward = MaxChainCookieReward(7, maxPayout * 7, CacheGoldenCookiesMult);
|
CacheChainFrenzyMaxReward = MaxChainCookieReward(7, maxPayout * 7, CacheGoldenCookiesMult);
|
||||||
CacheChainFrenzyRequired = (CacheChainFrenzyMaxReward[1] * 2) / CacheGoldenCookiesMult; // eslint-disable-line no-unused-vars
|
CacheChainFrenzyRequired = (CacheChainFrenzyMaxReward[1] * 2) / CacheGoldenCookiesMult;
|
||||||
CacheChainFrenzyRequiredNext = // eslint-disable-line no-unused-vars
|
CacheChainFrenzyRequiredNext =
|
||||||
CacheChainFrenzyMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
|
CacheChainFrenzyMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
|
||||||
|
|
||||||
CacheChainFrenzyWrathMaxReward = MaxChainCookieReward(6, maxPayout * 7, CacheWrathCookiesMult);
|
CacheChainFrenzyWrathMaxReward = MaxChainCookieReward(6, maxPayout * 7, CacheWrathCookiesMult);
|
||||||
CacheChainFrenzyWrathRequired = (CacheChainFrenzyWrathMaxReward[1] * 2) / CacheWrathCookiesMult; // eslint-disable-line no-unused-vars
|
CacheChainFrenzyWrathRequired = (CacheChainFrenzyWrathMaxReward[1] * 2) / CacheWrathCookiesMult;
|
||||||
CacheChainFrenzyWrathRequiredNext = // eslint-disable-line no-unused-vars
|
CacheChainFrenzyWrathRequiredNext =
|
||||||
CacheChainFrenzyWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
|
CacheChainFrenzyWrathMaxReward[2] / 60 / 60 / 6 / CacheDragonsFortuneMultAdjustment;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import {
|
import {
|
||||||
CacheHCPerSecond,
|
CacheHCPerSecond, // eslint-disable-line no-unused-vars
|
||||||
CacheLastHeavenlyCheck,
|
CacheLastHeavenlyCheck,
|
||||||
CacheLastHeavenlyChips,
|
CacheLastHeavenlyChips,
|
||||||
HeavenlyChipsDiff,
|
HeavenlyChipsDiff,
|
||||||
@@ -30,6 +30,6 @@ export default function CacheHeavenlyChipsPS() {
|
|||||||
CacheLastHeavenlyChips = ascendNowToGet;
|
CacheLastHeavenlyChips = ascendNowToGet;
|
||||||
|
|
||||||
// Get average gain over period of 5 seconds
|
// Get average gain over period of 5 seconds
|
||||||
CacheHCPerSecond = HeavenlyChipsDiff.calcAverage(5); // eslint-disable-line no-unused-vars
|
CacheHCPerSecond = HeavenlyChipsDiff.calcAverage(5);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { crateMissing } from '../../Disp/MenuSections/Statistics/CreateMissingUpgrades';
|
import { crateMissing } from '../../Disp/MenuSections/Statistics/CreateMissingUpgrades';
|
||||||
import {
|
import {
|
||||||
CacheMissingUpgrades,
|
CacheMissingUpgrades, // eslint-disable-line no-unused-vars
|
||||||
CacheMissingUpgradesCookies,
|
CacheMissingUpgradesCookies, // eslint-disable-line no-unused-vars
|
||||||
CacheMissingUpgradesPrestige,
|
CacheMissingUpgradesPrestige, // eslint-disable-line no-unused-vars
|
||||||
} from '../VariablesAndData';
|
} from '../VariablesAndData';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -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
|
* 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('Elder frenzy')) val *= 0.5;
|
||||||
if (Game.hasBuff('Frenzy')) val *= 0.75;
|
if (Game.hasBuff('Frenzy')) val *= 0.75;
|
||||||
CacheSeaSpec = Math.max(25, val);
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,17 +4,17 @@ import SimHas from '../../Sim/ReplacedGameFunctions/SimHas';
|
|||||||
import GetCPSBuffMult from '../CPS/GetCPSBuffMult';
|
import GetCPSBuffMult from '../CPS/GetCPSBuffMult';
|
||||||
import {
|
import {
|
||||||
CacheConjure,
|
CacheConjure,
|
||||||
CacheConjureReward,
|
CacheConjureReward, // eslint-disable-line no-unused-vars
|
||||||
CacheDragonsFortuneMultAdjustment,
|
CacheDragonsFortuneMultAdjustment,
|
||||||
CacheEdifice,
|
CacheEdifice,
|
||||||
CacheEdificeBuilding,
|
CacheEdificeBuilding, // eslint-disable-line no-unused-vars
|
||||||
CacheGoldenCookiesMult,
|
CacheGoldenCookiesMult,
|
||||||
CacheLucky,
|
CacheLucky,
|
||||||
CacheLuckyFrenzy,
|
CacheLuckyFrenzy,
|
||||||
CacheLuckyReward,
|
CacheLuckyReward, // eslint-disable-line no-unused-vars
|
||||||
CacheLuckyRewardFrenzy,
|
CacheLuckyRewardFrenzy, // eslint-disable-line no-unused-vars
|
||||||
CacheLuckyWrathReward,
|
CacheLuckyWrathReward, // eslint-disable-line no-unused-vars
|
||||||
CacheLuckyWrathRewardFrenzy,
|
CacheLuckyWrathRewardFrenzy, // eslint-disable-line no-unused-vars
|
||||||
CacheNoGoldSwitchCookiesPS,
|
CacheNoGoldSwitchCookiesPS,
|
||||||
CacheWrathCookiesMult,
|
CacheWrathCookiesMult,
|
||||||
} from '../VariablesAndData';
|
} from '../VariablesAndData';
|
||||||
@@ -28,13 +28,13 @@ export function CacheStatsCookies() {
|
|||||||
const cpsBuffMult = GetCPSBuffMult();
|
const cpsBuffMult = GetCPSBuffMult();
|
||||||
if (cpsBuffMult > 0) CacheLucky /= cpsBuffMult;
|
if (cpsBuffMult > 0) CacheLucky /= cpsBuffMult;
|
||||||
else CacheLucky = 0;
|
else CacheLucky = 0;
|
||||||
CacheLuckyReward = CacheGoldenCookiesMult * (CacheLucky * 0.15) + 13; // eslint-disable-line no-unused-vars
|
CacheLuckyReward = CacheGoldenCookiesMult * (CacheLucky * 0.15) + 13;
|
||||||
CacheLuckyWrathReward = CacheWrathCookiesMult * (CacheLucky * 0.15) + 13; // eslint-disable-line no-unused-vars
|
CacheLuckyWrathReward = CacheWrathCookiesMult * (CacheLucky * 0.15) + 13;
|
||||||
CacheLuckyFrenzy = CacheLucky * 7;
|
CacheLuckyFrenzy = CacheLucky * 7;
|
||||||
CacheLuckyRewardFrenzy = CacheGoldenCookiesMult * (CacheLuckyFrenzy * 0.15) + 13; // eslint-disable-line no-unused-vars
|
CacheLuckyRewardFrenzy = CacheGoldenCookiesMult * (CacheLuckyFrenzy * 0.15) + 13;
|
||||||
CacheLuckyWrathRewardFrenzy = CacheWrathCookiesMult * (CacheLuckyFrenzy * 0.15) + 13; // eslint-disable-line no-unused-vars
|
CacheLuckyWrathRewardFrenzy = CacheWrathCookiesMult * (CacheLuckyFrenzy * 0.15) + 13;
|
||||||
CacheConjure = CacheLucky * 2;
|
CacheConjure = CacheLucky * 2;
|
||||||
CacheConjureReward = CacheConjure * 0.15; // eslint-disable-line no-unused-vars
|
CacheConjureReward = CacheConjure * 0.15;
|
||||||
|
|
||||||
CacheEdifice = 0;
|
CacheEdifice = 0;
|
||||||
let max = 0;
|
let max = 0;
|
||||||
@@ -50,7 +50,7 @@ export function CacheStatsCookies() {
|
|||||||
Game.Objects[i].price * 2 > CacheEdifice
|
Game.Objects[i].price * 2 > CacheEdifice
|
||||||
) {
|
) {
|
||||||
CacheEdifice = Game.Objects[i].price * 2;
|
CacheEdifice = Game.Objects[i].price * 2;
|
||||||
CacheEdificeBuilding = i; // eslint-disable-line no-unused-vars
|
CacheEdificeBuilding = i;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,8 +3,8 @@
|
|||||||
import { SimObjects } from '../../Sim/VariablesAndData';
|
import { SimObjects } from '../../Sim/VariablesAndData';
|
||||||
import {
|
import {
|
||||||
CacheWrinklersFattest,
|
CacheWrinklersFattest,
|
||||||
CacheWrinklersNormal,
|
CacheWrinklersNormal, // eslint-disable-line no-unused-vars
|
||||||
CacheWrinklersTotal,
|
CacheWrinklersTotal, // eslint-disable-line no-unused-vars
|
||||||
} from '../VariablesAndData';
|
} from '../VariablesAndData';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -31,9 +31,9 @@ export default function CacheWrinklers() {
|
|||||||
else if (godLvl === 2) sucked *= 1.1;
|
else if (godLvl === 2) sucked *= 1.1;
|
||||||
else if (godLvl === 3) sucked *= 1.05;
|
else if (godLvl === 3) sucked *= 1.05;
|
||||||
}
|
}
|
||||||
CacheWrinklersTotal += sucked; // eslint-disable-line no-unused-vars
|
CacheWrinklersTotal += sucked;
|
||||||
if (Game.wrinklers[i].type === 0) {
|
if (Game.wrinklers[i].type === 0) {
|
||||||
CacheWrinklersNormal += sucked; // eslint-disable-line no-unused-vars
|
CacheWrinklersNormal += sucked;
|
||||||
if (sucked > CacheWrinklersFattest[0]) CacheWrinklersFattest = [sucked, i];
|
if (sucked > CacheWrinklersFattest[0]) CacheWrinklersFattest = [sucked, i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import UpdateUpgradeSectionsHeight from '../Disp/BuildingsUpgrades/UpdateUpgrade
|
|||||||
import UpdateUpgrades from '../Disp/BuildingsUpgrades/Upgrades';
|
import UpdateUpgrades from '../Disp/BuildingsUpgrades/Upgrades';
|
||||||
import RefreshScale from '../Disp/HelperFunctions/RefreshScale';
|
import RefreshScale from '../Disp/HelperFunctions/RefreshScale';
|
||||||
import { UpdateFavicon } from '../Disp/TabTitle/FavIcon';
|
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 SettingColours from './SettingClasses/SettingColours.ts';
|
||||||
import SettingInputNumber from './SettingClasses/SettingInputNumber.ts';
|
import SettingInputNumber from './SettingClasses/SettingInputNumber.ts';
|
||||||
import SettingStandard from './SettingClasses/SettingStandard.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',
|
'Calculate times and average Cookies Per Second with (only the single non-shiny fattest) wrinklers',
|
||||||
true,
|
true,
|
||||||
() => {
|
() => {
|
||||||
SimDoSims = true; // eslint-disable-line no-unused-vars
|
SimDoSims = true;
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import UpdateTooltips from './UpdateTooltips';
|
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 { CMOptions } from '../../Config/VariablesAndData';
|
||||||
import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
|
import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
|
||||||
import GetTimeColour from '../BeautifyAndFormatting/GetTimeColour';
|
import GetTimeColour from '../BeautifyAndFormatting/GetTimeColour';
|
||||||
@@ -122,8 +122,8 @@ export function CreateTooltip(type, name) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Sets global variables used by CM.Disp.UpdateTooltip()
|
// Sets global variables used by CM.Disp.UpdateTooltip()
|
||||||
TooltipType = type; // eslint-disable-line no-unused-vars
|
TooltipType = type;
|
||||||
TooltipName = name; // eslint-disable-line no-unused-vars
|
TooltipName = name;
|
||||||
|
|
||||||
UpdateTooltips();
|
UpdateTooltips();
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import CMDrawHook from '../Disp/DrawHook';
|
|||||||
import CMClickHook from '../Main/ClickHook';
|
import CMClickHook from '../Main/ClickHook';
|
||||||
import InitializeCookieMonster from '../Main/Initialization';
|
import InitializeCookieMonster from '../Main/Initialization';
|
||||||
import CMLoopHook from '../Main/LoopHook';
|
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:
|
* 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('draw', CMDrawHook);
|
||||||
Game.registerHook('logic', CMLoopHook);
|
Game.registerHook('logic', CMLoopHook);
|
||||||
|
|
||||||
isInitializing = false; // eslint-disable-line no-unused-vars
|
isInitializing = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { LoadConfig } from '../Config/SaveLoadReload/SaveLoadReloadSettings';
|
import { LoadConfig } from '../Config/SaveLoadReload/SaveLoadReloadSettings';
|
||||||
import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
|
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';
|
import InitData from '../Sim/InitializeData/InitData';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -11,7 +11,7 @@ export default function load(str) {
|
|||||||
const save = JSON.parse(str);
|
const save = JSON.parse(str);
|
||||||
InitData();
|
InitData();
|
||||||
// The if-statement is a failsafe for old saves
|
// 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);
|
LoadConfig(save.settings);
|
||||||
if (save.version !== `${VersionMajor}.${VersionMinor}`) {
|
if (save.version !== `${VersionMajor}.${VersionMinor}`) {
|
||||||
if (Game.prefs.popups)
|
if (Game.prefs.popups)
|
||||||
|
|||||||
@@ -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 { CMOptions } from '../../Config/VariablesAndData';
|
||||||
import CreateGCTimer from '../../Disp/GoldenCookieTimers/GoldenCookieTimers';
|
import CreateGCTimer from '../../Disp/GoldenCookieTimers/GoldenCookieTimers';
|
||||||
import Flash from '../../Disp/Notifications/Flash';
|
import Flash from '../../Disp/Notifications/Flash';
|
||||||
@@ -62,7 +62,7 @@ export default function CheckGoldenCookie() {
|
|||||||
}
|
}
|
||||||
UpdateFavicon();
|
UpdateFavicon();
|
||||||
LastSpawnedGoldenCookieState = CurrSpawnedGoldenCookieState;
|
LastSpawnedGoldenCookieState = CurrSpawnedGoldenCookieState;
|
||||||
if (CurrSpawnedGoldenCookieState === 0) CacheSpawnedGoldenShimmer = 0; // eslint-disable-line no-unused-vars
|
if (CurrSpawnedGoldenCookieState === 0) CacheSpawnedGoldenShimmer = 0;
|
||||||
} else if (CMOptions.GCTimer === 1 && LastGoldenCookieState) {
|
} else if (CMOptions.GCTimer === 1 && LastGoldenCookieState) {
|
||||||
Object.keys(GCTimers).forEach((i) => {
|
Object.keys(GCTimers).forEach((i) => {
|
||||||
GCTimers[i].style.opacity = CacheGoldenShimmersByID[i].l.style.opacity;
|
GCTimers[i].style.opacity = CacheGoldenShimmersByID[i].l.style.opacity;
|
||||||
|
|||||||
@@ -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 { CMOptions } from '../../Config/VariablesAndData';
|
||||||
import Flash from '../../Disp/Notifications/Flash';
|
import Flash from '../../Disp/Notifications/Flash';
|
||||||
import CreateNotification from '../../Disp/Notifications/Notification';
|
import CreateNotification from '../../Disp/Notifications/Notification';
|
||||||
@@ -14,7 +14,7 @@ export default function CheckSeasonPopup() {
|
|||||||
LastSeasonPopupState = Game.shimmerTypes.reindeer.spawned;
|
LastSeasonPopupState = Game.shimmerTypes.reindeer.spawned;
|
||||||
Object.keys(Game.shimmers).forEach((i) => {
|
Object.keys(Game.shimmers).forEach((i) => {
|
||||||
if (Game.shimmers[i].spawnLead && Game.shimmers[i].type === 'reindeer') {
|
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);
|
Flash(3, 'SeaFlash', false);
|
||||||
|
|||||||
@@ -12,12 +12,12 @@ import UpdateBuildingUpgradeStyle from '../Disp/Initialization/UpdateBuildingUpg
|
|||||||
import CreateFlashScreen from '../Disp/Initialization/FlashScreen';
|
import CreateFlashScreen from '../Disp/Initialization/FlashScreen';
|
||||||
import { CreateFavicon } from '../Disp/TabTitle/FavIcon';
|
import { CreateFavicon } from '../Disp/TabTitle/FavIcon';
|
||||||
import { CreateSimpleTooltip } from '../Disp/Tooltips/Tooltip';
|
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 InitData from '../Sim/InitializeData/InitData';
|
||||||
import ReplaceNativeGrimoire from './ReplaceGameElements/NativeGrimoire';
|
import ReplaceNativeGrimoire from './ReplaceGameElements/NativeGrimoire';
|
||||||
import ReplaceTooltips from './ReplaceGameElements/Tooltips';
|
import ReplaceTooltips from './ReplaceGameElements/Tooltips';
|
||||||
import ReplaceNative from './ReplaceGameFunctions/ReplaceNative';
|
import ReplaceNative from './ReplaceGameFunctions/ReplaceNative';
|
||||||
import { LastModCount } from './VariablesAndData';
|
import { LastModCount } from './VariablesAndData'; // eslint-disable-line no-unused-vars
|
||||||
import AddWrinklerAreaDetect from './WrinklerArea/AddDetectArea';
|
import AddWrinklerAreaDetect from './WrinklerArea/AddDetectArea';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -29,7 +29,7 @@ export default function InitializeCookieMonster() {
|
|||||||
InitCache();
|
InitCache();
|
||||||
|
|
||||||
// Stored to check if we need to re-initiliaze data
|
// 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
|
// Creating visual elements
|
||||||
CreateCssArea();
|
CreateCssArea();
|
||||||
@@ -54,7 +54,7 @@ export default function InitializeCookieMonster() {
|
|||||||
Game.CalculateGains();
|
Game.CalculateGains();
|
||||||
|
|
||||||
LoadConfig();
|
LoadConfig();
|
||||||
CMLastAscendState = Game.OnAscend; // eslint-disable-line no-unused-vars
|
CMLastAscendState = Game.OnAscend;
|
||||||
|
|
||||||
if (Game.prefs.popups)
|
if (Game.prefs.popups)
|
||||||
Game.Popup(`Cookie Monster version ${VersionMajor}.${VersionMinor} loaded!`);
|
Game.Popup(`Cookie Monster version ${VersionMajor}.${VersionMinor} loaded!`);
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import FormatTime from '../../Disp/BeautifyAndFormatting/FormatTime';
|
|||||||
import CalculateGrimoireRefillTime from '../../Disp/HelperFunctions/CalculateGrimoireRefillTime';
|
import CalculateGrimoireRefillTime from '../../Disp/HelperFunctions/CalculateGrimoireRefillTime';
|
||||||
import {
|
import {
|
||||||
BackupGrimoireDraw,
|
BackupGrimoireDraw,
|
||||||
BackupGrimoireLaunch,
|
BackupGrimoireLaunch, // eslint-disable-line no-unused-vars
|
||||||
BackupGrimoireLaunchMod,
|
BackupGrimoireLaunchMod,
|
||||||
HasReplaceNativeGrimoireDraw,
|
HasReplaceNativeGrimoireDraw,
|
||||||
HasReplaceNativeGrimoireLaunch,
|
HasReplaceNativeGrimoireLaunch,
|
||||||
@@ -35,7 +35,7 @@ function ReplaceNativeGrimoireDraw() {
|
|||||||
function ReplaceNativeGrimoireLaunch() {
|
function ReplaceNativeGrimoireLaunch() {
|
||||||
if (!HasReplaceNativeGrimoireLaunch && Game.Objects['Wizard tower'].minigameLoaded) {
|
if (!HasReplaceNativeGrimoireLaunch && Game.Objects['Wizard tower'].minigameLoaded) {
|
||||||
const { minigame } = Game.Objects['Wizard tower'];
|
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
|
BackupGrimoireLaunchMod = new Function( // eslint-disable-line no-new-func
|
||||||
`return ${minigame.launch
|
`return ${minigame.launch
|
||||||
.toString()
|
.toString()
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/** Functions related to replacing tooltips */
|
/** Functions related to replacing tooltips */
|
||||||
|
|
||||||
import { CreateTooltip } from '../../Disp/Tooltips/Tooltip';
|
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 ReplaceNativeGrimoire from './NativeGrimoire';
|
||||||
import ReplaceTooltipGrimoire from './TooltipGrimoire';
|
import ReplaceTooltipGrimoire from './TooltipGrimoire';
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ function ReplaceTooltipBuild() {
|
|||||||
*/
|
*/
|
||||||
function ReplaceTooltipLump() {
|
function ReplaceTooltipLump() {
|
||||||
if (Game.canLumps()) {
|
if (Game.canLumps()) {
|
||||||
TooltipLumpBackup = l('lumps').onmouseover; // eslint-disable-line no-unused-vars
|
TooltipLumpBackup = l('lumps').onmouseover;
|
||||||
l('lumps').onmouseover = function () {
|
l('lumps').onmouseover = function () {
|
||||||
Game.tooltip.dynamic = 1;
|
Game.tooltip.dynamic = 1;
|
||||||
Game.tooltip.draw(this, () => CreateTooltip('s', 'Lump'), 'this');
|
Game.tooltip.draw(this, () => CreateTooltip('s', 'Lump'), 'this');
|
||||||
|
|||||||
@@ -7,13 +7,13 @@ import AddMenu from '../../Disp/MenuSections/AddMenus';
|
|||||||
import UpdateTitle from '../../Disp/TabTitle/TabTitle';
|
import UpdateTitle from '../../Disp/TabTitle/TabTitle';
|
||||||
import ReplaceAscendTooltip from '../../Disp/Tooltips/AscendButton';
|
import ReplaceAscendTooltip from '../../Disp/Tooltips/AscendButton';
|
||||||
import UpdateTooltipLocation from '../../Disp/Tooltips/PositionLocation';
|
import UpdateTooltipLocation from '../../Disp/Tooltips/PositionLocation';
|
||||||
import { CMSayTime, Title } from '../../Disp/VariablesAndData';
|
import { CMSayTime, Title } from '../../Disp/VariablesAndData'; // eslint-disable-line no-unused-vars
|
||||||
import { SimDoSims } from '../../Sim/VariablesAndData';
|
import { SimDoSims } from '../../Sim/VariablesAndData'; // eslint-disable-line no-unused-vars
|
||||||
import ReplaceTooltipUpgrade from '../ReplaceGameElements/TooltipUpgrades';
|
import ReplaceTooltipUpgrade from '../ReplaceGameElements/TooltipUpgrades';
|
||||||
import {
|
import {
|
||||||
BackupFunctions,
|
BackupFunctions,
|
||||||
CenturyDateAtBeginLoop,
|
CenturyDateAtBeginLoop, // eslint-disable-line no-unused-vars
|
||||||
CycliusDateAtBeginLoop,
|
CycliusDateAtBeginLoop, // eslint-disable-line no-unused-vars
|
||||||
} from '../VariablesAndData';
|
} from '../VariablesAndData';
|
||||||
import FixMouseY from './FixMouse';
|
import FixMouseY from './FixMouse';
|
||||||
|
|
||||||
@@ -29,9 +29,9 @@ export default function ReplaceNative() {
|
|||||||
BackupFunctions.CalculateGains = Game.CalculateGains;
|
BackupFunctions.CalculateGains = Game.CalculateGains;
|
||||||
Game.CalculateGains = function () {
|
Game.CalculateGains = function () {
|
||||||
BackupFunctions.CalculateGains();
|
BackupFunctions.CalculateGains();
|
||||||
SimDoSims = 1; // eslint-disable-line no-unused-vars
|
SimDoSims = 1;
|
||||||
CycliusDateAtBeginLoop = Date.now(); // eslint-disable-line no-unused-vars
|
CycliusDateAtBeginLoop = Date.now();
|
||||||
CenturyDateAtBeginLoop = Date.now(); // eslint-disable-line no-unused-vars
|
CenturyDateAtBeginLoop = Date.now();
|
||||||
};
|
};
|
||||||
|
|
||||||
BackupFunctions.tooltip = {};
|
BackupFunctions.tooltip = {};
|
||||||
|
|||||||
@@ -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
|
* 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;
|
TooltipWrinklerArea = 1;
|
||||||
};
|
};
|
||||||
l('backgroundLeftCanvas').onmouseout = function () {
|
l('backgroundLeftCanvas').onmouseout = function () {
|
||||||
TooltipWrinklerArea = 0; // eslint-disable-line no-unused-vars
|
TooltipWrinklerArea = 0;
|
||||||
Game.tooltip.hide();
|
Game.tooltip.hide();
|
||||||
Object.keys(Game.wrinklers).forEach((i) => {
|
Object.keys(Game.wrinklers).forEach((i) => {
|
||||||
TooltipWrinklerBeingShown[i] = 0;
|
TooltipWrinklerBeingShown[i] = 0;
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ import SimWin from '../SimulationData/SimWin';
|
|||||||
import {
|
import {
|
||||||
SimAchievementsOwned,
|
SimAchievementsOwned,
|
||||||
SimCookiesPs,
|
SimCookiesPs,
|
||||||
SimCookiesPsRaw,
|
SimCookiesPsRaw, // eslint-disable-line no-unused-vars
|
||||||
SimEffs,
|
SimEffs, // eslint-disable-line no-unused-vars
|
||||||
SimHeavenlyPower,
|
SimHeavenlyPower,
|
||||||
SimObjects,
|
SimObjects,
|
||||||
SimPrestige,
|
SimPrestige,
|
||||||
@@ -38,7 +38,7 @@ export default function CalculateGains() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
SimEffs = effs; // eslint-disable-line no-unused-vars
|
SimEffs = effs;
|
||||||
|
|
||||||
if (Game.ascensionMode !== 1)
|
if (Game.ascensionMode !== 1)
|
||||||
mult += parseFloat(SimPrestige) * 0.01 * SimHeavenlyPower * SimGetHeavenlyMultiplier();
|
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);
|
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 { n } = Game.shimmerTypes.golden;
|
||||||
const auraMult = SimAuraMult("Dragon's Fortune");
|
const auraMult = SimAuraMult("Dragon's Fortune");
|
||||||
|
|||||||
@@ -6,18 +6,18 @@ import InitialBuildingData from '../InitializeData/InitialBuildingData';
|
|||||||
import InitUpgrade from '../InitializeData/InitUpgrade';
|
import InitUpgrade from '../InitializeData/InitUpgrade';
|
||||||
import {
|
import {
|
||||||
SimAchievements,
|
SimAchievements,
|
||||||
SimAchievementsOwned,
|
SimAchievementsOwned, // eslint-disable-line no-unused-vars
|
||||||
SimDragonAura,
|
SimDragonAura, // eslint-disable-line no-unused-vars
|
||||||
SimDragonAura2,
|
SimDragonAura2, // eslint-disable-line no-unused-vars
|
||||||
SimGod1,
|
SimGod1, // eslint-disable-line no-unused-vars
|
||||||
SimGod2,
|
SimGod2, // eslint-disable-line no-unused-vars
|
||||||
SimGod3,
|
SimGod3, // eslint-disable-line no-unused-vars
|
||||||
SimHeavenlyPower,
|
SimHeavenlyPower, // eslint-disable-line no-unused-vars
|
||||||
SimObjects,
|
SimObjects,
|
||||||
SimPledges,
|
SimPledges, // eslint-disable-line no-unused-vars
|
||||||
SimPrestige,
|
SimPrestige, // eslint-disable-line no-unused-vars
|
||||||
SimUpgrades,
|
SimUpgrades,
|
||||||
SimUpgradesOwned,
|
SimUpgradesOwned, // eslint-disable-line no-unused-vars
|
||||||
} from '../VariablesAndData';
|
} from '../VariablesAndData';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -26,11 +26,11 @@ import {
|
|||||||
*/
|
*/
|
||||||
export default function CopyData() {
|
export default function CopyData() {
|
||||||
// Other variables
|
// Other variables
|
||||||
SimUpgradesOwned = Game.UpgradesOwned; // eslint-disable-line no-unused-vars
|
SimUpgradesOwned = Game.UpgradesOwned;
|
||||||
SimPledges = Game.pledges; // eslint-disable-line no-unused-vars
|
SimPledges = Game.pledges;
|
||||||
SimAchievementsOwned = Game.AchievementsOwned; // eslint-disable-line no-unused-vars
|
SimAchievementsOwned = Game.AchievementsOwned;
|
||||||
SimHeavenlyPower = Game.heavenlyPower; // eslint-disable-line no-unused-vars
|
SimHeavenlyPower = Game.heavenlyPower;
|
||||||
SimPrestige = Game.prestige; // eslint-disable-line no-unused-vars
|
SimPrestige = Game.prestige;
|
||||||
|
|
||||||
// Buildings
|
// Buildings
|
||||||
Object.keys(Game.Objects).forEach((i) => {
|
Object.keys(Game.Objects).forEach((i) => {
|
||||||
@@ -49,9 +49,9 @@ export default function CopyData() {
|
|||||||
you.free = me.free;
|
you.free = me.free;
|
||||||
if (me.minigameLoaded) {
|
if (me.minigameLoaded) {
|
||||||
if (me.name === 'Temple') {
|
if (me.name === 'Temple') {
|
||||||
SimGod1 = me.minigame.slot[0]; // eslint-disable-line no-unused-vars
|
SimGod1 = me.minigame.slot[0];
|
||||||
SimGod2 = me.minigame.slot[1]; // eslint-disable-line no-unused-vars
|
SimGod2 = me.minigame.slot[1];
|
||||||
SimGod3 = me.minigame.slot[2]; // eslint-disable-line no-unused-vars
|
SimGod3 = me.minigame.slot[2];
|
||||||
}
|
}
|
||||||
you.minigameLoaded = me.minigameLoaded;
|
you.minigameLoaded = me.minigameLoaded;
|
||||||
you.minigame = me.minigame;
|
you.minigame = me.minigame;
|
||||||
@@ -85,6 +85,6 @@ export default function CopyData() {
|
|||||||
|
|
||||||
// Auras
|
// Auras
|
||||||
CacheDragonAuras();
|
CacheDragonAuras();
|
||||||
SimDragonAura = CacheDragonAura; // eslint-disable-line no-unused-vars
|
SimDragonAura = CacheDragonAura;
|
||||||
SimDragonAura2 = CacheDragonAura2; // eslint-disable-line no-unused-vars
|
SimDragonAura2 = CacheDragonAura2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
* 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]) {
|
||||||
if (SimAchievements[what].won === 0) {
|
if (SimAchievements[what].won === 0) {
|
||||||
SimAchievements[what].won = 1;
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import CheckOtherAchiev from '../Calculations/CheckOtherAchiev';
|
|||||||
import CopyData from '../SimulationData/CopyData';
|
import CopyData from '../SimulationData/CopyData';
|
||||||
import {
|
import {
|
||||||
SimAchievementsOwned,
|
SimAchievementsOwned,
|
||||||
SimBuildingsOwned,
|
SimBuildingsOwned, // eslint-disable-line no-unused-vars
|
||||||
SimCookiesPs,
|
SimCookiesPs,
|
||||||
SimDragonAura,
|
SimDragonAura,
|
||||||
SimDragonAura2,
|
SimDragonAura2,
|
||||||
@@ -32,7 +32,7 @@ export default function CalculateChangeAura(aura) {
|
|||||||
if (Game.ObjectsById[i].amount > 0) {
|
if (Game.ObjectsById[i].amount > 0) {
|
||||||
const highestBuilding = SimObjects[Game.ObjectsById[i].name].name;
|
const highestBuilding = SimObjects[Game.ObjectsById[i].name].name;
|
||||||
SimObjects[highestBuilding].amount -= 1;
|
SimObjects[highestBuilding].amount -= 1;
|
||||||
SimBuildingsOwned -= 1; // eslint-disable-line no-unused-vars
|
SimBuildingsOwned -= 1;
|
||||||
price =
|
price =
|
||||||
SimObjects[highestBuilding].basePrice *
|
SimObjects[highestBuilding].basePrice *
|
||||||
Game.priceIncrease **
|
Game.priceIncrease **
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import {
|
|||||||
SimObjects,
|
SimObjects,
|
||||||
SimPledges,
|
SimPledges,
|
||||||
SimUpgrades,
|
SimUpgrades,
|
||||||
SimUpgradesOwned,
|
SimUpgradesOwned, // eslint-disable-line no-unused-vars
|
||||||
} from '../VariablesAndData';
|
} from '../VariablesAndData';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -122,7 +122,7 @@ export default function BuyUpgradesBonusIncome(upgrade) {
|
|||||||
} else {
|
} else {
|
||||||
SimUpgrades[upgrade].bought = (SimUpgrades[upgrade].bought + 1) % 2;
|
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') {
|
if (upgrade === 'Elder Pledge') {
|
||||||
SimPledges += 1;
|
SimPledges += 1;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import CalculateGains from '../Calculations/CalculateGains';
|
import CalculateGains from '../Calculations/CalculateGains';
|
||||||
import CheckOtherAchiev from '../Calculations/CheckOtherAchiev';
|
import CheckOtherAchiev from '../Calculations/CheckOtherAchiev';
|
||||||
import CopyData from '../SimulationData/CopyData';
|
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
|
* This functions calculates the cps and cost of changing a Dragon Aura
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import CalculateGains from '../Calculations/CalculateGains';
|
|||||||
import CheckOtherAchiev from '../Calculations/CheckOtherAchiev';
|
import CheckOtherAchiev from '../Calculations/CheckOtherAchiev';
|
||||||
import CopyData from '../SimulationData/CopyData';
|
import CopyData from '../SimulationData/CopyData';
|
||||||
import SimWin from '../SimulationData/SimWin';
|
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
|
* 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;
|
const ResetCPS = SimCookiesPs - curCPS;
|
||||||
|
|
||||||
// Reset Pretige level after calculation as it is used in CM.Sim.CalculateGains() so can't be local
|
// 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;
|
return ResetCPS;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import CopyData from '../SimulationData/CopyData';
|
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';
|
import BuildingSell from './SellBuilding';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -32,7 +32,7 @@ export default function SellBuildingsForChoEgg() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
SimObjects[highestBuilding].amount -= 1;
|
SimObjects[highestBuilding].amount -= 1;
|
||||||
SimBuildingsOwned -= 1; // eslint-disable-line no-unused-vars
|
SimBuildingsOwned -= 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get money made by selling all remaining buildings
|
// Get money made by selling all remaining buildings
|
||||||
|
|||||||
Reference in New Issue
Block a user