From a71ae8e01314d0653f785a022a898636cdf54424 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Rollo Date: Sat, 13 Jan 2018 12:38:55 +0100 Subject: Version 1.0 --- signs_road/README.md | 2 +- signs_road/nodes.lua | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'signs_road') diff --git a/signs_road/README.md b/signs_road/README.md index 2343ea9..0a2f685 100644 --- a/signs_road/README.md +++ b/signs_road/README.md @@ -2,7 +2,7 @@ This mod provides road signs with text display. Text is locked if area is protected. -For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?f=11&t=13563) at the Minetest forums. +For more information, see the [forum topic](https://forum.minetest.net/viewtopic.php?t=19365) at the Minetest forums. **Dependancies**: default, display\_lib, font\_lib, signs diff --git a/signs_road/nodes.lua b/signs_road/nodes.lua index c5d92b6..b167db8 100644 --- a/signs_road/nodes.lua +++ b/signs_road/nodes.lua @@ -27,7 +27,7 @@ local models = { width = 14/16, height = 12/16, entity_fields = { - resolution = { x = 144, y = 64 }, + resolution = { x = 11, y = 5.5 }, maxlines = 3, color = "#fff", }, @@ -44,7 +44,7 @@ local models = { width = 64/16, height = 12/16, entity_fields = { - resolution = { x = 30, y = 20 }, + resolution = { x = 2.5, y = 1.5 }, maxlines = 1, color = "#000", }, @@ -63,7 +63,7 @@ local models = { width = 1, height = 7/16, entity_fields = { - resolution = { x = 96, y = 64 }, + resolution = { x = 8, y = 4 }, maxlines = 1, color = "#000", }, @@ -80,7 +80,7 @@ local models = { width = 1, height = 7/16, entity_fields = { - resolution = { x = 96, y = 64 }, + resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#000", }, @@ -97,7 +97,7 @@ local models = { width = 1, height = 7/16, entity_fields = { - resolution = { x = 96, y = 64 }, + resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#fff", }, @@ -114,7 +114,7 @@ local models = { width = 1, height = 7/16, entity_fields = { - resolution = { x = 96, y = 64 }, + resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#000", }, @@ -131,7 +131,7 @@ local models = { width = 1, height = 0.5, entity_fields = { - resolution = { x = 96, y = 64 }, + resolution = { x = 7, y = 5 }, maxlines = 1, color = "#000", }, @@ -151,7 +151,7 @@ local models = { width = 1, height = 0.5, entity_fields = { - resolution = { x = 96, y = 64 }, + resolution = { x = 7, y = 5 }, maxlines = 1, color = "#000", }, @@ -176,7 +176,7 @@ local models = { entity_fields = { right = -3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, + resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#fff", }, @@ -200,7 +200,7 @@ local models = { entity_fields = { right = 3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, + resolution = { x = 9, y = 5.5 }, maxlines = 2, color="#fff", }, @@ -226,7 +226,7 @@ local models = { entity_fields = { right = -3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, + resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#000", }, @@ -250,7 +250,7 @@ local models = { entity_fields = { right = 3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, + resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#000", }, @@ -276,7 +276,7 @@ local models = { entity_fields = { right = -3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, + resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#000", }, @@ -300,7 +300,7 @@ local models = { entity_fields = { right = 3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 112, y = 64 }, + resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#000", }, -- cgit v1.2.3 From 60e80180c61ad2d851a6f6794c73b5b3b6d002b8 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Rollo Date: Sun, 28 Jan 2018 19:08:07 +0100 Subject: Copyright notices update --- signs_road/copyright.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'signs_road') diff --git a/signs_road/copyright.txt b/signs_road/copyright.txt index c53bf3d..bb7adc8 100644 --- a/signs_road/copyright.txt +++ b/signs_road/copyright.txt @@ -1,5 +1,9 @@ Code, Textures and Models by Pierre-Yves Rollo (pyrollo) -intllib support (i18n) by fat115 +intllib support (i18n) by (fat115) intllib fallback code and tools by Diego Martínez (kaeza) -Extra contributors : (gpcf) - +Extra contributors: +(gpcf) +(Thomas--S) +Translations: +Muhammad Nur Hidayat Yasuyoshi (MuhdNurHidayat) +(fat115) -- cgit v1.2.3 From f3970f641eb60bf92492b6715084273cc1bceb74 Mon Sep 17 00:00:00 2001 From: Thomas--S Date: Thu, 1 Feb 2018 16:54:55 +0100 Subject: Seperate signs API from signs definitions Change modnames from *_lib to *_api --- signs_road/compatibility.lua | 6 +++--- signs_road/depends.txt | 6 +++--- signs_road/nodes.lua | 48 ++++++++++++++++++++++---------------------- 3 files changed, 30 insertions(+), 30 deletions(-) (limited to 'signs_road') diff --git a/signs_road/compatibility.lua b/signs_road/compatibility.lua index fa5f94b..9e6b29b 100644 --- a/signs_road/compatibility.lua +++ b/signs_road/compatibility.lua @@ -45,9 +45,9 @@ local function compatibility_check(pos, node) node.name = convert_nodes[node.name] if node.name then node.param2 = wallmounted_to_facedir[node.param2] - display_lib.on_destruct(pos) + display_api.on_destruct(pos) minetest.swap_node(pos, node) - display_lib.on_construct(pos) + display_api.on_construct(pos) end end @@ -69,7 +69,7 @@ local function compatibility_check_2(pos, node) end end -- Create new entity - display_lib.update_entities(pos) + display_api.update_entities(pos) end minetest.register_lbm({ name = "signs_road:conpatibility_2", diff --git a/signs_road/depends.txt b/signs_road/depends.txt index 730e727..eeb3b01 100644 --- a/signs_road/depends.txt +++ b/signs_road/depends.txt @@ -1,6 +1,6 @@ default intllib? dye -display_lib -font_lib -signs +display_api +font_api +signs_api diff --git a/signs_road/nodes.lua b/signs_road/nodes.lua index b167db8..c4c0b04 100644 --- a/signs_road/nodes.lua +++ b/signs_road/nodes.lua @@ -131,7 +131,7 @@ local models = { width = 1, height = 0.5, entity_fields = { - resolution = { x = 7, y = 5 }, + resolution = { x = 7, y = 5 }, maxlines = 1, color = "#000", }, @@ -142,8 +142,8 @@ local models = { "signs_road_sides.png", "signs_road_black_dir_right.png" }, inventory_image = "signs_road_black_dir_inventory.png", signs_other_dir = "signs_road:black_left_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, }, }, black_left_sign = { @@ -164,8 +164,8 @@ local models = { signs_other_dir = "signs_road:black_right_sign", groups = { not_in_creative_inventory = 1 }, drop = "signs_road:black_right_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, }, }, @@ -174,7 +174,7 @@ local models = { width = 14/16, height = 7/16, entity_fields = { - right = -3/32, + right = -3/32, size = { x = 12/16, y = 6/16 }, resolution = { x = 9, y = 5.5 }, maxlines = 2, @@ -185,8 +185,8 @@ local models = { tiles = { "signs_road_green_direction.png" }, inventory_image = "signs_road_green_dir_inventory.png", signs_other_dir = "signs_road:green_left_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_right.obj", selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, @@ -198,7 +198,7 @@ local models = { width = 14/16, height = 7/16, entity_fields = { - right = 3/32, + right = 3/32, size = { x = 12/16, y = 6/16 }, resolution = { x = 9, y = 5.5 }, maxlines = 2, @@ -209,8 +209,8 @@ local models = { tiles = { "signs_road_green_direction.png" }, inventory_image = "signs_road_green_dir_inventory.png", signs_other_dir = "signs_road:green_right_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_left.obj", selection_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, @@ -224,7 +224,7 @@ local models = { width = 14/16, height = 7/16, entity_fields = { - right = -3/32, + right = -3/32, size = { x = 12/16, y = 6/16 }, resolution = { x = 9, y = 5.5 }, maxlines = 2, @@ -235,8 +235,8 @@ local models = { tiles = { "signs_road_yellow_direction.png" }, inventory_image = "signs_road_yellow_dir_inventory.png", signs_other_dir = "signs_road:yellow_left_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_right.obj", selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, @@ -248,7 +248,7 @@ local models = { width = 14/16, height = 7/16, entity_fields = { - right = 3/32, + right = 3/32, size = { x = 12/16, y = 6/16 }, resolution = { x = 9, y = 5.5 }, maxlines = 2, @@ -259,8 +259,8 @@ local models = { tiles = { "signs_road_yellow_direction.png" }, inventory_image = "signs_road_yellow_dir_inventory.png", signs_other_dir = "signs_road:yellow_right_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_left.obj", selection_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, @@ -274,7 +274,7 @@ local models = { width = 14/16, height = 7/16, entity_fields = { - right = -3/32, + right = -3/32, size = { x = 12/16, y = 6/16 }, resolution = { x = 9, y = 5.5 }, maxlines = 2, @@ -285,8 +285,8 @@ local models = { tiles = { "signs_road_white_direction.png" }, inventory_image = "signs_road_white_dir_inventory.png", signs_other_dir = "signs_road:white_left_sign", - on_place = signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_right.obj", selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, @@ -298,7 +298,7 @@ local models = { width = 14/16, height = 7/16, entity_fields = { - right = 3/32, + right = 3/32, size = { x = 12/16, y = 6/16 }, resolution = { x = 9, y = 5.5 }, maxlines = 2, @@ -309,8 +309,8 @@ local models = { tiles = { "signs_road_white_direction.png" }, inventory_image = "signs_road_white_dir_inventory.png", signs_other_dir = "signs_road:white_right_sign", - on_place=signs.on_place_direction, - on_rightclick = signs.on_right_click_direction, + on_place=signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_left.obj", selection_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, @@ -324,7 +324,7 @@ local models = { -- Node registration for name, model in pairs(models) do - signs.register_sign("signs_road", name, model) + signs_api.register_sign("signs_road", name, model) end -- cgit v1.2.3 From 8c7557e45d4744fe35ad058950062cf771640126 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Rollo Date: Fri, 13 Jul 2018 20:41:53 +0200 Subject: Rework all nodes displaying text according to new font_api --- signs_road/nodes.lua | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'signs_road') diff --git a/signs_road/nodes.lua b/signs_road/nodes.lua index c4c0b04..ab95b2b 100644 --- a/signs_road/nodes.lua +++ b/signs_road/nodes.lua @@ -27,7 +27,7 @@ local models = { width = 14/16, height = 12/16, entity_fields = { - resolution = { x = 11, y = 5.5 }, + size = { x = 14/16, y = 10/16 }, maxlines = 3, color = "#fff", }, @@ -44,7 +44,6 @@ local models = { width = 64/16, height = 12/16, entity_fields = { - resolution = { x = 2.5, y = 1.5 }, maxlines = 1, color = "#000", }, @@ -57,13 +56,12 @@ local models = { inventory_image = "signs_road_white.png", }, }, - red_street_sign = { depth = 1/16, width = 1, height = 7/16, entity_fields = { - resolution = { x = 8, y = 4 }, + size = { x = 1, y = 4/16 }, maxlines = 1, color = "#000", }, @@ -80,7 +78,7 @@ local models = { width = 1, height = 7/16, entity_fields = { - resolution = { x = 9, y = 5.5 }, + size = { x = 1, y = 6/16 }, maxlines = 2, color = "#000", }, @@ -97,7 +95,7 @@ local models = { width = 1, height = 7/16, entity_fields = { - resolution = { x = 9, y = 5.5 }, + size = { x = 1, y = 6/16 }, maxlines = 2, color = "#fff", }, @@ -114,7 +112,7 @@ local models = { width = 1, height = 7/16, entity_fields = { - resolution = { x = 9, y = 5.5 }, + size = { x = 1, y = 6/16 }, maxlines = 2, color = "#000", }, @@ -131,7 +129,8 @@ local models = { width = 1, height = 0.5, entity_fields = { - resolution = { x = 7, y = 5 }, + aspect_ratio = 3/4, + size = { x = 1, y = 3/16 }, maxlines = 1, color = "#000", }, @@ -151,7 +150,8 @@ local models = { width = 1, height = 0.5, entity_fields = { - resolution = { x = 7, y = 5 }, + aspect_ratio = 3/4, + size = { x = 1, y = 3/16 }, maxlines = 1, color = "#000", }, @@ -176,7 +176,6 @@ local models = { entity_fields = { right = -3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#fff", }, @@ -200,7 +199,6 @@ local models = { entity_fields = { right = 3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 9, y = 5.5 }, maxlines = 2, color="#fff", }, @@ -226,7 +224,6 @@ local models = { entity_fields = { right = -3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#000", }, @@ -250,7 +247,6 @@ local models = { entity_fields = { right = 3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#000", }, @@ -266,7 +262,7 @@ local models = { selection_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, collision_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, groups = { not_in_creative_inventory = 1 }, - drop = "signs_road:yellow_left_sign", + drop = "signs_road:yellow_right_sign", }, }, white_right_sign = { @@ -276,7 +272,6 @@ local models = { entity_fields = { right = -3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#000", }, @@ -300,7 +295,6 @@ local models = { entity_fields = { right = 3/32, size = { x = 12/16, y = 6/16 }, - resolution = { x = 9, y = 5.5 }, maxlines = 2, color = "#000", }, -- cgit v1.2.3 From 125cae3300ce8a66e470fcb0414d76e587edabd6 Mon Sep 17 00:00:00 2001 From: 12Me21 Date: Sun, 7 Oct 2018 00:32:12 -0400 Subject: Fixes collision boxes on right directional signs --- signs_road/nodes.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'signs_road') diff --git a/signs_road/nodes.lua b/signs_road/nodes.lua index ab95b2b..b560e96 100644 --- a/signs_road/nodes.lua +++ b/signs_road/nodes.lua @@ -189,7 +189,7 @@ local models = { drawtype = "mesh", mesh = "signs_dir_right.obj", selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, - collision_box = { type = "fixed", fixed = { -0,5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, }, }, green_left_sign = { @@ -237,7 +237,7 @@ local models = { drawtype = "mesh", mesh = "signs_dir_right.obj", selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, - collision_box = { type = "fixed", fixed = { -0,5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, }, }, yellow_left_sign = { @@ -285,7 +285,7 @@ local models = { drawtype = "mesh", mesh = "signs_dir_right.obj", selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, - collision_box = { type = "fixed", fixed = { -0,5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, }, }, white_left_sign = { -- cgit v1.2.3 From 52eb47626adc56c7fa188e1bae2c98ee1c98a723 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Rollo Date: Mon, 26 Nov 2018 20:14:20 +0100 Subject: Update SVG files --- signs_road/svg/green_street.svg | 108 --------- signs_road/svg/signs_blue_street.svg | 139 ----------- signs_road/svg/signs_green_direction.svg | 168 -------------- signs_road/svg/signs_road_black_direction.svg | 172 -------------- signs_road/svg/signs_road_direction.svg | 316 ++++++++++++++++++++++++++ signs_road/svg/signs_road_rectangle.svg | 188 +++++++++++++++ signs_road/svg/signs_road_red.svg | 123 ---------- signs_road/svg/signs_road_street_blue.svg | 139 +++++++++++ signs_road/svg/signs_yellow_direction.svg | 168 -------------- signs_road/svg/white_street.svg | 110 --------- signs_road/svg/yellow_street.svg | 108 --------- 11 files changed, 643 insertions(+), 1096 deletions(-) delete mode 100644 signs_road/svg/green_street.svg delete mode 100644 signs_road/svg/signs_blue_street.svg delete mode 100644 signs_road/svg/signs_green_direction.svg delete mode 100644 signs_road/svg/signs_road_black_direction.svg create mode 100644 signs_road/svg/signs_road_direction.svg create mode 100644 signs_road/svg/signs_road_rectangle.svg delete mode 100644 signs_road/svg/signs_road_red.svg create mode 100644 signs_road/svg/signs_road_street_blue.svg delete mode 100644 signs_road/svg/signs_yellow_direction.svg delete mode 100644 signs_road/svg/white_street.svg delete mode 100644 signs_road/svg/yellow_street.svg (limited to 'signs_road') diff --git a/signs_road/svg/green_street.svg b/signs_road/svg/green_street.svg deleted file mode 100644 index 89d8474..0000000 --- a/signs_road/svg/green_street.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/signs_road/svg/signs_blue_street.svg b/signs_road/svg/signs_blue_street.svg deleted file mode 100644 index 0aa87ff..0000000 --- a/signs_road/svg/signs_blue_street.svg +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/signs_road/svg/signs_green_direction.svg b/signs_road/svg/signs_green_direction.svg deleted file mode 100644 index 3cdbc77..0000000 --- a/signs_road/svg/signs_green_direction.svg +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/signs_road/svg/signs_road_black_direction.svg b/signs_road/svg/signs_road_black_direction.svg deleted file mode 100644 index f513524..0000000 --- a/signs_road/svg/signs_road_black_direction.svg +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/signs_road/svg/signs_road_direction.svg b/signs_road/svg/signs_road_direction.svg new file mode 100644 index 0000000..665146b --- /dev/null +++ b/signs_road/svg/signs_road_direction.svg @@ -0,0 +1,316 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/signs_road/svg/signs_road_rectangle.svg b/signs_road/svg/signs_road_rectangle.svg new file mode 100644 index 0000000..3dad58d --- /dev/null +++ b/signs_road/svg/signs_road_rectangle.svg @@ -0,0 +1,188 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/signs_road/svg/signs_road_red.svg b/signs_road/svg/signs_road_red.svg deleted file mode 100644 index 513b970..0000000 --- a/signs_road/svg/signs_road_red.svg +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/signs_road/svg/signs_road_street_blue.svg b/signs_road/svg/signs_road_street_blue.svg new file mode 100644 index 0000000..0aa87ff --- /dev/null +++ b/signs_road/svg/signs_road_street_blue.svg @@ -0,0 +1,139 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/signs_road/svg/signs_yellow_direction.svg b/signs_road/svg/signs_yellow_direction.svg deleted file mode 100644 index 1414a5c..0000000 --- a/signs_road/svg/signs_yellow_direction.svg +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/signs_road/svg/white_street.svg b/signs_road/svg/white_street.svg deleted file mode 100644 index f33bc02..0000000 --- a/signs_road/svg/white_street.svg +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/signs_road/svg/yellow_street.svg b/signs_road/svg/yellow_street.svg deleted file mode 100644 index ea26f30..0000000 --- a/signs_road/svg/yellow_street.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - -- cgit v1.2.3 From ba5b7aee52af1280fdb3c019bba3b5b92c001e96 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Rollo Date: Mon, 26 Nov 2018 21:05:58 +0100 Subject: Red and blue signs, node names tidy up --- signs_road/compatibility.lua | 7 +- signs_road/crafts.lua | 130 +++++++++++-- signs_road/nodes.lua | 207 +++++++++++++++++---- signs_road/textures/signs_road_blue.png | Bin 436 -> 302 bytes .../textures/signs_road_blue_dir_inventory.png | Bin 0 -> 377 bytes signs_road/textures/signs_road_blue_direction.png | Bin 0 -> 1108 bytes signs_road/textures/signs_road_blue_street.png | Bin 0 -> 436 bytes signs_road/textures/signs_road_red.png | Bin 0 -> 282 bytes .../textures/signs_road_red_dir_inventory.png | Bin 0 -> 289 bytes signs_road/textures/signs_road_red_direction.png | Bin 0 -> 1071 bytes 10 files changed, 284 insertions(+), 60 deletions(-) create mode 100644 signs_road/textures/signs_road_blue_dir_inventory.png create mode 100644 signs_road/textures/signs_road_blue_direction.png create mode 100644 signs_road/textures/signs_road_blue_street.png create mode 100644 signs_road/textures/signs_road_red.png create mode 100644 signs_road/textures/signs_road_red_dir_inventory.png create mode 100644 signs_road/textures/signs_road_red_direction.png (limited to 'signs_road') diff --git a/signs_road/compatibility.lua b/signs_road/compatibility.lua index 9e6b29b..5fb673a 100644 --- a/signs_road/compatibility.lua +++ b/signs_road/compatibility.lua @@ -22,7 +22,7 @@ ------------------------------------ local wallmounted_to_facedir = { - [0]=1, -- Should not happend with signs + [0]=1, -- Should not happend with signs [1]=1, -- Should not happend with signs [2]=1, [3]=3, @@ -82,4 +82,9 @@ minetest.register_lbm({ name = "signs_road:conpatibility_2", action = compatibility_check_2, }) +-- Node name tidy up +-------------------- +minetest.register_alias("signs_road:green_street_sign", "signs_road:green_sign") +minetest.register_alias("signs_road:yellow_street_sign", "signs_road:yellow_sign") +minetest.register_alias("signs_road:white_street_sign", "signs_road:white_sign") diff --git a/signs_road/crafts.lua b/signs_road/crafts.lua index 3c15437..314a91a 100644 --- a/signs_road/crafts.lua +++ b/signs_road/crafts.lua @@ -19,57 +19,54 @@ along with signs_road. If not, see . --]] +-- Standard rectangle signs + minetest.register_craft({ - output = 'signs_road:blue_street_sign 2', + output = 'signs_road:white_sign 2', recipe = { - {'dye:blue', 'dye:white', ''}, + {'dye:white', 'dye:black', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) minetest.register_craft({ - output = 'signs_road:red_street_sign 2', + output = 'signs_road:blue_sign 2', recipe = { - {'dye:white', 'dye:red', ''}, + {'dye:blue', 'dye:white', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) minetest.register_craft({ - output = 'signs_road:white_street_sign 2', + output = 'signs_road:green_sign 2', recipe = { - {'dye:white', 'dye:black', ''}, + {'dye:green', 'dye:white', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) minetest.register_craft({ - type = "shapeless", - output = 'signs_road:large_street_sign', - recipe = {'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign'}, -}) - -minetest.register_craft({ - output = 'signs_road:green_street_sign 2', + output = 'signs_road:yellow_sign 2', recipe = { - {'dye:green', 'dye:white', ''}, + {'dye:yellow', 'dye:black', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) minetest.register_craft({ - output = 'signs_road:yellow_street_sign 2', + output = 'signs_road:red_sign 2', recipe = { - {'dye:yellow', 'dye:black', ''}, + {'dye:red', 'dye:white', ''}, {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, {'', '', ''}, } }) +-- Standard direction signs minetest.register_craft({ output = 'signs_road:black_right_sign 2', @@ -80,6 +77,24 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'signs_road:white_right_sign 2', + recipe = { + {'dye:white', 'dye:black', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot', ''}, + {'', '', ''}, + } +}) + +minetest.register_craft({ + output = 'signs_road:blue_right_sign 2', + recipe = { + {'dye:blue', 'dye:white', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot', ''}, + {'', '', ''}, + } +}) + minetest.register_craft({ output = 'signs_road:green_right_sign 2', recipe = { @@ -92,18 +107,95 @@ minetest.register_craft({ minetest.register_craft({ output = 'signs_road:yellow_right_sign 2', recipe = { - {'dye:yellow', 'dye:white', 'default:steel_ingot'}, + {'dye:yellow', 'dye:black', 'default:steel_ingot'}, {'default:steel_ingot', 'default:steel_ingot', ''}, {'', '', ''}, } }) minetest.register_craft({ - output = 'signs_road:white_right_sign 2', + output = 'signs_road:red_right_sign 2', recipe = { - {'dye:white', 'dye:black', 'default:steel_ingot'}, + {'dye:red', 'dye:white', 'default:steel_ingot'}, {'default:steel_ingot', 'default:steel_ingot', ''}, {'', '', ''}, } }) +-- Transform Rectangle <-> Direction + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:white_right_sign', + recipe = {'signs_road:white_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:white_sign', + recipe = {'signs_road:white_right_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:blue_right_sign', + recipe = {'signs_road:blue_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:blue_sign', + recipe = {'signs_road:blue_right_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:green_right_sign', + recipe = {'signs_road:green_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:green_sign', + recipe = {'signs_road:green_right_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:yellow_right_sign', + recipe = {'signs_road:yellow_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:yellow_sign', + recipe = {'signs_road:yellow_right_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:red_right_sign', + recipe = {'signs_road:red_sign'}, +}) + +minetest.register_craft({ + type = 'shapeless', output = 'signs_road:red_sign', + recipe = {'signs_road:red_right_sign'}, +}) + +-- Various signs + +minetest.register_craft({ + output = 'signs_road:blue_street_sign 4', + recipe = { + {'dye:blue', 'dye:white', 'dye:blue'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + } +}) + +minetest.register_craft({ + output = 'signs_road:red_street_sign 2', + recipe = { + {'dye:white', 'dye:red', 'dye:black'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'', '', ''}, + } +}) + +minetest.register_craft({ + type = "shapeless", + output = 'signs_road:large_street_sign', + recipe = {'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign', 'signs_road:white_street_sign'}, +}) diff --git a/signs_road/nodes.lua b/signs_road/nodes.lua index b560e96..74eca23 100644 --- a/signs_road/nodes.lua +++ b/signs_road/nodes.lua @@ -33,10 +33,10 @@ local models = { }, node_fields = { description = S("Blue street sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_blue.png" }, - inventory_image = "signs_road_blue.png", + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_blue_street.png" }, + inventory_image = "signs_road_blue_street.png", }, }, large_street_sign = { @@ -50,8 +50,8 @@ local models = { node_fields = { visual_scale = 1, description = S("Large banner"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_large_white.png" }, inventory_image = "signs_road_white.png", }, @@ -67,13 +67,13 @@ local models = { }, node_fields = { description = S("Red and white town sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_red_white.png" }, inventory_image="signs_road_red_white.png", }, }, - white_street_sign = { + white_sign = { depth = 1/16, width = 1, height = 7/16, @@ -84,13 +84,13 @@ local models = { }, node_fields = { description = S("White street sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_white.png" }, inventory_image = "signs_road_white.png", }, }, - green_street_sign = { + blue_sign = { depth = 1/16, width = 1, height = 7/16, @@ -100,14 +100,31 @@ local models = { color = "#fff", }, node_fields = { - description = S("Green street sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + description = S("Blue road sign"), + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_blue.png" }, + inventory_image = "signs_road_blue.png", + }, + }, + green_sign = { + depth = 1/16, + width = 1, + height = 7/16, + entity_fields = { + size = { x = 1, y = 6/16 }, + maxlines = 2, + color = "#fff", + }, + node_fields = { + description = S("Green road sign"), + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_green.png" }, inventory_image = "signs_road_green.png", }, }, - yellow_street_sign = { + yellow_sign = { depth = 1/16, width = 1, height = 7/16, @@ -117,13 +134,30 @@ local models = { color = "#000", }, node_fields = { - description = S("Yellow street sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + description = S("Yellow road sign"), + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_yellow.png" }, inventory_image="signs_road_yellow.png", }, }, + red_sign = { + depth = 1/16, + width = 1, + height = 7/16, + entity_fields = { + size = { x = 1, y = 6/16 }, + maxlines = 2, + color = "#fff", + }, + node_fields = { + description = S("Red road sign"), + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_red.png" }, + inventory_image = "signs_road_red.png", + }, + }, black_right_sign = { depth = 1/32, width = 1, @@ -136,8 +170,8 @@ local models = { }, node_fields = { description = S("Black direction sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_black_dir_right.png" }, inventory_image = "signs_road_black_dir_inventory.png", signs_other_dir = "signs_road:black_left_sign", @@ -157,8 +191,8 @@ local models = { }, node_fields = { description = S("Black direction sign"), - tiles = { "signs_road_sides.png", "signs_road_sides.png", - "signs_road_sides.png", "signs_road_sides.png", + tiles = { "signs_road_sides.png", "signs_road_sides.png", + "signs_road_sides.png", "signs_road_sides.png", "signs_road_sides.png", "signs_road_black_dir_left.png" }, inventory_image = "signs_road_black_dir_inventory.png", signs_other_dir = "signs_road:black_right_sign", @@ -168,7 +202,102 @@ local models = { on_rightclick = signs_api.on_right_click_direction, }, }, - + white_right_sign = { + depth = 1/16, + width = 14/16, + height = 7/16, + entity_fields = { + right = -3/32, + size = { x = 12/16, y = 6/16 }, + maxlines = 2, + color = "#000", + }, + node_fields = { + description = S("White direction sign"), + tiles = { "signs_road_white_direction.png" }, + inventory_image = "signs_road_white_dir_inventory.png", + signs_other_dir = "signs_road:white_left_sign", + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, + drawtype = "mesh", + mesh = "signs_dir_right.obj", + selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + }, + }, + white_left_sign = { + depth = 1/16, + width = 14/16, + height = 7/16, + entity_fields = { + right = 3/32, + size = { x = 12/16, y = 6/16 }, + maxlines = 2, + color = "#000", + }, + node_fields = { + description = S("White direction sign"), + tiles = { "signs_road_white_direction.png" }, + inventory_image = "signs_road_white_dir_inventory.png", + signs_other_dir = "signs_road:white_right_sign", + on_place=signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, + drawtype = "mesh", + mesh = "signs_dir_left.obj", + selection_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, + groups = { not_in_creative_inventory = 1 }, + drop = "signs_road:white_right_sign", + }, + }, + blue_right_sign = { + depth = 1/16, + width = 14/16, + height = 7/16, + entity_fields = { + right = -3/32, + size = { x = 12/16, y = 6/16 }, + maxlines = 2, + color = "#fff", + }, + node_fields = { + description = S("Blue direction sign"), + tiles = { "signs_road_blue_direction.png" }, + inventory_image = "signs_road_blue_dir_inventory.png", + signs_other_dir = "signs_road:blue_left_sign", + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, + drawtype = "mesh", + mesh = "signs_dir_right.obj", + selection_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, + }, + }, + blue_left_sign = { + depth = 1/16, + width = 14/16, + height = 7/16, + entity_fields = { + right = 3/32, + size = { x = 12/16, y = 6/16 }, + maxlines = 2, + color="#fff", + }, + node_fields = { + description = S("Blue direction sign"), + tiles = { "signs_road_blue_direction.png" }, + inventory_image = "signs_road_blue_dir_inventory.png", + signs_other_dir = "signs_road:blue_right_sign", + on_place = signs_api.on_place_direction, + on_rightclick = signs_api.on_right_click_direction, + drawtype = "mesh", + mesh = "signs_dir_left.obj", + selection_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, + collision_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, + groups = { not_in_creative_inventory = 1 }, + drop = "signs_road:blue_right_sign", + }, + }, green_right_sign = { depth = 1/16, width = 14/16, @@ -265,7 +394,7 @@ local models = { drop = "signs_road:yellow_right_sign", }, }, - white_right_sign = { + red_right_sign = { depth = 1/16, width = 14/16, height = 7/16, @@ -273,13 +402,13 @@ local models = { right = -3/32, size = { x = 12/16, y = 6/16 }, maxlines = 2, - color = "#000", + color = "#fff", }, node_fields = { - description = S("White direction sign"), - tiles = { "signs_road_white_direction.png" }, - inventory_image = "signs_road_white_dir_inventory.png", - signs_other_dir = "signs_road:white_left_sign", + description = S("Red direction sign"), + tiles = { "signs_road_red_direction.png" }, + inventory_image = "signs_road_red_dir_inventory.png", + signs_other_dir = "signs_road:red_left_sign", on_place = signs_api.on_place_direction, on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", @@ -288,7 +417,7 @@ local models = { collision_box = { type = "fixed", fixed = { -0.5, -7/32, 0.5, 7/16, 7/32, 7/16 } }, }, }, - white_left_sign = { + red_left_sign = { depth = 1/16, width = 14/16, height = 7/16, @@ -296,21 +425,21 @@ local models = { right = 3/32, size = { x = 12/16, y = 6/16 }, maxlines = 2, - color = "#000", + color = "#fff", }, node_fields = { - description = S("White direction sign"), - tiles = { "signs_road_white_direction.png" }, - inventory_image = "signs_road_white_dir_inventory.png", - signs_other_dir = "signs_road:white_right_sign", - on_place=signs_api.on_place_direction, + description = S("Red direction sign"), + tiles = { "signs_road_red_direction.png" }, + inventory_image = "signs_road_red_dir_inventory.png", + signs_other_dir = "signs_road:red_right_sign", + on_place = signs_api.on_place_direction, on_rightclick = signs_api.on_right_click_direction, drawtype = "mesh", mesh = "signs_dir_left.obj", selection_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, collision_box = { type = "fixed", fixed = { -7/16, -7/32, 0.5, 0.5, 7/32, 7/16 } }, groups = { not_in_creative_inventory = 1 }, - drop = "signs_road:white_right_sign", + drop = "signs_road:red_right_sign", }, }, } @@ -320,5 +449,3 @@ for name, model in pairs(models) do signs_api.register_sign("signs_road", name, model) end - - diff --git a/signs_road/textures/signs_road_blue.png b/signs_road/textures/signs_road_blue.png index 540a390..51dc83b 100644 Binary files a/signs_road/textures/signs_road_blue.png and b/signs_road/textures/signs_road_blue.png differ diff --git a/signs_road/textures/signs_road_blue_dir_inventory.png b/signs_road/textures/signs_road_blue_dir_inventory.png new file mode 100644 index 0000000..426c997 Binary files /dev/null and b/signs_road/textures/signs_road_blue_dir_inventory.png differ diff --git a/signs_road/textures/signs_road_blue_direction.png b/signs_road/textures/signs_road_blue_direction.png new file mode 100644 index 0000000..bba2b00 Binary files /dev/null and b/signs_road/textures/signs_road_blue_direction.png differ diff --git a/signs_road/textures/signs_road_blue_street.png b/signs_road/textures/signs_road_blue_street.png new file mode 100644 index 0000000..540a390 Binary files /dev/null and b/signs_road/textures/signs_road_blue_street.png differ diff --git a/signs_road/textures/signs_road_red.png b/signs_road/textures/signs_road_red.png new file mode 100644 index 0000000..5614f6f Binary files /dev/null and b/signs_road/textures/signs_road_red.png differ diff --git a/signs_road/textures/signs_road_red_dir_inventory.png b/signs_road/textures/signs_road_red_dir_inventory.png new file mode 100644 index 0000000..4d9d559 Binary files /dev/null and b/signs_road/textures/signs_road_red_dir_inventory.png differ diff --git a/signs_road/textures/signs_road_red_direction.png b/signs_road/textures/signs_road_red_direction.png new file mode 100644 index 0000000..632a925 Binary files /dev/null and b/signs_road/textures/signs_road_red_direction.png differ -- cgit v1.2.3