From 0ed24f1d6a37692804f44ce13d0dbd3afd2bef8d Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Tue, 25 Sep 2018 22:18:13 -0400
Subject: update street signs

---
 street_signs/init.lua                              |  54 +++++++++++++++++++--
 .../textures/street_signs_warning_3_line_inv.png   | Bin 0 -> 2378 bytes
 .../textures/street_signs_warning_4_line_inv.png   | Bin 0 -> 2107 bytes
 street_signs/textures/street_signs_warning_inv.png | Bin 1056 -> 0 bytes
 4 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 street_signs/textures/street_signs_warning_3_line_inv.png
 create mode 100644 street_signs/textures/street_signs_warning_4_line_inv.png
 delete mode 100644 street_signs/textures/street_signs_warning_inv.png

(limited to 'street_signs')

diff --git a/street_signs/init.lua b/street_signs/init.lua
index 9b96b69..f9336bd 100644
--- a/street_signs/init.lua
+++ b/street_signs/init.lua
@@ -777,8 +777,8 @@ cbox = {
 	fixed = { -0.5, -0.5, 0.4375, 0.5, 0.5, 0.5 }
 }
 
-minetest.register_node("street_signs:sign_warning", {
-	description = "Basic US diamond-shaped \"warning\" sign",
+minetest.register_node("street_signs:sign_warning_3_line", {
+	description = "Basic US diamond-shaped \"warning\" sign (3-line)",
 	paramtype = "light",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
@@ -787,7 +787,7 @@ minetest.register_node("street_signs:sign_warning", {
 	selection_box = cbox,
 	mesh = "street_signs_warning.obj",
 	tiles = { "street_signs_warning.png" },
-	inventory_image = "street_signs_warning_inv.png",
+	inventory_image = "street_signs_warning_3_line_inv.png",
 	groups = {choppy=2, dig_immediate=2},
 	default_color = "0",
 	on_construct = function(pos) 
@@ -804,11 +804,55 @@ minetest.register_node("street_signs:sign_warning", {
 	end,
 	number_of_lines = 3,
 	horiz_scaling = 1.75,
-	vert_scaling = 1.4,
+	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_4_line", {
+	description = "Basic US diamond-shaped \"warning\" sign (4-line)",
+	paramtype = "light",
+	sunlight_propagates = true,
+	paramtype2 = "facedir",
+	drawtype = "mesh",
+	node_box = cbox,
+	selection_box = cbox,
+	mesh = "street_signs_warning.obj",
+	tiles = { "street_signs_warning.png" },
+	inventory_image = "street_signs_warning_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 = 10,
+	y_offset = 25,
 	chars_per_line = 15,
 	entity_info = {
 		mesh = "street_signs_warning_entity.obj",
diff --git a/street_signs/textures/street_signs_warning_3_line_inv.png b/street_signs/textures/street_signs_warning_3_line_inv.png
new file mode 100644
index 0000000..3fd5276
Binary files /dev/null and b/street_signs/textures/street_signs_warning_3_line_inv.png differ
diff --git a/street_signs/textures/street_signs_warning_4_line_inv.png b/street_signs/textures/street_signs_warning_4_line_inv.png
new file mode 100644
index 0000000..6336cb9
Binary files /dev/null and b/street_signs/textures/street_signs_warning_4_line_inv.png differ
diff --git a/street_signs/textures/street_signs_warning_inv.png b/street_signs/textures/street_signs_warning_inv.png
deleted file mode 100644
index 2ebb2f4..0000000
Binary files a/street_signs/textures/street_signs_warning_inv.png and /dev/null differ
-- 
cgit v1.2.3