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

Minor code cleanup from merge

Browse Source
This commit is contained in:
Aktanusa
2019-10-10 20:23:23 -04:00
parent 9f649d8806
commit 244d0342ec
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CookieMonster.js
View File

@@ -1511,10 +1511,11 @@ CM.Disp.UpdateTitle = function() {
document.title = CM.Cache.Title; document.title = CM.Cache.Title;
} }
else if (CM.Config.Title == 1) { else if (CM.Config.Title == 1) {
var addFC = false;
var addSP = false; var addSP = false;
var titleGC; var titleGC;
var titleFC = ''; var titleFC;
var titleSP; var titleSP;
if (CM.Disp.lastGoldenCookieState) { if (CM.Disp.lastGoldenCookieState) {
if (CM.Disp.goldenShimmer.wrath) { if (CM.Disp.goldenShimmer.wrath) {
@@ -1531,6 +1532,7 @@ CM.Disp.UpdateTitle = function() {
titleGC = '[GS]' titleGC = '[GS]'
} }
if (CM.Disp.lastTickerFortuneState) { if (CM.Disp.lastTickerFortuneState) {
addFC = true;
titleFC = '[F]'; titleFC = '[F]';
} }
if (Game.season == 'christmas') { if (Game.season == 'christmas') {
@@ -1548,14 +1550,11 @@ CM.Disp.UpdateTitle = function() {
str = str.substring(str.lastIndexOf(']') + 1); str = str.substring(str.lastIndexOf(']') + 1);
} }
document.title = titleFC + titleGC + (addSP ? titleSP : '') + ' ' + str; document.title = titleGC + (addFC ? titleFC : '') + (addSP ? titleSP : '') + ' ' + str;
} }
else if (CM.Config.Title == 2) { else if (CM.Config.Title == 2) {
var str = ''; var str = '';
var spawn = false; var spawn = false;
if (CM.Disp.lastTickerFortuneState) {
str += '[F]';
}
if (CM.Disp.lastGoldenCookieState) { if (CM.Disp.lastGoldenCookieState) {
spawn = true; spawn = true;
if (CM.Disp.goldenShimmer.wrath) { if (CM.Disp.goldenShimmer.wrath) {
@@ -1565,6 +1564,10 @@ CM.Disp.UpdateTitle = function() {
str += '[G ' + Math.ceil(CM.Disp.goldenShimmer.life / Game.fps) + ']'; str += '[G ' + Math.ceil(CM.Disp.goldenShimmer.life / Game.fps) + ']';
} }
} }
if (CM.Disp.lastTickerFortuneState) {
spawn = true;
str += '[F]';
}
if (Game.season == 'christmas' && CM.Disp.lastSeasonPopupState) { if (Game.season == 'christmas' && CM.Disp.lastSeasonPopupState) {
str += '[R ' + Math.ceil(CM.Disp.seasonPopShimmer.life / Game.fps) + ']'; str += '[R ' + Math.ceil(CM.Disp.seasonPopShimmer.life / Game.fps) + ']';
spawn = true; spawn = true;

13
src/Disp.js
View File

@@ -912,10 +912,11 @@ CM.Disp.UpdateTitle = function() {
document.title = CM.Cache.Title; document.title = CM.Cache.Title;
} }
else if (CM.Config.Title == 1) { else if (CM.Config.Title == 1) {
var addFC = false;
var addSP = false; var addSP = false;
var titleGC; var titleGC;
var titleFC = ''; var titleFC;
var titleSP; var titleSP;
if (CM.Disp.lastGoldenCookieState) { if (CM.Disp.lastGoldenCookieState) {
if (CM.Disp.goldenShimmer.wrath) { if (CM.Disp.goldenShimmer.wrath) {
@@ -932,6 +933,7 @@ CM.Disp.UpdateTitle = function() {
titleGC = '[GS]' titleGC = '[GS]'
} }
if (CM.Disp.lastTickerFortuneState) { if (CM.Disp.lastTickerFortuneState) {
addFC = true;
titleFC = '[F]'; titleFC = '[F]';
} }
if (Game.season == 'christmas') { if (Game.season == 'christmas') {
@@ -949,14 +951,11 @@ CM.Disp.UpdateTitle = function() {
str = str.substring(str.lastIndexOf(']') + 1); str = str.substring(str.lastIndexOf(']') + 1);
} }
document.title = titleFC + titleGC + (addSP ? titleSP : '') + ' ' + str; document.title = titleGC + (addFC ? titleFC : '') + (addSP ? titleSP : '') + ' ' + str;
} }
else if (CM.Config.Title == 2) { else if (CM.Config.Title == 2) {
var str = ''; var str = '';
var spawn = false; var spawn = false;
if (CM.Disp.lastTickerFortuneState) {
str += '[F]';
}
if (CM.Disp.lastGoldenCookieState) { if (CM.Disp.lastGoldenCookieState) {
spawn = true; spawn = true;
if (CM.Disp.goldenShimmer.wrath) { if (CM.Disp.goldenShimmer.wrath) {
@@ -966,6 +965,10 @@ CM.Disp.UpdateTitle = function() {
str += '[G ' + Math.ceil(CM.Disp.goldenShimmer.life / Game.fps) + ']'; str += '[G ' + Math.ceil(CM.Disp.goldenShimmer.life / Game.fps) + ']';
} }
} }
if (CM.Disp.lastTickerFortuneState) {
spawn = true;
str += '[F]';
}
if (Game.season == 'christmas' && CM.Disp.lastSeasonPopupState) { if (Game.season == 'christmas' && CM.Disp.lastSeasonPopupState) {
str += '[R ' + Math.ceil(CM.Disp.seasonPopShimmer.life / Game.fps) + ']'; str += '[R ' + Math.ceil(CM.Disp.seasonPopShimmer.life / Game.fps) + ']';
spawn = true; spawn = true;