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

Fixed buff bars (Issue #77)

Browse Source
This commit is contained in:
Aktanusa
2016-04-28 17:43:07 -04:00
parent e62b7bfe04
commit 9555e73475
2 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
CookieMonster.js
View File

@@ -752,7 +752,7 @@ CM.Disp.CreateTimerBar = function() {
var type = document.createElement('span'); var type = document.createElement('span');
type.style.display = 'inline-block'; type.style.display = 'inline-block';
type.style.textAlign = 'right'; type.style.textAlign = 'right';
type.style.width = '78px'; type.style.width = '108px';
type.style.marginRight = '5px'; type.style.marginRight = '5px';
type.style.verticalAlign = 'text-top'; type.style.verticalAlign = 'text-top';
type.textContent = name; type.textContent = name;
@@ -844,8 +844,8 @@ CM.Disp.ToggleTimerBarPos = function() {
CM.Disp.UpdateTimerBar = function() { CM.Disp.UpdateTimerBar = function() {
if (CM.Config.TimerBar == 1) { if (CM.Config.TimerBar == 1) {
// label width: 83, timer width: 26, div margin: 20 // label width: 113, timer width: 26, div margin: 20
var maxWidth = CM.Disp.TimerBar.offsetWidth - 129; var maxWidth = CM.Disp.TimerBar.offsetWidth - 159;
var count = 0; var count = 0;
if (Game.shimmerTypes['golden'].spawned == 0 && !Game.Has('Golden switch [off]')) { if (Game.shimmerTypes['golden'].spawned == 0 && !Game.Has('Golden switch [off]')) {
@@ -878,7 +878,36 @@ CM.Disp.UpdateTimerBar = function() {
CM.Disp.TimerBarRen.style.display = 'none'; CM.Disp.TimerBarRen.style.display = 'none';
} }
if (Game.frenzy > 0) { var buffCount = 0;
for (var i in Game.buffs) {
if (Game.buffs[i]) {
buffCount++;
CM.Disp['TimerBarBuff' + buffCount].style.display = '';
l('CMTimerBarBuff' + buffCount + 'Type').textContent = Game.buffs[i].name;
var classColor = '';
if (typeof CM.Disp.buffColors[Game.buffs[i].name] !== 'undefined') {
classColor = CM.Disp.buffColors[Game.buffs[i].name];
}
else {
classColor = CM.Disp.colorPurple;
}
l('CMTimerBarBuff' + buffCount + 'Bar').className = CM.Disp.colorBackPre + classColor;
l('CMTimerBarBuff' + buffCount + 'Bar').style.width = Math.round(Game.buffs[i].time * maxWidth / Game.buffs[i].maxTime) + 'px';
l('CMTimerBarBuff' + buffCount + 'Time').textContent = Math.ceil(Game.buffs[i].time / Game.fps);
count++;
if (buffCount == 2) {
break;
}
}
}
if (buffCount < 2) {
CM.Disp.TimerBarBuff2.style.display = 'none';
if (buffCount < 1) {
CM.Disp.TimerBarBuff1.style.display = 'none';
}
}
/*if (Game.frenzy > 0) {
CM.Disp.TimerBarBuff1.style.display = ''; CM.Disp.TimerBarBuff1.style.display = '';
if (Game.frenzyPower == 7) { if (Game.frenzyPower == 7) {
l('CMTimerBarBuff1Type').textContent = 'Frenzy'; l('CMTimerBarBuff1Type').textContent = 'Frenzy';
@@ -920,7 +949,7 @@ CM.Disp.UpdateTimerBar = function() {
} }
else { else {
CM.Disp.TimerBarBuff2.style.display = 'none'; CM.Disp.TimerBarBuff2.style.display = 'none';
} }*/
if (count != 0) { if (count != 0) {
var height = 48 / count; var height = 48 / count;
@@ -2279,6 +2308,7 @@ CM.Disp.colorGray = 'Gray';
CM.Disp.colorPink = 'Pink'; CM.Disp.colorPink = 'Pink';
CM.Disp.colorBrown = 'Brown'; CM.Disp.colorBrown = 'Brown';
CM.Disp.colors = [CM.Disp.colorBlue, CM.Disp.colorGreen, CM.Disp.colorYellow, CM.Disp.colorOrange, CM.Disp.colorRed, CM.Disp.colorPurple, CM.Disp.colorGray, CM.Disp.colorPink, CM.Disp.colorBrown]; CM.Disp.colors = [CM.Disp.colorBlue, CM.Disp.colorGreen, CM.Disp.colorYellow, CM.Disp.colorOrange, CM.Disp.colorRed, CM.Disp.colorPurple, CM.Disp.colorGray, CM.Disp.colorPink, CM.Disp.colorBrown];
CM.Disp.buffColors = {'Frenzy': CM.Disp.colorYellow, 'Dragon Harvest': CM.Disp.colorBrown, 'Elder frenzy': CM.Disp.colorGreen, 'Clot': CM.Disp.colorRed, 'Click frenzy': CM.Disp.colorBlue, 'Dragonflight': CM.Disp.colorPink};
CM.Disp.lastGoldenCookieState = 0; CM.Disp.lastGoldenCookieState = 0;
CM.Disp.lastSeasonPopupState = 0; CM.Disp.lastSeasonPopupState = 0;
CM.Disp.goldenShimmer; CM.Disp.goldenShimmer;

40
src/Disp.js
View File

@@ -250,7 +250,7 @@ CM.Disp.CreateTimerBar = function() {
var type = document.createElement('span'); var type = document.createElement('span');
type.style.display = 'inline-block'; type.style.display = 'inline-block';
type.style.textAlign = 'right'; type.style.textAlign = 'right';
type.style.width = '78px'; type.style.width = '108px';
type.style.marginRight = '5px'; type.style.marginRight = '5px';
type.style.verticalAlign = 'text-top'; type.style.verticalAlign = 'text-top';
type.textContent = name; type.textContent = name;
@@ -342,8 +342,8 @@ CM.Disp.ToggleTimerBarPos = function() {
CM.Disp.UpdateTimerBar = function() { CM.Disp.UpdateTimerBar = function() {
if (CM.Config.TimerBar == 1) { if (CM.Config.TimerBar == 1) {
// label width: 83, timer width: 26, div margin: 20 // label width: 113, timer width: 26, div margin: 20
var maxWidth = CM.Disp.TimerBar.offsetWidth - 129; var maxWidth = CM.Disp.TimerBar.offsetWidth - 159;
var count = 0; var count = 0;
if (Game.shimmerTypes['golden'].spawned == 0 && !Game.Has('Golden switch [off]')) { if (Game.shimmerTypes['golden'].spawned == 0 && !Game.Has('Golden switch [off]')) {
@@ -376,7 +376,36 @@ CM.Disp.UpdateTimerBar = function() {
CM.Disp.TimerBarRen.style.display = 'none'; CM.Disp.TimerBarRen.style.display = 'none';
} }
if (Game.frenzy > 0) { var buffCount = 0;
for (var i in Game.buffs) {
if (Game.buffs[i]) {
buffCount++;
CM.Disp['TimerBarBuff' + buffCount].style.display = '';
l('CMTimerBarBuff' + buffCount + 'Type').textContent = Game.buffs[i].name;
var classColor = '';
if (typeof CM.Disp.buffColors[Game.buffs[i].name] !== 'undefined') {
classColor = CM.Disp.buffColors[Game.buffs[i].name];
}
else {
classColor = CM.Disp.colorPurple;
}
l('CMTimerBarBuff' + buffCount + 'Bar').className = CM.Disp.colorBackPre + classColor;
l('CMTimerBarBuff' + buffCount + 'Bar').style.width = Math.round(Game.buffs[i].time * maxWidth / Game.buffs[i].maxTime) + 'px';
l('CMTimerBarBuff' + buffCount + 'Time').textContent = Math.ceil(Game.buffs[i].time / Game.fps);
count++;
if (buffCount == 2) {
break;
}
}
}
if (buffCount < 2) {
CM.Disp.TimerBarBuff2.style.display = 'none';
if (buffCount < 1) {
CM.Disp.TimerBarBuff1.style.display = 'none';
}
}
/*if (Game.frenzy > 0) {
CM.Disp.TimerBarBuff1.style.display = ''; CM.Disp.TimerBarBuff1.style.display = '';
if (Game.frenzyPower == 7) { if (Game.frenzyPower == 7) {
l('CMTimerBarBuff1Type').textContent = 'Frenzy'; l('CMTimerBarBuff1Type').textContent = 'Frenzy';
@@ -418,7 +447,7 @@ CM.Disp.UpdateTimerBar = function() {
} }
else { else {
CM.Disp.TimerBarBuff2.style.display = 'none'; CM.Disp.TimerBarBuff2.style.display = 'none';
} }*/
if (count != 0) { if (count != 0) {
var height = 48 / count; var height = 48 / count;
@@ -1777,6 +1806,7 @@ CM.Disp.colorGray = 'Gray';
CM.Disp.colorPink = 'Pink'; CM.Disp.colorPink = 'Pink';
CM.Disp.colorBrown = 'Brown'; CM.Disp.colorBrown = 'Brown';
CM.Disp.colors = [CM.Disp.colorBlue, CM.Disp.colorGreen, CM.Disp.colorYellow, CM.Disp.colorOrange, CM.Disp.colorRed, CM.Disp.colorPurple, CM.Disp.colorGray, CM.Disp.colorPink, CM.Disp.colorBrown]; CM.Disp.colors = [CM.Disp.colorBlue, CM.Disp.colorGreen, CM.Disp.colorYellow, CM.Disp.colorOrange, CM.Disp.colorRed, CM.Disp.colorPurple, CM.Disp.colorGray, CM.Disp.colorPink, CM.Disp.colorBrown];
CM.Disp.buffColors = {'Frenzy': CM.Disp.colorYellow, 'Dragon Harvest': CM.Disp.colorBrown, 'Elder frenzy': CM.Disp.colorGreen, 'Clot': CM.Disp.colorRed, 'Click frenzy': CM.Disp.colorBlue, 'Dragonflight': CM.Disp.colorPink};
CM.Disp.lastGoldenCookieState = 0; CM.Disp.lastGoldenCookieState = 0;
CM.Disp.lastSeasonPopupState = 0; CM.Disp.lastSeasonPopupState = 0;
CM.Disp.goldenShimmer; CM.Disp.goldenShimmer;