From 0d094bed13f1700ea2ef1924ecf089c9d96dda83 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Tue, 9 Oct 2018 07:50:37 -0400 Subject: update street_signs, signs_lib, and unifieddyes --- street_signs/api.lua | 18 +++++++++ street_signs/signs_misc_generic.lua | 41 ++++++++++++++++++++- .../textures/street_signs_font_15px_81.png | Bin 0 -> 121 bytes .../textures/street_signs_font_15px_82.png | Bin 0 -> 143 bytes .../textures/street_signs_font_15px_83.png | Bin 0 -> 117 bytes .../textures/street_signs_font_15px_84.png | Bin 0 -> 143 bytes .../textures/street_signs_font_15px_85.png | Bin 0 -> 119 bytes .../textures/street_signs_font_15px_86.png | Bin 0 -> 143 bytes .../textures/street_signs_font_15px_87.png | Bin 0 -> 118 bytes .../textures/street_signs_font_15px_88.png | Bin 0 -> 146 bytes .../textures/street_signs_font_15px_8a.png | Bin 0 -> 137 bytes .../textures/street_signs_font_15px_8b.png | Bin 0 -> 157 bytes .../textures/street_signs_font_15px_8c.png | Bin 0 -> 133 bytes .../textures/street_signs_font_15px_8d.png | Bin 0 -> 170 bytes .../textures/street_signs_font_15px_8e.png | Bin 0 -> 138 bytes .../textures/street_signs_font_15px_8f.png | Bin 0 -> 162 bytes .../textures/street_signs_font_15px_90.png | Bin 0 -> 136 bytes .../textures/street_signs_font_15px_91.png | Bin 0 -> 168 bytes .../textures/street_signs_font_31px_81.png | Bin 0 -> 166 bytes .../textures/street_signs_font_31px_82.png | Bin 0 -> 185 bytes .../textures/street_signs_font_31px_83.png | Bin 0 -> 167 bytes .../textures/street_signs_font_31px_84.png | Bin 0 -> 200 bytes .../textures/street_signs_font_31px_85.png | Bin 0 -> 169 bytes .../textures/street_signs_font_31px_86.png | Bin 0 -> 185 bytes .../textures/street_signs_font_31px_87.png | Bin 0 -> 165 bytes .../textures/street_signs_font_31px_88.png | Bin 0 -> 190 bytes .../textures/street_signs_font_31px_8a.png | Bin 0 -> 207 bytes .../textures/street_signs_font_31px_8b.png | Bin 0 -> 224 bytes .../textures/street_signs_font_31px_8c.png | Bin 0 -> 189 bytes .../textures/street_signs_font_31px_8d.png | Bin 0 -> 223 bytes .../textures/street_signs_font_31px_8e.png | Bin 0 -> 219 bytes .../textures/street_signs_font_31px_8f.png | Bin 0 -> 221 bytes .../textures/street_signs_font_31px_90.png | Bin 0 -> 183 bytes .../textures/street_signs_font_31px_91.png | Bin 0 -> 235 bytes 34 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 street_signs/textures/street_signs_font_15px_81.png create mode 100644 street_signs/textures/street_signs_font_15px_82.png create mode 100644 street_signs/textures/street_signs_font_15px_83.png create mode 100644 street_signs/textures/street_signs_font_15px_84.png create mode 100644 street_signs/textures/street_signs_font_15px_85.png create mode 100644 street_signs/textures/street_signs_font_15px_86.png create mode 100644 street_signs/textures/street_signs_font_15px_87.png create mode 100644 street_signs/textures/street_signs_font_15px_88.png create mode 100644 street_signs/textures/street_signs_font_15px_8a.png create mode 100644 street_signs/textures/street_signs_font_15px_8b.png create mode 100644 street_signs/textures/street_signs_font_15px_8c.png create mode 100644 street_signs/textures/street_signs_font_15px_8d.png create mode 100644 street_signs/textures/street_signs_font_15px_8e.png create mode 100644 street_signs/textures/street_signs_font_15px_8f.png create mode 100644 street_signs/textures/street_signs_font_15px_90.png create mode 100644 street_signs/textures/street_signs_font_15px_91.png create mode 100644 street_signs/textures/street_signs_font_31px_81.png create mode 100644 street_signs/textures/street_signs_font_31px_82.png create mode 100644 street_signs/textures/street_signs_font_31px_83.png create mode 100644 street_signs/textures/street_signs_font_31px_84.png create mode 100644 street_signs/textures/street_signs_font_31px_85.png create mode 100644 street_signs/textures/street_signs_font_31px_86.png create mode 100644 street_signs/textures/street_signs_font_31px_87.png create mode 100644 street_signs/textures/street_signs_font_31px_88.png create mode 100644 street_signs/textures/street_signs_font_31px_8a.png create mode 100644 street_signs/textures/street_signs_font_31px_8b.png create mode 100644 street_signs/textures/street_signs_font_31px_8c.png create mode 100644 street_signs/textures/street_signs_font_31px_8d.png create mode 100644 street_signs/textures/street_signs_font_31px_8e.png create mode 100644 street_signs/textures/street_signs_font_31px_8f.png create mode 100644 street_signs/textures/street_signs_font_31px_90.png create mode 100644 street_signs/textures/street_signs_font_31px_91.png (limited to 'street_signs') diff --git a/street_signs/api.lua b/street_signs/api.lua index e69a8dd..3887572 100644 --- a/street_signs/api.lua +++ b/street_signs/api.lua @@ -217,6 +217,24 @@ local function make_line_texture(line, lineno, pos, line_width, line_height, cwi for word_i, word in ipairs(line) do local chars = { } local ch_offs = 0 + word = string.gsub(word, "%^[12345678abcdefgh]", { + ["^1"] = string.char(0x81), + ["^2"] = string.char(0x82), + ["^3"] = string.char(0x83), + ["^4"] = string.char(0x84), + ["^5"] = string.char(0x85), + ["^6"] = string.char(0x86), + ["^7"] = string.char(0x87), + ["^8"] = string.char(0x88), + ["^a"] = string.char(0x8a), + ["^b"] = string.char(0x8b), + ["^c"] = string.char(0x8c), + ["^d"] = string.char(0x8d), + ["^e"] = string.char(0x8e), + ["^f"] = string.char(0x8f), + ["^g"] = string.char(0x90), + ["^h"] = string.char(0x91) + }) local word_l = #word local i = 1 while i <= word_l do diff --git a/street_signs/signs_misc_generic.lua b/street_signs/signs_misc_generic.lua index 78d346b..9e7edc6 100644 --- a/street_signs/signs_misc_generic.lua +++ b/street_signs/signs_misc_generic.lua @@ -194,7 +194,7 @@ for _, s in ipairs(street_signs.big_sign_sizes) do local defc = c[2] minetest.register_node("street_signs:sign_highway_"..size.."_"..color, { - description = "Generic highway sign (3-line, "..size..", "..color..")", + description = "Generic highway sign ("..nlines.."-line, "..size..", "..color..")", inventory_image = "street_signs_generic_highway_"..size.."_"..color.."_inv.png", wield_image = "street_signs_generic_highway_"..size.."_"..color.."_inv.png", paramtype = "light", @@ -230,7 +230,46 @@ for _, s in ipairs(street_signs.big_sign_sizes) do } }) + minetest.register_node("street_signs:sign_highway_widefont_"..size.."_"..color, { + description = "Generic highway sign (Wide font, "..nlines.."-line, "..size..", "..color..")", + inventory_image = "street_signs_generic_highway_"..size.."_"..color.."_inv.png", + wield_image = "street_signs_generic_highway_"..size.."_"..color.."_inv.png", + paramtype = "light", + sunlight_propagates = true, + paramtype2 = "wallmounted", + drawtype = "mesh", + node_box = cbox, + selection_box = cbox, + mesh = "street_signs_generic_highway_"..size..".obj", + tiles = { + "street_signs_generic_highway_front_"..size.."_"..color..".png", + "street_signs_generic_highway_back_"..size..".png", + "street_signs_generic_highway_edges.png" + }, + default_color = defc, + groups = {choppy=2, dig_immediate=2}, + on_construct = street_signs.construct_sign, + on_destruct = street_signs.destruct_sign, + on_receive_fields = street_signs.receive_fields, + on_punch = street_signs.update_sign, + on_rotate = street_signs.wallmounted_rotate, + number_of_lines = nlines, + chars_per_line = math.ceil(nchars/1.4), + horiz_scaling = hscale/1.4, + vert_scaling = vscale, + line_spacing = 2, + font_size = 31, + x_offset = xoffs, + y_offset = yoffs, + entity_info = { + mesh = "street_signs_generic_highway_"..size.."_entity.obj", + yaw = street_signs.wallmounted_yaw + } + }) + table.insert(street_signs.lbm_restore_nodes, "street_signs:sign_highway_"..size.."_"..color) + table.insert(street_signs.lbm_restore_nodes, "street_signs:sign_highway_widefont_"..size.."_"..color) + end end diff --git a/street_signs/textures/street_signs_font_15px_81.png b/street_signs/textures/street_signs_font_15px_81.png new file mode 100644 index 0000000..df38787 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_81.png differ diff --git a/street_signs/textures/street_signs_font_15px_82.png b/street_signs/textures/street_signs_font_15px_82.png new file mode 100644 index 0000000..e769d35 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_82.png differ diff --git a/street_signs/textures/street_signs_font_15px_83.png b/street_signs/textures/street_signs_font_15px_83.png new file mode 100644 index 0000000..7c8c59a Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_83.png differ diff --git a/street_signs/textures/street_signs_font_15px_84.png b/street_signs/textures/street_signs_font_15px_84.png new file mode 100644 index 0000000..9af1a9b Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_84.png differ diff --git a/street_signs/textures/street_signs_font_15px_85.png b/street_signs/textures/street_signs_font_15px_85.png new file mode 100644 index 0000000..a83d4c3 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_85.png differ diff --git a/street_signs/textures/street_signs_font_15px_86.png b/street_signs/textures/street_signs_font_15px_86.png new file mode 100644 index 0000000..7ca6698 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_86.png differ diff --git a/street_signs/textures/street_signs_font_15px_87.png b/street_signs/textures/street_signs_font_15px_87.png new file mode 100644 index 0000000..2b0eba0 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_87.png differ diff --git a/street_signs/textures/street_signs_font_15px_88.png b/street_signs/textures/street_signs_font_15px_88.png new file mode 100644 index 0000000..ebab336 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_88.png differ diff --git a/street_signs/textures/street_signs_font_15px_8a.png b/street_signs/textures/street_signs_font_15px_8a.png new file mode 100644 index 0000000..eeac2a1 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_8a.png differ diff --git a/street_signs/textures/street_signs_font_15px_8b.png b/street_signs/textures/street_signs_font_15px_8b.png new file mode 100644 index 0000000..35681f0 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_8b.png differ diff --git a/street_signs/textures/street_signs_font_15px_8c.png b/street_signs/textures/street_signs_font_15px_8c.png new file mode 100644 index 0000000..bbcd100 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_8c.png differ diff --git a/street_signs/textures/street_signs_font_15px_8d.png b/street_signs/textures/street_signs_font_15px_8d.png new file mode 100644 index 0000000..e280cd9 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_8d.png differ diff --git a/street_signs/textures/street_signs_font_15px_8e.png b/street_signs/textures/street_signs_font_15px_8e.png new file mode 100644 index 0000000..c97a758 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_8e.png differ diff --git a/street_signs/textures/street_signs_font_15px_8f.png b/street_signs/textures/street_signs_font_15px_8f.png new file mode 100644 index 0000000..845f51c Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_8f.png differ diff --git a/street_signs/textures/street_signs_font_15px_90.png b/street_signs/textures/street_signs_font_15px_90.png new file mode 100644 index 0000000..bafc851 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_90.png differ diff --git a/street_signs/textures/street_signs_font_15px_91.png b/street_signs/textures/street_signs_font_15px_91.png new file mode 100644 index 0000000..f5d2462 Binary files /dev/null and b/street_signs/textures/street_signs_font_15px_91.png differ diff --git a/street_signs/textures/street_signs_font_31px_81.png b/street_signs/textures/street_signs_font_31px_81.png new file mode 100644 index 0000000..d44b0cc Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_81.png differ diff --git a/street_signs/textures/street_signs_font_31px_82.png b/street_signs/textures/street_signs_font_31px_82.png new file mode 100644 index 0000000..665b9c4 Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_82.png differ diff --git a/street_signs/textures/street_signs_font_31px_83.png b/street_signs/textures/street_signs_font_31px_83.png new file mode 100644 index 0000000..8c28c96 Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_83.png differ diff --git a/street_signs/textures/street_signs_font_31px_84.png b/street_signs/textures/street_signs_font_31px_84.png new file mode 100644 index 0000000..67a557b Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_84.png differ diff --git a/street_signs/textures/street_signs_font_31px_85.png b/street_signs/textures/street_signs_font_31px_85.png new file mode 100644 index 0000000..9844dcb Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_85.png differ diff --git a/street_signs/textures/street_signs_font_31px_86.png b/street_signs/textures/street_signs_font_31px_86.png new file mode 100644 index 0000000..a1c90cb Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_86.png differ diff --git a/street_signs/textures/street_signs_font_31px_87.png b/street_signs/textures/street_signs_font_31px_87.png new file mode 100644 index 0000000..0632b15 Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_87.png differ diff --git a/street_signs/textures/street_signs_font_31px_88.png b/street_signs/textures/street_signs_font_31px_88.png new file mode 100644 index 0000000..7568730 Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_88.png differ diff --git a/street_signs/textures/street_signs_font_31px_8a.png b/street_signs/textures/street_signs_font_31px_8a.png new file mode 100644 index 0000000..e38280e Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_8a.png differ diff --git a/street_signs/textures/street_signs_font_31px_8b.png b/street_signs/textures/street_signs_font_31px_8b.png new file mode 100644 index 0000000..7b6c97c Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_8b.png differ diff --git a/street_signs/textures/street_signs_font_31px_8c.png b/street_signs/textures/street_signs_font_31px_8c.png new file mode 100644 index 0000000..fa08fba Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_8c.png differ diff --git a/street_signs/textures/street_signs_font_31px_8d.png b/street_signs/textures/street_signs_font_31px_8d.png new file mode 100644 index 0000000..f4e0f71 Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_8d.png differ diff --git a/street_signs/textures/street_signs_font_31px_8e.png b/street_signs/textures/street_signs_font_31px_8e.png new file mode 100644 index 0000000..d546346 Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_8e.png differ diff --git a/street_signs/textures/street_signs_font_31px_8f.png b/street_signs/textures/street_signs_font_31px_8f.png new file mode 100644 index 0000000..726b7c1 Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_8f.png differ diff --git a/street_signs/textures/street_signs_font_31px_90.png b/street_signs/textures/street_signs_font_31px_90.png new file mode 100644 index 0000000..c920165 Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_90.png differ diff --git a/street_signs/textures/street_signs_font_31px_91.png b/street_signs/textures/street_signs_font_31px_91.png new file mode 100644 index 0000000..c3a3934 Binary files /dev/null and b/street_signs/textures/street_signs_font_31px_91.png differ -- cgit v1.2.3