Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a8d404aca7 | ||
|
|
989ef30f4a |
@@ -639,6 +639,14 @@ CM.Disp.UpdateTimerBar = function() {
|
|||||||
if (Game.goldenCookie.life <= 0 && Game.goldenCookie.toDie == 0) {
|
if (Game.goldenCookie.life <= 0 && Game.goldenCookie.toDie == 0) {
|
||||||
CM.Disp.TimerBarGC.style.display = '';
|
CM.Disp.TimerBarGC.style.display = '';
|
||||||
l('CMTimerBarGCMinBar').style.width = Math.round(Math.max(0, Game.goldenCookie.minTime - Game.goldenCookie.time) * maxWidth / Game.goldenCookie.maxTime) + 'px';
|
l('CMTimerBarGCMinBar').style.width = Math.round(Math.max(0, Game.goldenCookie.minTime - Game.goldenCookie.time) * maxWidth / Game.goldenCookie.maxTime) + 'px';
|
||||||
|
if (Game.goldenCookie.minTime == Game.goldenCookie.maxTime) {
|
||||||
|
l('CMTimerBarGCMinBar').style.borderTopRightRadius = '10px';
|
||||||
|
l('CMTimerBarGCMinBar').style.borderBottomRightRadius = '10px';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
l('CMTimerBarGCMinBar').style.borderTopRightRadius = '';
|
||||||
|
l('CMTimerBarGCMinBar').style.borderBottomRightRadius = '';
|
||||||
|
}
|
||||||
l('CMTimerBarGCBar').style.width = Math.round(Math.min(Game.goldenCookie.maxTime - Game.goldenCookie.minTime, Game.goldenCookie.maxTime - Game.goldenCookie.time) * maxWidth / Game.goldenCookie.maxTime) + 'px';
|
l('CMTimerBarGCBar').style.width = Math.round(Math.min(Game.goldenCookie.maxTime - Game.goldenCookie.minTime, Game.goldenCookie.maxTime - Game.goldenCookie.time) * maxWidth / Game.goldenCookie.maxTime) + 'px';
|
||||||
l('CMTimerBarGCTime').textContent = Math.ceil((Game.goldenCookie.maxTime - Game.goldenCookie.time) / Game.fps);
|
l('CMTimerBarGCTime').textContent = Math.ceil((Game.goldenCookie.maxTime - Game.goldenCookie.time) / Game.fps);
|
||||||
count++;
|
count++;
|
||||||
@@ -816,6 +824,7 @@ CM.Disp.ToggleUpBarColor = function() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
CM.Disp.UpdateUpgrades = function() {
|
CM.Disp.UpdateUpgrades = function() {
|
||||||
|
if (CM.Config.UpBarColor == 1) {
|
||||||
var blue = 0;
|
var blue = 0;
|
||||||
var green = 0;
|
var green = 0;
|
||||||
var yellow = 0;
|
var yellow = 0;
|
||||||
@@ -853,6 +862,7 @@ CM.Disp.UpdateUpgrades = function() {
|
|||||||
l('CMUpgradeBarRed').textContent = red;
|
l('CMUpgradeBarRed').textContent = red;
|
||||||
l('CMUpgradeBarPurple').textContent = purple;
|
l('CMUpgradeBarPurple').textContent = purple;
|
||||||
l('CMUpgradeBarGray').textContent = gray;
|
l('CMUpgradeBarGray').textContent = gray;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CM.Disp.CreateWhiteScreen = function() {
|
CM.Disp.CreateWhiteScreen = function() {
|
||||||
@@ -1913,7 +1923,7 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBar
|
|||||||
CM.ConfigPrefix = 'CMConfig';
|
CM.ConfigPrefix = 'CMConfig';
|
||||||
|
|
||||||
CM.VersionMajor = '1.0465';
|
CM.VersionMajor = '1.0465';
|
||||||
CM.VersionMinor = '10';
|
CM.VersionMinor = '11';
|
||||||
|
|
||||||
/*******
|
/*******
|
||||||
* Sim *
|
* Sim *
|
||||||
|
|||||||
10
src/Disp.js
10
src/Disp.js
@@ -320,6 +320,14 @@ CM.Disp.UpdateTimerBar = function() {
|
|||||||
if (Game.goldenCookie.life <= 0 && Game.goldenCookie.toDie == 0) {
|
if (Game.goldenCookie.life <= 0 && Game.goldenCookie.toDie == 0) {
|
||||||
CM.Disp.TimerBarGC.style.display = '';
|
CM.Disp.TimerBarGC.style.display = '';
|
||||||
l('CMTimerBarGCMinBar').style.width = Math.round(Math.max(0, Game.goldenCookie.minTime - Game.goldenCookie.time) * maxWidth / Game.goldenCookie.maxTime) + 'px';
|
l('CMTimerBarGCMinBar').style.width = Math.round(Math.max(0, Game.goldenCookie.minTime - Game.goldenCookie.time) * maxWidth / Game.goldenCookie.maxTime) + 'px';
|
||||||
|
if (Game.goldenCookie.minTime == Game.goldenCookie.maxTime) {
|
||||||
|
l('CMTimerBarGCMinBar').style.borderTopRightRadius = '10px';
|
||||||
|
l('CMTimerBarGCMinBar').style.borderBottomRightRadius = '10px';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
l('CMTimerBarGCMinBar').style.borderTopRightRadius = '';
|
||||||
|
l('CMTimerBarGCMinBar').style.borderBottomRightRadius = '';
|
||||||
|
}
|
||||||
l('CMTimerBarGCBar').style.width = Math.round(Math.min(Game.goldenCookie.maxTime - Game.goldenCookie.minTime, Game.goldenCookie.maxTime - Game.goldenCookie.time) * maxWidth / Game.goldenCookie.maxTime) + 'px';
|
l('CMTimerBarGCBar').style.width = Math.round(Math.min(Game.goldenCookie.maxTime - Game.goldenCookie.minTime, Game.goldenCookie.maxTime - Game.goldenCookie.time) * maxWidth / Game.goldenCookie.maxTime) + 'px';
|
||||||
l('CMTimerBarGCTime').textContent = Math.ceil((Game.goldenCookie.maxTime - Game.goldenCookie.time) / Game.fps);
|
l('CMTimerBarGCTime').textContent = Math.ceil((Game.goldenCookie.maxTime - Game.goldenCookie.time) / Game.fps);
|
||||||
count++;
|
count++;
|
||||||
@@ -497,6 +505,7 @@ CM.Disp.ToggleUpBarColor = function() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
CM.Disp.UpdateUpgrades = function() {
|
CM.Disp.UpdateUpgrades = function() {
|
||||||
|
if (CM.Config.UpBarColor == 1) {
|
||||||
var blue = 0;
|
var blue = 0;
|
||||||
var green = 0;
|
var green = 0;
|
||||||
var yellow = 0;
|
var yellow = 0;
|
||||||
@@ -534,6 +543,7 @@ CM.Disp.UpdateUpgrades = function() {
|
|||||||
l('CMUpgradeBarRed').textContent = red;
|
l('CMUpgradeBarRed').textContent = red;
|
||||||
l('CMUpgradeBarPurple').textContent = purple;
|
l('CMUpgradeBarPurple').textContent = purple;
|
||||||
l('CMUpgradeBarGray').textContent = gray;
|
l('CMUpgradeBarGray').textContent = gray;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CM.Disp.CreateWhiteScreen = function() {
|
CM.Disp.CreateWhiteScreen = function() {
|
||||||
|
|||||||
@@ -129,5 +129,5 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBar
|
|||||||
CM.ConfigPrefix = 'CMConfig';
|
CM.ConfigPrefix = 'CMConfig';
|
||||||
|
|
||||||
CM.VersionMajor = '1.0465';
|
CM.VersionMajor = '1.0465';
|
||||||
CM.VersionMinor = '10';
|
CM.VersionMinor = '11';
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user