Fixed elder pledge tooltip #613

src/Cache/PriceAndIncome/PriceAndIncome.js

@@ -1,10 +1,16 @@
 /* eslint-disable no-unused-vars */
 /** Section: Functions related to caching income */
 
+import { CMOptions } from '../../Config/VariablesAndData';
+import GetCPS from '../../Disp/HelperFunctions/GetCPS';
 import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
 import BuyBuildingsBonusIncome from '../../Sim/SimulationEvents/BuyBuildingBonusIncome';
 import BuyUpgradesBonusIncome from '../../Sim/SimulationEvents/BuyUpgrades';
 import {
+  CacheAverageCPS,
+  CacheAverageGainBank,
+  CacheAverageGainWrink,
+  CacheAverageGainWrinkFattest,
   CacheDoRemakeBuildPrices,
   CacheObjects1,
   CacheObjects10,
@@ -38,9 +44,18 @@ function CacheUpgradeIncome() {
   CacheUpgrades = [];
   Object.keys(Game.Upgrades).forEach((i) => {
     const bonusIncome = BuyUpgradesBonusIncome(i);
-    CacheUpgrades[i] = {};
+    if (i === 'Elder Pledge') {
-    if (bonusIncome[0]) CacheUpgrades[i].bonus = bonusIncome[0];
+      CacheUpgrades[i] = { bonus: Game.cookiesPs - CacheAverageGainBank };
-    if (bonusIncome[1]) CacheUpgrades[i].bonusMouse = bonusIncome[1];
+      if (CMOptions.CalcWrink === 1)
+        CacheUpgrades[i].bonus -= CacheAverageGainWrink;
+      else if (CMOptions.CalcWrink === 2)
+        CacheUpgrades[i].bonus -= CacheAverageGainWrinkFattest;
+      if (!Number.isFinite(CacheUpgrades[i].bonus)) CacheUpgrades[i].bonus = 0;
+    } else {
+      CacheUpgrades[i] = {};
+      if (bonusIncome[0]) CacheUpgrades[i].bonus = bonusIncome[0];
+      if (bonusIncome[1]) CacheUpgrades[i].bonusMouse = bonusIncome[1];
+    }
   });
 }
 

src/Data/SettingsData.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
 import CheckNotificationPermissions from '../Config/CheckNotificationPermissions';
 import { ToggleTimerBar, ToggleTimerBarPos } from '../Config/SpecificToggles';
 import ToggleBotBar from '../Config/Toggles/ToggleBotBar';
@@ -13,6 +14,7 @@ import UpdateUpgrades from '../Disp/BuildingsUpgrades/Upgrades';
 import RefreshScale from '../Disp/HelperFunctions/RefreshScale';
 import UpdateColors from '../Disp/HelperFunctions/UpdateColors';
 import { UpdateFavicon } from '../Disp/TabTitle/FavIcon';
+import { SimDoSims } from '../Sim/VariablesAndData';
 import {
   SettingStandard,
   SettingColours,
@@ -159,6 +161,9 @@ const Config = {
     ],
     'Calculate times and average Cookies Per Second with (only the single non-shiny fattest) Wrinklers',
     true,
+    function () {
+      SimDoSims = true;
+    },
   ),
   CPSMode: new SettingStandard(
     'bool',