From 43a651ea4a411d20ce55017e8f380d05b1e6b23d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Mon, 19 Jul 2021 21:05:50 +0200
Subject: [PATCH] Only iterate over UpgradesInStore

---
 src/Cache/PriceAndIncome/PriceAndIncome.js | 27 ++++++++++++----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Cache/PriceAndIncome/PriceAndIncome.js b/src/Cache/PriceAndIncome/PriceAndIncome.js
index cf1700e..dd4453b 100644
--- a/src/Cache/PriceAndIncome/PriceAndIncome.js
+++ b/src/Cache/PriceAndIncome/PriceAndIncome.js
@@ -38,22 +38,25 @@ function CacheBuildingIncome(amount) {
  * It is called by CM.Cache.CacheIncome()
  */
 function CacheUpgradeIncome() {
-  CacheUpgrades = [];
-  Object.keys(Game.Upgrades).forEach((i) => {
-    const bonusIncome = BuyUpgradesBonusIncome(i);
-    if (i === 'Elder Pledge') {
-      CacheUpgrades[i] = { bonus: Game.cookiesPs - CacheAverageGainBank };
+  CacheUpgrades = {};
+  for (let i = 0; i < Game.UpgradesInStore.length; i++) {
+    const upgradeName = Game.UpgradesInStore[i].name;
+    const bonusIncome = BuyUpgradesBonusIncome(upgradeName);
+    if (upgradeName === 'Elder Pledge') {
+      CacheUpgrades[upgradeName] = {
+        bonus: Game.cookiesPs - CacheAverageGainBank,
+      };
       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)
-        CacheUpgrades[i].bonus -= CacheAverageGainWrinkFattest;
-      if (!Number.isFinite(CacheUpgrades[i].bonus)) CacheUpgrades[i].bonus = 0;
+        CacheUpgrades[upgradeName].bonus -= CacheAverageGainWrinkFattest;
+      if (!Number.isFinite(CacheUpgrades[upgradeName].bonus)) CacheUpgrades[upgradeName].bonus = 0;
     } else {
-      CacheUpgrades[i] = {};
-      if (bonusIncome[0]) CacheUpgrades[i].bonus = bonusIncome[0];
-      if (bonusIncome[1]) CacheUpgrades[i].bonusMouse = bonusIncome[1];
+      CacheUpgrades[upgradeName] = {};
+      if (bonusIncome[0]) CacheUpgrades[upgradeName].bonus = bonusIncome[0];
+      if (bonusIncome[1]) CacheUpgrades[upgradeName].bonusMouse = bonusIncome[1];
     }
-  });
+  }
 }
 
 /**