From 0df7fcd05444feb8545c9acccf3c8e7ca018f137 Mon Sep 17 00:00:00 2001 From: webdesigner97 Date: Sat, 12 Oct 2013 11:54:52 +0200 Subject: Improved selectionbox --- trafficlight/init.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'trafficlight') diff --git a/trafficlight/init.lua b/trafficlight/init.lua index 768c26a..1d3049d 100644 --- a/trafficlight/init.lua +++ b/trafficlight/init.lua @@ -17,12 +17,6 @@ minetest.register_node(":streets:trafficlight_bottom",{ {-0.1,0.25,-0.1,0.1,0.5,0.1} } }, - selection_box = { - type = "fixed", - fixed = { - {-0.25,-0.5,-0.25,0.25,2.5,0.25}, - } - } }) minetest.register_node(":streets:trafficlight_middle",{ @@ -54,6 +48,13 @@ minetest.register_node(":streets:trafficlight_controller",{ {-0.05,0.5,-0.05,0.05,1.6,0.05} } }, + selection_box = { + type = "fixed", + fixed = { + {-0.5,-0.5,-0.5,0.5,0.5,0.5}, + {-0.5,1.5,-0.5,0.5,4.5,0.5} + } + }, on_receive_fields = function(pos, formname, fields, sender) minetest.get_meta(pos):set_string("channel", fields.channel) end, -- cgit v1.2.3 From 5508d85d407282c391336bdcb8937a26f21e8c6d Mon Sep 17 00:00:00 2001 From: webdesigner97 Date: Wed, 16 Oct 2013 10:10:19 +0200 Subject: Lightened code --- asphaltstairs/function.lua | 56 ---------------------------------------------- asphaltstairs/init.lua | 5 ++--- concretestairs/init.lua | 2 +- emergencyphone/init.lua | 44 +++++++++++++++++------------------- labels/init.lua | 2 -- trafficlight/init.lua | 5 +---- 6 files changed, 25 insertions(+), 89 deletions(-) delete mode 100644 asphaltstairs/function.lua (limited to 'trafficlight') diff --git a/asphaltstairs/function.lua b/asphaltstairs/function.lua deleted file mode 100644 index 9879d4c..0000000 --- a/asphaltstairs/function.lua +++ /dev/null @@ -1,56 +0,0 @@ --- StreetsMod needs a special slab definition, so it needs its own register_stair_and_slab -streets.register_stair_and_slab = function(node,desc,tile,item) - minetest.register_node(":streets:"..node.."_stair",{ - description = desc.."stair", - groups = {cracky = 3}, - tiles = tile, - paramtype = "light", - paramtype2 = "facedir", - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - {-0.5, 0, 0, 0.5, 0.5, 0.5} - } - } - }) - minetest.register_node(":streets:"..node.."_slab",{ - description = desc.." slab", - groups = {cracky = 3}, - tiles = tile, - paramtype = "light", - paramtype2 = "facedir", - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0, 0.5}, - } - } - }) - minetest.register_craft({ - output = "streets:"..node.."_stair 4", - recipe = { - {"","",item}, - {"",item,item}, - {item,item,item} - } - }) - minetest.register_craft({ - output = "streets:"..node.."_stair 4", - recipe = { - {item,"",""}, - {item,item,""}, - {item,item,item} - } - }) - minetest.register_craft({ - output = "streets:"..node.."_slab 3", - recipe = { - {"","",""}, - {"","",""}, - {item,item,item} - } - }) -end \ No newline at end of file diff --git a/asphaltstairs/init.lua b/asphaltstairs/init.lua index 7c1c181..aae9e22 100644 --- a/asphaltstairs/init.lua +++ b/asphaltstairs/init.lua @@ -1,7 +1,7 @@ --[[ StreetsMod: Asphalt stairs ]] -if streets.extendedBy.moreblocks == true then +if type(register_stair_slab_panel_micro) ~= "function" then return end -- Asphalt register_stair_slab_panel_micro("streets", "asphalt", "streets:asphalt", {cracky=3}, {"streets_asphalt.png"}, "Asphalt", "asphalt", nil) minetest.register_alias("streets:asphalt_stair","stairs:stair_asphalt") @@ -224,5 +224,4 @@ if streets.extendedBy.moreblocks == true then type = "shapeless", output = "streets:asphalt_side_l", recipe = {"streets:asphalt_side_r"} - }) -end \ No newline at end of file + }) \ No newline at end of file diff --git a/concretestairs/init.lua b/concretestairs/init.lua index 4cd3efd..b3000fa 100644 --- a/concretestairs/init.lua +++ b/concretestairs/init.lua @@ -1,7 +1,7 @@ --[[ StreetsMod: Concrete stairs (compatible to circular saw) ]] -if streets.extendedBy.moreblocks == true and streets.extendedBy.prefab == false then +if type(register_stair_slab_panel_mirco) == "function" and streets.extendedBy.prefab == false then register_stair_slab_panel_micro("streets", "concrete", "streets:concrete", {cracky=2}, {"streets_concrete.png"}, "Concrete", "concrete", nil) table.insert(circular_saw.known_stairs,"streets:concrete") minetest.register_alias("stairs:stair_concrete","streets:stair_concrete") diff --git a/emergencyphone/init.lua b/emergencyphone/init.lua index 90124a8..2dc818f 100644 --- a/emergencyphone/init.lua +++ b/emergencyphone/init.lua @@ -1,27 +1,25 @@ --[[ StreetsMod: Emergency Phone ]] -if streets.extendedBy.wool == true then - minetest.register_node(":streets:emergencyphone",{ - description = "Emergency Phone", - tiles = {"streets_sos_top.png","streets_sos_bottom.png","streets_sos_side.png","streets_sos_side.png","streets_sos_side.png","streets_sos_front.png"}, - groups = {cracky = 3}, - paramtype2 = "facedir", - light_source = 5, - on_rightclick = function(pos,node,clicker) - if clicker:is_player() and clicker:get_hp() < 6 then - clicker:set_hp(6) - minetest.log("action",clicker:get_player_name() .. " healed by emergency phone at pos (" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ")") - end +minetest.register_node(":streets:emergencyphone",{ + description = "Emergency Phone", + tiles = {"streets_sos_top.png","streets_sos_bottom.png","streets_sos_side.png","streets_sos_side.png","streets_sos_side.png","streets_sos_front.png"}, + groups = {cracky = 3}, + paramtype2 = "facedir", + light_source = 5, + on_rightclick = function(pos,node,clicker) + if clicker:is_player() and clicker:get_hp() < 6 then + clicker:set_hp(6) + minetest.log("action",clicker:get_player_name() .. " healed by emergency phone at pos (" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ")") end - }) - minetest.register_alias("streets:emergency_phone","streets:emergencyphone") - minetest.register_craft({ - output = "streets:emergencyphone", - recipe = { - {"wool:orange","default:torch","wool:orange"}, - {"wool:orange","default:apple","wool:orange"}, - {"default:steel_ingot","default:diamondblock","default:steel_ingot"} - } - }) -end \ No newline at end of file + end + }) + minetest.register_alias("streets:emergency_phone","streets:emergencyphone") +minetest.register_craft({ + output = "streets:emergencyphone", + recipe = { + {"wool:orange","default:torch","wool:orange"}, + {"wool:orange","default:apple","wool:orange"}, + {"default:steel_ingot","default:diamondblock","default:steel_ingot"} + } +}) \ No newline at end of file diff --git a/labels/init.lua b/labels/init.lua index 5e59a3c..d53b7af 100644 --- a/labels/init.lua +++ b/labels/init.lua @@ -1,8 +1,6 @@ --[[ StreetsMod: All kinds of asphalt with labels ]] -if streets.extendedBy.wool == false then return end --- minetest.register_node(":streets:asphalt_sideline",{ description = "Asphalt with sideline", groups = {cracky=3}, diff --git a/trafficlight/init.lua b/trafficlight/init.lua index 1d3049d..44e463a 100644 --- a/trafficlight/init.lua +++ b/trafficlight/init.lua @@ -1,7 +1,6 @@ --[[ StreetsMod: inDev Trafficlights ]] -if streets.extendedBy.mesecons and streets.extendedBy.digilines then minetest.register_node(":streets:trafficlight_bottom",{ description = "Cheater", groups = {not_in_creative_inventory = 1}, @@ -224,6 +223,4 @@ minetest.register_node(":streets:trafficlight_top_warn",{ }, pointable = false, light_source = 6, -}) - -end \ No newline at end of file +}) \ No newline at end of file -- cgit v1.2.3 From 114d1b173cd318e1a80d276b67b8d70362547a1b Mon Sep 17 00:00:00 2001 From: webdesigner97 Date: Sat, 19 Oct 2013 14:49:06 +0200 Subject: Added drop = '' to some nodes --- roadsigns/pole.lua | 3 ++- streetlamps/init.lua | 4 ++++ trafficlight/init.lua | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) (limited to 'trafficlight') diff --git a/roadsigns/pole.lua b/roadsigns/pole.lua index 8f2f7ba..478afb9 100644 --- a/roadsigns/pole.lua +++ b/roadsigns/pole.lua @@ -48,7 +48,8 @@ minetest.register_node(":streets:pole_top",{ paramtype = "light", paramtype2 = "facedir", drawtype = "nodebox", - can_dig = function(pos,player) + drop = "", + can_dig = function() return false end, node_box = { diff --git a/streetlamps/init.lua b/streetlamps/init.lua index d813de9..ac08cde 100644 --- a/streetlamps/init.lua +++ b/streetlamps/init.lua @@ -39,6 +39,7 @@ minetest.register_node(":streets:streetlamp_basic_controller",{ end }) minetest.register_node(":streets:streetlamp_basic_bottom",{ + drop = "", description = "Street lamp", tiles = {"streets_lamps_basic_bottom.png"}, groups = {cracky = 1}, @@ -59,6 +60,7 @@ minetest.register_node(":streets:streetlamp_basic_bottom",{ end }) minetest.register_node(":streets:streetlamp_basic_middle",{ + drop = "", description = "U cheater U", groups = {cracky = 1, not_in_creative_inventory = 1}, tiles = {"streets_lamps_basic_middle.png"}, @@ -73,6 +75,7 @@ minetest.register_node(":streets:streetlamp_basic_middle",{ } }) minetest.register_node(":streets:streetlamp_basic_top_off",{ + drop = "", description = "U cheater U", groups = {cracky = 1, not_in_creative_inventory = 1}, paramtype = "light", @@ -87,6 +90,7 @@ minetest.register_node(":streets:streetlamp_basic_top_off",{ } }) minetest.register_node(":streets:streetlamp_basic_top_on",{ + drop = "", description = "U cheater U", groups = {cracky = 1, not_in_creative_inventory = 1}, tiles = {"streets_lamps_basic_top_top.png","streets_lamps_basic_top_top.png","streets_lamps_basic_top.png","streets_lamps_basic_top.png","streets_lamps_basic_top.png","streets_lamps_basic_top.png"}, diff --git a/trafficlight/init.lua b/trafficlight/init.lua index 44e463a..48d7a62 100644 --- a/trafficlight/init.lua +++ b/trafficlight/init.lua @@ -3,6 +3,7 @@ ]] minetest.register_node(":streets:trafficlight_bottom",{ description = "Cheater", + drop = "", groups = {not_in_creative_inventory = 1}, paramtype = "light", paramtype2 = "facedir", @@ -20,6 +21,7 @@ minetest.register_node(":streets:trafficlight_bottom",{ minetest.register_node(":streets:trafficlight_middle",{ description = "Cheater!", + drop = "", groups = {cracky = 1, not_in_creative_inventory = 1}, paramtype = "light", drawtype = "nodebox", @@ -117,6 +119,7 @@ minetest.register_node(":streets:trafficlight_controller",{ minetest.register_node(":streets:trafficlight_top_off",{ description = "U cheater U", + drop = "", groups = {cracky = 1, not_in_creative_inventory = 1}, paramtype = "light", paramtype2 = "facedir", @@ -134,6 +137,7 @@ minetest.register_node(":streets:trafficlight_top_off",{ minetest.register_node(":streets:trafficlight_top_red",{ description = "U cheater U", + drop = "", groups = {cracky = 1, not_in_creative_inventory = 1}, paramtype = "light", paramtype2 = "facedir", @@ -152,6 +156,7 @@ minetest.register_node(":streets:trafficlight_top_red",{ minetest.register_node(":streets:trafficlight_top_yellow",{ description = "U cheater U", + drop = "", groups = {cracky = 1, not_in_creative_inventory = 1}, paramtype = "light", paramtype2 = "facedir", @@ -170,6 +175,7 @@ minetest.register_node(":streets:trafficlight_top_yellow",{ minetest.register_node(":streets:trafficlight_top_redyellow",{ description = "U cheater U", + drop = "", groups = {cracky = 1, not_in_creative_inventory = 1}, paramtype = "light", paramtype2 = "facedir", @@ -188,6 +194,7 @@ minetest.register_node(":streets:trafficlight_top_redyellow",{ minetest.register_node(":streets:trafficlight_top_green",{ description = "U cheater U", + drop = "", groups = {cracky = 1, not_in_creative_inventory = 1}, paramtype = "light", paramtype2 = "facedir", @@ -206,6 +213,7 @@ minetest.register_node(":streets:trafficlight_top_green",{ minetest.register_node(":streets:trafficlight_top_warn",{ description = "U cheater U", + drop = "", groups = {cracky = 1, not_in_creative_inventory = 1}, paramtype = "light", paramtype2 = "facedir", -- cgit v1.2.3 From b5b9527658e7388bb17091d7269ffdf0ecae66b1 Mon Sep 17 00:00:00 2001 From: webdesigner97 Date: Sun, 24 Nov 2013 13:39:08 +0100 Subject: recipe --- trafficlight/init.lua | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'trafficlight') diff --git a/trafficlight/init.lua b/trafficlight/init.lua index 48d7a62..b3c8835 100644 --- a/trafficlight/init.lua +++ b/trafficlight/init.lua @@ -231,4 +231,13 @@ minetest.register_node(":streets:trafficlight_top_warn",{ }, pointable = false, light_source = 6, +}) + +minetest.register_craft({ + output = "streets:trafficlight_controller", + recipe = { + {"dye:red","",""}, + {"dye:yellow","",""}, + {"dye:green","",""} + } }) \ No newline at end of file -- cgit v1.2.3 From a88b2dcfd60e86205d562b8ba9c402f9345e5ee9 Mon Sep 17 00:00:00 2001 From: webdesigner97 Date: Sun, 24 Nov 2013 19:52:14 +0100 Subject: crafts and inv images --- roadsigns/workshop.lua | 9 +++++++++ streetlamps/init.lua | 1 + streetlamps/textures/streets_lamps_basi_inv.png | Bin 0 -> 4210 bytes trafficlight/init.lua | 1 + trafficlight/textures/streets_trafficlight_inv.png | Bin 0 -> 2772 bytes 5 files changed, 11 insertions(+) create mode 100644 streetlamps/textures/streets_lamps_basi_inv.png create mode 100644 trafficlight/textures/streets_trafficlight_inv.png (limited to 'trafficlight') diff --git a/roadsigns/workshop.lua b/roadsigns/workshop.lua index e5dc0d6..9c68fb7 100644 --- a/roadsigns/workshop.lua +++ b/roadsigns/workshop.lua @@ -135,4 +135,13 @@ minetest.register_node(":streets:signworkshop",{ end end end +}) + +minetest.register_craft({ + output = "streets:signworkshop", + recipe = { + {"default:steel_ingot","default:glass","default:steel_ingot"}, + {"default:steel_ingot","default:diamond","default:steel_ingot"}, + {"default:cobble","default:cobble","default:cobble"} + } }) \ No newline at end of file diff --git a/streetlamps/init.lua b/streetlamps/init.lua index 597dd54..a139104 100644 --- a/streetlamps/init.lua +++ b/streetlamps/init.lua @@ -43,6 +43,7 @@ minetest.register_node(":streets:streetlamp_basic_bottom",{ drop = "", description = "Street lamp", tiles = {"streets_lamps_basic_bottom.png"}, + inventory_image = "streets_lamps_basi_inv.png", groups = {cracky = 1}, paramtype = "light", drawtype = "nodebox", diff --git a/streetlamps/textures/streets_lamps_basi_inv.png b/streetlamps/textures/streets_lamps_basi_inv.png new file mode 100644 index 0000000..5c31236 Binary files /dev/null and b/streetlamps/textures/streets_lamps_basi_inv.png differ diff --git a/trafficlight/init.lua b/trafficlight/init.lua index b3c8835..68a818e 100644 --- a/trafficlight/init.lua +++ b/trafficlight/init.lua @@ -38,6 +38,7 @@ minetest.register_node(":streets:trafficlight_middle",{ minetest.register_node(":streets:trafficlight_controller",{ description = "Trafficlight", + inventory_image = "streets_trafficlight_inv.png", tiles = {"streets_lampcontroller_top.png","streets_lampcontroller_bottom.png","streets_lampcontroller_sides.png"}, groups = {cracky = 1}, drawtype = "nodebox", diff --git a/trafficlight/textures/streets_trafficlight_inv.png b/trafficlight/textures/streets_trafficlight_inv.png new file mode 100644 index 0000000..fb76b72 Binary files /dev/null and b/trafficlight/textures/streets_trafficlight_inv.png differ -- cgit v1.2.3 From 4fab78d25b26bb9111aa5d5da0511c8395f0c5ca Mon Sep 17 00:00:00 2001 From: webdesigner97 Date: Sun, 24 Nov 2013 20:09:24 +0100 Subject: misc and screenshot --- screenshot.png | Bin 1085475 -> 818904 bytes trafficlight/init.lua | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'trafficlight') diff --git a/screenshot.png b/screenshot.png index 501435e..d9bf232 100644 Binary files a/screenshot.png and b/screenshot.png differ diff --git a/trafficlight/init.lua b/trafficlight/init.lua index 68a818e..3eaa43a 100644 --- a/trafficlight/init.lua +++ b/trafficlight/init.lua @@ -54,7 +54,7 @@ minetest.register_node(":streets:trafficlight_controller",{ type = "fixed", fixed = { {-0.5,-0.5,-0.5,0.5,0.5,0.5}, - {-0.5,1.5,-0.5,0.5,4.5,0.5} + {-0.3,1.5,-0.3,0.3,4.5,0.3} } }, on_receive_fields = function(pos, formname, fields, sender) -- cgit v1.2.3