From 3ddd1b3d2357f2af88a11165b18d5619eaf14ffd Mon Sep 17 00:00:00 2001 From: Aktanusa Date: Sat, 30 Aug 2014 01:24:42 -0400 Subject: [PATCH] Version change/added the option to change colors (Issue #20) --- CookieMonster.js | 164 +++++--- jscolor/arrow.gif | Bin 0 -> 66 bytes jscolor/cross.gif | Bin 0 -> 83 bytes jscolor/hs.png | Bin 0 -> 2684 bytes jscolor/hv.png | Bin 0 -> 2865 bytes jscolor/jscolor.js | 997 +++++++++++++++++++++++++++++++++++++++++++++ src/Config.js | 33 +- src/Disp.js | 119 ++++-- src/Main.js | 12 +- 9 files changed, 1219 insertions(+), 106 deletions(-) create mode 100644 jscolor/arrow.gif create mode 100644 jscolor/cross.gif create mode 100644 jscolor/hs.png create mode 100644 jscolor/hv.png create mode 100644 jscolor/jscolor.js diff --git a/CookieMonster.js b/CookieMonster.js index 1b4bee0..711a660 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -202,31 +202,37 @@ CM.LoadConfig = function() { // Check values var mod = false; for (var i in CM.ConfigDefault) { - if (i != 'StatsPref') { + if (CM.Config[i] == undefined) { + mod = true; + CM.Config[i] = CM.ConfigDefault[i]; + } + else if (i != 'StatsPref' && i != 'Colors') { if (i.indexOf('SoundURL') == -1) { - if (CM.Config[i] == undefined || !(CM.Config[i] > -1 && CM.Config[i] < CM.ConfigData[i].label.length)) { + if (!(CM.Config[i] > -1 && CM.Config[i] < CM.ConfigData[i].label.length)) { mod = true; CM.Config[i] = CM.ConfigDefault[i]; } } else { // Sound URLs - if (CM.Config[i] == undefined || typeof CM.Config[i] != 'string') { + if (typeof CM.Config[i] != 'string') { mod = true; CM.Config[i] = CM.ConfigDefault[i]; } } } - else { // Statistics Preferences - if (CM.Config[i] == undefined) { - mod = true; - CM.Config[i] = CM.ConfigDefault[i]; + else if (i == 'StatsPref') { + for (var j in CM.ConfigDefault.StatsPref) { + if (CM.Config[i][j] == undefined || !(CM.Config[i][j] > -1 && CM.Config[i][j] < 2)) { + mod = true; + CM.Config[i][j] = CM.ConfigDefault[i][j]; + } } - else { - for (var j in CM.ConfigDefault.StatsPref) { - if (CM.Config[i][j] == undefined || !(CM.Config[i][j] > -1 && CM.Config[i][j] < 2)) { - mod = true; - CM.Config[i][j] = CM.ConfigDefault[i][j]; - } + } + else { // Colors + for (var j in CM.ConfigDefault.StatsPref) { + if (CM.Config[i][j] == undefined || typeof CM.Config[i][j] != 'string') { + mod = true; + CM.Config[i][j] = CM.ConfigDefault[i][j]; } } } @@ -290,6 +296,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', func: function() {CM.Disp.ToggleTimerBarPos();}}; CM.ConfigData.BuildColor = {label: ['Building Colors OFF', 'Building Colors ON'], desc: 'Color code buildings', 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', func: function() {CM.Disp.ToggleUpBarColor();}}; +CM.ConfigData.Colors = {desc: {Blue: 'Color for better than best BCI building', Green: 'Color for best BCI building', Yellow: 'Color for between best and worst BCI buildings closer to best', Orange: 'Color for between best and worst BCI buildings closer to worst', Red: 'Color for worst BCI building', Purple: 'Color for worse than worst BCI building', Gray: 'Color for negative or infinity BCI'}, func: function() {CM.Disp.UpdateColors();}}; CM.ConfigData.Flash = {label: ['Flash OFF', 'Flash ON'], desc: 'Flash screen on Golden Cookie/Season Popup'}; CM.ConfigData.Sound = {label: ['Sounds OFF', 'Sounds ON'], desc: 'Play a sound on Golden Cookie/Season Popup'}; CM.ConfigData.Volume = {label: [], desc: 'Volume of the sound'}; @@ -415,6 +422,19 @@ CM.Disp.GetConfigDisplay = function(config) { return CM.ConfigData[config].label[CM.Config[config]]; } +CM.Disp.AddJscolor = function() { + CM.Disp.Jscolor = document.createElement('script'); + CM.Disp.Jscolor.type = 'text/javascript'; + CM.Disp.Jscolor.setAttribute('src', 'http://aktanusa.github.io/CookieMonster/jscolor/jscolor.js'); +} + +CM.Disp.CreateCssArea = function() { + CM.Disp.Css = document.createElement('style'); + CM.Disp.Css.type = 'text/css'; + + document.head.appendChild(CM.Disp.Css); +} + CM.Disp.CreateBotBar = function() { CM.Disp.BotBar = document.createElement('div'); CM.Disp.BotBar.id = 'CMBotBar'; @@ -441,7 +461,7 @@ CM.Disp.CreateBotBar = function() { var firstCol = function(text, color) { var td = document.createElement('td'); td.style.textAlign = 'right'; - td.style.color = color; + td.className = CM.Disp.colorTextPre + color; td.textContent = text; return td; } @@ -464,7 +484,7 @@ CM.Disp.CreateBotBar = function() { var header = document.createElement('td'); header.appendChild(document.createTextNode((i.indexOf(' ') != -1 ? i.substring(0, i.indexOf(' ')) : i) + ' (')); var span = document.createElement('span'); - span.style.color = CM.Disp.colorBlue; + span.className = CM.Disp.colorTextPre + CM.Disp.colorBlue; header.appendChild(span); header.appendChild(document.createTextNode(')')); type.appendChild(header); @@ -498,7 +518,7 @@ CM.Disp.UpdateBotBarOther = function() { count++; CM.Disp.BotBar.firstChild.firstChild.childNodes[0].childNodes[count].childNodes[1].textContent = Game.Objects[i].amount; CM.Disp.BotBar.firstChild.firstChild.childNodes[1].childNodes[count].textContent = Beautify(CM.Cache.Objects[i].bonus, 2); - CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].style.color = CM.Cache.Objects[i].color; + CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].className = CM.Disp.colorTextPre + CM.Cache.Objects[i].color; CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].textContent = Beautify(CM.Cache.Objects[i].bci, 2); } } @@ -511,7 +531,7 @@ CM.Disp.UpdateBotBarTime = function() { for (var i in CM.Cache.Objects) { count++; var timeColor = CM.Disp.GetTimeColor(Game.Objects[i].getPrice()); - CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].style.color = timeColor.color; + CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].className = CM.Disp.colorTextPre + timeColor.color; CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].textContent = timeColor.text; } } @@ -557,7 +577,7 @@ CM.Disp.CreateTimerBar = function() { colorBar.style.borderBottomRightRadius = '10px'; } if (bars[i].color != undefined) { - colorBar.style.backgroundColor = bars[i].color; + colorBar.className = CM.Disp.colorBackPre + bars[i].color; } div.appendChild(colorBar); } @@ -670,15 +690,15 @@ CM.Disp.UpdateTimerBar = function() { CM.Disp.TimerBarFren.style.display = ''; if (Game.frenzyPower == 7) { l('CMTimerBarFrenType').textContent = 'Frenzy'; - l('CMTimerBarFrenBar').style.backgroundColor = CM.Disp.colorYellow; + l('CMTimerBarFrenBar').className = CM.Disp.colorBackPre + CM.Disp.colorYellow; } else if (Game.frenzyPower == 0.5) { l('CMTimerBarFrenType').textContent = 'Clot'; - l('CMTimerBarFrenBar').style.backgroundColor = CM.Disp.colorRed; + l('CMTimerBarFrenBar').className = CM.Disp.colorBackPre + CM.Disp.colorRed; } else { l('CMTimerBarFrenType').textContent = 'Blood Frenzy'; - l('CMTimerBarFrenBar').style.backgroundColor = CM.Disp.colorGreen; + l('CMTimerBarFrenBar').className = CM.Disp.colorBackPre + CM.Disp.colorGreen; } l('CMTimerBarFrenBar').style.width = Math.round(Game.frenzy * maxWidth / Game.frenzyMax) + 'px'; l('CMTimerBarFrenTime').textContent = Math.ceil(Game.frenzy / Game.fps); @@ -737,7 +757,7 @@ CM.Disp.UpdateBotTimerBarDisplay = function() { CM.Disp.UpdateBuildings = function() { if (CM.Config.BuildColor == 1) { for (var i in CM.Cache.Objects) { - l('productPrice' + Game.Objects[i].id).style.color = CM.Cache.Objects[i].color; + l('productPrice' + Game.Objects[i].id).style.color = CM.Config.Colors[CM.Cache.Objects[i].color]; } } else { @@ -771,7 +791,7 @@ CM.Disp.CreateUpgradeBar = function() { var div = document.createElement('div'); div.style.verticalAlign = 'middle'; var span = document.createElement('span'); - span.style.backgroundColor = color; + span.className = CM.Disp.colorBackPre + color; span.style.display = 'inline-block'; span.style.height = '10px'; span.style.width = '10px'; @@ -795,7 +815,7 @@ CM.Disp.CreateUpgradeBar = function() { var upgradeNumber = function(id, color) { var span = document.createElement('span'); span.id = id; - span.style.color = color; + span.className = CM.Disp.colorTextPre + color; span.style.width = '14.28571428571429%'; span.style.display = 'inline-block'; span.textContent = '0'; @@ -836,13 +856,13 @@ CM.Disp.UpdateUpgrades = function() { for (var i in Game.UpgradesInStore) { var me = Game.UpgradesInStore[i]; if (l('upgrade' + i).childNodes.length > 0) { - l('upgrade' + i).childNodes[0].style.backgroundColor = CM.Cache.Upgrades[me.name].color; + l('upgrade' + i).childNodes[0].className = CM.Disp.colorBackPre + CM.Cache.Upgrades[me.name].color; } else { var div = document.createElement('div'); div.style.width = '17px'; div.style.height = '17px'; - div.style.backgroundColor = CM.Cache.Upgrades[me.name].color; + div.className = CM.Disp.colorBackPre + CM.Cache.Upgrades[me.name].color; l('upgrade' + i).appendChild(div); } if (CM.Cache.Upgrades[me.name].color == CM.Disp.colorBlue) blue++; @@ -865,6 +885,21 @@ CM.Disp.UpdateUpgrades = function() { } } +CM.Disp.UpdateColors = function() { + var str = ''; + for (var i = 0; i < CM.Disp.colors.length; i++) { + str += '.' + CM.Disp.colorTextPre + CM.Disp.colors[i] + ' { color: ' + CM.Config.Colors[CM.Disp.colors[i]] + '; }'; + } + for (var i = 0; i < CM.Disp.colors.length; i++) { + str += '.' + CM.Disp.colorBackPre + CM.Disp.colors[i] + ' { background-color: ' + CM.Config.Colors[CM.Disp.colors[i]] + '; }'; + } + for (var i = 0; i < CM.Disp.colors.length; i++) { + str += '.' + CM.Disp.colorBorderPre + CM.Disp.colors[i] + ' { border: 1px solid ' + CM.Config.Colors[CM.Disp.colors[i]] + '; }'; + } + CM.Disp.Css.textContent = str; + CM.Disp.UpdateBuildings(); // Class has been already set +} + CM.Disp.CreateWhiteScreen = function() { CM.Disp.WhiteScreen = document.createElement('div'); CM.Disp.WhiteScreen.id = 'CMWhiteScreen'; @@ -1072,6 +1107,22 @@ CM.Disp.AddMenuPref = function(title) { frag.appendChild(listing('TimerBarPos')); frag.appendChild(listing('BuildColor')); frag.appendChild(listing('UpBarColor')); + for (var i = 0; i < CM.Disp.colors.length; i++) { + var div = document.createElement('div'); + div.className = 'listing'; + var input = document.createElement('input'); + input.id = CM.ConfigPrefix + 'Color' + CM.Disp.colors[i]; + input.className = 'option'; + input.style.width = '65px'; + input.value = CM.Config.Colors[CM.Disp.colors[i]]; + div.appendChild(input); + eval('var change = function() {CM.Config.Colors[\'' + CM.Disp.colors[i] + '\'] = l(CM.ConfigPrefix + \'Color\' + \'' + CM.Disp.colors[i] + '\').value; CM.Disp.UpdateColors(); CM.SaveConfig(CM.Config);}'); + var jscolorpicker = new jscolor.color(input, {hash: true, caps: false, pickerZIndex: 1000000, pickerPosition: 'right', onImmediateChange: change}); + var label = document.createElement('label'); + label.textContent = CM.ConfigData.Colors.desc[CM.Disp.colors[i]]; + div.appendChild(label); + frag.appendChild(div); + } frag.appendChild(header('Golden Cookie/Season Popup Emphasis')); frag.appendChild(listing('Flash')); @@ -1184,7 +1235,7 @@ CM.Disp.AddMenuStats = function(title) { var luckyReqFrag = document.createDocumentFragment(); var luckyReqSpan = document.createElement('span'); luckyReqSpan.style.fontWeight = 'bold'; - luckyReqSpan.style.color = luckyColor; + luckyReqSpan.className = CM.Disp.colorTextPre + luckyColor; luckyReqSpan.textContent = Beautify(CM.Cache.Lucky); luckyReqFrag.appendChild(luckyReqSpan); if (luckyTime != '') { @@ -1196,7 +1247,7 @@ CM.Disp.AddMenuStats = function(title) { var luckyReqFrenFrag = document.createDocumentFragment(); var luckyReqFrenSpan = document.createElement('span'); luckyReqFrenSpan.style.fontWeight = 'bold'; - luckyReqFrenSpan.style.color = luckyColorFrenzy; + luckyReqFrenSpan.className = CM.Disp.colorTextPre + luckyColorFrenzy; luckyReqFrenSpan.textContent = Beautify(CM.Cache.LuckyFrenzy); luckyReqFrenFrag.appendChild(luckyReqFrenSpan); if (luckyTimeFrenzy != '') { @@ -1223,7 +1274,7 @@ CM.Disp.AddMenuStats = function(title) { var chainReqFrag = document.createDocumentFragment(); var chainReqSpan = document.createElement('span'); chainReqSpan.style.fontWeight = 'bold'; - chainReqSpan.style.color = chainColor; + chainReqSpan.className = CM.Disp.colorTextPre + chainColor; chainReqSpan.textContent = Beautify(CM.Cache.Chain); chainReqFrag.appendChild(chainReqSpan); if (chainTime != '') { @@ -1235,7 +1286,7 @@ CM.Disp.AddMenuStats = function(title) { var chainReqFrenFrag = document.createDocumentFragment(); var chainReqFrenSpan = document.createElement('span'); chainReqFrenSpan.style.fontWeight = 'bold'; - chainReqFrenSpan.style.color = chainColorFrenzy; + chainReqFrenSpan.className = CM.Disp.colorTextPre + chainColorFrenzy; chainReqFrenSpan.textContent = Beautify(CM.Cache.ChainFrenzy); chainReqFrenFrag.appendChild(chainReqFrenSpan); if (chainTimeFrenzy != '') { @@ -1407,8 +1458,7 @@ CM.Disp.AddMenuStats = function(title) { CM.Disp.AddMenu = function() { var title = function() { var div = document.createElement('div'); - div.className = 'title'; - div.style.color = CM.Disp.colorBlue; + div.className = 'title ' + CM.Disp.colorTextPre + CM.Disp.colorBlue; div.textContent = 'Cookie Monster Goodies'; return div; } @@ -1449,13 +1499,13 @@ CM.Disp.CreateTooltipWarnCaut = function() { box.style.MsTransition = 'opacity 0.1s ease-out'; box.style.OTransition = 'opacity 0.1s ease-out'; box.style.transition = 'opacity 0.1s ease-out'; - box.style.border = '1px solid ' + color; + box.className = CM.Disp.colorBorderPre + color; box.style.padding = '2px'; box.style.background = '#000 url(img/darkNoise.png)'; var labelDiv = document.createElement('div'); box.appendChild(labelDiv); var labelSpan = document.createElement('span'); - labelSpan.style.color = color; + labelSpan.className = CM.Disp.colorTextPre + color; labelSpan.style.fontWeight = 'bold'; labelSpan.textContent = labelTextFront; labelDiv.appendChild(labelSpan); @@ -1551,7 +1601,7 @@ CM.Disp.Tooltip = function(type, name) { var header = function(text) { var div = document.createElement('div'); div.style.fontWeight = 'bold'; - div.style.color = CM.Disp.colorBlue; + div.className = CM.Disp.colorTextPre + CM.Disp.colorBlue; div.textContent = text; return div; } @@ -1593,18 +1643,18 @@ CM.Disp.UpdateTooltip = function() { bonus = CM.Cache.Objects[CM.Disp.tooltipName].bonus; price = Game.Objects[CM.Disp.tooltipName].getPrice(); if (CM.Config.Tooltip == 1) { - l('CMTooltipBorder').style.color = CM.Cache.Objects[CM.Disp.tooltipName].color; + l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Objects[CM.Disp.tooltipName].color; l('CMTooltipBCI').textContent = Beautify(CM.Cache.Objects[CM.Disp.tooltipName].bci, 2); - l('CMTooltipBCI').style.color = CM.Cache.Objects[CM.Disp.tooltipName].color; + l('CMTooltipBCI').className = CM.Disp.colorTextPre + CM.Cache.Objects[CM.Disp.tooltipName].color; } } else { bonus = CM.Cache.Objects10[CM.Disp.tooltipName].bonus; price = CM.Cache.Objects10[CM.Disp.tooltipName].price; if (CM.Config.Tooltip == 1) { - l('CMTooltipBorder').style.color = CM.Cache.Objects10[CM.Disp.tooltipName].color; + l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Objects10[CM.Disp.tooltipName].color; l('CMTooltipBCI').textContent = Beautify(CM.Cache.Objects10[CM.Disp.tooltipName].bci, 2); - l('CMTooltipBCI').style.color = CM.Cache.Objects10[CM.Disp.tooltipName].color; + l('CMTooltipBCI').className = CM.Disp.colorTextPre + CM.Cache.Objects10[CM.Disp.tooltipName].color; } } } @@ -1612,9 +1662,9 @@ CM.Disp.UpdateTooltip = function() { bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus; price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice(); if (CM.Config.Tooltip == 1) { - l('CMTooltipBorder').style.color = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; + l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; l('CMTooltipBCI').textContent = Beautify(CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bci, 2); - l('CMTooltipBCI').style.color = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; + l('CMTooltipBCI').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; } } if (CM.Config.Tooltip == 1) { @@ -1627,7 +1677,7 @@ CM.Disp.UpdateTooltip = function() { var timeColor = CM.Disp.GetTimeColor(price); l('CMTooltipTime').textContent = timeColor.text; - l('CMTooltipTime').style.color = timeColor.color; + l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color; } if (CM.Config.ToolWarnCaut == 1) { @@ -1771,13 +1821,17 @@ CM.Disp.RefreshScale = function() { CM.Disp.min = -1; CM.Disp.max = -1; CM.Disp.mid = -1; -CM.Disp.colorBlue = '#4bb8f0'; -CM.Disp.colorGreen = 'lime'; -CM.Disp.colorYellow = 'yellow'; -CM.Disp.colorOrange = '#ff7f00'; -CM.Disp.colorRed = 'red'; -CM.Disp.colorPurple = 'magenta'; -CM.Disp.colorGray = '#b3b3b3'; +CM.Disp.colorTextPre = 'CMText'; +CM.Disp.colorBackPre = 'CMBack'; +CM.Disp.colorBorderPre = 'CMBorder'; +CM.Disp.colorBlue = 'Blue'; +CM.Disp.colorGreen = 'Green'; +CM.Disp.colorYellow = 'Yellow'; +CM.Disp.colorOrange = 'Orange'; +CM.Disp.colorRed = 'Red'; +CM.Disp.colorPurple = 'Purple'; +CM.Disp.colorGray = 'Gray'; +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.lastGoldenCookieState = 'none'; CM.Disp.metric = ['M', 'G', 'T', 'P', 'E', 'Z', 'Y']; @@ -1839,8 +1893,10 @@ CM.ReplaceNative = function() { CM.Backup.UpdateMenu = Game.UpdateMenu; Game.UpdateMenu = function() { - CM.Backup.UpdateMenu(); - CM.Disp.AddMenu(); + if (jscolor == undefined || jscolor.picker == undefined || jscolor.picker.owner == undefined) { + CM.Backup.UpdateMenu(); + CM.Disp.AddMenu(); + } } CM.Backup.sayTime = Game.sayTime; @@ -1898,6 +1954,8 @@ CM.Init = function() { proceed = confirm('Cookie Monster version ' + CM.VersionMajor + '.' + CM.VersionMinor + ' is meant for Game version ' + CM.VersionMajor + '. Loading a different version may cause errors. Do you still want to load Cookie Monster?'); } if (proceed) { + CM.Disp.AddJscolor(); + CM.Disp.CreateCssArea(); CM.Disp.CreateBotBar(); CM.Disp.CreateTimerBar(); CM.Disp.CreateUpgradeBar(); @@ -1919,11 +1977,11 @@ CM.Init = function() { } } -CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBarColor: 1, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Tooltip: 1, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, HC: 1, Wrink: 1, Sea: 1}}; +CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBarColor: 1, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Tooltip: 1, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, HC: 1, Wrink: 1, Sea: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3'}}; CM.ConfigPrefix = 'CMConfig'; CM.VersionMajor = '1.0465'; -CM.VersionMinor = '11'; +CM.VersionMinor = '12'; /******* * Sim * diff --git a/jscolor/arrow.gif b/jscolor/arrow.gif new file mode 100644 index 0000000000000000000000000000000000000000..246478a864f812d93d4cd0e0d0ad1c8e2d09c825 GIT binary patch literal 66 zcmZ?wbhEHbWM|-JSjfZx1poj4Utv=LM2bII7`Ygj7<53QAbAERVV@R>f}L*~a`L;Z PKCZl?^}@uHk--`OML81Y literal 0 HcmV?d00001 diff --git a/jscolor/cross.gif b/jscolor/cross.gif new file mode 100644 index 0000000000000000000000000000000000000000..0ee9c7ac517bee40b78aea03afa809631f0b69fa GIT binary patch literal 83 zcmZ?wbhEHb3k<8jPQJQ=fuv5eVo^ZVob{r>y?yxzz6n|{I3RuQNUl#q~6w6{Y!i_W*AbzM$M zv?qg)_ee+pt?W@2m!pR{B_p?CM-{APX1sq0k!v%Dx?=2xC6f&jlZz_Dn#dT_Y>InI z6zGP*0qIZBM5F|EZW=wONLxZCI;oxx8efxF<=55NtkzwRuA@S|$OSZUS~0 zbSDgzxPwEAll?BgdT}XWOAZOcMD`pUO+CGfB}rVxe|WEK0gw_Tz-cDmNG4L+O1BG& zsF@TK6o0+-x8xsR`X2n=3~i7e()sQ8nbs7jD=(px9H|qDd%c<@)UuI(EKt5ngFHjS zh|qTPjol+wD*VrOrP2AHgU&lZ7-h-S-Ry`OC^$7+KSF!aG?mu&pn3IaR(#Gf!EQP! zqeS?o6nx*@RWD5RUuQ+fDEvFrgK2PwV_AaZi_nFD)fY6UXpc#9)D{%+=WH ztBRU(0-f)NSeD3_)#+p<)n=t7Y1EDi=wXXR?Z#vSuGOPoT|XQYUp$jeW`dW9Q1kjz#P#FKJ!aH3zn{59p6;=yx%D9tmqxQwiPk>^XJ#hnQPa&UStGb;zpzVAA13RQ2C{(WQtPtlHN+xES>Qyk?T{p)3L zKdG1CZ}noWtWb#qCxunq6cmKZkSp8AJFQzC5VAmliNf$>rVM$2Q1P|$>9btrJLz|{ zSEp42us*S@mNJKs{J(s20WSGheRHFfo!iS!%VR(!BLtg%5&G73YBwnQiPTC@yb!(mV=4^=hMGc{L0KQ&GaYT41_sNl0+=?tU1#T8=w<5Hp>qu7gwyz zwLL3bXQ5-%%-%`x@Pre{8xpv$>VeI=t#(~rx$b&PV(x))i0v`~VbW)#SQBCXq2{3C z4AjaS!bRt4Q?8=ly@6M=+29nh0d(fs{K~%zNbr`+-cFUZNG!0O= ztBy>FTi+F8DTC6pr<-QLfNg0`0~OrWJ{oz=)6L|D%a{=NsYO5|-NfUp7Y1+9*lFRJ z5eJQ!*^GZ@s9{T9oBa_K8|h+p-X6RjZg2E_MT>zCjV(~r*6%7Sij>(`t)O^DQ?5kw z*5IZ}6Yl9oCX2J~K~(ouR!YtW!n|s+M;#USu3QS5lI+Z7T#@>eP@xM!TPE-?u=Htd z49Zqbfk!YI?d;mMp}J=|f0P<;(10YFMR-D=9)aeZ@G{Ezv(9sw5v++8tRHhq6NB;- zH2vx(PU1qD_8+#|>&xHm)UbkK4M?w_%wFEr_E+5T%vx9E!xmutZiFRIq28_H5VovP z_lMzL{cKdx%a2HTauX~RSRYm)64<0F_{Nbco!|_?rpPw_J}NA-umuds1iE=$J7Q`F zd!s(MKF>pom>+ITdp;<{lMnDf4uN>z#SiECQt#jM)8rIa7;kozw6%A3yMEz5P%>>m zP^aP@mh`^eyybD<|3=Fv?u;ybH7RFB;|YJx_d1J;6wJ4KGeT+E44^QNm!_X5b@{by z^qAAkM5!d@0aKxHZ8pbuQ7dm3CvtBsZV5_Hgs2II9V+0N-jO z<7fC^Ce~l|mVr*^!BrfL2MdrqJ@FI)L|?pK(7K}a393z0of$38A-e)82RKKU@XM+GiX?Y$A|=p{IK)2ld$R?8M=wUPAOfgq5a^ zjXY_~fw7l{P`h&ljSQ;F(xYQzv?H8HuM}KNO-j0-M-5?t<^wZ3n@*m2ebd~#%i(;jkY@`es^)?`9scc%tlnlUq+;7p=^6Tm`D0W}i)}TQA0bY8fVJ@Ykj4dfDYvd{ zjmUxdb}M2@x@URp28`;9B~+Ps7g`6cP9NO%S~Zm#UzG*YLiaT_OPTB(e#8W+bIJtG zHSn{{R7Ah+{aGq1u=3L$M3#B`zC!tx`wk~q^gwlhT41Cwgft#({kId%-IMMflvHxU{(d)BqpTjk&WEXSBpAD;%Rb zpPV1>?v#`9OCL@2@8?GllEy7V6uP>x>Ajs}Hm)}I8R(EtQ*KD5B(Y*OBNM)%$`!A2 zv+I7!11vu%pSE=1PZ>w~XKP*NFI`|o?X0yNT(?y(-ta%=LQ4K;p%&07YKL*_5P7rr zR9kKx+y`tt(7_svRuxC8;j)miAfSX?M|9Ladf4zeO?n&EMM2JE0Q6A5#?^TU3!~Vl zs4+YvJ!u|5x*cR;3M`2ol(60+K1QomP+|c!3SOBpo`2I4Al%NaA;URpKsgTQ`um*) z$$0jzaM_tG3$^<%+IquqoA<(IXZhE{tm>@gJUP5p{A3J6+&@8B1Ab`k#pS#XQGLsb z!I1N@6}*sK$&^j&E9UfVBsE3Cy09vRRbP@j2V8RUyS}$EzQISB8Wob;L&@gXJ0-qG zN5LYq5L0xS_C~Y5ieq)J$^evnrYxC3DF5rA^JvXg$)Z@TW4d~?c5Fm1;n8+WV9n3A zREIvTfx}B&q+1AP^S|orTG__8w)t@5vGN(1#THk!CKLHp`#)!zH7z`x^Y2abdkC%N zVpo9#I|*N>2gAEStK;2nH>2-d8UgV}Ce62}O-VSnpIx1GP7~)f>xpwmI^Gq>t9ccs zdo47kYWW=g+WUVuK=)o4jL>*SZet8NcRq)42(#4#7K&?jfMC8bH5#uho9aCC9Sc8| z&eN*3Xr9L%twp11piU_UMd7cxt!d0dy(tNJ+3&*_^j;1X9gV|DYj@pg2={0^wT+T5 z?Xw4UzW(|>jIRGsKJaB+PUaLZQP!rJ26J1VGh%$e>x-WKf|{S*YSJH@EETJjsGMoT zZ6{6eiS3#V@YL5Z@Hgy9@bEpRGI;>Z_}tQa8IhV#m14ak_?Dm8Rb(N8c>8!Bbg8nV z@Fnflx2C1NJLL_>Z|O7~CV@n+T&C@vpgqh~t(`X)qaj=ypFdgdNZsNlmAwU7;S#iO z`J>RxSlI>*l1c;-I(BztG~ID9hmZHLX}mTDprkNW`2*nM`NCrG^K)aoYd*>U5=8}T zz<8Trh(5#1==-ntBY@u7k%!+X7o>B<{Wf^*@YzUESz$bKtAufemd7|St0063A+%|% YzFqsNg>|5V=vOIWZ|#VBZRvIQe;Bk#LI3~& literal 0 HcmV?d00001 diff --git a/jscolor/hv.png b/jscolor/hv.png new file mode 100644 index 0000000000000000000000000000000000000000..1c5e01f8bcecc4cf835e8eeeaa43ef2c06789022 GIT binary patch literal 2865 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 E0LKozl>h($ literal 0 HcmV?d00001 diff --git a/jscolor/jscolor.js b/jscolor/jscolor.js new file mode 100644 index 0000000..ef3bce5 --- /dev/null +++ b/jscolor/jscolor.js @@ -0,0 +1,997 @@ +/** + * jscolor, JavaScript Color Picker + * + * @version 1.4.3 + * @license GNU Lesser General Public License, http://www.gnu.org/copyleft/lesser.html + * @author Jan Odvarko, http://odvarko.cz + * @created 2008-06-15 + * @updated 2014-07-16 + * @link http://jscolor.com + */ + + +var jscolor = { + + + dir : '', // location of jscolor directory (leave empty to autodetect) + bindClass : 'color', // class name + binding : true, // automatic binding via + preloading : true, // use image preloading? + + + install : function() { + jscolor.addEvent(window, 'load', jscolor.init); + }, + + + init : function() { + if(jscolor.binding) { + jscolor.bind(); + } + if(jscolor.preloading) { + jscolor.preload(); + } + }, + + + getDir : function() { + if(!jscolor.dir) { + var detected = jscolor.detectDir(); + jscolor.dir = detected!==false ? detected : 'jscolor/'; + } + return jscolor.dir; + }, + + + detectDir : function() { + var base = location.href; + + var e = document.getElementsByTagName('base'); + for(var i=0; i vs[a] ? + (-vp[a]+tp[a]+ts[a]/2 > vs[a]/2 && tp[a]+ts[a]-ps[a] >= 0 ? tp[a]+ts[a]-ps[a] : tp[a]) : + tp[a], + -vp[b]+tp[b]+ts[b]+ps[b]-l+l*c > vs[b] ? + (-vp[b]+tp[b]+ts[b]/2 > vs[b]/2 && tp[b]+ts[b]-l-l*c >= 0 ? tp[b]+ts[b]-l-l*c : tp[b]+ts[b]-l+l*c) : + (tp[b]+ts[b]-l+l*c >= 0 ? tp[b]+ts[b]-l+l*c : tp[b]+ts[b]-l-l*c) + ]; + } + drawPicker(pp[a], pp[b]); + } + }; + + + this.importColor = function() { + if(!valueElement) { + this.exportColor(); + } else { + if(!this.adjust) { + if(!this.fromString(valueElement.value, leaveValue)) { + styleElement.style.backgroundImage = styleElement.jscStyle.backgroundImage; + styleElement.style.backgroundColor = styleElement.jscStyle.backgroundColor; + styleElement.style.color = styleElement.jscStyle.color; + this.exportColor(leaveValue | leaveStyle); + } + } else if(!this.required && /^\s*$/.test(valueElement.value)) { + valueElement.value = ''; + styleElement.style.backgroundImage = styleElement.jscStyle.backgroundImage; + styleElement.style.backgroundColor = styleElement.jscStyle.backgroundColor; + styleElement.style.color = styleElement.jscStyle.color; + this.exportColor(leaveValue | leaveStyle); + + } else if(this.fromString(valueElement.value)) { + // OK + } else { + this.exportColor(); + } + } + }; + + + this.exportColor = function(flags) { + if(!(flags & leaveValue) && valueElement) { + var value = this.toString(); + if(this.caps) { value = value.toUpperCase(); } + if(this.hash) { value = '#'+value; } + valueElement.value = value; + } + if(!(flags & leaveStyle) && styleElement) { + styleElement.style.backgroundImage = "none"; + styleElement.style.backgroundColor = + '#'+this.toString(); + styleElement.style.color = + 0.213 * this.rgb[0] + + 0.715 * this.rgb[1] + + 0.072 * this.rgb[2] + < 0.5 ? '#FFF' : '#000'; + } + if(!(flags & leavePad) && isPickerOwner()) { + redrawPad(); + } + if(!(flags & leaveSld) && isPickerOwner()) { + redrawSld(); + } + }; + + + this.fromHSV = function(h, s, v, flags) { // null = don't change + if(h !== null) { h = Math.max(0.0, this.minH, Math.min(6.0, this.maxH, h)); } + if(s !== null) { s = Math.max(0.0, this.minS, Math.min(1.0, this.maxS, s)); } + if(v !== null) { v = Math.max(0.0, this.minV, Math.min(1.0, this.maxV, v)); } + + this.rgb = HSV_RGB( + h===null ? this.hsv[0] : (this.hsv[0]=h), + s===null ? this.hsv[1] : (this.hsv[1]=s), + v===null ? this.hsv[2] : (this.hsv[2]=v) + ); + + this.exportColor(flags); + }; + + + this.fromRGB = function(r, g, b, flags) { // null = don't change + if(r !== null) { r = Math.max(0.0, Math.min(1.0, r)); } + if(g !== null) { g = Math.max(0.0, Math.min(1.0, g)); } + if(b !== null) { b = Math.max(0.0, Math.min(1.0, b)); } + + var hsv = RGB_HSV( + r===null ? this.rgb[0] : r, + g===null ? this.rgb[1] : g, + b===null ? this.rgb[2] : b + ); + if(hsv[0] !== null) { + this.hsv[0] = Math.max(0.0, this.minH, Math.min(6.0, this.maxH, hsv[0])); + } + if(hsv[2] !== 0) { + this.hsv[1] = hsv[1]===null ? null : Math.max(0.0, this.minS, Math.min(1.0, this.maxS, hsv[1])); + } + this.hsv[2] = hsv[2]===null ? null : Math.max(0.0, this.minV, Math.min(1.0, this.maxV, hsv[2])); + + // update RGB according to final HSV, as some values might be trimmed + var rgb = HSV_RGB(this.hsv[0], this.hsv[1], this.hsv[2]); + this.rgb[0] = rgb[0]; + this.rgb[1] = rgb[1]; + this.rgb[2] = rgb[2]; + + this.exportColor(flags); + }; + + + this.fromString = function(hex, flags) { + var m = hex.match(/^\W*([0-9A-F]{3}([0-9A-F]{3})?)\W*$/i); + if(!m) { + return false; + } else { + if(m[1].length === 6) { // 6-char notation + this.fromRGB( + parseInt(m[1].substr(0,2),16) / 255, + parseInt(m[1].substr(2,2),16) / 255, + parseInt(m[1].substr(4,2),16) / 255, + flags + ); + } else { // 3-char notation + this.fromRGB( + parseInt(m[1].charAt(0)+m[1].charAt(0),16) / 255, + parseInt(m[1].charAt(1)+m[1].charAt(1),16) / 255, + parseInt(m[1].charAt(2)+m[1].charAt(2),16) / 255, + flags + ); + } + return true; + } + }; + + + this.toString = function() { + return ( + (0x100 | Math.round(255*this.rgb[0])).toString(16).substr(1) + + (0x100 | Math.round(255*this.rgb[1])).toString(16).substr(1) + + (0x100 | Math.round(255*this.rgb[2])).toString(16).substr(1) + ); + }; + + + function RGB_HSV(r, g, b) { + var n = Math.min(Math.min(r,g),b); + var v = Math.max(Math.max(r,g),b); + var m = v - n; + if(m === 0) { return [ null, 0, v ]; } + var h = r===n ? 3+(b-g)/m : (g===n ? 5+(r-b)/m : 1+(g-r)/m); + return [ h===6?0:h, m/v, v ]; + } + + + function HSV_RGB(h, s, v) { + if(h === null) { return [ v, v, v ]; } + var i = Math.floor(h); + var f = i%2 ? h-i : 1-(h-i); + var m = v * (1 - s); + var n = v * (1 - s*f); + switch(i) { + case 6: + case 0: return [v,n,m]; + case 1: return [n,v,m]; + case 2: return [m,v,n]; + case 3: return [m,n,v]; + case 4: return [n,m,v]; + case 5: return [v,m,n]; + } + } + + + function removePicker() { + delete jscolor.picker.owner; + document.getElementsByTagName('body')[0].removeChild(jscolor.picker.boxB); + } + + + function drawPicker(x, y) { + if(!jscolor.picker) { + jscolor.picker = { + box : document.createElement('div'), + boxB : document.createElement('div'), + pad : document.createElement('div'), + padB : document.createElement('div'), + padM : document.createElement('div'), + sld : document.createElement('div'), + sldB : document.createElement('div'), + sldM : document.createElement('div'), + btn : document.createElement('div'), + btnS : document.createElement('span'), + btnT : document.createTextNode(THIS.pickerCloseText) + }; + for(var i=0,segSize=4; i -1 && CM.Config[i] < CM.ConfigData[i].label.length)) { + if (!(CM.Config[i] > -1 && CM.Config[i] < CM.ConfigData[i].label.length)) { mod = true; CM.Config[i] = CM.ConfigDefault[i]; } } else { // Sound URLs - if (CM.Config[i] == undefined || typeof CM.Config[i] != 'string') { + if (typeof CM.Config[i] != 'string') { mod = true; CM.Config[i] = CM.ConfigDefault[i]; } } } - else { // Statistics Preferences - if (CM.Config[i] == undefined) { - mod = true; - CM.Config[i] = CM.ConfigDefault[i]; + else if (i == 'StatsPref') { + for (var j in CM.ConfigDefault.StatsPref) { + if (CM.Config[i][j] == undefined || !(CM.Config[i][j] > -1 && CM.Config[i][j] < 2)) { + mod = true; + CM.Config[i][j] = CM.ConfigDefault[i][j]; + } } - else { - for (var j in CM.ConfigDefault.StatsPref) { - if (CM.Config[i][j] == undefined || !(CM.Config[i][j] > -1 && CM.Config[i][j] < 2)) { - mod = true; - CM.Config[i][j] = CM.ConfigDefault[i][j]; - } + } + else { // Colors + for (var j in CM.ConfigDefault.StatsPref) { + if (CM.Config[i][j] == undefined || typeof CM.Config[i][j] != 'string') { + mod = true; + CM.Config[i][j] = CM.ConfigDefault[i][j]; } } } @@ -101,6 +107,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', func: function() {CM.Disp.ToggleTimerBarPos();}}; CM.ConfigData.BuildColor = {label: ['Building Colors OFF', 'Building Colors ON'], desc: 'Color code buildings', 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', func: function() {CM.Disp.ToggleUpBarColor();}}; +CM.ConfigData.Colors = {desc: {Blue: 'Color for better than best BCI building', Green: 'Color for best BCI building', Yellow: 'Color for between best and worst BCI buildings closer to best', Orange: 'Color for between best and worst BCI buildings closer to worst', Red: 'Color for worst BCI building', Purple: 'Color for worse than worst BCI building', Gray: 'Color for negative or infinity BCI'}, func: function() {CM.Disp.UpdateColors();}}; CM.ConfigData.Flash = {label: ['Flash OFF', 'Flash ON'], desc: 'Flash screen on Golden Cookie/Season Popup'}; CM.ConfigData.Sound = {label: ['Sounds OFF', 'Sounds ON'], desc: 'Play a sound on Golden Cookie/Season Popup'}; CM.ConfigData.Volume = {label: [], desc: 'Volume of the sound'}; diff --git a/src/Disp.js b/src/Disp.js index 27ba03c..5320dc7 100644 --- a/src/Disp.js +++ b/src/Disp.js @@ -96,6 +96,19 @@ CM.Disp.GetConfigDisplay = function(config) { return CM.ConfigData[config].label[CM.Config[config]]; } +CM.Disp.AddJscolor = function() { + CM.Disp.Jscolor = document.createElement('script'); + CM.Disp.Jscolor.type = 'text/javascript'; + CM.Disp.Jscolor.setAttribute('src', 'http://aktanusa.github.io/CookieMonster/jscolor/jscolor.js'); +} + +CM.Disp.CreateCssArea = function() { + CM.Disp.Css = document.createElement('style'); + CM.Disp.Css.type = 'text/css'; + + document.head.appendChild(CM.Disp.Css); +} + CM.Disp.CreateBotBar = function() { CM.Disp.BotBar = document.createElement('div'); CM.Disp.BotBar.id = 'CMBotBar'; @@ -122,7 +135,7 @@ CM.Disp.CreateBotBar = function() { var firstCol = function(text, color) { var td = document.createElement('td'); td.style.textAlign = 'right'; - td.style.color = color; + td.className = CM.Disp.colorTextPre + color; td.textContent = text; return td; } @@ -145,7 +158,7 @@ CM.Disp.CreateBotBar = function() { var header = document.createElement('td'); header.appendChild(document.createTextNode((i.indexOf(' ') != -1 ? i.substring(0, i.indexOf(' ')) : i) + ' (')); var span = document.createElement('span'); - span.style.color = CM.Disp.colorBlue; + span.className = CM.Disp.colorTextPre + CM.Disp.colorBlue; header.appendChild(span); header.appendChild(document.createTextNode(')')); type.appendChild(header); @@ -179,7 +192,7 @@ CM.Disp.UpdateBotBarOther = function() { count++; CM.Disp.BotBar.firstChild.firstChild.childNodes[0].childNodes[count].childNodes[1].textContent = Game.Objects[i].amount; CM.Disp.BotBar.firstChild.firstChild.childNodes[1].childNodes[count].textContent = Beautify(CM.Cache.Objects[i].bonus, 2); - CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].style.color = CM.Cache.Objects[i].color; + CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].className = CM.Disp.colorTextPre + CM.Cache.Objects[i].color; CM.Disp.BotBar.firstChild.firstChild.childNodes[2].childNodes[count].textContent = Beautify(CM.Cache.Objects[i].bci, 2); } } @@ -192,7 +205,7 @@ CM.Disp.UpdateBotBarTime = function() { for (var i in CM.Cache.Objects) { count++; var timeColor = CM.Disp.GetTimeColor(Game.Objects[i].getPrice()); - CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].style.color = timeColor.color; + CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].className = CM.Disp.colorTextPre + timeColor.color; CM.Disp.BotBar.firstChild.firstChild.childNodes[3].childNodes[count].textContent = timeColor.text; } } @@ -238,7 +251,7 @@ CM.Disp.CreateTimerBar = function() { colorBar.style.borderBottomRightRadius = '10px'; } if (bars[i].color != undefined) { - colorBar.style.backgroundColor = bars[i].color; + colorBar.className = CM.Disp.colorBackPre + bars[i].color; } div.appendChild(colorBar); } @@ -351,15 +364,15 @@ CM.Disp.UpdateTimerBar = function() { CM.Disp.TimerBarFren.style.display = ''; if (Game.frenzyPower == 7) { l('CMTimerBarFrenType').textContent = 'Frenzy'; - l('CMTimerBarFrenBar').style.backgroundColor = CM.Disp.colorYellow; + l('CMTimerBarFrenBar').className = CM.Disp.colorBackPre + CM.Disp.colorYellow; } else if (Game.frenzyPower == 0.5) { l('CMTimerBarFrenType').textContent = 'Clot'; - l('CMTimerBarFrenBar').style.backgroundColor = CM.Disp.colorRed; + l('CMTimerBarFrenBar').className = CM.Disp.colorBackPre + CM.Disp.colorRed; } else { l('CMTimerBarFrenType').textContent = 'Blood Frenzy'; - l('CMTimerBarFrenBar').style.backgroundColor = CM.Disp.colorGreen; + l('CMTimerBarFrenBar').className = CM.Disp.colorBackPre + CM.Disp.colorGreen; } l('CMTimerBarFrenBar').style.width = Math.round(Game.frenzy * maxWidth / Game.frenzyMax) + 'px'; l('CMTimerBarFrenTime').textContent = Math.ceil(Game.frenzy / Game.fps); @@ -418,7 +431,7 @@ CM.Disp.UpdateBotTimerBarDisplay = function() { CM.Disp.UpdateBuildings = function() { if (CM.Config.BuildColor == 1) { for (var i in CM.Cache.Objects) { - l('productPrice' + Game.Objects[i].id).style.color = CM.Cache.Objects[i].color; + l('productPrice' + Game.Objects[i].id).style.color = CM.Config.Colors[CM.Cache.Objects[i].color]; } } else { @@ -452,7 +465,7 @@ CM.Disp.CreateUpgradeBar = function() { var div = document.createElement('div'); div.style.verticalAlign = 'middle'; var span = document.createElement('span'); - span.style.backgroundColor = color; + span.className = CM.Disp.colorBackPre + color; span.style.display = 'inline-block'; span.style.height = '10px'; span.style.width = '10px'; @@ -476,7 +489,7 @@ CM.Disp.CreateUpgradeBar = function() { var upgradeNumber = function(id, color) { var span = document.createElement('span'); span.id = id; - span.style.color = color; + span.className = CM.Disp.colorTextPre + color; span.style.width = '14.28571428571429%'; span.style.display = 'inline-block'; span.textContent = '0'; @@ -517,13 +530,13 @@ CM.Disp.UpdateUpgrades = function() { for (var i in Game.UpgradesInStore) { var me = Game.UpgradesInStore[i]; if (l('upgrade' + i).childNodes.length > 0) { - l('upgrade' + i).childNodes[0].style.backgroundColor = CM.Cache.Upgrades[me.name].color; + l('upgrade' + i).childNodes[0].className = CM.Disp.colorBackPre + CM.Cache.Upgrades[me.name].color; } else { var div = document.createElement('div'); div.style.width = '17px'; div.style.height = '17px'; - div.style.backgroundColor = CM.Cache.Upgrades[me.name].color; + div.className = CM.Disp.colorBackPre + CM.Cache.Upgrades[me.name].color; l('upgrade' + i).appendChild(div); } if (CM.Cache.Upgrades[me.name].color == CM.Disp.colorBlue) blue++; @@ -546,6 +559,21 @@ CM.Disp.UpdateUpgrades = function() { } } +CM.Disp.UpdateColors = function() { + var str = ''; + for (var i = 0; i < CM.Disp.colors.length; i++) { + str += '.' + CM.Disp.colorTextPre + CM.Disp.colors[i] + ' { color: ' + CM.Config.Colors[CM.Disp.colors[i]] + '; }'; + } + for (var i = 0; i < CM.Disp.colors.length; i++) { + str += '.' + CM.Disp.colorBackPre + CM.Disp.colors[i] + ' { background-color: ' + CM.Config.Colors[CM.Disp.colors[i]] + '; }'; + } + for (var i = 0; i < CM.Disp.colors.length; i++) { + str += '.' + CM.Disp.colorBorderPre + CM.Disp.colors[i] + ' { border: 1px solid ' + CM.Config.Colors[CM.Disp.colors[i]] + '; }'; + } + CM.Disp.Css.textContent = str; + CM.Disp.UpdateBuildings(); // Class has been already set +} + CM.Disp.CreateWhiteScreen = function() { CM.Disp.WhiteScreen = document.createElement('div'); CM.Disp.WhiteScreen.id = 'CMWhiteScreen'; @@ -753,6 +781,22 @@ CM.Disp.AddMenuPref = function(title) { frag.appendChild(listing('TimerBarPos')); frag.appendChild(listing('BuildColor')); frag.appendChild(listing('UpBarColor')); + for (var i = 0; i < CM.Disp.colors.length; i++) { + var div = document.createElement('div'); + div.className = 'listing'; + var input = document.createElement('input'); + input.id = CM.ConfigPrefix + 'Color' + CM.Disp.colors[i]; + input.className = 'option'; + input.style.width = '65px'; + input.value = CM.Config.Colors[CM.Disp.colors[i]]; + div.appendChild(input); + eval('var change = function() {CM.Config.Colors[\'' + CM.Disp.colors[i] + '\'] = l(CM.ConfigPrefix + \'Color\' + \'' + CM.Disp.colors[i] + '\').value; CM.Disp.UpdateColors(); CM.SaveConfig(CM.Config);}'); + var jscolorpicker = new jscolor.color(input, {hash: true, caps: false, pickerZIndex: 1000000, pickerPosition: 'right', onImmediateChange: change}); + var label = document.createElement('label'); + label.textContent = CM.ConfigData.Colors.desc[CM.Disp.colors[i]]; + div.appendChild(label); + frag.appendChild(div); + } frag.appendChild(header('Golden Cookie/Season Popup Emphasis')); frag.appendChild(listing('Flash')); @@ -865,7 +909,7 @@ CM.Disp.AddMenuStats = function(title) { var luckyReqFrag = document.createDocumentFragment(); var luckyReqSpan = document.createElement('span'); luckyReqSpan.style.fontWeight = 'bold'; - luckyReqSpan.style.color = luckyColor; + luckyReqSpan.className = CM.Disp.colorTextPre + luckyColor; luckyReqSpan.textContent = Beautify(CM.Cache.Lucky); luckyReqFrag.appendChild(luckyReqSpan); if (luckyTime != '') { @@ -877,7 +921,7 @@ CM.Disp.AddMenuStats = function(title) { var luckyReqFrenFrag = document.createDocumentFragment(); var luckyReqFrenSpan = document.createElement('span'); luckyReqFrenSpan.style.fontWeight = 'bold'; - luckyReqFrenSpan.style.color = luckyColorFrenzy; + luckyReqFrenSpan.className = CM.Disp.colorTextPre + luckyColorFrenzy; luckyReqFrenSpan.textContent = Beautify(CM.Cache.LuckyFrenzy); luckyReqFrenFrag.appendChild(luckyReqFrenSpan); if (luckyTimeFrenzy != '') { @@ -904,7 +948,7 @@ CM.Disp.AddMenuStats = function(title) { var chainReqFrag = document.createDocumentFragment(); var chainReqSpan = document.createElement('span'); chainReqSpan.style.fontWeight = 'bold'; - chainReqSpan.style.color = chainColor; + chainReqSpan.className = CM.Disp.colorTextPre + chainColor; chainReqSpan.textContent = Beautify(CM.Cache.Chain); chainReqFrag.appendChild(chainReqSpan); if (chainTime != '') { @@ -916,7 +960,7 @@ CM.Disp.AddMenuStats = function(title) { var chainReqFrenFrag = document.createDocumentFragment(); var chainReqFrenSpan = document.createElement('span'); chainReqFrenSpan.style.fontWeight = 'bold'; - chainReqFrenSpan.style.color = chainColorFrenzy; + chainReqFrenSpan.className = CM.Disp.colorTextPre + chainColorFrenzy; chainReqFrenSpan.textContent = Beautify(CM.Cache.ChainFrenzy); chainReqFrenFrag.appendChild(chainReqFrenSpan); if (chainTimeFrenzy != '') { @@ -1088,8 +1132,7 @@ CM.Disp.AddMenuStats = function(title) { CM.Disp.AddMenu = function() { var title = function() { var div = document.createElement('div'); - div.className = 'title'; - div.style.color = CM.Disp.colorBlue; + div.className = 'title ' + CM.Disp.colorTextPre + CM.Disp.colorBlue; div.textContent = 'Cookie Monster Goodies'; return div; } @@ -1130,13 +1173,13 @@ CM.Disp.CreateTooltipWarnCaut = function() { box.style.MsTransition = 'opacity 0.1s ease-out'; box.style.OTransition = 'opacity 0.1s ease-out'; box.style.transition = 'opacity 0.1s ease-out'; - box.style.border = '1px solid ' + color; + box.className = CM.Disp.colorBorderPre + color; box.style.padding = '2px'; box.style.background = '#000 url(img/darkNoise.png)'; var labelDiv = document.createElement('div'); box.appendChild(labelDiv); var labelSpan = document.createElement('span'); - labelSpan.style.color = color; + labelSpan.className = CM.Disp.colorTextPre + color; labelSpan.style.fontWeight = 'bold'; labelSpan.textContent = labelTextFront; labelDiv.appendChild(labelSpan); @@ -1232,7 +1275,7 @@ CM.Disp.Tooltip = function(type, name) { var header = function(text) { var div = document.createElement('div'); div.style.fontWeight = 'bold'; - div.style.color = CM.Disp.colorBlue; + div.className = CM.Disp.colorTextPre + CM.Disp.colorBlue; div.textContent = text; return div; } @@ -1274,18 +1317,18 @@ CM.Disp.UpdateTooltip = function() { bonus = CM.Cache.Objects[CM.Disp.tooltipName].bonus; price = Game.Objects[CM.Disp.tooltipName].getPrice(); if (CM.Config.Tooltip == 1) { - l('CMTooltipBorder').style.color = CM.Cache.Objects[CM.Disp.tooltipName].color; + l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Objects[CM.Disp.tooltipName].color; l('CMTooltipBCI').textContent = Beautify(CM.Cache.Objects[CM.Disp.tooltipName].bci, 2); - l('CMTooltipBCI').style.color = CM.Cache.Objects[CM.Disp.tooltipName].color; + l('CMTooltipBCI').className = CM.Disp.colorTextPre + CM.Cache.Objects[CM.Disp.tooltipName].color; } } else { bonus = CM.Cache.Objects10[CM.Disp.tooltipName].bonus; price = CM.Cache.Objects10[CM.Disp.tooltipName].price; if (CM.Config.Tooltip == 1) { - l('CMTooltipBorder').style.color = CM.Cache.Objects10[CM.Disp.tooltipName].color; + l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Objects10[CM.Disp.tooltipName].color; l('CMTooltipBCI').textContent = Beautify(CM.Cache.Objects10[CM.Disp.tooltipName].bci, 2); - l('CMTooltipBCI').style.color = CM.Cache.Objects10[CM.Disp.tooltipName].color; + l('CMTooltipBCI').className = CM.Disp.colorTextPre + CM.Cache.Objects10[CM.Disp.tooltipName].color; } } } @@ -1293,9 +1336,9 @@ CM.Disp.UpdateTooltip = function() { bonus = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bonus; price = Game.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].getPrice(); if (CM.Config.Tooltip == 1) { - l('CMTooltipBorder').style.color = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; + l('CMTooltipBorder').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; l('CMTooltipBCI').textContent = Beautify(CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].bci, 2); - l('CMTooltipBCI').style.color = CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; + l('CMTooltipBCI').className = CM.Disp.colorTextPre + CM.Cache.Upgrades[Game.UpgradesInStore[CM.Disp.tooltipName].name].color; } } if (CM.Config.Tooltip == 1) { @@ -1308,7 +1351,7 @@ CM.Disp.UpdateTooltip = function() { var timeColor = CM.Disp.GetTimeColor(price); l('CMTooltipTime').textContent = timeColor.text; - l('CMTooltipTime').style.color = timeColor.color; + l('CMTooltipTime').className = CM.Disp.colorTextPre + timeColor.color; } if (CM.Config.ToolWarnCaut == 1) { @@ -1452,13 +1495,17 @@ CM.Disp.RefreshScale = function() { CM.Disp.min = -1; CM.Disp.max = -1; CM.Disp.mid = -1; -CM.Disp.colorBlue = '#4bb8f0'; -CM.Disp.colorGreen = 'lime'; -CM.Disp.colorYellow = 'yellow'; -CM.Disp.colorOrange = '#ff7f00'; -CM.Disp.colorRed = 'red'; -CM.Disp.colorPurple = 'magenta'; -CM.Disp.colorGray = '#b3b3b3'; +CM.Disp.colorTextPre = 'CMText'; +CM.Disp.colorBackPre = 'CMBack'; +CM.Disp.colorBorderPre = 'CMBorder'; +CM.Disp.colorBlue = 'Blue'; +CM.Disp.colorGreen = 'Green'; +CM.Disp.colorYellow = 'Yellow'; +CM.Disp.colorOrange = 'Orange'; +CM.Disp.colorRed = 'Red'; +CM.Disp.colorPurple = 'Purple'; +CM.Disp.colorGray = 'Gray'; +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.lastGoldenCookieState = 'none'; CM.Disp.metric = ['M', 'G', 'T', 'P', 'E', 'Z', 'Y']; diff --git a/src/Main.js b/src/Main.js index 729e310..f21d565 100644 --- a/src/Main.js +++ b/src/Main.js @@ -45,8 +45,10 @@ CM.ReplaceNative = function() { CM.Backup.UpdateMenu = Game.UpdateMenu; Game.UpdateMenu = function() { - CM.Backup.UpdateMenu(); - CM.Disp.AddMenu(); + if (jscolor == undefined || jscolor.picker == undefined || jscolor.picker.owner == undefined) { + CM.Backup.UpdateMenu(); + CM.Disp.AddMenu(); + } } CM.Backup.sayTime = Game.sayTime; @@ -104,6 +106,8 @@ CM.Init = function() { proceed = confirm('Cookie Monster version ' + CM.VersionMajor + '.' + CM.VersionMinor + ' is meant for Game version ' + CM.VersionMajor + '. Loading a different version may cause errors. Do you still want to load Cookie Monster?'); } if (proceed) { + CM.Disp.AddJscolor(); + CM.Disp.CreateCssArea(); CM.Disp.CreateBotBar(); CM.Disp.CreateTimerBar(); CM.Disp.CreateUpgradeBar(); @@ -125,9 +129,9 @@ CM.Init = function() { } } -CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBarColor: 1, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Tooltip: 1, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, HC: 1, Wrink: 1, Sea: 1}}; +CM.ConfigDefault = {BotBar: 1, TimerBar: 1, TimerBarPos: 0, BuildColor: 1, UpBarColor: 1, Flash: 1, Sound: 1, Volume: 100, GCSoundURL: 'http://freesound.org/data/previews/66/66717_931655-lq.mp3', SeaSoundURL: 'http://www.freesound.org/data/previews/121/121099_2193266-lq.mp3', GCTimer: 1, Title: 1, Tooltip: 1, ToolWarnCaut: 1, ToolWarnCautPos: 1, ToolWrink: 1, Stats: 1, UpStats: 1, SayTime: 1, Scale: 2, StatsPref: {Lucky: 1, Chain: 1, HC: 1, Wrink: 1, Sea: 1}, Colors : {Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3'}}; CM.ConfigPrefix = 'CMConfig'; CM.VersionMajor = '1.0465'; -CM.VersionMinor = '11'; +CM.VersionMinor = '12';