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

Merge pull request #423 from Chorizorro/fix/disp

Browse Source 
Fix favicon not being reset with no GC left
This commit is contained in:
DanielNoord authored and GitHub committed 2020-12-06 12:43:00 +01:00
2 parents bf8e1922cb 87a85bfc59
commit 7c08431271
3 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CookieMonster.js
+3 -3
View File
@@ -1894,7 +1894,7 @@ CM.Disp.CreateFavicon = function() {
* By relying on CM.Cache.spawnedGoldenShimmer it only changes for non-user spawned cookie * By relying on CM.Cache.spawnedGoldenShimmer it only changes for non-user spawned cookie
*/ */
CM.Disp.UpdateFavicon = function() { CM.Disp.UpdateFavicon = function() {
if (CM.Config.Favicon == 1) { if (CM.Config.Favicon == 1 && CM.Main.lastGoldenCookieState > 0) {
if (CM.Cache.spawnedGoldenShimmer.wrath) CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico'; if (CM.Cache.spawnedGoldenShimmer.wrath) CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
else CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico'; else CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
} }
@@ -3784,7 +3784,6 @@ CM.Main.CheckGoldenCookie = function() {
CM.Disp.PlaySound(CM.Config.GCSoundURL, 'GCSound', 'GCVolume'); CM.Disp.PlaySound(CM.Config.GCSoundURL, 'GCSound', 'GCVolume');
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.UpdateFavicon();
for (var i in Game.shimmers) { for (var i in Game.shimmers) {
if (typeof CM.Disp.GCTimers[Game.shimmers[i].id] == "undefined") { if (typeof CM.Disp.GCTimers[Game.shimmers[i].id] == "undefined") {
@@ -3792,7 +3791,8 @@ CM.Main.CheckGoldenCookie = function() {
} }
} }
} }
CM.Main.lastSpawnedGoldenCookieState = CM.Main.currSpawnedGoldenCookieState CM.Disp.UpdateFavicon();
CM.Main.lastSpawnedGoldenCookieState = CM.Main.currSpawnedGoldenCookieState;
if (CM.Main.currSpawnedGoldenCookieState == 0) CM.Cache.spawnedGoldenShimmer = 0; if (CM.Main.currSpawnedGoldenCookieState == 0) CM.Cache.spawnedGoldenShimmer = 0;
} }
else if (CM.Config.GCTimer == 1 && CM.Main.lastGoldenCookieState) { else if (CM.Config.GCTimer == 1 && CM.Main.lastGoldenCookieState) {
src/Disp.js
+1 -1
View File
@@ -1006,7 +1006,7 @@ CM.Disp.CreateFavicon = function() {
* By relying on CM.Cache.spawnedGoldenShimmer it only changes for non-user spawned cookie * By relying on CM.Cache.spawnedGoldenShimmer it only changes for non-user spawned cookie
*/ */
CM.Disp.UpdateFavicon = function() { CM.Disp.UpdateFavicon = function() {
if (CM.Config.Favicon == 1) { if (CM.Config.Favicon == 1 && CM.Main.lastGoldenCookieState > 0) {
if (CM.Cache.spawnedGoldenShimmer.wrath) CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico'; if (CM.Cache.spawnedGoldenShimmer.wrath) CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
else CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico'; else CM.Disp.Favicon.href = 'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
} }
src/Main.js
+2 -2
View File
@@ -305,7 +305,6 @@ CM.Main.CheckGoldenCookie = function() {
CM.Disp.PlaySound(CM.Config.GCSoundURL, 'GCSound', 'GCVolume'); CM.Disp.PlaySound(CM.Config.GCSoundURL, 'GCSound', 'GCVolume');
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.UpdateFavicon();
for (var i in Game.shimmers) { for (var i in Game.shimmers) {
if (typeof CM.Disp.GCTimers[Game.shimmers[i].id] == "undefined") { if (typeof CM.Disp.GCTimers[Game.shimmers[i].id] == "undefined") {
@@ -313,7 +312,8 @@ CM.Main.CheckGoldenCookie = function() {
} }
} }
} }
CM.Main.lastSpawnedGoldenCookieState = CM.Main.currSpawnedGoldenCookieState CM.Disp.UpdateFavicon();
CM.Main.lastSpawnedGoldenCookieState = CM.Main.currSpawnedGoldenCookieState;
if (CM.Main.currSpawnedGoldenCookieState == 0) CM.Cache.spawnedGoldenShimmer = 0; if (CM.Main.currSpawnedGoldenCookieState == 0) CM.Cache.spawnedGoldenShimmer = 0;
} }
else if (CM.Config.GCTimer == 1 && CM.Main.lastGoldenCookieState) { else if (CM.Config.GCTimer == 1 && CM.Main.lastGoldenCookieState) {