diff --git a/CookieMonster.js b/CookieMonster.js index 5921aa7..683acee 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -513,7 +513,7 @@ CM.ConfigData.TimerBar = {label: ['Timer Bar OFF', 'Timer Bar ON'], desc: 'Timer CM.ConfigData.TimerBarPos = {label: ['Timer Bar Position (Top Left)', 'Timer Bar Position (Bottom)'], desc: 'Placement of the Timer Bar', toggle: false, func: function() {CM.Disp.ToggleTimerBarPos();}}; CM.ConfigData.BuildColor = {label: ['Building Colors OFF', 'Building Colors ON'], desc: 'Color code buildings', toggle: true, func: function() {CM.Disp.UpdateBuildings();}}; CM.ConfigData.BulkBuildColor = {label: ['Bulk Building Colors (Single Buildings Color)', 'Bulk Building Colors (Calculated Color)'], desc: 'Color code bulk buildings based on single buildings color or calculated bulk value color', toggle: false, func: function() {CM.Disp.UpdateBuildings();}}; -CM.ConfigData.UpBarColor = {label: ['Upgrade Bar/Colors OFF', 'Upgrade Bar/Colors ON'], desc: 'Color code upgrades and add a counter', toggle: true, func: function() {CM.Disp.ToggleUpBarColor();}}; +CM.ConfigData.UpBarColor = {label: ['Upgrade Colors/Bar OFF', 'Upgrade Colors with Bar ON', 'Upgrade Colors without Bar ON'], desc: 'Color code upgrades and optionally add a counter bar', toggle: false, func: function() {CM.Disp.ToggleUpBarColor();}}; CM.ConfigData.Colors = { desc: { Blue: 'Color Blue. Used to show better than best PP building, for Click Frenzy bar, and for various labels', @@ -1245,6 +1245,10 @@ CM.Disp.ToggleUpBarColor = function() { CM.Disp.UpgradeBar.style.display = ''; CM.Disp.UpdateUpgrades(); } + else if (CM.Config.UpBarColor == 2) { + CM.Disp.UpgradeBar.style.display = 'none'; + CM.Disp.UpdateUpgrades(); + } else { CM.Disp.UpgradeBar.style.display = 'none'; Game.RebuildUpgrades(); @@ -1252,7 +1256,7 @@ CM.Disp.ToggleUpBarColor = function() { } CM.Disp.UpdateUpgrades = function() { - if (CM.Config.UpBarColor == 1) { + if (CM.Config.UpBarColor > 0) { var blue = 0; var green = 0; var yellow = 0; diff --git a/src/Config.js b/src/Config.js index 9c83a6a..63c6b18 100644 --- a/src/Config.js +++ b/src/Config.js @@ -119,7 +119,7 @@ CM.ConfigData.TimerBar = {label: ['Timer Bar OFF', 'Timer Bar ON'], desc: 'Timer CM.ConfigData.TimerBarPos = {label: ['Timer Bar Position (Top Left)', 'Timer Bar Position (Bottom)'], desc: 'Placement of the Timer Bar', toggle: false, func: function() {CM.Disp.ToggleTimerBarPos();}}; CM.ConfigData.BuildColor = {label: ['Building Colors OFF', 'Building Colors ON'], desc: 'Color code buildings', toggle: true, func: function() {CM.Disp.UpdateBuildings();}}; CM.ConfigData.BulkBuildColor = {label: ['Bulk Building Colors (Single Buildings Color)', 'Bulk Building Colors (Calculated Color)'], desc: 'Color code bulk buildings based on single buildings color or calculated bulk value color', toggle: false, func: function() {CM.Disp.UpdateBuildings();}}; -CM.ConfigData.UpBarColor = {label: ['Upgrade Bar/Colors OFF', 'Upgrade Bar/Colors ON'], desc: 'Color code upgrades and add a counter', toggle: true, func: function() {CM.Disp.ToggleUpBarColor();}}; +CM.ConfigData.UpBarColor = {label: ['Upgrade Colors/Bar OFF', 'Upgrade Colors with Bar ON', 'Upgrade Colors without Bar ON'], desc: 'Color code upgrades and optionally add a counter bar', toggle: false, func: function() {CM.Disp.ToggleUpBarColor();}}; CM.ConfigData.Colors = { desc: { Blue: 'Color Blue. Used to show better than best PP building, for Click Frenzy bar, and for various labels', diff --git a/src/Disp.js b/src/Disp.js index ce4f87e..4197b76 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -665,6 +665,10 @@ CM.Disp.ToggleUpBarColor = function() { CM.Disp.UpgradeBar.style.display = ''; CM.Disp.UpdateUpgrades(); } + else if (CM.Config.UpBarColor == 2) { + CM.Disp.UpgradeBar.style.display = 'none'; + CM.Disp.UpdateUpgrades(); + } else { CM.Disp.UpgradeBar.style.display = 'none'; Game.RebuildUpgrades(); @@ -672,7 +676,7 @@ CM.Disp.ToggleUpBarColor = function() { } CM.Disp.UpdateUpgrades = function() { - if (CM.Config.UpBarColor == 1) { + if (CM.Config.UpBarColor > 0) { var blue = 0; var green = 0; var yellow = 0;