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

Merge pull request #410 from Aktanusa/master

Browse Source 
Publish hotfixes to gh-pages
This commit is contained in:
DanielNoord
2020-12-04 20:58:05 +01:00
committed by GitHub
parent 09cc7ca646 3bca426eb1
commit da2902dd67
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CookieMonster.js
View File

@@ -1876,6 +1876,7 @@ CM.Disp.CheckGoldenCookie = function() {
CM.Disp.Notification('GCNotification', "Golden Cookie Spawned", "A Golden Cookie has spawned. Click it now!") CM.Disp.Notification('GCNotification', "Golden Cookie Spawned", "A Golden Cookie has spawned. Click it now!")
} }
CM.Disp.lastSpawnedGoldenCookieState = CM.Disp.currSpawnedGoldenCookieState CM.Disp.lastSpawnedGoldenCookieState = CM.Disp.currSpawnedGoldenCookieState
if (CM.Main.currSpawnedGoldenCookieState == 0) CM.Disp.spawnedGoldenShimmer = 0;
CM.Disp.UpdateFavicon(); CM.Disp.UpdateFavicon();
if (CM.Config.GCTimer == 1) { if (CM.Config.GCTimer == 1) {
@@ -3106,7 +3107,7 @@ CM.Disp.UpdateTooltip = function() {
l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2); l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2);
l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color;
} }
if (CM.Config.TooltipBuildUp) { if (CM.Config.TooltipBuildUp && Game.buyMode == 1) {
for (var i in Game.Objects[CM.Disp.tooltipName].productionAchievs) { for (var i in Game.Objects[CM.Disp.tooltipName].productionAchievs) {
if (!CM.Sim.HasAchiev(Game.Objects[CM.Disp.tooltipName].productionAchievs[i].achiev.name)) { if (!CM.Sim.HasAchiev(Game.Objects[CM.Disp.tooltipName].productionAchievs[i].achiev.name)) {
var nextProductionAchiev = Game.Objects[CM.Disp.tooltipName].productionAchievs[i] var nextProductionAchiev = Game.Objects[CM.Disp.tooltipName].productionAchievs[i]
@@ -3951,11 +3952,11 @@ CM.Sim.hasGod=function(what) {
CM.Sim.eff = function(name) { CM.Sim.eff = function(name) {
if (typeof CM.Sim.effs[name]==='undefined') { if (typeof CM.Sim.effs[name]==='undefined') {
CM.Sim.effs[name] = 1 CM.Sim.effs[name] = 1;
return CM.Sim.effs[name] return CM.Sim.effs[name];
} }
else { else {
return Game.effs[name]; return CM.Sim.effs[name];
} }
} }
@@ -4089,7 +4090,7 @@ CM.Sim.CalculateGains = function() {
var mult = 1; var mult = 1;
// Include minigame effects // Include minigame effects
var effs={}; var effs={};
for (var i in CM.Cache.Objects) { for (var i in Game.Objects) {
// TODO Store minigames and effects in Cache // TODO Store minigames and effects in Cache
// Include possibility of new/modded building and new/modded minigames // Include possibility of new/modded building and new/modded minigames
if (CM.Sim.Objects[i].minigameLoaded && CM.Sim.Objects[i].minigame.effs) { if (CM.Sim.Objects[i].minigameLoaded && CM.Sim.Objects[i].minigame.effs) {

3
src/Disp.js
View File

@@ -1034,6 +1034,7 @@ CM.Disp.CheckGoldenCookie = function() {
CM.Disp.Notification('GCNotification', "Golden Cookie Spawned", "A Golden Cookie has spawned. Click it now!") CM.Disp.Notification('GCNotification', "Golden Cookie Spawned", "A Golden Cookie has spawned. Click it now!")
} }
CM.Disp.lastSpawnedGoldenCookieState = CM.Disp.currSpawnedGoldenCookieState CM.Disp.lastSpawnedGoldenCookieState = CM.Disp.currSpawnedGoldenCookieState
if (CM.Main.currSpawnedGoldenCookieState == 0) CM.Disp.spawnedGoldenShimmer = 0;
CM.Disp.UpdateFavicon(); CM.Disp.UpdateFavicon();
if (CM.Config.GCTimer == 1) { if (CM.Config.GCTimer == 1) {
@@ -2264,7 +2265,7 @@ CM.Disp.UpdateTooltip = function() {
l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2); l('CMTooltipPP').textContent = Beautify(CM.Cache[target][CM.Disp.tooltipName].pp, 2);
l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color; l('CMTooltipPP').className = CM.Disp.colorTextPre + CM.Cache[target][CM.Disp.tooltipName].color;
} }
if (CM.Config.TooltipBuildUp) { if (CM.Config.TooltipBuildUp && Game.buyMode == 1) {
for (var i in Game.Objects[CM.Disp.tooltipName].productionAchievs) { for (var i in Game.Objects[CM.Disp.tooltipName].productionAchievs) {
if (!CM.Sim.HasAchiev(Game.Objects[CM.Disp.tooltipName].productionAchievs[i].achiev.name)) { if (!CM.Sim.HasAchiev(Game.Objects[CM.Disp.tooltipName].productionAchievs[i].achiev.name)) {
var nextProductionAchiev = Game.Objects[CM.Disp.tooltipName].productionAchievs[i] var nextProductionAchiev = Game.Objects[CM.Disp.tooltipName].productionAchievs[i]

8
src/Sim.js
View File

@@ -114,11 +114,11 @@ CM.Sim.hasGod=function(what) {
CM.Sim.eff = function(name) { CM.Sim.eff = function(name) {
if (typeof CM.Sim.effs[name]==='undefined') { if (typeof CM.Sim.effs[name]==='undefined') {
CM.Sim.effs[name] = 1 CM.Sim.effs[name] = 1;
return CM.Sim.effs[name] return CM.Sim.effs[name];
} }
else { else {
return Game.effs[name]; return CM.Sim.effs[name];
} }
} }
@@ -252,7 +252,7 @@ CM.Sim.CalculateGains = function() {
var mult = 1; var mult = 1;
// Include minigame effects // Include minigame effects
var effs={}; var effs={};
for (var i in CM.Cache.Objects) { for (var i in Game.Objects) {
// TODO Store minigames and effects in Cache // TODO Store minigames and effects in Cache
// Include possibility of new/modded building and new/modded minigames // Include possibility of new/modded building and new/modded minigames
if (CM.Sim.Objects[i].minigameLoaded && CM.Sim.Objects[i].minigame.effs) { if (CM.Sim.Objects[i].minigameLoaded && CM.Sim.Objects[i].minigame.effs) {