[Automated] Merge dev into gh-pages

src/Data/Moddata.ts

@@ -17,4 +17,5 @@ export const LatestReleaseNotes = `This update adds support for some parts of co
 - added support for new tiers of Shimmering veil</br>
 - added support for unshackled upgrades</br>
 - updated some simulator logic to more cloesly match updated cookie clicker logic</br>
-- resolved major issue for negative calculations due to missing glucosimium upgrades, kittens, and achievements</br>`;
+- Bugfix: conjure backed goods tooltip used cached no gold switch raw cps instead of live cps</br>
+- Bugfix: negative calculations due to glucosimium upgrades, kittens, unshackled, and achievements</br>`;

src/Disp/Tooltips/TypesOfTooltips/Grimoire.js

@@ -1,9 +1,7 @@
-import { CacheNoGoldSwitchCookiesPS } from '../../../Cache/VariablesAndData';
 
 import Beautify from '../../BeautifyAndFormatting/Beautify';
 import GetTimeColour from '../../BeautifyAndFormatting/GetTimeColour';
 import CalculateGrimoireRefillTime from '../../HelperFunctions/CalculateGrimoireRefillTime';
-import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank';
 import { ColourTextPre, TooltipName } from '../../VariablesAndData';
 import * as Create from '../CreateTooltip';
 
@@ -58,9 +56,12 @@ export default function Grimoire() {
       const reward = document.createElement('span');
       reward.style.color = '#33FF00';
       reward.textContent = Beautify(
-        Math.min(
-          (Game.cookies + GetWrinkConfigBank()) * 0.15,
-          CacheNoGoldSwitchCookiesPS * 60 * 30,
+        Math.max(
+          Math.min(
+            Game.cookies * 0.15,
+            Game.cookiesPs * 60 * 30
+          ),
+          7
         ),
         2,
       );
@@ -70,7 +71,16 @@ export default function Grimoire() {
       conjure.appendChild(seperator);
       const loss = document.createElement('span');
       loss.style.color = 'red';
-      loss.textContent = Beautify(CacheNoGoldSwitchCookiesPS * 60 * 15, 2);
+      loss.textContent = Beautify(
+        Math.min(
+          Game.cookies,
+          Math.min(
+            Game.cookies * 0.15,
+            Game.cookiesPs * 60 * 15
+          ) + 13
+        ),
+        2
+      );
       conjure.appendChild(loss);
     }