diff --git a/constants.js b/constants.js index b5f8b59..4b4ce3d 100644 --- a/constants.js +++ b/constants.js @@ -314,7 +314,8 @@ function createTemplateUpgrades() { deepFreeze(news); } -const prodUpgradeCounts = [1, 5, 10, 25, 50, 75, 100]; +const prodUpgradeCounts = [1, 25, 50, 75, 100]; +const prodUpgradeColors = ["#003f5c","#58508d","#bc5090","#ff6361","#ffa600"]; function createProdUpgrades() { for (const [key, value] of Object.entries(prodUpgradeText)) { @@ -324,7 +325,9 @@ function createProdUpgrades() { upgrades[prefix + counter] = { "name": contents.name, "desc": contents.desc, - "icon": buildings[key].icon, + "icon": [ + { icon: buildings[key].icon, color: prodUpgradeColors[counter] } + ], "cost": { "food": buildings[key].cost.food * 5 * Math.pow(10, counter - 1) }, diff --git a/gorge.css b/gorge.css index f7684ba..2b9b36c 100644 --- a/gorge.css +++ b/gorge.css @@ -321,13 +321,13 @@ button { width: 100px; height: 100px; font-size: 60px; - transform: translate(-10px, -40px); + transform: translate(-10px, 10px); opacity: 0.5; pointer-events: none; } .upgrade-button:hover { - background-color: #999; + background-color: #666; box-shadow: inset 0px 0px 0px 2px red; } diff --git a/gorge.js b/gorge.js index 9037d42..4a36c66 100644 --- a/gorge.js +++ b/gorge.js @@ -850,16 +850,22 @@ function createUpgrades() { button.classList.add("upgrade-button"); button.classList.add("hidden"); button.id = "upgrade-" + key; - let buttonName = document.createElement("div"); - buttonName.classList.add("upgrade-button-name"); - buttonName.innerText = ""; - - let upgradeIcon = document.createElement("i"); - upgradeIcon.classList.add("fas"); - upgradeIcon.classList.add(value.icon); - button.appendChild(buttonName); - button.appendChild(upgradeIcon); + if (typeof(value.icon) == "object") { + value.icon.forEach(icon => { + let upgradeIcon = document.createElement("i"); + upgradeIcon.classList.add("fas"); + upgradeIcon.classList.add(icon.icon); + upgradeIcon.style.color = icon.color; + button.appendChild(upgradeIcon); + }) + } else { + let upgradeIcon = document.createElement("i"); + upgradeIcon.classList.add("fas"); + upgradeIcon.classList.add(value.icon); + button.appendChild(upgradeIcon); + } + button.addEventListener("mouseenter", function (e) { mouseTarget = button; upgradeTooltip(key, e); }); button.addEventListener("mousemove", function (e) { mouseTarget = button; upgradeTooltip(key, e); });