Improve Signs

* Add light_source
* Add meshes
* Allow big signs
* Reduce texture size

api.lua

@@ -41,7 +41,9 @@ function streets.register_road_surface(data)
 end
 
 function streets.register_road_sign(data)
-	streets.signs.signtypes["streets:" .. data.name] = data
+	if data.type == "minetest" or data.type == "normal" or data.type == "big" then
+		streets.signs.signtypes["streets:" .. data.name] = data
+	end
 end
 
 function streets.register_road_marking(data)

api_register_all.lua

@@ -23,101 +23,120 @@ local register_surface_nodes = function(friendlyname, name, tiles, groups, sound
 	end
 end
 
-local register_sign_node = function(friendlyname, name, tiles, thickness)
-	tiles[5] = tiles[5] .. "^[mask:" .. tiles[6] .. "^[colorize:#fff^[mask:" .. tiles[5]
-	minetest.register_node(":streets:" .. name, {
-		description = friendlyname,
-		tiles = tiles,
-		groups = { cracky = 3, not_in_creative_inventory = (name == "sign_blank" and 0 or 1), sign = 1 },
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		inventory_image = tiles[6],
-		after_place_node = function(pos)
-			local behind_pos = { x = pos.x, y = pos.y, z = pos.z }
-			local node = minetest.get_node(pos)
-			local param2 = node.param2
-			if param2 == 0 then
-				behind_pos.z = behind_pos.z + 1
-			elseif param2 == 1 then
-				behind_pos.x = behind_pos.x + 1
-			elseif param2 == 2 then
-				behind_pos.z = behind_pos.z - 1
-			elseif param2 == 3 then
-				behind_pos.x = behind_pos.x - 1
-			end
-			local behind_node = minetest.get_node(behind_pos)
-			local behind_nodes = {}
-			behind_nodes["streets:roadwork_traffic_barrier"] = true
-			behind_nodes["streets:concrete_wall"] = true
-			behind_nodes["technic:concrete_post"] = true
-			local under_pos = { x = pos.x, y = pos.y - 1, z = pos.z }
-			local under_node = minetest.get_node(under_pos)
-			local under_nodes = {}
-			under_nodes["streets:roadwork_traffic_barrier"] = true
-			under_nodes["streets:concrete_wall"] = true
-			under_nodes["technic:concrete_post"] = true
-			local upper_pos = { x = pos.x, y = pos.y + 1, z = pos.z }
-			local upper_node = minetest.get_node(upper_pos)
-			if (minetest.registered_nodes[behind_node.name].groups.bigpole
-					and minetest.registered_nodes[behind_node.name].streets_pole_connection[param2][behind_node.param2 + 1] ~= 1)
-					or behind_nodes[behind_node.name] == true then
-				node.name = node.name .. "_polemount"
-				minetest.set_node(pos, node)
-			elseif (minetest.registered_nodes[under_node.name].groups.bigpole
-					and minetest.registered_nodes[under_node.name].streets_pole_connection["t"][under_node.param2 + 1] == 1)
-					or under_nodes[under_node.name] then
+local register_sign_node = function(friendlyname, name, tiles, type, inventory_image, light_source)
+	if type == "minetest" then
+		tiles[5] = tiles[6] .. "^[colorize:#fff^[mask:(" .. tiles[6] .. "^" .. tiles[5] .. ")"
+	elseif type == "normal" or type == "big" then
+		tiles[2] = tiles[1] .. "^[colorize:#fff^[mask:(" .. tiles[1] .. "^" .. tiles[2] .. ")^[transformFX"
+	end
+	local def = {}
+	def.description = friendlyname
+	def.paramtype = "light"
+	def.paramtype2 = "facedir"
+	def.tiles = tiles
+	def.light_source = light_source
+	def.groups = { cracky = 3, not_in_creative_inventory = 1, sign = 1 }
+	def.drop = "streets:" .. name
+	if type == "minetest" then
+		def.drawtype = "nodebox"
+		def.inventory_image = tiles[6]
+	elseif type == "normal" or type == "big" then
+		def.drawtype = "mesh"
+		def.inventory_image = tiles[1]
+	end
+
+	if inventory_image then
+		def.inventory_image = inventory_image
+	end
+
+	local normal_def = table.copy(def)
+	local center_def = table.copy(def)
+	local polemount_def = table.copy(def)
+
+	if type == "minetest" then
+		normal_def.node_box = {
+			type = "fixed",
+			fixed = { -1 / 2, -1 / 2, 0.5, 1 / 2, 1 / 2, 0.45 }
+		}
+		center_def.node_box = {
+			type = "fixed",
+			fixed = { -1 / 2, -1 / 2, -0.025, 1 / 2, 1 / 2, 0.025 }
+		}
+		polemount_def.node_box = {
+			type = "fixed",
+			fixed = { -1 / 2, -1 / 2, 0.8, 1 / 2, 1 / 2, 0.85 }
+		}
+	elseif type == "normal" then
+		normal_def.mesh = "sign.obj"
+		center_def.mesh = "sign_center.obj"
+		polemount_def.mesh = "sign_polemount.obj"
+	elseif type == "big" then
+		normal_def.mesh = "sign_big.obj"
+		center_def.mesh = "sign_center_big.obj"
+		polemount_def.mesh = "sign_polemount_big.obj"
+	end
+
+	normal_def.selection_box = {
+		type = "fixed",
+		fixed = { -1 / 2, -1 / 2, 0.5, 1 / 2, 1 / 2, 0.45 }
+	}
+	center_def.selection_box = {
+		type = "fixed",
+		fixed = { -1 / 2, -1 / 2, -0.025, 1 / 2, 1 / 2, 0.025 }
+	}
+	polemount_def.selection_box = {
+		type = "fixed",
+		fixed = { -1 / 2, -1 / 2, 0.8, 1 / 2, 1 / 2, 0.85 }
+	}
+
+	normal_def.after_place_node = function(pos)
+		local behind_pos = { x = pos.x, y = pos.y, z = pos.z }
+		local node = minetest.get_node(pos)
+		local param2 = node.param2
+		if param2 == 0 then
+			behind_pos.z = behind_pos.z + 1
+		elseif param2 == 1 then
+			behind_pos.x = behind_pos.x + 1
+		elseif param2 == 2 then
+			behind_pos.z = behind_pos.z - 1
+		elseif param2 == 3 then
+			behind_pos.x = behind_pos.x - 1
+		end
+		local behind_node = minetest.get_node(behind_pos)
+		local behind_nodes = {}
+		behind_nodes["streets:roadwork_traffic_barrier"] = true
+		behind_nodes["streets:concrete_wall"] = true
+		behind_nodes["technic:concrete_post"] = true
+		local under_pos = { x = pos.x, y = pos.y - 1, z = pos.z }
+		local under_node = minetest.get_node(under_pos)
+		local under_nodes = {}
+		under_nodes["streets:roadwork_traffic_barrier"] = true
+		under_nodes["streets:concrete_wall"] = true
+		under_nodes["technic:concrete_post"] = true
+		local upper_pos = { x = pos.x, y = pos.y + 1, z = pos.z }
+		local upper_node = minetest.get_node(upper_pos)
+		if (minetest.registered_nodes[behind_node.name].groups.bigpole
+				and minetest.registered_nodes[behind_node.name].streets_pole_connection[param2][behind_node.param2 + 1] ~= 1)
+				or behind_nodes[behind_node.name] == true then
+			node.name = node.name .. "_polemount"
+			minetest.set_node(pos, node)
+		elseif (minetest.registered_nodes[under_node.name].groups.bigpole
+				and minetest.registered_nodes[under_node.name].streets_pole_connection["t"][under_node.param2 + 1] == 1)
+				or under_nodes[under_node.name] then
+			node.name = node.name .. "_center"
+			minetest.set_node(pos, node)
+		elseif minetest.registered_nodes[upper_node.name].groups.bigpole then
+			if minetest.registered_nodes[upper_node.name].streets_pole_connection["b"][upper_node.param2 + 1] == 1 then
 				node.name = node.name .. "_center"
 				minetest.set_node(pos, node)
-			elseif minetest.registered_nodes[upper_node.name].groups.bigpole then
-				if minetest.registered_nodes[upper_node.name].streets_pole_connection["b"][upper_node.param2 + 1] == 1 then
-					node.name = node.name .. "_center"
-					minetest.set_node(pos, node)
-				end
 			end
-		end,
-		node_box = {
-			type = "fixed",
-			fixed = { -1 / 2, -1 / 2, 0.5, 1 / 2, 1 / 2, 0.5 - thickness }
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = { -1 / 2, -1 / 2, 0.5, 1 / 2, 1 / 2, math.min(0.5 - thickness, 0.45) }
-		}
-	})
-	minetest.register_node(":streets:" .. name .. "_polemount", {
-		tiles = tiles,
-		groups = { cracky = 3, not_in_creative_inventory = 1 },
-		drop = "streets:" .. name,
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		node_box = {
-			type = "fixed",
-			fixed = { -1 / 2, -1 / 2, 0.85 - thickness, 1 / 2, 1 / 2, 0.85 }
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = { -1 / 2, -1 / 2, math.min(0.875 - thickness, 0.80), 1 / 2, 1 / 2, 0.85 }
-		}
-	})
+		end
+	end
+
+	minetest.register_node(":streets:" .. name, normal_def)
+	minetest.register_node(":streets:" .. name .. "_center", center_def)
+	minetest.register_node(":streets:" .. name .. "_polemount", polemount_def)
 
-	minetest.register_node(":streets:" .. name .. "_center", {
-		tiles = tiles,
-		groups = { cracky = 3, not_in_creative_inventory = 1 },
-		drop = "streets:" .. name,
-		drawtype = "nodebox",
-		paramtype = "light",
-		paramtype2 = "facedir",
-		node_box = {
-			type = "fixed",
-			fixed = { -1 / 2, -1 / 2, -(thickness / 2), 1 / 2, 1 / 2, (thickness / 2) }
-		},
-		selection_box = {
-			type = "fixed",
-			fixed = { -1 / 2, -1 / 2, -math.min((thickness / 2), 0.05), 1 / 2, 1 / 2, math.min((thickness / 2), 0.05) }
-		}
-	})
 end
 
 local register_marking_nodes = function(surface_friendlyname, surface_name, surface_tiles, surface_groups, surface_sounds, register_stairs, friendlyname, name, tex, r, basic)
@@ -324,6 +343,6 @@ end
 
 if streets.signs.signtypes then
 	for _, v in pairs(streets.signs.signtypes) do
-		register_sign_node(v.friendlyname, v.name, v.tiles, v.thickness)
+		register_sign_node(v.friendlyname, v.name, v.tiles, v.type, v.inventory_image, v.light_source)
 	end
 end

models/sign.obj

@@ -0,0 +1,29 @@
+# Blender v2.78 (sub 0) OBJ File: 'sign_middle.blend'
+# www.blender.org
+mtllib sign.mtl
+g Cube.002
+v -0.500000 0.500000 0.499000
+v 0.500000 0.500000 0.499000
+v -0.500000 -0.500000 0.499000
+v 0.500000 -0.500000 0.499000
+vt 0.9999 0.0001
+vt 0.9999 0.9999
+vt 0.0001 0.9999
+vt 0.0001 0.0001
+vn 0.0000 0.0000 -1.0000
+usemtl Material
+s off
+f 3/1/1 1/2/1 2/3/1 4/4/1
+g Cube.001
+v 0.500000 -0.500000 0.501000
+v -0.500000 -0.500000 0.501000
+v 0.500000 0.500000 0.501000
+v -0.500000 0.500000 0.501000
+vt 0.9999 0.0001
+vt 0.9999 0.9999
+vt 0.0001 0.9999
+vt 0.0001 0.0001
+vn 0.0000 0.0000 1.0000
+usemtl Material
+s off
+f 5/5/2 7/6/2 8/7/2 6/8/2

models/sign_big.obj

@@ -0,0 +1,29 @@
+# Blender v2.78 (sub 0) OBJ File: 'sign.blend'
+# www.blender.org
+mtllib sign.mtl
+g Cube.002
+v -1.500000 1.500000 0.499000
+v 1.500000 1.500000 0.499000
+v -1.500001 -1.500000 0.499000
+v 1.500000 -1.500000 0.499000
+vt 0.9999 0.0001
+vt 0.9999 0.9999
+vt 0.0001 0.9999
+vt 0.0001 0.0001
+vn 0.0000 0.0000 -1.0000
+usemtl Material
+s off
+f 3/1/1 1/2/1 2/3/1 4/4/1
+g Cube.001
+v 1.500000 -1.500000 0.501000
+v -1.500000 -1.500000 0.501000
+v 1.499999 1.500000 0.501000
+v -1.500000 1.500000 0.501000
+vt 0.9999 0.0001
+vt 0.9999 0.9999
+vt 0.0001 0.9999
+vt 0.0001 0.0001
+vn 0.0000 0.0000 1.0000
+usemtl Material
+s off
+f 5/5/2 7/6/2 8/7/2 6/8/2

models/sign_center.obj

@@ -0,0 +1,29 @@
+# Blender v2.78 (sub 0) OBJ File: 'sign_middle.blend'
+# www.blender.org
+mtllib sign_middle.mtl
+g Cube.002
+v -0.500000 0.500000 -0.001000
+v 0.500000 0.500000 -0.001000
+v -0.500000 -0.500000 -0.001000
+v 0.500000 -0.500000 -0.001000
+vt 0.9999 0.0001
+vt 0.9999 0.9999
+vt 0.0001 0.9999
+vt 0.0001 0.0001
+vn -0.0000 -0.0000 -1.0000
+usemtl Material
+s off
+f 3/1/1 1/2/1 2/3/1 4/4/1
+g Cube.001
+v 0.500000 -0.500000 0.001000
+v -0.500000 -0.500000 0.001000
+v 0.500000 0.500000 0.001000
+v -0.500000 0.500000 0.001000
+vt 0.9999 0.0001
+vt 0.9999 0.9999
+vt 0.0001 0.9999
+vt 0.0001 0.0001
+vn -0.0000 -0.0000 1.0000
+usemtl Material
+s off
+f 5/5/2 7/6/2 8/7/2 6/8/2

models/sign_center_big.obj

@@ -0,0 +1,29 @@
+# Blender v2.78 (sub 0) OBJ File: 'sign_middle.blend'
+# www.blender.org
+mtllib sign_center.mtl
+g Cube.002
+v -1.500000 1.500000 -0.001000
+v 1.500000 1.500000 -0.001000
+v -1.500001 -1.500000 -0.001000
+v 1.500000 -1.500000 -0.001000
+vt 0.9999 0.0001
+vt 0.9999 0.9999
+vt 0.0001 0.9999
+vt 0.0001 0.0001
+vn -0.0000 -0.0000 -1.0000
+usemtl Material
+s off
+f 3/1/1 1/2/1 2/3/1 4/4/1
+g Cube.001
+v 1.500000 -1.500000 0.001000
+v -1.500000 -1.500000 0.001000
+v 1.499999 1.500000 0.001000
+v -1.500000 1.500000 0.001000
+vt 0.9999 0.0001
+vt 0.9999 0.9999
+vt 0.0001 0.9999
+vt 0.0001 0.0001
+vn -0.0000 -0.0000 1.0000
+usemtl Material
+s off
+f 5/5/2 7/6/2 8/7/2 6/8/2

models/sign_polemount.obj

@@ -0,0 +1,29 @@
+# Blender v2.78 (sub 0) OBJ File: 'sign.blend'
+# www.blender.org
+mtllib sign_pole.mtl
+g Cube.002
+v -0.500000 0.500000 0.844000
+v 0.500000 0.500000 0.844000
+v -0.500000 -0.500000 0.844000
+v 0.500000 -0.500000 0.844000
+vt 0.9999 0.0001
+vt 0.9999 0.9999
+vt 0.0001 0.9999
+vt 0.0001 0.0001
+vn 0.0000 0.0000 -1.0000
+usemtl Material
+s off
+f 3/1/1 1/2/1 2/3/1 4/4/1
+g Cube.001
+v 0.500000 -0.500000 0.846000
+v -0.500000 -0.500000 0.846000
+v 0.500000 0.500000 0.846000
+v -0.500000 0.500000 0.846000
+vt 0.9999 0.0001
+vt 0.9999 0.9999
+vt 0.0001 0.9999
+vt 0.0001 0.0001
+vn 0.0000 0.0000 1.0000
+usemtl Material
+s off
+f 5/5/2 7/6/2 8/7/2 6/8/2

models/sign_polemount_big.obj

@@ -0,0 +1,29 @@
+# Blender v2.78 (sub 0) OBJ File: 'sign_pole.blend'
+# www.blender.org
+mtllib sign_polemount.mtl
+g Cube.002
+v -1.500000 1.500000 0.844000
+v 1.500000 1.500000 0.844000
+v -1.500001 -1.500000 0.844000
+v 1.500000 -1.500000 0.844000
+vt 0.9999 0.0001
+vt 0.9999 0.9999
+vt 0.0001 0.9999
+vt 0.0001 0.0001
+vn 0.0000 0.0000 -1.0000
+usemtl Material
+s off
+f 3/1/1 1/2/1 2/3/1 4/4/1
+g Cube.001
+v 1.500000 -1.500000 0.846000
+v -1.500000 -1.500000 0.846000
+v 1.499999 1.500000 0.846000
+v -1.500000 1.500000 0.846000
+vt 0.9999 0.0001
+vt 0.9999 0.9999
+vt 0.0001 0.9999
+vt 0.0001 0.0001
+vn 0.0000 0.0000 1.0000
+usemtl Material
+s off
+f 5/5/2 7/6/2 8/7/2 6/8/2

streets_signs/eu/euinfo.lua

@@ -1,6 +1,4 @@
 local euinfo = {
-	{ "trafficcalmingarea", "Traffic Calming Area", { blue = 3, white = 1 } },
-	{ "trafficcalmingareaend", "End of Traffic Calming Area", { blue = 3, white = 1, red = 1 } },
 	{ "tunnel", "Tunnel", { blue = 2, white = 1, black = 1 } },
 	{ "breakdownbay", "Breakdown Bay", { blue = 2, white = 1, black = 1 } },
 	{ "highway", "Highway", { blue = 2, white = 1 } },
@@ -13,6 +11,27 @@ local euinfo = {
 	{ "info", "Information Center", { blue = 2, white = 1, black = 1 } },
 	{ "wc", "WC", { blue = 2, white = 1, black = 1 } },
 	{ "parkingsite", "Parking Site", { blue = 2, white = 1 } },
+}
+
+for k, v in pairs(euinfo) do
+	streets.register_road_sign({
+		name = "sign_eu_" .. v[1],
+		friendlyname = v[2] .. " Sign",
+		light_source = 3,
+		tiles = {
+			"streets_sign_eu_" .. v[1] .. ".png",
+			"streets_sign_back.png",
+		},
+		type = "normal",
+		section = "euinfo",
+		dye_needed = v[3],
+	})
+end
+
+
+local euinfo_big = {
+	{ "trafficcalmingarea", "Traffic Calming Area", { blue = 3, white = 1 } },
+	{ "trafficcalmingareaend", "End of Traffic Calming Area", { blue = 3, white = 1, red = 1 } },
 	{ "exit", "Exit", { blue = 2, white = 1 } },
 	{ "detourright", "Detour Right", { yellow = 2, black = 1 } },
 	{ "detourleft", "Detour Left", { yellow = 2, black = 1 } },
@@ -20,20 +39,18 @@ local euinfo = {
 	{ "detourend", "End of Detour", { yellow = 2, black = 1, red = 1 } },
 }
 
-for k, v in pairs(euinfo) do
+for k, v in pairs(euinfo_big) do
 	streets.register_road_sign({
 		name = "sign_eu_" .. v[1],
 		friendlyname = v[2] .. " Sign",
+		light_source = 3,
 		tiles = {
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
+			"streets_sign_eu_" .. v[1] .. ".png",
 			"streets_sign_back.png",
-			"streets_sign_eu_" .. v[1] .. ".png"
 		},
-		thickness = 0.01,
+		type = "big",
 		section = "euinfo",
-		dye_needed = v[3]
+		dye_needed = v[3],
+		inventory_image = "streets_sign_eu_" .. v[1] .. "_inv.png",
 	})
 end

streets_signs/eu/eumandat.lua

@@ -7,8 +7,6 @@ local eumandat = {
 	{ "straightrightonly", "Straight and Right Only", { blue = 2, white = 1 } },
 	{ "straightleftonly", "Straight and Left Only", { blue = 2, white = 1 } },
 	{ "roundabout", "Roundabout", { blue = 2, white = 1 } },
-	{ "onewayright", "One Way Road", { blue = 2, white = 1, black = 1 } },
-	{ "onewayleft", "One Way Road", { blue = 2, white = 1, black = 1 } },
 	{ "passingright", "Passing Right", { blue = 2, white = 1 } },
 	{ "passingleft", "Passing Left", { blue = 2, white = 1 } },
 	{ "busstation", "Busstation", { green = 2, yellow = 2 } },
@@ -25,16 +23,35 @@ for k, v in pairs(eumandat) do
 	streets.register_road_sign({
 		name = "sign_eu_" .. v[1],
 		friendlyname = v[2] .. " Sign",
+		light_source = 3,
 		tiles = {
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
+			"streets_sign_eu_" .. v[1] .. ".png",
 			"streets_sign_back.png",
-			"streets_sign_eu_" .. v[1] .. ".png"
 		},
-		thickness = 0.01,
+		type = "normal",
 		section = "eumandat",
 		dye_needed = v[3]
 	})
+end
+
+
+local eumandat_big = {
+	{ "onewayright", "One Way Road", { blue = 2, white = 1, black = 1 } },
+	{ "onewayleft", "One Way Road", { blue = 2, white = 1, black = 1 } },
+}
+
+for k, v in pairs(eumandat_big) do
+	streets.register_road_sign({
+		name = "sign_eu_" .. v[1],
+		friendlyname = v[2] .. " Sign",
+		light_source = 3,
+		tiles = {
+			"streets_sign_eu_" .. v[1] .. ".png",
+			"streets_sign_back.png",
+		},
+		type = "big",
+		section = "eumandat",
+		dye_needed = v[3],
+		inventory_image = "streets_sign_eu_" .. v[1] .. "_inv.png",
+	})
 end

streets_signs/eu/euother.lua

@@ -2,9 +2,6 @@ local euother = {
 	{ "guideboard", "Guide Board", { white = 2, red = 2 } },
 	{ "bendright", "Guide Sign in Bends", { white = 2, red = 2 } },
 	{ "bendleft", "Guide Sign in Bends", { white = 2, red = 2 } },
-	{ "additionallane", "Additional Lane", { white = 3, black = 1 } },
-	{ "mergelanes", "Merge Lanes", { white = 3, black = 1 } },
-	{ "laneshift", "Lane Shift", { white = 3, black = 1 } },
 	{ "pedestriansleft", "Pedestrians to the Left", { white = 2, black = 1 } },
 	{ "pedestriansright", "Pedestrians to the Right", { white = 2, black = 1 } },
 	{ "arrowright", "Right", { white = 2, black = 1 } },
@@ -22,16 +19,36 @@ for k, v in pairs(euother) do
 	streets.register_road_sign({
 		name = "sign_eu_" .. v[1],
 		friendlyname = v[2] .. " Sign",
+		light_source = 3,
 		tiles = {
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
+			"streets_sign_eu_" .. v[1] .. ".png",
 			"streets_sign_back.png",
-			"streets_sign_eu_" .. v[1] .. ".png"
 		},
-		thickness = 0.01,
+		type = "normal",
 		section = "euother",
 		dye_needed = v[3]
 	})
+end
+
+
+local euother_big = {
+	{ "additionallane", "Additional Lane", { white = 3, black = 1 } },
+	{ "mergelanes", "Merge Lanes", { white = 3, black = 1 } },
+	{ "laneshift", "Lane Shift", { white = 3, black = 1 } },
+}
+
+for k, v in pairs(euother_big) do
+	streets.register_road_sign({
+		name = "sign_eu_" .. v[1],
+		friendlyname = v[2] .. " Sign",
+		light_source = 3,
+		tiles = {
+			"streets_sign_eu_" .. v[1] .. ".png",
+			"streets_sign_back.png",
+		},
+		type = "big",
+		section = "euother",
+		dye_needed = v[3],
+		inventory_image = "streets_sign_eu_" .. v[1] .. "_inv.png",
+	})
 end

streets_signs/eu/euprio.lua

@@ -1,5 +1,4 @@
 local euprio = {
-	{ "standrews", "St. Andrews Cross", { white = 2, red = 1 } },
 	{ "yield", "Yield", { white = 2, red = 2 } },
 	{ "stop", "Stop", { white = 1, red = 3 } },
 	{ "givewayoncoming", "Give Way to Oncoming Traffic", { white = 2, red = 2, black = 1 } },
@@ -14,16 +13,34 @@ for k, v in pairs(euprio) do
 	streets.register_road_sign({
 		name = "sign_eu_" .. v[1],
 		friendlyname = v[2] .. " Sign",
+		light_source = 3,
 		tiles = {
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
+			"streets_sign_eu_" .. v[1] .. ".png",
 			"streets_sign_back.png",
-			"streets_sign_eu_" .. v[1] .. ".png"
 		},
-		thickness = 0.01,
+		type = "normal",
 		section = "euprio",
 		dye_needed = v[3]
 	})
+end
+
+
+local euprio_big = {
+	{ "standrews", "St. Andrews Cross", { white = 2, red = 1 } },
+}
+
+for k, v in pairs(euprio_big) do
+	streets.register_road_sign({
+		name = "sign_eu_" .. v[1],
+		friendlyname = v[2] .. " Sign",
+		light_source = 3,
+		tiles = {
+			"streets_sign_eu_" .. v[1] .. ".png",
+			"streets_sign_back.png",
+		},
+		type = "big",
+		section = "euprio",
+		dye_needed = v[3],
+		inventory_image = "streets_sign_eu_" .. v[1] .. "_inv.png",
+	})
 end

streets_signs/eu/euprohib.lua

@@ -27,15 +27,12 @@ for k, v in pairs(euprohib) do
 	streets.register_road_sign({
 		name = "sign_eu_" .. v[1],
 		friendlyname = v[2] .. " Sign",
+		light_source = 3,
 		tiles = {
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
+			"streets_sign_eu_" .. v[1] .. ".png",
 			"streets_sign_back.png",
-			"streets_sign_eu_" .. v[1] .. ".png"
 		},
-		thickness = 0.01,
+		type = "normal",
 		section = "euprohib",
 		dye_needed = v[3]
 	})

streets_signs/eu/euwarn.lua

@@ -29,15 +29,12 @@ for k, v in pairs(euwarn) do
 	streets.register_road_sign({
 		name = "sign_eu_" .. v[1],
 		friendlyname = v[2] .. " Sign",
+		light_source = 3,
 		tiles = {
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
+			"streets_sign_eu_" .. v[1] .. ".png",
 			"streets_sign_back.png",
-			"streets_sign_eu_" .. v[1] .. ".png"
 		},
-		thickness = 0.01,
+		type = "normal",
 		section = "euwarn",
 		dye_needed = v[3]
 	})

streets_signs/init.lua

@@ -22,25 +22,7 @@ streets.signs.sections = {
 	{ name = "euother", friendlyname = "EU Other" }
 }
 
-streets.register_road_sign({
-	name = "sign_blank",
-	friendlyname = "Blank Sign",
-	tiles = {
-		"streets_sign_back.png",
-		"streets_sign_back.png",
-		"streets_sign_back.png",
-		"streets_sign_back.png",
-		"streets_sign_back.png",
-		"streets_sign_back.png"
-	},
-	thickness = 0.05
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "streets:sign_blank",
-	recipe = { "streets:asphalt", "default:sign_wall_wood" },
-})
+minetest.register_alias("streets:sign_blank", "default:sign_wall_steel")
 
 streets.register_road_sign({
 	name = "sign_curve_chevron_right",
@@ -53,7 +35,7 @@ streets.register_road_sign({
 		"streets_sign_back.png",
 		"streets_curve_sign.png"
 	},
-	thickness = 0.05,
+	type = "minetest",
 	section = "warn",
 	dye_needed = { yellow = 3, black = 3 }
 })
@@ -69,7 +51,7 @@ streets.register_road_sign({
 		"streets_sign_back.png",
 		"streets_curve_sign.png^[transformFX"
 	},
-	thickness = 0.05,
+	type = "minetest",
 	section = "warn",
 	dye_needed = { yellow = 3, black = 3 }
 })
@@ -85,7 +67,7 @@ streets.register_road_sign({
 		"streets_sign_back.png",
 		"streets_square_sign_empty.png^streets_sign_warning.png"
 	},
-	thickness = 0.05,
+	type = "minetest",
 	section = "warn",
 	dye_needed = { black = 2 }
 })
@@ -101,7 +83,7 @@ streets.register_road_sign({
 		"streets_sign_back.png",
 		"streets_square_sign_empty.png^streets_sign_water.png"
 	},
-	thickness = 0.05,
+	type = "minetest",
 	section = "warn",
 	dye_needed = { green = 1, blue = 3, black = 1 }
 })
@@ -117,7 +99,7 @@ streets.register_road_sign({
 		"streets_sign_back.png",
 		"streets_square_sign_empty.png^streets_sign_lava.png"
 	},
-	thickness = 0.05,
+	type = "minetest",
 	section = "warn",
 	dye_needed = { green = 1, red = 3 }
 })
@@ -133,7 +115,7 @@ streets.register_road_sign({
 		"streets_sign_back.png",
 		"streets_square_sign_empty.png^streets_sign_construction.png"
 	},
-	thickness = 0.05,
+	type = "minetest",
 	section = "warn",
 	dye_needed = { green = 1, blue = 1, brown = 1 }
 })
@@ -149,7 +131,7 @@ streets.register_road_sign({
 		"streets_sign_back.png",
 		"streets_square_sign_empty.png^streets_sign_grass.png"
 	},
-	thickness = 0.05,
+	type = "minetest",
 	section = "reg",
 	dye_needed = { green = 3, red = 2 }
 })
@@ -165,7 +147,7 @@ streets.register_road_sign({
 		"streets_sign_back.png",
 		"streets_square_sign_empty.png^streets_sign_mine.png"
 	},
-	thickness = 0.05,
+	type = "minetest",
 	section = "info",
 	dye_needed = { blue = 2, yellow = 1 }
 })
@@ -181,7 +163,7 @@ streets.register_road_sign({
 		"streets_sign_back.png",
 		"streets_square_sign_empty.png^streets_sign_shop.png"
 	},
-	thickness = 0.05,
+	type = "minetest",
 	section = "info",
 	dye_needed = { blue = 1, red = 1, yellow = 1, blue = 1 }
 })
@@ -197,7 +179,7 @@ streets.register_road_sign({
 		"streets_sign_back.png",
 		"streets_square_sign_empty.png^streets_sign_workshop.png"
 	},
-	thickness = 0.05,
+	type = "minetest",
 	section = "info",
 	dye_needed = { red = 1, yellow = 2, blue = 1 }
 })

streets_signs/us/usinfo.lua

@@ -9,14 +9,10 @@ for k, v in pairs(usinfo) do
 		name = "sign_us_" .. v[1],
 		friendlyname = v[2] .. " Sign",
 		tiles = {
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
+			"streets_sign_us_" .. v[1] .. ".png",
 			"streets_sign_back.png",
-			"streets_sign_us_" .. v[1] .. ".png"
 		},
-		thickness = 0.01,
+		type = "normal",
 		section = "usinfo",
 		dye_needed = v[3]
 	})

streets_signs/us/usom.lua

@@ -12,14 +12,10 @@ for k, v in pairs(usom) do
 		name = "sign_us_" .. v[1],
 		friendlyname = v[2] .. " Sign",
 		tiles = {
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
+			"streets_sign_us_" .. v[1] .. ".png",
 			"streets_sign_back.png",
-			"streets_sign_us_" .. v[1] .. ".png"
 		},
-		thickness = 0.01,
+		type = "normal",
 		section = "usom",
 		dye_needed = v[3]
 	})

streets_signs/us/usreg.lua

@@ -40,14 +40,10 @@ for k, v in pairs(usreg) do
 		name = "sign_us_" .. v[1],
 		friendlyname = v[2] .. " Sign",
 		tiles = {
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
+			"streets_sign_us_" .. v[1] .. ".png",
 			"streets_sign_back.png",
-			"streets_sign_us_" .. v[1] .. ".png"
 		},
-		thickness = 0.01,
+		type = "normal",
 		section = "usreg",
 		dye_needed = v[3]
 	})

streets_signs/us/usttc.lua

@@ -12,14 +12,10 @@ for k, v in pairs(usttc) do
 		name = "sign_us_" .. v[1],
 		friendlyname = v[2] .. " Sign",
 		tiles = {
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
+			"streets_sign_us_" .. v[1] .. ".png",
 			"streets_sign_back.png",
-			"streets_sign_us_" .. v[1] .. ".png"
 		},
-		thickness = 0.01,
+		type = "normal",
 		section = "usttc",
 		dye_needed = v[3]
 	})

streets_signs/us/uswarn.lua

@@ -42,14 +42,10 @@ for k, v in pairs(uswarn) do
 		name = "sign_us_" .. v[1],
 		friendlyname = v[2] .. " Sign",
 		tiles = {
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
-			"streets_transparent.png",
+			"streets_sign_us_" .. v[1] .. ".png",
 			"streets_sign_back.png",
-			"streets_sign_us_" .. v[1] .. ".png"
 		},
-		thickness = 0.01,
+		type = "normal",
 		section = "uswarn",
 		dye_needed = v[3]
 	})