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

Merge branch 'dev' of https://github.com/Aktanusa/CookieMonster into gardentooltip

Browse Source
This commit is contained in:
Daniel van Noord
2021-01-23 23:03:24 +01:00
parent c64f42bcfa 6df4abf945
commit 55c6b5db8b
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

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