update signs_lib and street signs

12 files changed, 93 insertions, 3 deletions

diff --git a/signs_lib/textures/signs_orange_front.png b/signs_lib/textures/signs_orange_front.png
index 633b19a..6e81443 100644
--- a/signs_lib/textures/signs_orange_front.png
+++ b/signs_lib/textures/signs_orange_front.png
diff --git a/signs_lib/textures/signs_orange_inv.png b/signs_lib/textures/signs_orange_inv.png
index 5a813ae..8f9f9e6 100644
--- a/signs_lib/textures/signs_orange_inv.png
+++ b/signs_lib/textures/signs_orange_inv.png
diff --git a/street_signs/init.lua b/street_signs/init.lua
index f9336bd..4b8062b 100644
--- a/street_signs/init.lua
+++ b/street_signs/init.lua
@@ -515,7 +515,8 @@ minetest.register_node("street_signs:sign_basic_top_only", {
 local colors = {
 	{ "green",  "f", "dye:green",  "dye:white" },
 	{ "blue",   "f", "dye:blue",   "dye:white" },
-	{ "yellow", "0", "dye:yellow", "dye:black" }
+	{ "yellow", "0", "dye:yellow", "dye:black" },
+	{ "orange", "0", "dye:orange", "dye:black" }
 }
 
 for _, c in ipairs(colors) do
@@ -778,7 +779,7 @@ cbox = {
 }
 
 minetest.register_node("street_signs:sign_warning_3_line", {
-	description = "Basic US diamond-shaped \"warning\" sign (3-line)",
+	description = "Basic US diamond-shaped \"warning\" sign (3-line, yellow)",
 	paramtype = "light",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
@@ -822,7 +823,7 @@ minetest.register_node("street_signs:sign_warning_3_line", {
 })
 
 minetest.register_node("street_signs:sign_warning_4_line", {
-	description = "Basic US diamond-shaped \"warning\" sign (4-line)",
+	description = "Basic US diamond-shaped \"warning\" sign (4-line, yellow)",
 	paramtype = "light",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
@@ -865,6 +866,95 @@ minetest.register_node("street_signs:sign_warning_4_line", {
 	}
 })
 
+minetest.register_node("street_signs:sign_warning_orange_3_line", {
+	description = "Basic US diamond-shaped \"warning\" sign (3-line, orange)",
+	paramtype = "light",
+	sunlight_propagates = true,
+	paramtype2 = "facedir",
+	drawtype = "mesh",
+	node_box = cbox,
+	selection_box = cbox,
+	mesh = "street_signs_warning.obj",
+	tiles = { "street_signs_warning_orange.png" },
+	inventory_image = "street_signs_warning_orange_3_line_inv.png",
+	groups = {choppy=2, dig_immediate=2},
+	default_color = "0",
+	on_construct = function(pos) 
+		street_signs.construct_sign(pos)
+	end,
+	on_destruct = function(pos)
+		street_signs.destruct_sign(pos)
+	end,
+	on_receive_fields = function(pos, formname, fields, sender)
+		street_signs.receive_fields(pos, formname, fields, sender)
+	end,
+	on_punch = function(pos, node, puncher)
+		street_signs.update_sign(pos)
+	end,
+	number_of_lines = 3,
+	horiz_scaling = 1.75,
+	vert_scaling = 1.75,
+	line_spacing = 1,
+	font_size = 15,
+	x_offset = 6,
+	y_offset = 19,
+	chars_per_line = 15,
+	entity_info = {
+		mesh = "street_signs_warning_entity.obj",
+		yaw = {
+			0,
+			math.pi / -2,
+			math.pi,
+			math.pi / 2,
+		}
+	}
+})
+
+minetest.register_node("street_signs:sign_warning_orange_4_line", {
+	description = "Basic US diamond-shaped \"warning\" sign (4-line, orange)",
+	paramtype = "light",
+	sunlight_propagates = true,
+	paramtype2 = "facedir",
+	drawtype = "mesh",
+	node_box = cbox,
+	selection_box = cbox,
+	mesh = "street_signs_warning.obj",
+	tiles = { "street_signs_warning_orange.png" },
+	inventory_image = "street_signs_warning_orange_4_line_inv.png",
+	groups = {choppy=2, dig_immediate=2},
+	default_color = "0",
+	on_construct = function(pos) 
+		street_signs.construct_sign(pos)
+	end,
+	on_destruct = function(pos)
+		street_signs.destruct_sign(pos)
+	end,
+	on_receive_fields = function(pos, formname, fields, sender)
+		street_signs.receive_fields(pos, formname, fields, sender)
+	end,
+	on_punch = function(pos, node, puncher)
+		street_signs.update_sign(pos)
+	end,
+	number_of_lines = 4,
+	horiz_scaling = 1.75,
+	vert_scaling = 1.75,
+	line_spacing = 1,
+	font_size = 15,
+	x_offset = 6,
+	y_offset = 25,
+	chars_per_line = 15,
+	entity_info = {
+		mesh = "street_signs_warning_entity.obj",
+		yaw = {
+			0,
+			math.pi / -2,
+			math.pi,
+			math.pi / 2,
+		}
+	}
+})
+
+
 local signs_text_on_activate
 
 signs_text_on_activate = function(self)
diff --git a/street_signs/textures/street_signs_highway_large_orange.png b/street_signs/textures/street_signs_highway_large_orange.png
new file mode 100644
index 0000000..fc1f955
--- /dev/null
+++ b/street_signs/textures/street_signs_highway_large_orange.png
diff --git a/street_signs/textures/street_signs_highway_large_orange_inv.png b/street_signs/textures/street_signs_highway_large_orange_inv.png
new file mode 100644
index 0000000..7298bcd
--- /dev/null
+++ b/street_signs/textures/street_signs_highway_large_orange_inv.png
diff --git a/street_signs/textures/street_signs_highway_medium_orange.png b/street_signs/textures/street_signs_highway_medium_orange.png
new file mode 100644
index 0000000..944e7d5
--- /dev/null
+++ b/street_signs/textures/street_signs_highway_medium_orange.png
diff --git a/street_signs/textures/street_signs_highway_medium_orange_inv.png b/street_signs/textures/street_signs_highway_medium_orange_inv.png
new file mode 100644
index 0000000..3cc8a89
--- /dev/null
+++ b/street_signs/textures/street_signs_highway_medium_orange_inv.png
diff --git a/street_signs/textures/street_signs_highway_small_orange.png b/street_signs/textures/street_signs_highway_small_orange.png
new file mode 100644
index 0000000..b6ed4b6
--- /dev/null
+++ b/street_signs/textures/street_signs_highway_small_orange.png
diff --git a/street_signs/textures/street_signs_highway_small_orange_inv.png b/street_signs/textures/street_signs_highway_small_orange_inv.png
new file mode 100644
index 0000000..6494690
--- /dev/null
+++ b/street_signs/textures/street_signs_highway_small_orange_inv.png
diff --git a/street_signs/textures/street_signs_warning_orange.png b/street_signs/textures/street_signs_warning_orange.png
new file mode 100644
index 0000000..02b75b4
--- /dev/null
+++ b/street_signs/textures/street_signs_warning_orange.png
diff --git a/street_signs/textures/street_signs_warning_orange_3_line_inv.png b/street_signs/textures/street_signs_warning_orange_3_line_inv.png
new file mode 100644
index 0000000..2aa9b1b
--- /dev/null
+++ b/street_signs/textures/street_signs_warning_orange_3_line_inv.png
diff --git a/street_signs/textures/street_signs_warning_orange_4_line_inv.png b/street_signs/textures/street_signs_warning_orange_4_line_inv.png
new file mode 100644
index 0000000..35b041c
--- /dev/null
+++ b/street_signs/textures/street_signs_warning_orange_4_line_inv.png