david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cache gods and implement CM.Sim.hasGodI()

Browse Source
This commit is contained in:
Daniel van Noord
2020-11-28 13:46:39 +01:00
parent 9de7591531
commit d7883e7238
4 changed files with 58 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
CookieMonster.js
View File

@@ -68,8 +68,8 @@ CM.Cache.RemakeWrinkBank = function() {
if (Game.wrinklers[i].type==1) toSuck *= 3; // Shiny wrinklers if (Game.wrinklers[i].type==1) toSuck *= 3; // Shiny wrinklers
sucked *= toSuck; sucked *= toSuck;
if (Game.Has('Wrinklerspawn')) sucked *= 1.05; if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
if (Game.hasGod) { if (CM.Sim.Objects.Temple.minigameLoaded) {
var godLvl = Game.hasGod('scorn'); var godLvl = CM.Sim.hasGod('scorn');
if (godLvl == 1) sucked *= 1.15; if (godLvl == 1) sucked *= 1.15;
else if (godLvl == 2) sucked *= 1.1; else if (godLvl == 2) sucked *= 1.1;
else if (godLvl == 3) sucked *= 1.05; else if (godLvl == 3) sucked *= 1.05;
@@ -78,8 +78,8 @@ CM.Cache.RemakeWrinkBank = function() {
} }
CM.Cache.WrinkBank = totalSucked; CM.Cache.WrinkBank = totalSucked;
CM.Cache.WrinkGodBank = totalSucked; CM.Cache.WrinkGodBank = totalSucked;
if (Game.hasGod) { if (CM.Sim.Objects.Temple.minigameLoaded) {
var godLvl = Game.hasGod('scorn'); var godLvl = CM.Sim.hasGod('scorn');
if (godLvl == 2) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.1; 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 == 3) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.05;
else if (godLvl != 1) CM.Cache.WrinkGodBank *= 1.15; else if (godLvl != 1) CM.Cache.WrinkGodBank *= 1.15;
@@ -3066,8 +3066,8 @@ CM.Disp.UpdateWrinklerTooltip = function() {
if (Game.wrinklers[CM.Disp.TooltipWrinkler].type == 1) toSuck *= 3; // Shiny wrinklers if (Game.wrinklers[CM.Disp.TooltipWrinkler].type == 1) toSuck *= 3; // Shiny wrinklers
sucked *= toSuck; sucked *= toSuck;
if (Game.Has('Wrinklerspawn')) sucked *= 1.05; if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
if (Game.hasGod) { if (CM.Sim.Objects.Temple.minigameLoaded) {
var godLvl = Game.hasGod('scorn'); var godLvl = CM.Sim.hasGod('scorn');
if (godLvl == 1) sucked *= 1.15; if (godLvl == 1) sucked *= 1.15;
else if (godLvl == 2) sucked *= 1.1; else if (godLvl == 2) sucked *= 1.1;
else if (godLvl == 3) sucked *= 1.05; else if (godLvl == 3) sucked *= 1.05;
@@ -3570,6 +3570,7 @@ eval('CM.Sim.HasAchiev = ' + Game.HasAchiev.toString().split('Game').join('CM.Si
eval('CM.Sim.GetHeavenlyMultiplier = ' + Game.GetHeavenlyMultiplier.toString().split('Game.Has').join('CM.Sim.Has').split('Game.hasAura').join('CM.Sim.hasAura').split('Game.auraMult').join('CM.Sim.auraMult')); eval('CM.Sim.GetHeavenlyMultiplier = ' + Game.GetHeavenlyMultiplier.toString().split('Game.Has').join('CM.Sim.Has').split('Game.hasAura').join('CM.Sim.hasAura').split('Game.auraMult').join('CM.Sim.auraMult'));
// Check for Pantheon Auras
CM.Sim.hasAura = function(what) { CM.Sim.hasAura = function(what) {
if (Game.dragonAuras[CM.Sim.dragonAura].name == what || Game.dragonAuras[CM.Sim.dragonAura2].name == what) if (Game.dragonAuras[CM.Sim.dragonAura].name == what || Game.dragonAuras[CM.Sim.dragonAura2].name == what)
return true; return true;
@@ -3588,6 +3589,16 @@ CM.Sim.auraMult = function(what) {
return n; return n;
} }
CM.Sim.hasGod=function(what) {
var possibleGods = CM.Sim.Objects.Temple.minigame.gods
var god=possibleGods[what];
for (var i=0;i<3;i++)
{
if (CM.Sim.Objects.Temple.minigame.slot[i]==god.id) return (i+1);
}
return false;
}
eval('CM.Sim.GetTieredCpsMult = ' + Game.GetTieredCpsMult.toString() eval('CM.Sim.GetTieredCpsMult = ' + Game.GetTieredCpsMult.toString()
.split('Game.Has').join('CM.Sim.Has') .split('Game.Has').join('CM.Sim.Has')
.split('me.tieredUpgrades').join('Game.Objects[me.name].tieredUpgrades') .split('me.tieredUpgrades').join('Game.Objects[me.name].tieredUpgrades')
@@ -3661,6 +3672,7 @@ CM.Sim.CopyData = function() {
} }
you.amount = me.amount; you.amount = me.amount;
you.level = me.level; you.level = me.level;
if (me.minigameLoaded) you.minigameLoaded = me.minigameLoaded; you.minigame = me.minigame;
} }
// Upgrades // Upgrades
@@ -3730,32 +3742,31 @@ CM.Sim.CalculateGains = function() {
if (CM.Sim.Has('Dragon scale')) mult *= 1.03; if (CM.Sim.Has('Dragon scale')) mult *= 1.03;
// Cached and sim temple gods // Check effect of chosen Gods
// TODO: Caches chosen gods
var buildMult = 1; var buildMult = 1;
if (Game.hasGod) { if (CM.Sim.Objects.Temple.minigameLoaded) {
var godLvl = Game.hasGod('asceticism'); var godLvl = CM.Sim.hasGod('asceticism');
if (godLvl == 1) mult *= 1.15; if (godLvl == 1) mult *= 1.15;
else if (godLvl == 2) mult *= 1.1; else if (godLvl == 2) mult *= 1.1;
else if (godLvl == 3) mult *= 1.05; else if (godLvl == 3) mult *= 1.05;
// TODO: What does DateAges do? // TODO: What does DateAges do?
var godLvl = Game.hasGod('ages'); var godLvl = CM.Sim.hasGod('ages');
if (godLvl == 1) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 3)) * Math.PI * 2); if (godLvl == 1) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 3)) * Math.PI * 2);
else if (godLvl == 2) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 12)) * Math.PI*2); else if (godLvl == 2) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 12)) * Math.PI*2);
else if (godLvl == 3) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 24)) * Math.PI*2); else if (godLvl == 3) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 24)) * Math.PI*2);
var godLvl = Game.hasGod('decadence'); var godLvl = CM.Sim.hasGod('decadence');
if (godLvl == 1) buildMult *= 0.93; if (godLvl == 1) buildMult *= 0.93;
else if (godLvl == 2) buildMult *= 0.95; else if (godLvl == 2) buildMult *= 0.95;
else if (godLvl == 3) buildMult *= 0.98; else if (godLvl == 3) buildMult *= 0.98;
var godLvl = Game.hasGod('industry'); var godLvl = CM.Sim.hasGod('industry');
if (godLvl == 1) buildMult *= 1.1; if (godLvl == 1) buildMult *= 1.1;
else if (godLvl == 2) buildMult *= 1.06; else if (godLvl == 2) buildMult *= 1.06;
else if (godLvl == 3) buildMult *= 1.03; else if (godLvl == 3) buildMult *= 1.03;
var godLvl = Game.hasGod('labor'); var godLvl = CM.Sim.hasGod('labor');
if (godLvl == 1) buildMult *= 0.97; if (godLvl == 1) buildMult *= 0.97;
else if (godLvl == 2) buildMult *= 0.98; else if (godLvl == 2) buildMult *= 0.98;
else if (godLvl == 3) buildMult *= 0.99; else if (godLvl == 3) buildMult *= 0.99;
@@ -3768,8 +3779,8 @@ CM.Sim.CalculateGains = function() {
if (CM.Sim.Has('Santa\'s milk and cookies')) milkMult *= 1.05; if (CM.Sim.Has('Santa\'s milk and cookies')) milkMult *= 1.05;
//if (CM.Sim.hasAura('Breath of Milk')) milkMult *= 1.05; //if (CM.Sim.hasAura('Breath of Milk')) milkMult *= 1.05;
milkMult *= 1 + CM.Sim.auraMult('Breath of Milk') * 0.05; milkMult *= 1 + CM.Sim.auraMult('Breath of Milk') * 0.05;
if (Game.hasGod) { if (CM.Sim.Objects.Temple.minigameLoaded) {
var godLvl = Game.hasGod('mother'); var godLvl = CM.Sim.hasGod('mother');
if (godLvl == 1) milkMult *= 1.1; if (godLvl == 1) milkMult *= 1.1;
else if (godLvl == 2) milkMult *= 1.05; else if (godLvl == 2) milkMult *= 1.05;
else if (godLvl == 3) milkMult *= 1.03; else if (godLvl == 3) milkMult *= 1.03;
@@ -4142,8 +4153,8 @@ CM.Sim.modifyBuildingPrice = function(building,price) {
if (Game.hasBuff('Nasty goblins')) price *= 1.02; if (Game.hasBuff('Nasty goblins')) price *= 1.02;
if (building.fortune && CM.Sim.Has(building.fortune.name)) price *= 0.93; if (building.fortune && CM.Sim.Has(building.fortune.name)) price *= 0.93;
price *= Game.eff('buildingCost'); price *= Game.eff('buildingCost');
if (Game.hasGod) { if (CM.Sim.Objects.Temple.minigameLoaded) {
var godLvl = Game.hasGod('creation'); var godLvl = CM.Sim.hasGod('creation');
if (godLvl == 1) price *= 0.93; if (godLvl == 1) price *= 0.93;
else if (godLvl == 2) price *= 0.95; else if (godLvl == 2) price *= 0.95;
else if (godLvl == 3) price *= 0.98; else if (godLvl == 3) price *= 0.98;

8
src/Cache.js
View File

@@ -48,8 +48,8 @@ CM.Cache.RemakeWrinkBank = function() {
if (Game.wrinklers[i].type==1) toSuck *= 3; // Shiny wrinklers if (Game.wrinklers[i].type==1) toSuck *= 3; // Shiny wrinklers
sucked *= toSuck; sucked *= toSuck;
if (Game.Has('Wrinklerspawn')) sucked *= 1.05; if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
if (Game.hasGod) { if (CM.Sim.Objects.Temple.minigameLoaded) {
var godLvl = Game.hasGod('scorn'); var godLvl = CM.Sim.hasGod('scorn');
if (godLvl == 1) sucked *= 1.15; if (godLvl == 1) sucked *= 1.15;
else if (godLvl == 2) sucked *= 1.1; else if (godLvl == 2) sucked *= 1.1;
else if (godLvl == 3) sucked *= 1.05; else if (godLvl == 3) sucked *= 1.05;
@@ -58,8 +58,8 @@ CM.Cache.RemakeWrinkBank = function() {
} }
CM.Cache.WrinkBank = totalSucked; CM.Cache.WrinkBank = totalSucked;
CM.Cache.WrinkGodBank = totalSucked; CM.Cache.WrinkGodBank = totalSucked;
if (Game.hasGod) { if (CM.Sim.Objects.Temple.minigameLoaded) {
var godLvl = Game.hasGod('scorn'); var godLvl = CM.Sim.hasGod('scorn');
if (godLvl == 2) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.1; 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 == 3) CM.Cache.WrinkGodBank = CM.Cache.WrinkGodBank * 1.15 / 1.05;
else if (godLvl != 1) CM.Cache.WrinkGodBank *= 1.15; else if (godLvl != 1) CM.Cache.WrinkGodBank *= 1.15;

4
src/Disp.js
View File

@@ -2340,8 +2340,8 @@ CM.Disp.UpdateWrinklerTooltip = function() {
if (Game.wrinklers[CM.Disp.TooltipWrinkler].type == 1) toSuck *= 3; // Shiny wrinklers if (Game.wrinklers[CM.Disp.TooltipWrinkler].type == 1) toSuck *= 3; // Shiny wrinklers
sucked *= toSuck; sucked *= toSuck;
if (Game.Has('Wrinklerspawn')) sucked *= 1.05; if (Game.Has('Wrinklerspawn')) sucked *= 1.05;
if (Game.hasGod) { if (CM.Sim.Objects.Temple.minigameLoaded) {
var godLvl = Game.hasGod('scorn'); var godLvl = CM.Sim.hasGod('scorn');
if (godLvl == 1) sucked *= 1.15; if (godLvl == 1) sucked *= 1.15;
else if (godLvl == 2) sucked *= 1.1; else if (godLvl == 2) sucked *= 1.1;
else if (godLvl == 3) sucked *= 1.05; else if (godLvl == 3) sucked *= 1.05;

35
src/Sim.js
View File

@@ -79,6 +79,7 @@ eval('CM.Sim.HasAchiev = ' + Game.HasAchiev.toString().split('Game').join('CM.Si
eval('CM.Sim.GetHeavenlyMultiplier = ' + Game.GetHeavenlyMultiplier.toString().split('Game.Has').join('CM.Sim.Has').split('Game.hasAura').join('CM.Sim.hasAura').split('Game.auraMult').join('CM.Sim.auraMult')); eval('CM.Sim.GetHeavenlyMultiplier = ' + Game.GetHeavenlyMultiplier.toString().split('Game.Has').join('CM.Sim.Has').split('Game.hasAura').join('CM.Sim.hasAura').split('Game.auraMult').join('CM.Sim.auraMult'));
// Check for Pantheon Auras
CM.Sim.hasAura = function(what) { CM.Sim.hasAura = function(what) {
if (Game.dragonAuras[CM.Sim.dragonAura].name == what || Game.dragonAuras[CM.Sim.dragonAura2].name == what) if (Game.dragonAuras[CM.Sim.dragonAura].name == what || Game.dragonAuras[CM.Sim.dragonAura2].name == what)
return true; return true;
@@ -97,6 +98,16 @@ CM.Sim.auraMult = function(what) {
return n; return n;
} }
CM.Sim.hasGod=function(what) {
var possibleGods = CM.Sim.Objects.Temple.minigame.gods
var god=possibleGods[what];
for (var i=0;i<3;i++)
{
if (CM.Sim.Objects.Temple.minigame.slot[i]==god.id) return (i+1);
}
return false;
}
eval('CM.Sim.GetTieredCpsMult = ' + Game.GetTieredCpsMult.toString() eval('CM.Sim.GetTieredCpsMult = ' + Game.GetTieredCpsMult.toString()
.split('Game.Has').join('CM.Sim.Has') .split('Game.Has').join('CM.Sim.Has')
.split('me.tieredUpgrades').join('Game.Objects[me.name].tieredUpgrades') .split('me.tieredUpgrades').join('Game.Objects[me.name].tieredUpgrades')
@@ -170,6 +181,7 @@ CM.Sim.CopyData = function() {
} }
you.amount = me.amount; you.amount = me.amount;
you.level = me.level; you.level = me.level;
if (me.minigameLoaded) you.minigameLoaded = me.minigameLoaded; you.minigame = me.minigame;
} }
// Upgrades // Upgrades
@@ -239,32 +251,31 @@ CM.Sim.CalculateGains = function() {
if (CM.Sim.Has('Dragon scale')) mult *= 1.03; if (CM.Sim.Has('Dragon scale')) mult *= 1.03;
// Cached and sim temple gods // Check effect of chosen Gods
// TODO: Caches chosen gods
var buildMult = 1; var buildMult = 1;
if (Game.hasGod) { if (CM.Sim.Objects.Temple.minigameLoaded) {
var godLvl = Game.hasGod('asceticism'); var godLvl = CM.Sim.hasGod('asceticism');
if (godLvl == 1) mult *= 1.15; if (godLvl == 1) mult *= 1.15;
else if (godLvl == 2) mult *= 1.1; else if (godLvl == 2) mult *= 1.1;
else if (godLvl == 3) mult *= 1.05; else if (godLvl == 3) mult *= 1.05;
// TODO: What does DateAges do? // TODO: What does DateAges do?
var godLvl = Game.hasGod('ages'); var godLvl = CM.Sim.hasGod('ages');
if (godLvl == 1) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 3)) * Math.PI * 2); if (godLvl == 1) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 3)) * Math.PI * 2);
else if (godLvl == 2) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 12)) * Math.PI*2); else if (godLvl == 2) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 12)) * Math.PI*2);
else if (godLvl == 3) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 24)) * Math.PI*2); else if (godLvl == 3) mult *= 1 + 0.15 * Math.sin((CM.Sim.DateAges / 1000 / (60 * 60 * 24)) * Math.PI*2);
var godLvl = Game.hasGod('decadence'); var godLvl = CM.Sim.hasGod('decadence');
if (godLvl == 1) buildMult *= 0.93; if (godLvl == 1) buildMult *= 0.93;
else if (godLvl == 2) buildMult *= 0.95; else if (godLvl == 2) buildMult *= 0.95;
else if (godLvl == 3) buildMult *= 0.98; else if (godLvl == 3) buildMult *= 0.98;
var godLvl = Game.hasGod('industry'); var godLvl = CM.Sim.hasGod('industry');
if (godLvl == 1) buildMult *= 1.1; if (godLvl == 1) buildMult *= 1.1;
else if (godLvl == 2) buildMult *= 1.06; else if (godLvl == 2) buildMult *= 1.06;
else if (godLvl == 3) buildMult *= 1.03; else if (godLvl == 3) buildMult *= 1.03;
var godLvl = Game.hasGod('labor'); var godLvl = CM.Sim.hasGod('labor');
if (godLvl == 1) buildMult *= 0.97; if (godLvl == 1) buildMult *= 0.97;
else if (godLvl == 2) buildMult *= 0.98; else if (godLvl == 2) buildMult *= 0.98;
else if (godLvl == 3) buildMult *= 0.99; else if (godLvl == 3) buildMult *= 0.99;
@@ -277,8 +288,8 @@ CM.Sim.CalculateGains = function() {
if (CM.Sim.Has('Santa\'s milk and cookies')) milkMult *= 1.05; if (CM.Sim.Has('Santa\'s milk and cookies')) milkMult *= 1.05;
//if (CM.Sim.hasAura('Breath of Milk')) milkMult *= 1.05; //if (CM.Sim.hasAura('Breath of Milk')) milkMult *= 1.05;
milkMult *= 1 + CM.Sim.auraMult('Breath of Milk') * 0.05; milkMult *= 1 + CM.Sim.auraMult('Breath of Milk') * 0.05;
if (Game.hasGod) { if (CM.Sim.Objects.Temple.minigameLoaded) {
var godLvl = Game.hasGod('mother'); var godLvl = CM.Sim.hasGod('mother');
if (godLvl == 1) milkMult *= 1.1; if (godLvl == 1) milkMult *= 1.1;
else if (godLvl == 2) milkMult *= 1.05; else if (godLvl == 2) milkMult *= 1.05;
else if (godLvl == 3) milkMult *= 1.03; else if (godLvl == 3) milkMult *= 1.03;
@@ -651,8 +662,8 @@ CM.Sim.modifyBuildingPrice = function(building,price) {
if (Game.hasBuff('Nasty goblins')) price *= 1.02; if (Game.hasBuff('Nasty goblins')) price *= 1.02;
if (building.fortune && CM.Sim.Has(building.fortune.name)) price *= 0.93; if (building.fortune && CM.Sim.Has(building.fortune.name)) price *= 0.93;
price *= Game.eff('buildingCost'); price *= Game.eff('buildingCost');
if (Game.hasGod) { if (CM.Sim.Objects.Temple.minigameLoaded) {
var godLvl = Game.hasGod('creation'); var godLvl = CM.Sim.hasGod('creation');
if (godLvl == 1) price *= 0.93; if (godLvl == 1) price *= 0.93;
else if (godLvl == 2) price *= 0.95; else if (godLvl == 2) price *= 0.95;
else if (godLvl == 3) price *= 0.98; else if (godLvl == 3) price *= 0.98;