From 3685e25713ff9ab59ed01246962200d05a5708af Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Mon, 21 Nov 2022 21:32:45 -0500 Subject: [PATCH] likely finalized color palette, removed color map from unit displays --- coordinator/startup.lua | 2 +- coordinator/ui/components/unit_detail.lua | 4 ---- coordinator/ui/style.lua | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/coordinator/startup.lua b/coordinator/startup.lua index bdb0a17..4becc59 100644 --- a/coordinator/startup.lua +++ b/coordinator/startup.lua @@ -17,7 +17,7 @@ local config = require("coordinator.config") local coordinator = require("coordinator.coordinator") local renderer = require("coordinator.renderer") -local COORDINATOR_VERSION = "alpha-v0.6.15" +local COORDINATOR_VERSION = "alpha-v0.6.16" local print = util.print local println = util.println diff --git a/coordinator/ui/components/unit_detail.lua b/coordinator/ui/components/unit_detail.lua index 26b2074..c036827 100644 --- a/coordinator/ui/components/unit_detail.lua +++ b/coordinator/ui/components/unit_detail.lua @@ -299,10 +299,6 @@ local function init(parent, id) MultiButton{parent=waste_sel,x=1,y=1,options=opts,callback=unit.set_waste,min_width=6,fg_bg=cpair(colors.black, colors.white)} TextBox{parent=waste_sel,text="Waste Processing",alignment=TEXT_ALIGN.CENTER,x=1,y=1,height=1} - ---@fixme test code - main.line_break() - ColorMap{parent=main,x=2,y=51} - return main end diff --git a/coordinator/ui/style.lua b/coordinator/ui/style.lua index 67453c7..509e87a 100644 --- a/coordinator/ui/style.lua +++ b/coordinator/ui/style.lua @@ -15,7 +15,7 @@ style.colors = { { c = colors.red, hex = 0xdf4949 }, { c = colors.orange, hex = 0xffb659 }, { c = colors.yellow, hex = 0xfffc79 }, - { c = colors.lime, hex = 0x64dd20 }, + { c = colors.lime, hex = 0x80ff80 }, { c = colors.green, hex = 0x4aee8a }, { c = colors.cyan, hex = 0x34bac8 }, { c = colors.lightBlue, hex = 0x6cc0f2 },