From 2202201e072bacdcc9adcd4f37d99518ae846c14 Mon Sep 17 00:00:00 2001
From: James Panther <4462786+jpanther@users.noreply.github.com>
Date: Fri, 1 Mar 2019 18:52:05 +1100
Subject: [PATCH] Added new signal colours

---
 changelog.txt                     |  1 +
 config.lua                        | 11 +++++++++--
 locale/en/dectorio.cfg            | 11 +++++++++--
 prototypes/signal/final-fixes.lua | 22 ++++++++++++++++++++++
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 66ddb59..e35f6ef 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -4,6 +4,7 @@ Date: 01. 03. 2019
   Added:
     - High resolution gfx for Wooden and Steel signs
     - High resolution gfx for Traffic bollard
+    - 7 new signal colours - maroon, brown, olive, emerald, teal, navy and violet
   Changed:
     - Updated technology icons
     - Additional compression of Refined concrete gfx to reduce mod package size
diff --git a/config.lua b/config.lua
index 65be3f5..4587d95 100644
--- a/config.lua
+++ b/config.lua
@@ -25,9 +25,16 @@ DECT.CONFIG.SIGNALS = {
 	{type="virtual", name="signal-blue", color={r=0.07,g=0.35,b=0.98,a=1.00}},          -- Crayon Blue
 	{type="virtual", name="signal-purple", color={r=0.65,g=0.38,b=0.99,a=1.00}},        -- Lavender Indigo
 	{type="virtual", name="signal-pink", color={r=1.00,g=0.42,b=0.99,a=1.00}},          -- Ultra Pink
-	{type="virtual", name="signal-white", color={r=1.00,g=1.00,b=1.00,a=1.00}},         -- White
-	{type="virtual", name="signal-grey", color={r=0.80,g=0.80,b=0.80,a=1.00}},          -- Iron
+	{type="virtual", name="signal-maroon", color={r=0.50,g=0.00,b=0.00,a=1.00}},				-- Burnt Umber
+	{type="virtual", name="signal-brown", color={r=0.60,g=0.39,b=0.14,a=1.00}},					-- Cape Palliser
+	{type="virtual", name="signal-olive", color={r=0.50,g=0.50,b=0.01,a=1.00}},					-- Trendy Green
+	{type="virtual", name="signal-emerald", color={r=0.17,g=0.54,b=0.25,a=1.00}},				-- Goblin
+	{type="virtual", name="signal-teal", color={r=0.28,g=0.60,b=0.56,a=1.00}},					-- Breaker Bay
+	{type="virtual", name="signal-navy", color={r=0.00,g=0.00,b=0.50,a=1.00}},					-- Jacksons Purple
+	{type="virtual", name="signal-violet", color={r=0.56,g=0.12,b=0.70,a=1.00}},				-- Vivid Violet
 	{type="virtual", name="signal-black", color={r=0.22,g=0.13,b=0.56,a=1.00}},         -- Blue Gem
+	{type="virtual", name="signal-grey", color={r=0.80,g=0.80,b=0.80,a=1.00}},          -- Iron
+	{type="virtual", name="signal-white", color={r=1.00,g=1.00,b=1.00,a=1.00}},         -- White
 
 	{type="item", name="wood", color={r=0.57,g=0.36,b=0.12,a=0.86}},                    -- Afghan Tan
 	{type="item", name="coal", color={r=0.17,g=0.17,b=0.17,a=0.86}},                    -- Bunker
diff --git a/locale/en/dectorio.cfg b/locale/en/dectorio.cfg
index 9f0aabe..a7fb74e 100644
--- a/locale/en/dectorio.cfg
+++ b/locale/en/dectorio.cfg
@@ -204,6 +204,13 @@ signal-aqua=Aqua signal
 signal-blue=Blue signal
 signal-purple=Purple signal
 signal-pink=Pink signal
-signal-white=White signal
-signal-grey=Grey signal
+signal-maroon=Maroon signal
+signal-brown=Brown signal
+signal-olive=Olive signal
+signal-emerald=Emerald signal
+signal-teal=Teal signal
+signal-navy=Navy signal
+signal-violet=Violet signal
 signal-black=Black signal
+signal-grey=Grey signal
+signal-white=White signal
diff --git a/prototypes/signal/final-fixes.lua b/prototypes/signal/final-fixes.lua
index 4048825..329a8a0 100755
--- a/prototypes/signal/final-fixes.lua
+++ b/prototypes/signal/final-fixes.lua
@@ -16,4 +16,26 @@ if DECT.ENABLED["signals"] then
 	local lamp_glow = data.raw.lamp["dect-small-lamp-glow"]
 	lamp_glow.signal_to_color_mapping = colors
 
+	-- Reorder some of the base game signals to improve the signal layout
+	data:extend({
+		{
+			type = "item-subgroup",
+			name = "last",
+			group = "signals",
+			order = "zz"
+		}
+	})
+	if data.raw["virtual-signal"]["signal-check"] then
+		data.raw["virtual-signal"]["signal-check"].subgroup = "last"
+		data.raw["virtual-signal"]["signal-check"].order = "z[misc]-[9checked]"
+	end
+	if data.raw["virtual-signal"]["signal-info"] then
+		data.raw["virtual-signal"]["signal-info"].subgroup = "last"
+		data.raw["virtual-signal"]["signal-info"].order = "z[misc]-[9info]"
+	end
+	if data.raw["virtual-signal"]["signal-dot"] then
+		data.raw["virtual-signal"]["signal-dot"].subgroup = "last"
+		data.raw["virtual-signal"]["signal-dot"].order = "z[misc]-[9dot]"
+	end
+
 end