diff options
| author | Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com> | 2018-10-09 07:50:37 -0400 |
|---|---|---|
| committer | Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com> | 2018-10-09 07:50:37 -0400 |
| commit | 0d094bed13f1700ea2ef1924ecf089c9d96dda83 (patch) | |
| tree | 8c9ef6fda2d7484e3998a98c0e1556e9ee291a19 | |
| parent | 69ae9cccb6e4dac0a50b3287a2c12b9daa3292b2 (diff) | |
| download | dreambuilder_modpack-0d094bed13f1700ea2ef1924ecf089c9d96dda83.tar dreambuilder_modpack-0d094bed13f1700ea2ef1924ecf089c9d96dda83.tar.gz dreambuilder_modpack-0d094bed13f1700ea2ef1924ecf089c9d96dda83.tar.bz2 dreambuilder_modpack-0d094bed13f1700ea2ef1924ecf089c9d96dda83.tar.xz dreambuilder_modpack-0d094bed13f1700ea2ef1924ecf089c9d96dda83.zip | |
update street_signs, signs_lib, and unifieddyes
52 files changed, 85 insertions, 2 deletions
diff --git a/signs_lib/init.lua b/signs_lib/init.lua index 5d44b2c..eb78b67 100644 --- a/signs_lib/init.lua +++ b/signs_lib/init.lua @@ -387,6 +387,24 @@ local function make_line_texture(line, lineno, pos) 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/signs_lib/textures/hdf_81.png b/signs_lib/textures/hdf_81.png Binary files differnew file mode 100644 index 0000000..df38787 --- /dev/null +++ b/signs_lib/textures/hdf_81.png diff --git a/signs_lib/textures/hdf_82.png b/signs_lib/textures/hdf_82.png Binary files differnew file mode 100644 index 0000000..e769d35 --- /dev/null +++ b/signs_lib/textures/hdf_82.png diff --git a/signs_lib/textures/hdf_83.png b/signs_lib/textures/hdf_83.png Binary files differnew file mode 100644 index 0000000..7c8c59a --- /dev/null +++ b/signs_lib/textures/hdf_83.png diff --git a/signs_lib/textures/hdf_84.png b/signs_lib/textures/hdf_84.png Binary files differnew file mode 100644 index 0000000..9af1a9b --- /dev/null +++ b/signs_lib/textures/hdf_84.png diff --git a/signs_lib/textures/hdf_85.png b/signs_lib/textures/hdf_85.png Binary files differnew file mode 100644 index 0000000..a83d4c3 --- /dev/null +++ b/signs_lib/textures/hdf_85.png diff --git a/signs_lib/textures/hdf_86.png b/signs_lib/textures/hdf_86.png Binary files differnew file mode 100644 index 0000000..7ca6698 --- /dev/null +++ b/signs_lib/textures/hdf_86.png diff --git a/signs_lib/textures/hdf_87.png b/signs_lib/textures/hdf_87.png Binary files differnew file mode 100644 index 0000000..2b0eba0 --- /dev/null +++ b/signs_lib/textures/hdf_87.png diff --git a/signs_lib/textures/hdf_88.png b/signs_lib/textures/hdf_88.png Binary files differnew file mode 100644 index 0000000..ebab336 --- /dev/null +++ b/signs_lib/textures/hdf_88.png diff --git a/signs_lib/textures/hdf_8a.png b/signs_lib/textures/hdf_8a.png Binary files differnew file mode 100644 index 0000000..eeac2a1 --- /dev/null +++ b/signs_lib/textures/hdf_8a.png diff --git a/signs_lib/textures/hdf_8b.png b/signs_lib/textures/hdf_8b.png Binary files differnew file mode 100644 index 0000000..35681f0 --- /dev/null +++ b/signs_lib/textures/hdf_8b.png diff --git a/signs_lib/textures/hdf_8c.png b/signs_lib/textures/hdf_8c.png Binary files differnew file mode 100644 index 0000000..bbcd100 --- /dev/null +++ b/signs_lib/textures/hdf_8c.png diff --git a/signs_lib/textures/hdf_8d.png b/signs_lib/textures/hdf_8d.png Binary files differnew file mode 100644 index 0000000..e280cd9 --- /dev/null +++ b/signs_lib/textures/hdf_8d.png diff --git a/signs_lib/textures/hdf_8e.png b/signs_lib/textures/hdf_8e.png Binary files differnew file mode 100644 index 0000000..c97a758 --- /dev/null +++ b/signs_lib/textures/hdf_8e.png diff --git a/signs_lib/textures/hdf_8f.png b/signs_lib/textures/hdf_8f.png Binary files differnew file mode 100644 index 0000000..845f51c --- /dev/null +++ b/signs_lib/textures/hdf_8f.png diff --git a/signs_lib/textures/hdf_90.png b/signs_lib/textures/hdf_90.png Binary files differnew file mode 100644 index 0000000..bafc851 --- /dev/null +++ b/signs_lib/textures/hdf_90.png diff --git a/signs_lib/textures/hdf_91.png b/signs_lib/textures/hdf_91.png Binary files differnew file mode 100644 index 0000000..f5d2462 --- /dev/null +++ b/signs_lib/textures/hdf_91.png 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 Binary files differnew file mode 100644 index 0000000..df38787 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_81.png diff --git a/street_signs/textures/street_signs_font_15px_82.png b/street_signs/textures/street_signs_font_15px_82.png Binary files differnew file mode 100644 index 0000000..e769d35 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_82.png diff --git a/street_signs/textures/street_signs_font_15px_83.png b/street_signs/textures/street_signs_font_15px_83.png Binary files differnew file mode 100644 index 0000000..7c8c59a --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_83.png diff --git a/street_signs/textures/street_signs_font_15px_84.png b/street_signs/textures/street_signs_font_15px_84.png Binary files differnew file mode 100644 index 0000000..9af1a9b --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_84.png diff --git a/street_signs/textures/street_signs_font_15px_85.png b/street_signs/textures/street_signs_font_15px_85.png Binary files differnew file mode 100644 index 0000000..a83d4c3 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_85.png diff --git a/street_signs/textures/street_signs_font_15px_86.png b/street_signs/textures/street_signs_font_15px_86.png Binary files differnew file mode 100644 index 0000000..7ca6698 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_86.png diff --git a/street_signs/textures/street_signs_font_15px_87.png b/street_signs/textures/street_signs_font_15px_87.png Binary files differnew file mode 100644 index 0000000..2b0eba0 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_87.png diff --git a/street_signs/textures/street_signs_font_15px_88.png b/street_signs/textures/street_signs_font_15px_88.png Binary files differnew file mode 100644 index 0000000..ebab336 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_88.png diff --git a/street_signs/textures/street_signs_font_15px_8a.png b/street_signs/textures/street_signs_font_15px_8a.png Binary files differnew file mode 100644 index 0000000..eeac2a1 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_8a.png diff --git a/street_signs/textures/street_signs_font_15px_8b.png b/street_signs/textures/street_signs_font_15px_8b.png Binary files differnew file mode 100644 index 0000000..35681f0 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_8b.png diff --git a/street_signs/textures/street_signs_font_15px_8c.png b/street_signs/textures/street_signs_font_15px_8c.png Binary files differnew file mode 100644 index 0000000..bbcd100 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_8c.png diff --git a/street_signs/textures/street_signs_font_15px_8d.png b/street_signs/textures/street_signs_font_15px_8d.png Binary files differnew file mode 100644 index 0000000..e280cd9 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_8d.png diff --git a/street_signs/textures/street_signs_font_15px_8e.png b/street_signs/textures/street_signs_font_15px_8e.png Binary files differnew file mode 100644 index 0000000..c97a758 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_8e.png diff --git a/street_signs/textures/street_signs_font_15px_8f.png b/street_signs/textures/street_signs_font_15px_8f.png Binary files differnew file mode 100644 index 0000000..845f51c --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_8f.png diff --git a/street_signs/textures/street_signs_font_15px_90.png b/street_signs/textures/street_signs_font_15px_90.png Binary files differnew file mode 100644 index 0000000..bafc851 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_90.png diff --git a/street_signs/textures/street_signs_font_15px_91.png b/street_signs/textures/street_signs_font_15px_91.png Binary files differnew file mode 100644 index 0000000..f5d2462 --- /dev/null +++ b/street_signs/textures/street_signs_font_15px_91.png diff --git a/street_signs/textures/street_signs_font_31px_81.png b/street_signs/textures/street_signs_font_31px_81.png Binary files differnew file mode 100644 index 0000000..d44b0cc --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_81.png diff --git a/street_signs/textures/street_signs_font_31px_82.png b/street_signs/textures/street_signs_font_31px_82.png Binary files differnew file mode 100644 index 0000000..665b9c4 --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_82.png diff --git a/street_signs/textures/street_signs_font_31px_83.png b/street_signs/textures/street_signs_font_31px_83.png Binary files differnew file mode 100644 index 0000000..8c28c96 --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_83.png diff --git a/street_signs/textures/street_signs_font_31px_84.png b/street_signs/textures/street_signs_font_31px_84.png Binary files differnew file mode 100644 index 0000000..67a557b --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_84.png diff --git a/street_signs/textures/street_signs_font_31px_85.png b/street_signs/textures/street_signs_font_31px_85.png Binary files differnew file mode 100644 index 0000000..9844dcb --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_85.png diff --git a/street_signs/textures/street_signs_font_31px_86.png b/street_signs/textures/street_signs_font_31px_86.png Binary files differnew file mode 100644 index 0000000..a1c90cb --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_86.png diff --git a/street_signs/textures/street_signs_font_31px_87.png b/street_signs/textures/street_signs_font_31px_87.png Binary files differnew file mode 100644 index 0000000..0632b15 --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_87.png diff --git a/street_signs/textures/street_signs_font_31px_88.png b/street_signs/textures/street_signs_font_31px_88.png Binary files differnew file mode 100644 index 0000000..7568730 --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_88.png diff --git a/street_signs/textures/street_signs_font_31px_8a.png b/street_signs/textures/street_signs_font_31px_8a.png Binary files differnew file mode 100644 index 0000000..e38280e --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_8a.png diff --git a/street_signs/textures/street_signs_font_31px_8b.png b/street_signs/textures/street_signs_font_31px_8b.png Binary files differnew file mode 100644 index 0000000..7b6c97c --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_8b.png diff --git a/street_signs/textures/street_signs_font_31px_8c.png b/street_signs/textures/street_signs_font_31px_8c.png Binary files differnew file mode 100644 index 0000000..fa08fba --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_8c.png diff --git a/street_signs/textures/street_signs_font_31px_8d.png b/street_signs/textures/street_signs_font_31px_8d.png Binary files differnew file mode 100644 index 0000000..f4e0f71 --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_8d.png diff --git a/street_signs/textures/street_signs_font_31px_8e.png b/street_signs/textures/street_signs_font_31px_8e.png Binary files differnew file mode 100644 index 0000000..d546346 --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_8e.png diff --git a/street_signs/textures/street_signs_font_31px_8f.png b/street_signs/textures/street_signs_font_31px_8f.png Binary files differnew file mode 100644 index 0000000..726b7c1 --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_8f.png diff --git a/street_signs/textures/street_signs_font_31px_90.png b/street_signs/textures/street_signs_font_31px_90.png Binary files differnew file mode 100644 index 0000000..c920165 --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_90.png diff --git a/street_signs/textures/street_signs_font_31px_91.png b/street_signs/textures/street_signs_font_31px_91.png Binary files differnew file mode 100644 index 0000000..c3a3934 --- /dev/null +++ b/street_signs/textures/street_signs_font_31px_91.png diff --git a/unifieddyes/init.lua b/unifieddyes/init.lua index 47f8384..838d67e 100644 --- a/unifieddyes/init.lua +++ b/unifieddyes/init.lua @@ -99,6 +99,14 @@ unifieddyes.VALS = { "dark_" } +unifieddyes.VALS_SPLIT = { + "faint_", + "light_", + "", + "medium_", + "dark_" +} + unifieddyes.VALS_EXTENDED = { "faint_", "pastel_", @@ -282,7 +290,7 @@ end function unifieddyes.register_color_craft(craft) local hues_table = unifieddyes.HUES_EXTENDED local sats_table = unifieddyes.SATS - local vals_table = unifieddyes.VALS + local vals_table = unifieddyes.VALS_SPLIT local greys_table = unifieddyes.GREYS if craft.palette == "wallmounted" then |
