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

Only iterate over UpgradesInStore

Browse Source
This commit is contained in:
Daniël van Noord
2021-07-19 21:05:50 +02:00
parent 80dab239b6
commit 43a651ea4a
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Cache/PriceAndIncome/PriceAndIncome.js
View File

@@ -38,22 +38,25 @@ function CacheBuildingIncome(amount) {
* It is called by CM.Cache.CacheIncome() * It is called by CM.Cache.CacheIncome()
*/ */
function CacheUpgradeIncome() { function CacheUpgradeIncome() {
CacheUpgrades = []; CacheUpgrades = {};
Object.keys(Game.Upgrades).forEach((i) => { for (let i = 0; i < Game.UpgradesInStore.length; i++) {
const bonusIncome = BuyUpgradesBonusIncome(i); const upgradeName = Game.UpgradesInStore[i].name;
if (i === 'Elder Pledge') { const bonusIncome = BuyUpgradesBonusIncome(upgradeName);
CacheUpgrades[i] = { bonus: Game.cookiesPs - CacheAverageGainBank }; if (upgradeName === 'Elder Pledge') {
CacheUpgrades[upgradeName] = {
bonus: Game.cookiesPs - CacheAverageGainBank,
};
if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.CalcWrink === 1) if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.CalcWrink === 1)
CacheUpgrades[i].bonus -= CacheAverageGainWrink; CacheUpgrades[upgradeName].bonus -= CacheAverageGainWrink;
else if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.CalcWrink === 2) else if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.CalcWrink === 2)
CacheUpgrades[i].bonus -= CacheAverageGainWrinkFattest; CacheUpgrades[upgradeName].bonus -= CacheAverageGainWrinkFattest;
if (!Number.isFinite(CacheUpgrades[i].bonus)) CacheUpgrades[i].bonus = 0; if (!Number.isFinite(CacheUpgrades[upgradeName].bonus)) CacheUpgrades[upgradeName].bonus = 0;
} else { } else {
CacheUpgrades[i] = {}; CacheUpgrades[upgradeName] = {};
if (bonusIncome[0]) CacheUpgrades[i].bonus = bonusIncome[0]; if (bonusIncome[0]) CacheUpgrades[upgradeName].bonus = bonusIncome[0];
if (bonusIncome[1]) CacheUpgrades[i].bonusMouse = bonusIncome[1]; if (bonusIncome[1]) CacheUpgrades[upgradeName].bonusMouse = bonusIncome[1];
} }
}); }
} }
/** /**