Use CookieMonsterFramework for save/load, infoMenu

2021-07-11 10:21:16 +02:00
parent b959b3c024
commit c0e788b143
95 changed files with 809 additions and 675 deletions
--- a/src/Disp/MenuSections/Statistics/AddStatsPage.js
+++ b/src/Disp/MenuSections/Statistics/AddStatsPage.js
@@ -4,7 +4,6 @@ import { AddMissingUpgrades } from './CreateMissingUpgrades';
 import * as CreateSections from './CreateStatsSections';
 import * as CreateElements from './CreateDOMElements';
 import * as GameData from '../../../Data/Gamedata.ts';
-import { CMOptions } from '../../../Config/VariablesAndData';

 import {
  CacheAverageClicks,
@@ -31,37 +30,37 @@ export default function AddMenuStats(title) {
  stats.appendChild(title);

  stats.appendChild(CreateElements.StatsHeader('Lucky Cookies', 'Lucky'));
-  if (CMOptions.Header.Lucky) {
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers.Lucky) {
    stats.appendChild(CreateSections.LuckySection());
  }

  stats.appendChild(CreateElements.StatsHeader('Chain Cookies', 'Chain'));
-  if (CMOptions.Header.Chain) {
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers.Chain) {
    stats.appendChild(CreateSections.ChainSection());
  }

  if (Game.Objects['Wizard tower'].minigameLoaded) {
    stats.appendChild(CreateElements.StatsHeader('Spells', 'Spells'));
-    if (CMOptions.Header.Spells) {
+    if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers.Spells) {
      stats.appendChild(CreateSections.SpellsSection());
    }
  }

  if (Game.Objects.Farm.minigameLoaded) {
    stats.appendChild(CreateElements.StatsHeader('Garden', 'Garden'));
-    if (CMOptions.Header.Garden) {
+    if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers.Garden) {
      stats.appendChild(CreateSections.GardenSection());
    }
  }

  stats.appendChild(CreateElements.StatsHeader('Prestige', 'Prestige'));
-  if (CMOptions.Header.Prestige) {
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers.Prestige) {
    stats.appendChild(CreateSections.PrestigeSection());
  }

  if (Game.cpsSucked > 0) {
    stats.appendChild(CreateElements.StatsHeader('Wrinklers', 'Wrink'));
-    if (CMOptions.Header.Wrink) {
+    if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers.Wrink) {
      const popAllFrag = document.createDocumentFragment();
      popAllFrag.appendChild(
        document.createTextNode(
@@ -102,7 +101,7 @@ export default function AddMenuStats(title) {
  stats.appendChild(CreateSections.SeasonSection());

  stats.appendChild(CreateElements.StatsHeader('Achievements', 'Achievs'));
-  if (CMOptions.Header.Achievs) {
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers.Achievs) {
    Object.keys(Game.Objects).forEach((i) => {
      const ObjectsTillNext = CacheObjectsNextAchievement[i];
      stats.appendChild(
@@ -110,7 +109,11 @@ export default function AddMenuStats(title) {
          'basic',
          i,
          ObjectsTillNext.AmountNeeded < 101
-            ? document.createTextNode(`Next achievement in ${ObjectsTillNext.AmountNeeded}, price: ${Beautify(ObjectsTillNext.price)}`)
+            ? document.createTextNode(
+                `Next achievement in ${ObjectsTillNext.AmountNeeded}, price: ${Beautify(
+                  ObjectsTillNext.price,
+                )}`,
+              )
            : document.createTextNode('No new achievement for next 100 buildings'),
        ),
      );
@@ -118,15 +121,26 @@ export default function AddMenuStats(title) {
  }

  stats.appendChild(CreateElements.StatsHeader('Miscellaneous', 'Misc'));
-  if (CMOptions.Header.Misc) {
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers.Misc) {
    stats.appendChild(
      CreateElements.StatsListing(
        'basic',
        `Average cookies per second (past ${
-          CookieTimes[CMOptions.AvgCPSHist] < 60
-            ? `${CookieTimes[CMOptions.AvgCPSHist]} seconds`
-            : CookieTimes[CMOptions.AvgCPSHist] / 60 +
-              (CMOptions.AvgCPSHist === 3 ? ' minute' : ' minutes')
+          CookieTimes[
+            Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.AvgCPSHist
+          ] < 60
+            ? `${
+                CookieTimes[
+                  Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.AvgCPSHist
+                ]
+              } seconds`
+            : CookieTimes[
+                Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.AvgCPSHist
+              ] /
+                60 +
+              (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.AvgCPSHist === 3
+                ? ' minute'
+                : ' minutes')
        })`,
        document.createTextNode(Beautify(GetCPS(), 3)),
      ),
@@ -134,8 +148,14 @@ export default function AddMenuStats(title) {
    stats.appendChild(
      CreateElements.StatsListing(
        'basic',
-        `Average cookie clicks per second (past ${ClickTimes[CMOptions.AvgClicksHist]}${
-          CMOptions.AvgClicksHist === 0 ? ' second' : ' seconds'
+        `Average cookie clicks per second (past ${
+          ClickTimes[
+            Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.AvgClicksHist
+          ]
+        }${
+          Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.AvgClicksHist === 0
+            ? ' second'
+            : ' seconds'
        })`,
        document.createTextNode(Beautify(CacheAverageClicks, 1)),
      ),
@@ -143,13 +163,22 @@ export default function AddMenuStats(title) {
    stats.appendChild(
      CreateElements.StatsListing(
        'basic',
-        `Cookies from clicking (past ${ClickTimes[CMOptions.AvgClicksHist]}${
-          CMOptions.AvgClicksHist === 0 ? ' second' : ' seconds'
+        `Cookies from clicking (past ${
+          ClickTimes[
+            Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.AvgClicksHist
+          ]
+        }${
+          Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.AvgClicksHist === 0
+            ? ' second'
+            : ' seconds'
        })`,
        document.createTextNode(
          Beautify(
            CacheAverageCookiesFromClicks.calcSum(
-              CacheAverageClicks * ClickTimes[CMOptions.AvgClicksHist],
+              CacheAverageClicks *
+                ClickTimes[
+                  Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.AvgClicksHist
+                ],
            ),
          ),
        ),
@@ -171,7 +200,7 @@ export default function AddMenuStats(title) {
          ),
        );
    }
-    if (CMOptions.ShowMissedGC) {
+    if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.ShowMissedGC) {
      stats.appendChild(
        CreateElements.StatsListing(
          'basic',
@@ -193,10 +222,10 @@ export default function AddMenuStats(title) {

  l('menu').insertBefore(stats, l('menu').childNodes[2]);

-  if (CMOptions.MissingUpgrades) {
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.MissingUpgrades) {
    AddMissingUpgrades();
  }
-  if (CMOptions.MissingAchievements) {
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.MissingAchievements) {
    AddMissingAchievements();
  }
 }
--- a/src/Disp/MenuSections/Statistics/CreateDOMElements.js
+++ b/src/Disp/MenuSections/Statistics/CreateDOMElements.js
@@ -1,7 +1,7 @@
 /** Section: Functions related to the creation of basic DOM elements page */

 import { ToggleHeader } from '../../../Config/ToggleSetting';
-import { CMOptions } from '../../../Config/VariablesAndData';
+
 import { SimpleTooltipElements } from '../../VariablesAndData';

 /**
@@ -30,7 +30,9 @@ export function StatsHeader(text, config) {
  span.style.color = 'black';
  span.style.fontSize = '13px';
  span.style.verticalAlign = 'middle';
-  span.textContent = CMOptions.Header[config] ? '-' : '+';
+  span.textContent = Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers[config]
+    ? '-'
+    : '+';
  span.onclick = function () {
    ToggleHeader(config);
    Game.UpdateMenu();
@@ -99,7 +101,9 @@ export function StatsMissDispListing(type, name, text, current) {

  const listingName = document.createElement('b');
  listingName.textContent = name;
-  if (current === true) listingName.style.color = CMOptions.ColourGreen;
+  if (current === true)
+    listingName.style.color =
+      Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.ColourGreen;
  div.appendChild(listingName);
  div.appendChild(document.createTextNode(': '));
  div.appendChild(text);
--- a/src/Disp/MenuSections/Statistics/CreateMissingAchievements.js
+++ b/src/Disp/MenuSections/Statistics/CreateMissingAchievements.js
@@ -1,5 +1,3 @@
-import { CMOptions } from '../../../Config/VariablesAndData';
-
 function CrateTooltipLockedAchievements(me) {
  const tags = [];
  if (me.pool === 'shadow') tags.push('Shadow Achievement', '#9700cf');
@@ -51,7 +49,7 @@ export default function AddMissingAchievements() {
      achievs = i.parentElement.querySelectorAll('div.listing.crateBox')[0];
    }
  });
-  if (CMOptions.MissingAchievements) {
+  if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.MissingAchievements) {
    Object.values(achievs.children).forEach((achievsCrate) => {
      if (!achievsCrate.className.includes('enabled')) {
        const id = achievsCrate.onclick.toString().split(/\[(.*)\]/gi)[1];
--- a/src/Disp/MenuSections/Statistics/CreateStatsSections.js
+++ b/src/Disp/MenuSections/Statistics/CreateStatsSections.js
@@ -36,7 +36,6 @@ import {
  CacheWrathCookiesMult,
  CacheWrinklersTotal,
 } from '../../../Cache/VariablesAndData';
-import { CMOptions } from '../../../Config/VariablesAndData';
 import ResetBonus from '../../../Sim/SimulationEvents/ResetAscension';
 import GetCPS from '../../HelperFunctions/GetCPS';
 import GetWrinkConfigBank from '../../HelperFunctions/GetWrinkConfigBank';
@@ -567,7 +566,9 @@ export function PrestigeSection() {
    ),
  );

-  const HCTarget = Number(CMOptions.HeavenlyChipsTarget);
+  const HCTarget = Number(
+    Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.HeavenlyChipsTarget,
+  );
  if (!Number.isNaN(HCTarget)) {
    const CookiesTillTarget =
      HCTarget - Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned));
@@ -699,7 +700,7 @@ export function SeasonSection() {

  if (Game.season === 'christmas' || specDisp || choEgg || centEgg) {
    section.appendChild(StatsHeader('Season Specials', 'Sea'));
-    if (CMOptions.Header.Sea) {
+    if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.headers.Sea) {
      if (missingHalloweenCookies.length !== 0) {
        section.appendChild(
          StatsMissDispListing(