From c6c54054eed665871191fd9d1c0c1142253e1cd3 Mon Sep 17 00:00:00 2001 From: Daniel van Noord Date: Sat, 19 Dec 2020 17:37:01 +0100 Subject: [PATCH] Added section to Cache.js --- CookieMonster.js | 71 ++++++++++++++++++++++++------------------------ src/Cache.js | 71 ++++++++++++++++++++++++------------------------ 2 files changed, 72 insertions(+), 70 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index b4ed40e..8dc4b66 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -31,6 +31,9 @@ if (typeof CM == "undefined") { * Cache * *********/ +/******** + * Section: Functions related to Dragon Auras */ + /** * This functions caches the currently selected Dragon Auras * It is called by CM.Sim.CopyData() and CM.Sim.InitData() @@ -41,6 +44,39 @@ CM.Cache.CacheDragonAuras = function() { CM.Cache.dragonAura2 = Game.dragonAura2; } +/******** + * Section: Functions related to Wrinklers */ + +CM.Cache.RemakeWrinkBank = function() { + CM.Cache.WrinkBankTotal = 0; + CM.Cache.WrinkBankNormal = 0; + var totalSucked = 0; + for (var i in Game.wrinklers) { + var sucked = Game.wrinklers[i].sucked; + var toSuck = 1.1; + if (Game.Has('Sacrilegious corruption')) toSuck *= 1.05; + if (Game.wrinklers[i].type==1) toSuck *= 3; // Shiny wrinklers + sucked *= toSuck; + if (Game.Has('Wrinklerspawn')) sucked *= 1.05; + if (CM.Sim.Objects.Temple.minigameLoaded) { + var godLvl = CM.Sim.hasGod('scorn'); + if (godLvl == 1) sucked *= 1.15; + else if (godLvl == 2) sucked *= 1.1; + else if (godLvl == 3) sucked *= 1.05; + } + CM.Cache.WrinkBankTotal += sucked; + if (Game.wrinklers[i].type == 0) CM.Cache.WrinkBankNormal += sucked; + } + CM.Cache.WrinkGodBank = CM.Cache.WrinkBankTotal; + if (CM.Sim.Objects.Temple.minigameLoaded) { + var godLvl = CM.Sim.hasGod('scorn'); + if (godLvl == 2) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.1; + else if (godLvl == 3) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.05; + else if (godLvl != 1) CM.Cache.WrinkGodBank *= 1.15; + } +} + + /******** * Section: UNSORTED */ @@ -81,35 +117,6 @@ CM.Cache.RemakeIncome = function() { CM.Sim.BuyBuildings(100, 'Objects100'); } -CM.Cache.RemakeWrinkBank = function() { - CM.Cache.WrinkBankTotal = 0; - CM.Cache.WrinkBankNormal = 0; - var totalSucked = 0; - for (var i in Game.wrinklers) { - var sucked = Game.wrinklers[i].sucked; - var toSuck = 1.1; - if (Game.Has('Sacrilegious corruption')) toSuck *= 1.05; - if (Game.wrinklers[i].type==1) toSuck *= 3; // Shiny wrinklers - sucked *= toSuck; - if (Game.Has('Wrinklerspawn')) sucked *= 1.05; - if (CM.Sim.Objects.Temple.minigameLoaded) { - var godLvl = CM.Sim.hasGod('scorn'); - if (godLvl == 1) sucked *= 1.15; - else if (godLvl == 2) sucked *= 1.1; - else if (godLvl == 3) sucked *= 1.05; - } - CM.Cache.WrinkBankTotal += sucked; - if (Game.wrinklers[i].type == 0) CM.Cache.WrinkBankNormal += sucked; - } - CM.Cache.WrinkGodBank = CM.Cache.WrinkBankTotal; - if (CM.Sim.Objects.Temple.minigameLoaded) { - var godLvl = CM.Sim.hasGod('scorn'); - if (godLvl == 2) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.1; - else if (godLvl == 3) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.05; - else if (godLvl != 1) CM.Cache.WrinkGodBank *= 1.15; - } -} - CM.Cache.RemakeBuildingsPP = function() { CM.Cache.min = -1; CM.Cache.max = -1; @@ -573,12 +580,6 @@ CM.Cache.seasonPopShimmer; CM.Cache.goldenShimmersByID = {}; CM.Cache.spawnedGoldenShimmer = 0; -/** - * This variables are used by CM.Cache.CacheDragonAuras(), naming follows naming in Game - */ -CM.Cache.dragonAura = 0; -CM.Cache.dragonAura2 = 0; - /********** * Config * **********/ diff --git a/src/Cache.js b/src/Cache.js index 83416ad..ff95705 100644 --- a/src/Cache.js +++ b/src/Cache.js @@ -2,6 +2,9 @@ * Cache * *********/ +/******** + * Section: Functions related to Dragon Auras */ + /** * This functions caches the currently selected Dragon Auras * It is called by CM.Sim.CopyData() and CM.Sim.InitData() @@ -12,6 +15,39 @@ CM.Cache.CacheDragonAuras = function() { CM.Cache.dragonAura2 = Game.dragonAura2; } +/******** + * Section: Functions related to Wrinklers */ + +CM.Cache.RemakeWrinkBank = function() { + CM.Cache.WrinkBankTotal = 0; + CM.Cache.WrinkBankNormal = 0; + var totalSucked = 0; + for (var i in Game.wrinklers) { + var sucked = Game.wrinklers[i].sucked; + var toSuck = 1.1; + if (Game.Has('Sacrilegious corruption')) toSuck *= 1.05; + if (Game.wrinklers[i].type==1) toSuck *= 3; // Shiny wrinklers + sucked *= toSuck; + if (Game.Has('Wrinklerspawn')) sucked *= 1.05; + if (CM.Sim.Objects.Temple.minigameLoaded) { + var godLvl = CM.Sim.hasGod('scorn'); + if (godLvl == 1) sucked *= 1.15; + else if (godLvl == 2) sucked *= 1.1; + else if (godLvl == 3) sucked *= 1.05; + } + CM.Cache.WrinkBankTotal += sucked; + if (Game.wrinklers[i].type == 0) CM.Cache.WrinkBankNormal += sucked; + } + CM.Cache.WrinkGodBank = CM.Cache.WrinkBankTotal; + if (CM.Sim.Objects.Temple.minigameLoaded) { + var godLvl = CM.Sim.hasGod('scorn'); + if (godLvl == 2) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.1; + else if (godLvl == 3) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.05; + else if (godLvl != 1) CM.Cache.WrinkGodBank *= 1.15; + } +} + + /******** * Section: UNSORTED */ @@ -52,35 +88,6 @@ CM.Cache.RemakeIncome = function() { CM.Sim.BuyBuildings(100, 'Objects100'); } -CM.Cache.RemakeWrinkBank = function() { - CM.Cache.WrinkBankTotal = 0; - CM.Cache.WrinkBankNormal = 0; - var totalSucked = 0; - for (var i in Game.wrinklers) { - var sucked = Game.wrinklers[i].sucked; - var toSuck = 1.1; - if (Game.Has('Sacrilegious corruption')) toSuck *= 1.05; - if (Game.wrinklers[i].type==1) toSuck *= 3; // Shiny wrinklers - sucked *= toSuck; - if (Game.Has('Wrinklerspawn')) sucked *= 1.05; - if (CM.Sim.Objects.Temple.minigameLoaded) { - var godLvl = CM.Sim.hasGod('scorn'); - if (godLvl == 1) sucked *= 1.15; - else if (godLvl == 2) sucked *= 1.1; - else if (godLvl == 3) sucked *= 1.05; - } - CM.Cache.WrinkBankTotal += sucked; - if (Game.wrinklers[i].type == 0) CM.Cache.WrinkBankNormal += sucked; - } - CM.Cache.WrinkGodBank = CM.Cache.WrinkBankTotal; - if (CM.Sim.Objects.Temple.minigameLoaded) { - var godLvl = CM.Sim.hasGod('scorn'); - if (godLvl == 2) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.1; - else if (godLvl == 3) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.05; - else if (godLvl != 1) CM.Cache.WrinkGodBank *= 1.15; - } -} - CM.Cache.RemakeBuildingsPP = function() { CM.Cache.min = -1; CM.Cache.max = -1; @@ -544,9 +551,3 @@ CM.Cache.seasonPopShimmer; CM.Cache.goldenShimmersByID = {}; CM.Cache.spawnedGoldenShimmer = 0; -/** - * This variables are used by CM.Cache.CacheDragonAuras(), naming follows naming in Game - */ -CM.Cache.dragonAura = 0; -CM.Cache.dragonAura2 = 0; -