From 0ed24f1d6a37692804f44ce13d0dbd3afd2bef8d Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Tue, 25 Sep 2018 22:18:13 -0400 Subject: [PATCH] update street signs --- street_signs/init.lua | 54 ++++++++++++++++-- .../street_signs_warning_3_line_inv.png | Bin 0 -> 2378 bytes .../street_signs_warning_4_line_inv.png | Bin 0 -> 2107 bytes .../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 diff --git a/street_signs/init.lua b/street_signs/init.lua index 9b96b691..f9336bd6 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 = 10, + 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 = 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 0000000000000000000000000000000000000000..3fd5276b60a06e047f8b36bdb0c2cda696db34fe GIT binary patch literal 2378 zcmV-Q3AOf#P)IkPGT0xyVJ=%8Xc${@zSM6qJXFGe&c2;$r zt98e&r*_AeQ?;GC?RZw-3R2JmA}~;?h!I01$V*UOlJK4vlDj{U5J&?{ErX98$TKoHH+A?&VPPXm`@e}ld@6&?dkjhd9AXJX8XU8-VncM zYslKUvjry~cN$-^Sg>+loL{yyoK)2{3lyDN?XwGDSbSJ8@6e@UZFsPlB8(=QsJhoD zUX&CPny@B)Iu<1Op`g4=5;x2D(DqmS*T%<4iKjXR#uHD|zIcynTzkU$XNFg@ngkW(ZA5jv)sQYJ! z3$4c{lLY|a!{gXT!mG?i0>zfw`|&A!_;!-hXVj{?t;e=-h9M9D3d*`9%TxUiZGRQ` zUjO|~R4WaLmQW}z!0A0qMgqy)%ulYMa48OE zhVYRPGY!YjwLsTnL0AxlrOyXBckZ!!hbcq?$(H!~<~|%eS%(wn8cU1P)s{?=PgV=dcPVFSOy<*(PYajiWw)+^M%7M@j@P zJ(G!b0?CGW01)_6;F4xssnDWNPlHFAkrd|-E|-IbmOkwMT#owDRO9g3R;SYiZixq%a?evn8)JZ4(Jap zT5z$b6E|Iq1k%%Wp6%goB#@r2^WKEe>jDIFvf^*awV0V%hz~wjfJ>T@wlH|y>t2rp zC)I)Teb0H<*9kgFTom7Koxpik#gB!sa5RK9b7SKOYeVFXmjV`s1@k_=R6KR@3lhYz zRIh&OAgoTG4jMo~xlWR`B;ersOw)tib+}8#M9m_?XYkh4*7rvw#R{f8^S9($B)@VU z0I>J17`*@Uxd4EYTOE-7v>X8N^}z*Ln;}7EjRyb7ZNk-xHpE7W@ban%$|noJU5dx!fu_N=&;UgO zgomQuR#b2QAabugLe91u)@xPw4ftn%2R?qM4?8x+*+E_R%W^cgo2}OrjT)RS)F9;3 zS`-{xhQwHZmp1<-hk%6!2x4dr#JN|epw;ch3v*@*+HT7GakWAV(;)M&=}B^gY(P*EA@--Gdi@C{{PN8h-UvZcnupfTI3^dEXbB6A#sfot}g+JXS85 z25IEz-CpYa=_9kQ8`&yfEK=LF&i$OW(krSp6N+DzCRR5-GHl&@wBvl8s-7Oz7Ozv) z5B}*3oY=KF5IM4d{g;ZhVgPs{MGP**tT8M|5Zhf73Pw8g0|P_3ZZ^|6bGgHMea_k< zr_a1`S2Mo&p_$*h_ejTiWrK=#*bo_lpgGZ?HtfuniM9EqI*&wxAK(6U1jhkmw-#dv? zUfZHXVOm~^j!$xc$S_}!9KyTe-JJPJ0T_mGufg}uJSnd&IZ>FFSJK5NIkXi5O?z%f z$+Y-M0kDmPdDcjWdOG6 zkR;``r8w|}r&&BB0Bnsh$&n{a5rVV*JQLy>128rcm@1K;oO#9pFuhJ-LpUN_aO@m%CU)0ptYIuun@osm7m>TghQu4L6 w!jxGveKJ7PgY_+j%g4U%zRkAy{|^BF1yYqv4#n#%b^rhX07*qoM6N<$g7*7&NdN!< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6336cb942bc938f807ab75c2892723c03776d968 GIT binary patch literal 2107 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 literal 0 HcmV?d00001 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 2ebb2f41d2ad190cdbe28d2a55189aae2e06d8bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1056 zcmV+*1mF9KP)rAnNw1plQSfD`ZZRX5H&kMA_-+Y(AZTl zzOt;a4FFJTLb~8?SeiV-f z1wp$467XfE+@0Qj!CYFRW1=y_434gpG&qf|4vWs~nWZZMWr6P#PPV!a!L^IW;7qL% z!mI1>VK8iJa2i`26*{kX)-WCvc;ghOA-9qDZ#Asdi``HpnUM# z^H)v@C^!6W31P|-PzmsINLsJ4O4gNq07V%dk%GvW-OK^!V z0hJ1W;EEJc0xB7vMkS!q;iZ;3zQ0?&fNcZTm#N91-+0sa zd47?#RazPI39fx?a@FE;6l)GXaSAyW+FOr8MHvUaz?#)jS=a^uz;YZ1gg`-@0O$~a z(H{HuVE~Y2AWi@nX7i^3?5Jm)_!pzkYO9MEzKpEGyH5hd)`{lWqp>)=7~o-IW(}&! z^)nN`=-aI!_@bGac442QB_bbiOzb6SMBseu7VV|;3dh#jX1^AE z<^!MHYCf z0`|scQvD9 a0f0Y8t-1ykV2bbn0000