Version change

Fixed upgrades still having color boxes even when it is off in preferences (Issue #21 ) and fixed graphical glitch with timer bars on a cookie chain
2014-08-26 13:27:59 -04:00 · 2014-08-26 13:27:10 -04:00
3 changed files with 92 additions and 72 deletions
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -639,6 +639,14 @@ CM.Disp.UpdateTimerBar = function() {
 		if (Game.goldenCookie.life <= 0 && Game.goldenCookie.toDie == 0) {
 			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';
+			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('CMTimerBarGCTime').textContent = Math.ceil((Game.goldenCookie.maxTime - Game.goldenCookie.time) / Game.fps);
 			count++;
@@ -816,6 +824,7 @@ CM.Disp.ToggleUpBarColor = function() {
 }

 CM.Disp.UpdateUpgrades = function() {
+	if (CM.Config.UpBarColor == 1) {
 		var blue = 0;
 		var green = 0;
 		var yellow = 0;
@@ -853,6 +862,7 @@ CM.Disp.UpdateUpgrades = function() {
 		l('CMUpgradeBarRed').textContent = red;
 		l('CMUpgradeBarPurple').textContent = purple;
 		l('CMUpgradeBarGray').textContent = gray;
+	}
 }

 CM.Disp.CreateWhiteScreen = function() {
@@ -1913,7 +1923,7 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBar
 CM.ConfigPrefix = 'CMConfig';

 CM.VersionMajor = '1.0465';
-CM.VersionMinor = '10';
+CM.VersionMinor = '11';

 /*******
 * Sim *
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -320,6 +320,14 @@ CM.Disp.UpdateTimerBar = function() {
 		if (Game.goldenCookie.life <= 0 && Game.goldenCookie.toDie == 0) {
 			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';
+			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('CMTimerBarGCTime').textContent = Math.ceil((Game.goldenCookie.maxTime - Game.goldenCookie.time) / Game.fps);
 			count++;
@@ -497,6 +505,7 @@ CM.Disp.ToggleUpBarColor = function() {
 }

 CM.Disp.UpdateUpgrades = function() {
+	if (CM.Config.UpBarColor == 1) {
 		var blue = 0;
 		var green = 0;
 		var yellow = 0;
@@ -534,6 +543,7 @@ CM.Disp.UpdateUpgrades = function() {
 		l('CMUpgradeBarRed').textContent = red;
 		l('CMUpgradeBarPurple').textContent = purple;
 		l('CMUpgradeBarGray').textContent = gray;
+	}
 }

 CM.Disp.CreateWhiteScreen = function() {
--- a/src/Main.js
+++ b/src/Main.js
@@ -129,5 +129,5 @@ CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBar
 CM.ConfigPrefix = 'CMConfig';

 CM.VersionMajor = '1.0465';
-CM.VersionMinor = '10';
+CM.VersionMinor = '11';
Author	SHA1	Message	Date
Aktanusa	a8d404aca7	Version change	2014-08-26 13:27:59 -04:00
Aktanusa	989ef30f4a	Fixed upgrades still having color boxes even when it is off in preferences (Issue #21 ) and fixed graphical glitch with timer bars on a cookie chain	2014-08-26 13:27:10 -04:00