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

Merge pull request #493 from Aktanusa/master

Browse Source 
Rebase dev to incorporate hot fix for #490
This commit is contained in:
DanielNoord
2021-01-23 23:02:21 +01:00
committed by GitHub
parent 1875423a7b 242c6ba754
commit 6df4abf945
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CookieMonster.js
View File

@@ -4633,6 +4633,9 @@ CM.Sim.auraMult = function(what) {
} }
CM.Sim.hasGod=function(what) { CM.Sim.hasGod=function(what) {
if (!CM.Sim.Objects.Temple.minigameLoaded) {
return false
}
var possibleGods = CM.Sim.Objects.Temple.minigame.gods var possibleGods = CM.Sim.Objects.Temple.minigame.gods
var god=possibleGods[what]; var god=possibleGods[what];
for (var i=0;i<3;i++) for (var i=0;i<3;i++)
@@ -5403,15 +5406,16 @@ CM.Sim.mouseCps = function() {
} }
mult *= CM.Sim.eff('click'); mult *= CM.Sim.eff('click');
if (CM.Sim.Objects.Temple.minigameLoaded) {
if (CM.Sim.hasGod) if (CM.Sim.hasGod)
{ {
var godLvl = CM.Sim.hasGod('labor'); var godLvl = CM.Sim.hasGod('labor');
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;
}
} }
for (var i in Game.buffs) for (var i in Game.buffs)
{ {
if (typeof Game.buffs[i].multClick != 'undefined') mult*=Game.buffs[i].multClick; if (typeof Game.buffs[i].multClick != 'undefined') mult*=Game.buffs[i].multClick;

20
src/Sim.js
View File

@@ -103,6 +103,9 @@ CM.Sim.auraMult = function(what) {
} }
CM.Sim.hasGod=function(what) { CM.Sim.hasGod=function(what) {
if (!CM.Sim.Objects.Temple.minigameLoaded) {
return false
}
var possibleGods = CM.Sim.Objects.Temple.minigame.gods var possibleGods = CM.Sim.Objects.Temple.minigame.gods
var god=possibleGods[what]; var god=possibleGods[what];
for (var i=0;i<3;i++) for (var i=0;i<3;i++)
@@ -873,15 +876,16 @@ CM.Sim.mouseCps = function() {
} }
mult *= CM.Sim.eff('click'); mult *= CM.Sim.eff('click');
if (CM.Sim.Objects.Temple.minigameLoaded) {
if (CM.Sim.hasGod) if (CM.Sim.hasGod)
{ {
var godLvl = CM.Sim.hasGod('labor'); var godLvl = CM.Sim.hasGod('labor');
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;
}
} }
for (var i in Game.buffs) for (var i in Game.buffs)
{ {
if (typeof Game.buffs[i].multClick != 'undefined') mult*=Game.buffs[i].multClick; if (typeof Game.buffs[i].multClick != 'undefined') mult*=Game.buffs[i].multClick;