From: Novatux Date: Tue, 31 Dec 2013 09:12:25 +0000 (+0100) Subject: Fix indentation and coding style X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=27f3a8ab3158e37c02ba476bf0114fe8ffc9345c;p=zefram%2Fminetest%2Fpipeworks.git Fix indentation and coding style --- diff --git a/tubes.lua b/tubes.lua index 9a24782..feb3711 100644 --- a/tubes.lua +++ b/tubes.lua @@ -1,6 +1,6 @@ -- This file supplies the various kinds of pneumatic tubes -pipeworks.tubenodes={} +pipeworks.tubenodes = {} minetest.register_alias("pipeworks:tube", "pipeworks:tube_000000") @@ -215,333 +215,334 @@ end -- now let's actually call that function to get the real work done! -local noctr_textures={"pipeworks_tube_noctr.png","pipeworks_tube_noctr.png","pipeworks_tube_noctr.png", - "pipeworks_tube_noctr.png","pipeworks_tube_noctr.png","pipeworks_tube_noctr.png"} -local plain_textures={"pipeworks_tube_plain.png","pipeworks_tube_plain.png","pipeworks_tube_plain.png", - "pipeworks_tube_plain.png","pipeworks_tube_plain.png","pipeworks_tube_plain.png"} -local end_textures={"pipeworks_tube_end.png","pipeworks_tube_end.png","pipeworks_tube_end.png", - "pipeworks_tube_end.png","pipeworks_tube_end.png","pipeworks_tube_end.png"} -local short_texture="pipeworks_tube_short.png" -local inv_texture="pipeworks_tube_inv.png" +local noctr_textures = {"pipeworks_tube_noctr.png","pipeworks_tube_noctr.png","pipeworks_tube_noctr.png", + "pipeworks_tube_noctr.png","pipeworks_tube_noctr.png","pipeworks_tube_noctr.png"} +local plain_textures = {"pipeworks_tube_plain.png","pipeworks_tube_plain.png","pipeworks_tube_plain.png", + "pipeworks_tube_plain.png","pipeworks_tube_plain.png","pipeworks_tube_plain.png"} +local end_textures = {"pipeworks_tube_end.png","pipeworks_tube_end.png","pipeworks_tube_end.png", + "pipeworks_tube_end.png","pipeworks_tube_end.png","pipeworks_tube_end.png"} +local short_texture = "pipeworks_tube_short.png" +local inv_texture = "pipeworks_tube_inv.png" -pipeworks.register_tube("pipeworks:tube","Pneumatic tube segment",plain_textures,noctr_textures,end_textures,short_texture,inv_texture) - - -local mese_noctr_textures={"pipeworks_mese_tube_noctr_1.png","pipeworks_mese_tube_noctr_2.png","pipeworks_mese_tube_noctr_3.png", - "pipeworks_mese_tube_noctr_4.png","pipeworks_mese_tube_noctr_5.png","pipeworks_mese_tube_noctr_6.png"} -local mese_plain_textures={"pipeworks_mese_tube_plain_1.png","pipeworks_mese_tube_plain_2.png","pipeworks_mese_tube_plain_3.png", - "pipeworks_mese_tube_plain_4.png","pipeworks_mese_tube_plain_5.png","pipeworks_mese_tube_plain_6.png"} -local mese_end_textures={"pipeworks_mese_tube_end.png","pipeworks_mese_tube_end.png","pipeworks_mese_tube_end.png", - "pipeworks_mese_tube_end.png","pipeworks_mese_tube_end.png","pipeworks_mese_tube_end.png"} -local mese_short_texture="pipeworks_mese_tube_short.png" -local mese_inv_texture="pipeworks_mese_tube_inv.png" +pipeworks.register_tube("pipeworks:tube", "Pneumatic tube segment", plain_textures, noctr_textures, end_textures, short_texture, inv_texture) if pipeworks.enable_mese_tube then - pipeworks.register_tube("pipeworks:mese_tube","Mese pneumatic tube segment",mese_plain_textures,mese_noctr_textures, - mese_end_textures,mese_short_texture,mese_inv_texture, - {tube={can_go=function(pos,node,velocity,stack) - tbl={} - local meta=minetest.get_meta(pos) - local inv=meta:get_inventory() - local found=false - local name=stack:get_name() - for i,vect in ipairs(pipeworks.meseadjlist) do - if meta:get_int("l"..tostring(i).."s")==1 then - for _,st in ipairs(inv:get_list("line"..tostring(i))) do - if st:get_name()==name then - found=true - table.insert(tbl,vect) - end - end - end - end - if found==false then - for i,vect in ipairs(pipeworks.meseadjlist) do - if meta:get_int("l"..tostring(i).."s")==1 then - if inv:is_empty("line"..tostring(i)) then - table.insert(tbl,vect) - end - end - end - end - return tbl - end}, - on_construct = function(pos) - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - for i=1,6 do - meta:set_int("l"..tostring(i).."s",1) - inv:set_size("line"..tostring(i), 6*1) - end - meta:set_string("formspec", - "size[8,11]".. - "list[current_name;line1;1,0;6,1;]".. - "list[current_name;line2;1,1;6,1;]".. - "list[current_name;line3;1,2;6,1;]".. - "list[current_name;line4;1,3;6,1;]".. - "list[current_name;line5;1,4;6,1;]".. - "list[current_name;line6;1,5;6,1;]".. - "image[0,0;1,1;pipeworks_white.png]".. - "image[0,1;1,1;pipeworks_black.png]".. - "image[0,2;1,1;pipeworks_green.png]".. - "image[0,3;1,1;pipeworks_yellow.png]".. - "image[0,4;1,1;pipeworks_blue.png]".. - "image[0,5;1,1;pipeworks_red.png]".. - "button[7,0;1,1;button1;On]".. - "button[7,1;1,1;button2;On]".. - "button[7,2;1,1;button3;On]".. - "button[7,3;1,1;button4;On]".. - "button[7,4;1,1;button5;On]".. - "button[7,5;1,1;button6;On]".. - "list[current_player;main;0,7;8,4;]") - meta:set_string("infotext", "Mese pneumatic tube") - end, - on_receive_fields=function(pos,formname,fields,sender) - local meta=minetest.get_meta(pos) - local i - for key,_ in pairs(fields) do i=key end - if i==nil then return end - i=string.sub(i,-1) - newstate=1-meta:get_int("l"..i.."s") - meta:set_int("l"..i.."s",newstate) - local frm="size[8,11]".. - "list[current_name;line1;1,0;6,1;]".. - "list[current_name;line2;1,1;6,1;]".. - "list[current_name;line3;1,2;6,1;]".. - "list[current_name;line4;1,3;6,1;]".. - "list[current_name;line5;1,4;6,1;]".. - "list[current_name;line6;1,5;6,1;]".. - "image[0,0;1,1;pipeworks_white.png]".. - "image[0,1;1,1;pipeworks_black.png]".. - "image[0,2;1,1;pipeworks_green.png]".. - "image[0,3;1,1;pipeworks_yellow.png]".. - "image[0,4;1,1;pipeworks_blue.png]".. - "image[0,5;1,1;pipeworks_red.png]" - for i=1,6 do - local st=meta:get_int("l"..tostring(i).."s") - if st==0 then - frm=frm.."button[7,"..tostring(i-1)..";1,1;button"..tostring(i)..";Off]" - else - frm=frm.."button[7,"..tostring(i-1)..";1,1;button"..tostring(i)..";On]" - end - end - frm=frm.."list[current_player;main;0,7;8,4;]" - meta:set_string("formspec",frm) - end, - can_dig = function(pos,player) - local meta = minetest.get_meta(pos); - local inv = meta:get_inventory() - return (inv:is_empty("line1") and inv:is_empty("line2") and inv:is_empty("line3") and - inv:is_empty("line4") and inv:is_empty("line5") and inv:is_empty("line6")) - end - }, true) + local mese_noctr_textures = {"pipeworks_mese_tube_noctr_1.png","pipeworks_mese_tube_noctr_2.png","pipeworks_mese_tube_noctr_3.png", + "pipeworks_mese_tube_noctr_4.png","pipeworks_mese_tube_noctr_5.png","pipeworks_mese_tube_noctr_6.png"} + local mese_plain_textures = {"pipeworks_mese_tube_plain_1.png","pipeworks_mese_tube_plain_2.png","pipeworks_mese_tube_plain_3.png", + "pipeworks_mese_tube_plain_4.png","pipeworks_mese_tube_plain_5.png","pipeworks_mese_tube_plain_6.png"} + local mese_end_textures = {"pipeworks_mese_tube_end.png","pipeworks_mese_tube_end.png","pipeworks_mese_tube_end.png", + "pipeworks_mese_tube_end.png","pipeworks_mese_tube_end.png","pipeworks_mese_tube_end.png"} + local mese_short_texture = "pipeworks_mese_tube_short.png" + local mese_inv_texture = "pipeworks_mese_tube_inv.png" + pipeworks.register_tube("pipeworks:mese_tube", "Mese pneumatic tube segment", mese_plain_textures, mese_noctr_textures, + mese_end_textures, mese_short_texture, mese_inv_texture, + {tube = {can_go = function(pos, node, velocity, stack) + local tbl = {} + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + local found = false + local name = stack:get_name() + for i, vect in ipairs(pipeworks.meseadjlist) do + if meta:get_int("l"..tostring(i).."s") == 1 then + for _, st in ipairs(inv:get_list("line"..tostring(i))) do + if st:get_name() == name then + found = true + table.insert(tbl, vect) + end + end + end + end + if found == false then + for i, vect in ipairs(pipeworks.meseadjlist) do + if meta:get_int("l"..tostring(i).."s") == 1 then + if inv:is_empty("line"..tostring(i)) then + table.insert(tbl, vect) + end + end + end + end + return tbl + end}, + on_construct = function(pos) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + for i = 1, 6 do + meta:set_int("l"..tostring(i).."s", 1) + inv:set_size("line"..tostring(i), 6*1) + end + meta:set_string("formspec", + "size[8,11]".. + "list[current_name;line1;1,0;6,1;]".. + "list[current_name;line2;1,1;6,1;]".. + "list[current_name;line3;1,2;6,1;]".. + "list[current_name;line4;1,3;6,1;]".. + "list[current_name;line5;1,4;6,1;]".. + "list[current_name;line6;1,5;6,1;]".. + "image[0,0;1,1;pipeworks_white.png]".. + "image[0,1;1,1;pipeworks_black.png]".. + "image[0,2;1,1;pipeworks_green.png]".. + "image[0,3;1,1;pipeworks_yellow.png]".. + "image[0,4;1,1;pipeworks_blue.png]".. + "image[0,5;1,1;pipeworks_red.png]".. + "button[7,0;1,1;button1;On]".. + "button[7,1;1,1;button2;On]".. + "button[7,2;1,1;button3;On]".. + "button[7,3;1,1;button4;On]".. + "button[7,4;1,1;button5;On]".. + "button[7,5;1,1;button6;On]".. + "list[current_player;main;0,7;8,4;]") + meta:set_string("infotext", "Mese pneumatic tube") + end, + on_receive_fields = function(pos, formname, fields, sender) + local meta = minetest.get_meta(pos) + local i + if fields.quit then return end + for key, _ in pairs(fields) do i = key end + if i == nil then return end + i = string.sub(i,-1) + newstate = 1 - meta:get_int("l"..i.."s") + meta:set_int("l"..i.."s",newstate) + local frm = "size[8,11]".. + "list[current_name;line1;1,0;6,1;]".. + "list[current_name;line2;1,1;6,1;]".. + "list[current_name;line3;1,2;6,1;]".. + "list[current_name;line4;1,3;6,1;]".. + "list[current_name;line5;1,4;6,1;]".. + "list[current_name;line6;1,5;6,1;]".. + "image[0,0;1,1;pipeworks_white.png]".. + "image[0,1;1,1;pipeworks_black.png]".. + "image[0,2;1,1;pipeworks_green.png]".. + "image[0,3;1,1;pipeworks_yellow.png]".. + "image[0,4;1,1;pipeworks_blue.png]".. + "image[0,5;1,1;pipeworks_red.png]" + for i = 1, 6 do + local st = meta:get_int("l"..tostring(i).."s") + if st == 0 then + frm = frm.."button[7,"..tostring(i-1)..";1,1;button"..tostring(i)..";Off]" + else + frm = frm.."button[7,"..tostring(i-1)..";1,1;button"..tostring(i)..";On]" + end + end + frm = frm.."list[current_player;main;0,7;8,4;]" + meta:set_string("formspec", frm) + end, + can_dig = function(pos, player) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + return (inv:is_empty("line1") and inv:is_empty("line2") and inv:is_empty("line3") and + inv:is_empty("line4") and inv:is_empty("line5") and inv:is_empty("line6")) + end + }, true) end if pipeworks.enable_detector_tube then - - local detector_plain_textures={"pipeworks_detector_tube_plain.png","pipeworks_detector_tube_plain.png","pipeworks_detector_tube_plain.png", - "pipeworks_detector_tube_plain.png","pipeworks_detector_tube_plain.png","pipeworks_detector_tube_plain.png"} - local detector_inv_texture="pipeworks_detector_tube_inv.png" - - pipeworks.register_tube("pipeworks:detector_tube_on","Detector tube segment on (you hacker you)",detector_plain_textures,noctr_textures, - end_textures,short_texture,detector_inv_texture, - {tube={can_go=function(pos,node,velocity,stack) - local meta = minetest.get_meta(pos) - local name = minetest.get_node(pos).name - local nitems=meta:get_int("nitems")+1 - meta:set_int("nitems", nitems) - minetest.after(0.1,minetest.registered_nodes[name].item_exit,pos) - return pipeworks.notvel(pipeworks.meseadjlist,velocity) - end}, - groups={mesecon=2,not_in_creative_inventory=1}, - drop="pipeworks:detector_tube_off_000000", - mesecons={receptor={state="on", - rules=pipeworks.mesecons_rules}}, - item_exit = function(pos) - local meta = minetest.get_meta(pos) - local nitems=meta:get_int("nitems")-1 - local name = minetest.get_node(pos).name - if nitems==0 then - minetest.set_node(pos,{name=string.gsub(name,"on","off")}) - mesecon:receptor_off(pos,pipeworks.mesecons_rules) - else - meta:set_int("nitems", nitems) - end - end, - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_int("nitems", 1) - local name = minetest.get_node(pos).name - minetest.after(0.1,minetest.registered_nodes[name].item_exit,pos) - end}) - - pipeworks.register_tube("pipeworks:detector_tube_off","Detector tube segment",detector_plain_textures,noctr_textures, - end_textures,short_texture,detector_inv_texture, - {tube={can_go=function(pos,node,velocity,stack) - local name = minetest.get_node(pos).name - minetest.set_node(pos,{name=string.gsub(name,"off","on")}) - mesecon:receptor_on(pos,pipeworks.mesecons_rules) - return pipeworks.notvel(pipeworks.meseadjlist,velocity) - end}, - groups={mesecon=2}, - mesecons={receptor={state="off", - rules=pipeworks.mesecons_rules}} + local detector_plain_textures = {"pipeworks_detector_tube_plain.png", "pipeworks_detector_tube_plain.png", "pipeworks_detector_tube_plain.png", + "pipeworks_detector_tube_plain.png", "pipeworks_detector_tube_plain.png", "pipeworks_detector_tube_plain.png"} + local detector_inv_texture = "pipeworks_detector_tube_inv.png" + pipeworks.register_tube("pipeworks:detector_tube_on", "Detector tube segment on (you hacker you)", detector_plain_textures, noctr_textures, + end_textures, short_texture, detector_inv_texture, + {tube = {can_go = function(pos, node, velocity, stack) + local meta = minetest.get_meta(pos) + local name = minetest.get_node(pos).name + local nitems = meta:get_int("nitems")+1 + meta:set_int("nitems", nitems) + minetest.after(0.1, minetest.registered_nodes[name].item_exit, pos) + return pipeworks.notvel(pipeworks.meseadjlist,velocity) + end}, + groups = {mesecon = 2, not_in_creative_inventory = 1}, + drop = "pipeworks:detector_tube_off_1", + mesecons = {receptor = {state = "on", + rules = pipeworks.mesecons_rules}}, + item_exit = function(pos) + local meta = minetest.get_meta(pos) + local nitems = meta:get_int("nitems")-1 + local name = minetest.get_node(pos).name + if nitems == 0 then + minetest.set_node(pos,{name = string.gsub(name, "on", "off")}) + mesecon:receptor_off(pos, pipeworks.mesecons_rules) + else + meta:set_int("nitems", nitems) + end + end, + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_int("nitems", 1) + local name = minetest.get_node(pos).name + minetest.after(0.1, minetest.registered_nodes[name].item_exit,pos) + end}) + pipeworks.register_tube("pipeworks:detector_tube_off", "Detector tube segment", detector_plain_textures, noctr_textures, + end_textures, short_texture, detector_inv_texture, + {tube = {can_go = function(pos, node, velocity, stack) + local name = minetest.get_node(pos).name + minetest.set_node(pos,{name = string.gsub(name, "off", "on")}) + mesecon:receptor_on(pos, pipeworks.mesecons_rules) + return pipeworks.notvel(pipeworks.meseadjlist, velocity) + end}, + groups = {mesecon = 2}, + mesecons = {receptor = {state = "off", + rules = pipeworks.mesecons_rules}} }) end -local conductor_plain_textures={"pipeworks_conductor_tube_plain.png","pipeworks_conductor_tube_plain.png","pipeworks_conductor_tube_plain.png", - "pipeworks_conductor_tube_plain.png","pipeworks_conductor_tube_plain.png","pipeworks_conductor_tube_plain.png"} -local conductor_noctr_textures={"pipeworks_conductor_tube_noctr.png","pipeworks_conductor_tube_noctr.png","pipeworks_conductor_tube_noctr.png", - "pipeworks_conductor_tube_noctr.png","pipeworks_conductor_tube_noctr.png","pipeworks_conductor_tube_noctr.png"} -local conductor_end_textures={"pipeworks_conductor_tube_end.png","pipeworks_conductor_tube_end.png","pipeworks_conductor_tube_end.png", - "pipeworks_conductor_tube_end.png","pipeworks_conductor_tube_end.png","pipeworks_conductor_tube_end.png"} -local conductor_short_texture="pipeworks_conductor_tube_short.png" -local conductor_inv_texture="pipeworks_conductor_tube_inv.png" - -local conductor_on_plain_textures={"pipeworks_conductor_tube_on_plain.png","pipeworks_conductor_tube_on_plain.png","pipeworks_conductor_tube_on_plain.png", - "pipeworks_conductor_tube_on_plain.png","pipeworks_conductor_tube_on_plain.png","pipeworks_conductor_tube_on_plain.png"} -local conductor_on_noctr_textures={"pipeworks_conductor_tube_on_noctr.png","pipeworks_conductor_tube_on_noctr.png","pipeworks_conductor_tube_on_noctr.png", - "pipeworks_conductor_tube_on_noctr.png","pipeworks_conductor_tube_on_noctr.png","pipeworks_conductor_tube_on_noctr.png"} -local conductor_on_end_textures={"pipeworks_conductor_tube_on_end.png","pipeworks_conductor_tube_on_end.png","pipeworks_conductor_tube_on_end.png", - "pipeworks_conductor_tube_on_end.png","pipeworks_conductor_tube_on_end.png","pipeworks_conductor_tube_on_end.png"} - if pipeworks.enable_conductor_tube then - pipeworks.register_tube("pipeworks:conductor_tube_off","Conductor tube segment",conductor_plain_textures,conductor_noctr_textures, - conductor_end_textures,conductor_short_texture,conductor_inv_texture, - {groups={mesecon=2}, - mesecons={conductor={state="off", - rules=pipeworks.mesecons_rules, - onstate="pipeworks:conductor_tube_on_#id"}} + local conductor_plain_textures = {"pipeworks_conductor_tube_plain.png", "pipeworks_conductor_tube_plain.png", "pipeworks_conductor_tube_plain.png", + "pipeworks_conductor_tube_plain.png", "pipeworks_conductor_tube_plain.png", "pipeworks_conductor_tube_plain.png"} + local conductor_noctr_textures = {"pipeworks_conductor_tube_noctr.png", "pipeworks_conductor_tube_noctr.png", "pipeworks_conductor_tube_noctr.png", + "pipeworks_conductor_tube_noctr.png", "pipeworks_conductor_tube_noctr.png", "pipeworks_conductor_tube_noctr.png"} + local conductor_end_textures = {"pipeworks_conductor_tube_end.png", "pipeworks_conductor_tube_end.png", "pipeworks_conductor_tube_end.png", + "pipeworks_conductor_tube_end.png", "pipeworks_conductor_tube_end.png", "pipeworks_conductor_tube_end.png"} + local conductor_short_texture = "pipeworks_conductor_tube_short.png" + local conductor_inv_texture = "pipeworks_conductor_tube_inv.png" + + local conductor_on_plain_textures = {"pipeworks_conductor_tube_on_plain.png", "pipeworks_conductor_tube_on_plain.png", "pipeworks_conductor_tube_on_plain.png", + "pipeworks_conductor_tube_on_plain.png", "pipeworks_conductor_tube_on_plain.png", "pipeworks_conductor_tube_on_plain.png"} + local conductor_on_noctr_textures = {"pipeworks_conductor_tube_on_noctr.png", "pipeworks_conductor_tube_on_noctr.png", "pipeworks_conductor_tube_on_noctr.png", + "pipeworks_conductor_tube_on_noctr.png", "pipeworks_conductor_tube_on_noctr.png", "pipeworks_conductor_tube_on_noctr.png"} + local conductor_on_end_textures = {"pipeworks_conductor_tube_on_end.png", "pipeworks_conductor_tube_on_end.png", "pipeworks_conductor_tube_on_end.png", + "pipeworks_conductor_tube_on_end.png", "pipeworks_conductor_tube_on_end.png", "pipeworks_conductor_tube_on_end.png"} + + pipeworks.register_tube("pipeworks:conductor_tube_off", "Conductor tube segment", conductor_plain_textures, conductor_noctr_textures, + conductor_end_textures, conductor_short_texture, conductor_inv_texture, + {groups = {mesecon = 2}, + mesecons = {conductor = {state = "off", + rules = pipeworks.mesecons_rules, + onstate = "pipeworks:conductor_tube_on_#id"}} }) - pipeworks.register_tube("pipeworks:conductor_tube_on","Conductor tube segment on (you hacker you)",conductor_on_plain_textures,conductor_on_noctr_textures, - conductor_on_end_textures,conductor_short_texture,conductor_inv_texture, - {groups={mesecon=2,not_in_creative_inventory=1}, - drop="pipeworks:conductor_tube_off_000000", - mesecons={conductor={state="on", - rules=pipeworks.mesecons_rules, - offstate="pipeworks:conductor_tube_off_#id"}} + pipeworks.register_tube("pipeworks:conductor_tube_on", "Conductor tube segment on (you hacker you)", conductor_on_plain_textures, conductor_on_noctr_textures, + conductor_on_end_textures, conductor_short_texture, conductor_inv_texture, + {groups = {mesecon = 2, not_in_creative_inventory = 1}, + drop = "pipeworks:conductor_tube_off_1", + mesecons = {conductor = {state = "on", + rules = pipeworks.mesecons_rules, + offstate = "pipeworks:conductor_tube_off_#id"}} }) end -local accelerator_noctr_textures={"pipeworks_accelerator_tube_noctr.png","pipeworks_accelerator_tube_noctr.png","pipeworks_accelerator_tube_noctr.png", - "pipeworks_accelerator_tube_noctr.png","pipeworks_accelerator_tube_noctr.png","pipeworks_accelerator_tube_noctr.png"} -local accelerator_plain_textures={"pipeworks_accelerator_tube_plain.png","pipeworks_accelerator_tube_plain.png","pipeworks_accelerator_tube_plain.png", - "pipeworks_accelerator_tube_plain.png","pipeworks_accelerator_tube_plain.png","pipeworks_accelerator_tube_plain.png"} -local accelerator_end_textures={"pipeworks_accelerator_tube_end.png","pipeworks_accelerator_tube_end.png","pipeworks_accelerator_tube_end.png", - "pipeworks_accelerator_tube_end.png","pipeworks_accelerator_tube_end.png","pipeworks_accelerator_tube_end.png"} -local accelerator_short_texture="pipeworks_accelerator_tube_short.png" -local accelerator_inv_texture="pipeworks_accelerator_tube_inv.png" - if pipeworks.enable_accelerator_tube then - pipeworks.register_tube("pipeworks:accelerator_tube","Accelerator pneumatic tube segment",accelerator_plain_textures, - accelerator_noctr_textures,accelerator_end_textures,accelerator_short_texture,accelerator_inv_texture, - {tube={can_go=function(pos,node,velocity,stack) - velocity.speed=velocity.speed+1 - return pipeworks.notvel(pipeworks.meseadjlist,velocity) - end} + local accelerator_noctr_textures = {"pipeworks_accelerator_tube_noctr.png", "pipeworks_accelerator_tube_noctr.png", "pipeworks_accelerator_tube_noctr.png", + "pipeworks_accelerator_tube_noctr.png", "pipeworks_accelerator_tube_noctr.png", "pipeworks_accelerator_tube_noctr.png"} + local accelerator_plain_textures = {"pipeworks_accelerator_tube_plain.png" ,"pipeworks_accelerator_tube_plain.png", "pipeworks_accelerator_tube_plain.png", + "pipeworks_accelerator_tube_plain.png", "pipeworks_accelerator_tube_plain.png", "pipeworks_accelerator_tube_plain.png"} + local accelerator_end_textures = {"pipeworks_accelerator_tube_end.png", "pipeworks_accelerator_tube_end.png", "pipeworks_accelerator_tube_end.png", + "pipeworks_accelerator_tube_end.png", "pipeworks_accelerator_tube_end.png", "pipeworks_accelerator_tube_end.png"} + local accelerator_short_texture = "pipeworks_accelerator_tube_short.png" + local accelerator_inv_texture = "pipeworks_accelerator_tube_inv.png" + + pipeworks.register_tube("pipeworks:accelerator_tube", "Accelerator pneumatic tube segment", accelerator_plain_textures, + accelerator_noctr_textures, accelerator_end_textures, accelerator_short_texture, accelerator_inv_texture, + {tube = {can_go = function(pos, node, velocity, stack) + velocity.speed = velocity.speed+1 + return pipeworks.notvel(pipeworks.meseadjlist, velocity) + end} }) end if pipeworks.enable_crossing_tube then - pipeworks.register_tube("pipeworks:crossing_tube","Crossing tube segment",accelerator_plain_textures, - accelerator_noctr_textures,accelerator_end_textures,accelerator_short_texture,accelerator_inv_texture, - {tube={can_go=function(pos,node,velocity,stack) - return {velocity} - end} + -- FIXME: The textures are not the correct ones + pipeworks.register_tube("pipeworks:crossing_tube", "Crossing tube segment", accelerator_plain_textures, + accelerator_noctr_textures, accelerator_end_textures, accelerator_short_texture, accelerator_inv_texture, + {tube = {can_go = function(pos, node, velocity, stack) + return {velocity} + end} }) end -local sand_noctr_textures={"pipeworks_sand_tube_noctr.png","pipeworks_sand_tube_noctr.png","pipeworks_sand_tube_noctr.png", - "pipeworks_sand_tube_noctr.png","pipeworks_sand_tube_noctr.png","pipeworks_sand_tube_noctr.png"} -local sand_plain_textures={"pipeworks_sand_tube_plain.png","pipeworks_sand_tube_plain.png","pipeworks_sand_tube_plain.png", - "pipeworks_sand_tube_plain.png","pipeworks_sand_tube_plain.png","pipeworks_sand_tube_plain.png"} -local sand_end_textures={"pipeworks_sand_tube_end.png","pipeworks_sand_tube_end.png","pipeworks_sand_tube_end.png", - "pipeworks_sand_tube_end.png","pipeworks_sand_tube_end.png","pipeworks_sand_tube_end.png"} -local sand_short_texture="pipeworks_sand_tube_short.png" -local sand_inv_texture="pipeworks_sand_tube_inv.png" - if pipeworks.enable_sand_tube then - pipeworks.register_tube("pipeworks:sand_tube","Sand pneumatic tube segment",sand_plain_textures,sand_noctr_textures,sand_end_textures, - sand_short_texture,sand_inv_texture, - {groups={sand_tube=1}}) - - minetest.register_abm({nodenames={"group:sand_tube"},interval=1,chance=1, - action=function(pos, node, active_object_count, active_object_count_wider) - for _,object in ipairs(minetest.get_objects_inside_radius(pos, 2)) do - if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then - if object:get_luaentity().itemstring ~= "" then - local titem=pipeworks.tube_item(pos,object:get_luaentity().itemstring) - titem:get_luaentity().start_pos = {x=pos.x,y=pos.y-1,z=pos.z} - titem:setvelocity({x=0.01,y=1,z=-0.01}) - titem:setacceleration({x=0, y=0, z=0}) - end - object:get_luaentity().itemstring = "" - object:remove() - end - end - end + local sand_noctr_textures = {"pipeworks_sand_tube_noctr.png", "pipeworks_sand_tube_noctr.png", "pipeworks_sand_tube_noctr.png", + "pipeworks_sand_tube_noctr.png", "pipeworks_sand_tube_noctr.png", "pipeworks_sand_tube_noctr.png"} + local sand_plain_textures = {"pipeworks_sand_tube_plain.png", "pipeworks_sand_tube_plain.png", "pipeworks_sand_tube_plain.png", + "pipeworks_sand_tube_plain.png", "pipeworks_sand_tube_plain.png", "pipeworks_sand_tube_plain.png"} + local sand_end_textures = {"pipeworks_sand_tube_end.png", "pipeworks_sand_tube_end.png", "pipeworks_sand_tube_end.png", + "pipeworks_sand_tube_end.png", "pipeworks_sand_tube_end.png", "pipeworks_sand_tube_end.png"} + local sand_short_texture = "pipeworks_sand_tube_short.png" + local sand_inv_texture = "pipeworks_sand_tube_inv.png" + + pipeworks.register_tube("pipeworks:sand_tube", "Sand pneumatic tube segment", sand_plain_textures, sand_noctr_textures, sand_end_textures, + sand_short_texture, sand_inv_texture, + {groups = {sand_tube = 1}}) + + minetest.register_abm({nodenames = {"group:sand_tube"}, + interval = 1, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + for _, object in ipairs(minetest.get_objects_inside_radius(pos, 2)) do + if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then + if object:get_luaentity().itemstring ~= "" then + local titem = pipeworks.tube_item(pos,object:get_luaentity().itemstring) + titem:get_luaentity().start_pos = {x = pos.x, y = pos.y-1, z = pos.z} + titem:setvelocity({x = 0.01, y = 1, z = -0.01}) + titem:setacceleration({x = 0, y = 0, z = 0}) + end + object:get_luaentity().itemstring = "" + object:remove() + end + end + end }) end -local mese_sand_noctr_textures={"pipeworks_mese_sand_tube_noctr.png","pipeworks_mese_sand_tube_noctr.png","pipeworks_mese_sand_tube_noctr.png", - "pipeworks_mese_sand_tube_noctr.png","pipeworks_mese_sand_tube_noctr.png","pipeworks_mese_sand_tube_noctr.png"} -local mese_sand_plain_textures={"pipeworks_mese_sand_tube_plain.png","pipeworks_mese_sand_tube_plain.png","pipeworks_mese_sand_tube_plain.png", - "pipeworks_mese_sand_tube_plain.png","pipeworks_mese_sand_tube_plain.png","pipeworks_mese_sand_tube_plain.png"} -local mese_sand_end_textures={"pipeworks_mese_sand_tube_end.png","pipeworks_mese_sand_tube_end.png","pipeworks_mese_sand_tube_end.png", - "pipeworks_mese_sand_tube_end.png","pipeworks_mese_sand_tube_end.png","pipeworks_mese_sand_tube_end.png"} -local mese_sand_short_texture="pipeworks_mese_sand_tube_short.png" -local mese_sand_inv_texture="pipeworks_mese_sand_tube_inv.png" - if pipeworks.enable_mese_sand_tube then - pipeworks.register_tube("pipeworks:mese_sand_tube","Mese sand pneumatic tube segment",mese_sand_plain_textures,mese_sand_noctr_textures,mese_sand_end_textures, - mese_sand_short_texture,mese_sand_inv_texture, - {groups={mese_sand_tube=1}, - on_construct = function(pos) - local meta = minetest.env:get_meta(pos) - meta:set_int("dist", 0) - meta:set_string("formspec", - "size[2,1]".. - "field[.5,.5;1.5,1;dist;distance;${dist}]") - meta:set_string("infotext", "Mese sand pneumatic tube") - end, - on_receive_fields=function(pos,formname,fields,sender) - local meta=minetest.env:get_meta(pos) - local dist - _, dist = pcall(tonumber, fields.dist) - if dist and 0 <= dist and dist <= 8 then meta:set_int("dist", dist) end - end, + local mese_sand_noctr_textures = {"pipeworks_mese_sand_tube_noctr.png", "pipeworks_mese_sand_tube_noctr.png", "pipeworks_mese_sand_tube_noctr.png", + "pipeworks_mese_sand_tube_noctr.png", "pipeworks_mese_sand_tube_noctr.png", "pipeworks_mese_sand_tube_noctr.png"} + local mese_sand_plain_textures = {"pipeworks_mese_sand_tube_plain.png", "pipeworks_mese_sand_tube_plain.png", "pipeworks_mese_sand_tube_plain.png", + "pipeworks_mese_sand_tube_plain.png", "pipeworks_mese_sand_tube_plain.png", "pipeworks_mese_sand_tube_plain.png"} + local mese_sand_end_textures = {"pipeworks_mese_sand_tube_end.png", "pipeworks_mese_sand_tube_end.png", "pipeworks_mese_sand_tube_end.png", + "pipeworks_mese_sand_tube_end.png", "pipeworks_mese_sand_tube_end.png", "pipeworks_mese_sand_tube_end.png"} + local mese_sand_short_texture = "pipeworks_mese_sand_tube_short.png" + local mese_sand_inv_texture = "pipeworks_mese_sand_tube_inv.png" + + pipeworks.register_tube("pipeworks:mese_sand_tube", "Mese sand pneumatic tube segment", mese_sand_plain_textures, mese_sand_noctr_textures, + mese_sand_end_textures, mese_sand_short_texture,mese_sand_inv_texture, + {groups = {mese_sand_tube = 1}, + on_construct = function(pos) + local meta = minetest.env:get_meta(pos) + meta:set_int("dist", 0) + meta:set_string("formspec", + "size[2,1]".. + "field[.5,.5;1.5,1;dist;distance;${dist}]") + meta:set_string("infotext", "Mese sand pneumatic tube") + end, + on_receive_fields = function(pos,formname,fields,sender) + local meta = minetest.env:get_meta(pos) + local dist + _, dist = pcall(tonumber, fields.dist) + if dist and 0 <= dist and dist <= 8 then meta:set_int("dist", dist) end + end, }) local function get_objects_with_square_radius(pos, rad) - rad = rad + .5; - local objs = {} - for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, math.sqrt(3)*rad)) do - if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then - local opos = object:getpos() - if pos.x - rad <= opos.x and opos.x <= pos.x + rad and pos.y - rad <= opos.y and opos.y <= pos.y + rad and pos.z - rad <= opos.z and opos.z <= pos.z + rad then - objs[#objs + 1] = object - end - end - end - return objs - end - - minetest.register_abm({nodenames={"group:mese_sand_tube"},interval=1,chance=1, - action=function(pos, node, active_object_count, active_object_count_wider) - for _,object in ipairs(get_objects_with_square_radius(pos, minetest.env:get_meta(pos):get_int("dist"))) do - if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then - if object:get_luaentity().itemstring ~= "" then - local titem=pipeworks.tube_item(pos,object:get_luaentity().itemstring) - titem:get_luaentity().start_pos = {x=pos.x,y=pos.y-1,z=pos.z} - titem:setvelocity({x=0.01,y=1,z=-0.01}) - titem:setacceleration({x=0, y=0, z=0}) - end - object:get_luaentity().itemstring = "" - object:remove() + rad = rad + .5; + local objs = {} + for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, math.sqrt(3)*rad)) do + if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then + local opos = object:getpos() + if pos.x - rad <= opos.x and opos.x <= pos.x + rad and pos.y - rad <= opos.y and opos.y <= pos.y + rad and pos.z - rad <= opos.z and opos.z <= pos.z + rad then + objs[#objs + 1] = object end end end + return objs + end + + minetest.register_abm({nodenames = {"group:mese_sand_tube"}, + interval = 1, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + for _,object in ipairs(get_objects_with_square_radius(pos, minetest.env:get_meta(pos):get_int("dist"))) do + if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then + if object:get_luaentity().itemstring ~= "" then + local titem = pipeworks.tube_item(pos, object:get_luaentity().itemstring) + titem:get_luaentity().start_pos = {x = pos.x, y = pos.y-1, z = pos.z} + titem:setvelocity({x = 0.01, y = 1, z = -0.01}) + titem:setacceleration({x = 0, y = 0, z = 0}) + end + object:get_luaentity().itemstring = "" + object:remove() + end + end + end }) end @@ -549,55 +550,55 @@ local function facedir_to_right_dir(facedir) --find the other directions local backdir = minetest.facedir_to_dir(facedir) - local topdir = ({[0]={x=0, y=1, z=0}, - {x=0, y=0, z=1}, - {x=0, y=0, z=-1}, - {x=1, y=0, z=0}, - {x=-1, y=0, z=0}, - {x=0, y=-1, z=0}})[math.floor(facedir/4)] + local topdir = ({[0] = {x = 0, y = 1, z = 0}, + {x = 0, y = 0, z = 1}, + {x = 0, y = 0, z = -1}, + {x = 1, y = 0, z = 0}, + {x = -1, y = 0, z = 0}, + {x = 0, y = -1, z = 0}})[math.floor(facedir/4)] --return a cross product - return {x=topdir.y*backdir.z - backdir.y*topdir.z, - y=topdir.z*backdir.x - backdir.z*topdir.x, - z=topdir.x*backdir.y - backdir.x*topdir.y} + return {x = topdir.y*backdir.z - backdir.y*topdir.z, + y = topdir.z*backdir.x - backdir.z*topdir.x, + z = topdir.x*backdir.y - backdir.x*topdir.y} end if pipeworks.enable_one_way_tube then minetest.register_node("pipeworks:one_way_tube", { - description = "One way tube", - tiles = {"pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_output.png", - "pipeworks_one_way_tube_input.png", "pipeworks_one_way_tube_side.png", "pipeworks_one_way_tube_top.png"}, - paramtype2 = "facedir", - drawtype = "nodebox", - paramtype = "light", - node_box = {type="fixed", - fixed = {{-1/2, -9/64, -9/64, 1/2, 9/64, 9/64}}}, - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,tubedevice=1,tubedevice_receiver=1}, - legacy_facedir_simple = true, - sounds = default.node_sound_wood_defaults(), - after_place_node = function(pos) - pipeworks.scan_for_tube_objects(pos) - end, - after_dig_node = function(pos) - pipeworks.scan_for_tube_objects(pos) - end, - tube={connect_sides={left=1, right=1}, - can_go=function(pos,node,velocity,stack) - return velocity - end, - insert_object = function(pos,node,stack,direction) - item1=pipeworks.tube_item(pos,stack) - item1:get_luaentity().start_pos = pos - item1:setvelocity({x=direction.x*direction.speed, y=direction.y*direction.speed, z=direction.z*direction.speed}) - item1:setacceleration({x=0, y=0, z=0}) - return ItemStack("") - end, - can_insert=function(pos,node,stack,direction) - local dir = facedir_to_right_dir(node.param2) - if dir.x == direction.x and dir.y == direction.y and dir.z == direction.z then - return true - end - return false - end}, + description = "One way tube", + tiles = {"pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_top.png", "pipeworks_one_way_tube_output.png", + "pipeworks_one_way_tube_input.png", "pipeworks_one_way_tube_side.png", "pipeworks_one_way_tube_top.png"}, + paramtype2 = "facedir", + drawtype = "nodebox", + paramtype = "light", + node_box = {type="fixed", + fixed = {{-1/2, -9/64, -9/64, 1/2, 9/64, 9/64}}}, + groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, tubedevice = 1, tubedevice_receiver = 1}, + legacy_facedir_simple = true, + sounds = default.node_sound_wood_defaults(), + after_place_node = function(pos) + pipeworks.scan_for_tube_objects(pos) + end, + after_dig_node = function(pos) + pipeworks.scan_for_tube_objects(pos) + end, + tube = {connect_sides = {left = 1, right = 1}, + can_go = function(pos, node, velocity, stack) + return velocity + end, + insert_object = function(pos, node, stack, direction) + item1 = pipeworks.tube_item(pos, stack) + item1:get_luaentity().start_pos = pos + item1:setvelocity({x = direction.x*direction.speed, y = direction.y*direction.speed, z = direction.z*direction.speed}) + item1:setacceleration({x = 0, y = 0, z = 0}) + return ItemStack("") + end, + can_insert = function(pos, node, stack, direction) + local dir = facedir_to_right_dir(node.param2) + if dir.x == direction.x and dir.y == direction.y and dir.z == direction.z then + return true + end + return false + end}, }) end