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

Update beta JS with 1 fix

Browse Source
This commit is contained in:
Aktanusa
2015-12-26 21:30:52 -05:00
parent aeee5a2e9c
commit 47437ce496
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
CookieMonsterBeta.js
View File

@@ -755,29 +755,19 @@ CM.Disp.UpdateTimerBar = function() {
} }
CM.Disp.UpdateBotTimerBarDisplay = function() { CM.Disp.UpdateBotTimerBarDisplay = function() {
if (Game.OnAscend) { if (CM.Config.BotBar == 1 && CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 1) {
l('game').style.bottom = '0px'; CM.Disp.BotBar.style.bottom = '48px';
CM.Disp.BotBar.style.display = 'none'; l('game').style.bottom = '104px';
CM.Disp.TimerBar.style.display = 'none';
CM.Disp.GCTimer.style.display = 'none';
} }
else { else if (CM.Config.BotBar == 1) {
CM.Disp.BotBar.style.display = ''; CM.Disp.BotBar.style.bottom = '0px';
CM.Disp.TimerBar.style.display = ''; l('game').style.bottom = '56px';
if (CM.Config.BotBar == 1 && CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 1) { }
CM.Disp.BotBar.style.bottom = '48px'; else if (CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 1) {
l('game').style.bottom = '104px'; l('game').style.bottom = '48px';
} }
else if (CM.Config.BotBar == 1) { else { // No bars
CM.Disp.BotBar.style.bottom = '0px'; l('game').style.bottom = '0px';
l('game').style.bottom = '56px';
}
else if (CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 1) {
l('game').style.bottom = '48px';
}
else { // No bars
l('game').style.bottom = '0px';
}
} }
if (CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 0) { if (CM.Config.TimerBar == 1 && CM.Config.TimerBarPos == 0) {
@@ -1910,6 +1900,20 @@ CM.Disp.UpdateWrinklerTooltip = function() {
} }
} }
CM.Disp.UpdateAscendState = function() {
if (Game.OnAscend) {
l('game').style.bottom = '0px';
if (CM.Config.BotBar == 1) CM.Disp.BotBar.style.display = 'none';
if (CM.Config.TimerBar == 1) CM.Disp.TimerBar.style.display = 'none';
}
else {
CM.Disp.ToggleBotBar();
CM.Disp.ToggleTimerBar();
}
CM.Disp.UpdateBackground();
}
CM.Disp.ToggleSayTime = function() { CM.Disp.ToggleSayTime = function() {
if (CM.Config.SayTime == 1) { if (CM.Config.SayTime == 1) {
Game.sayTime = CM.Disp.sayTime; Game.sayTime = CM.Disp.sayTime;
@@ -2029,7 +2033,7 @@ CM.ReplaceNative = function() {
CM.Loop = function() { CM.Loop = function() {
if (CM.Disp.lastAscendState != Game.OnAscend) { if (CM.Disp.lastAscendState != Game.OnAscend) {
CM.Disp.lastAscendState = Game.OnAscend; CM.Disp.lastAscendState = Game.OnAscend;
CM.Disp.UpdateBotTimerBarDisplay(); CM.Disp.UpdateAscendState();
} }
if (!Game.OnAscend && Game.AscendTimer == 0) { if (!Game.OnAscend && Game.AscendTimer == 0) {
if (CM.Sim.DoSims) { if (CM.Sim.DoSims) {
@@ -2058,15 +2062,15 @@ CM.Loop = function() {
CM.Disp.CheckWrinklerTooltip(); CM.Disp.CheckWrinklerTooltip();
CM.Disp.UpdateWrinklerTooltip(); CM.Disp.UpdateWrinklerTooltip();
// Check Golden Cookies
CM.Disp.CheckGoldenCookie();
// Update Title // Update Title
CM.Disp.UpdateTitle(); CM.Disp.UpdateTitle();
// Change menu refresh interval // Change menu refresh interval
CM.Disp.RefreshMenu(); CM.Disp.RefreshMenu();
} }
// Check Golden Cookies
CM.Disp.CheckGoldenCookie();
} }
CM.Init = function() { CM.Init = function() {