From: Novatux Date: Sun, 20 Jan 2013 16:53:17 +0000 (+0100) Subject: Changed the name of some textures for naming conventions. Added deployer and node... X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=fe0fd686013bf24103d67a6a8b91ba19f41ca86e;p=zefram%2Fminetest%2Fpipeworks.git Changed the name of some textures for naming conventions. Added deployer and node breaker (most of the code is from Technic, the textures too). --- diff --git a/deployer.lua b/deployer.lua new file mode 100644 index 0000000..a57a895 --- /dev/null +++ b/deployer.lua @@ -0,0 +1,158 @@ +minetest.register_craft({ + output = 'pipeworks:deployer_off 1', + recipe = { + {'default:wood', 'default:chest','default:wood'}, + {'default:stone', 'mesecons:piston','default:stone'}, + {'default:stone', 'mesecons:mesecon','default:stone'}, + + } +}) + +deployer_on = function(pos, node) + local pos1={} + pos1.x=pos.x + pos1.y=pos.y + pos1.z=pos.z + local pos2={} + pos2.x=pos.x + pos2.y=pos.y + pos2.z=pos.z + if node.param2==3 then + pos1.x=pos1.x+1 + pos2.x=pos2.x+2 + end + if node.param2==2 then + pos1.z=pos1.z+1 + pos2.z=pos2.z+2 + end + if node.param2==1 then + pos1.x=pos1.x-1 + pos2.x=pos2.x-2 + end + if node.param2==0 then + pos1.z=pos1.z-1 + pos2.z=pos2.z-2 + end + + if node.name == "pipeworks:deployer_off" then + hacky_swap_node(pos,"pipeworks:deployer_on") + nodeupdate(pos) + local meta = minetest.env:get_meta(pos); + + local inv = meta:get_inventory() + local invlist=inv:get_list("main") + for i,stack in ipairs(invlist) do + + if stack:get_name() ~=nil and stack:get_name() ~="" and minetest.env:get_node(pos1).name == "air" then + local placer={} + function placer:get_player_name() return "deployer" end + function placer:getpos() return pos end + local stack2=minetest.item_place(stack,placer,{type="node", under=pos1, above=pos2}) + invlist[i]=stack2 + inv:set_list("main",invlist) + return + end + end + end +end + +deployer_off = function(pos, node) + if node.name == "pipeworks:deployer_on" then + hacky_swap_node(pos,"pipeworks:deployer_off") + nodeupdate(pos) + end +end + +minetest.register_node("pipeworks:deployer_off", { + description = "Deployer", + tile_images = {"pipeworks_deployer_top.png","pipeworks_deployer_bottom.png","pipeworks_deployer_side2.png","pipeworks_deployer_side1.png", + "pipeworks_deployer_back.png","pipeworks_deployer_front_off.png"}, + mesecons = {effector={action_on=deployer_on,action_off=deployer_off}}, + tube={insert_object=function(pos,node,stack,direction) + local meta=minetest.env:get_meta(pos) + local inv=meta:get_inventory() + return inv:add_item("main",stack) + end, + can_insert=function(pos,node,stack,direction) + local meta=minetest.env:get_meta(pos) + local inv=meta:get_inventory() + return inv:room_for_item("main",stack) + end, + input_inventory="main"}, + is_ground_content = true, + paramtype2 = "facedir", + groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1, tubedevice_receiver=1}, + sounds = default.node_sound_stone_defaults(), + on_construct = function(pos) + local meta = minetest.env:get_meta(pos) + meta:set_string("formspec", + "invsize[8,9;]".. + "label[0,0;Deployer]".. + "list[current_name;main;4,1;3,3;]".. + "list[current_player;main;0,5;8,4;]") + meta:set_string("infotext", "Deployer") + local inv = meta:get_inventory() + inv:set_size("main", 3*3) + end, + + can_dig = function(pos,player) + local meta = minetest.env:get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("main") + end, + +}) + +minetest.register_node("pipeworks:deployer_on", { + description = "Deployer", + tile_images = {"pipeworks_deployer_top.png","pipeworks_deployer_bottom.png","pipeworks_deployer_side2.png","pipeworks_deployer_side1.png", + "pipeworks_deployer_back.png","pipeworks_deployer_front_on.png"}, + mesecons = {effector={action_on=deployer_on,action_off=deployer_off}}, + tube={insert_object=function(pos,node,stack,direction) + local meta=minetest.env:get_meta(pos) + local inv=meta:get_inventory() + return inv:add_item("main",stack) + end, + can_insert=function(pos,node,stack,direction) + local meta=minetest.env:get_meta(pos) + local inv=meta:get_inventory() + return inv:room_for_item("main",stack) + end, + input_inventory="main"}, + is_ground_content = true, + paramtype2 = "facedir", + tubelike=1, + groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1, tubedevice_receiver=1,not_in_creative_inventory=1}, + sounds = default.node_sound_stone_defaults(), + on_construct = function(pos) + local meta = minetest.env:get_meta(pos) + meta:set_string("formspec", + "invsize[8,9;]".. + "label[0,0;Deployer]".. + "list[current_name;main;4,1;3,3;]".. + "list[current_player;main;0,5;8,4;]") + meta:set_string("infotext", "Deployer") + local inv = meta:get_inventory() + inv:set_size("main", 3*3) + end, + can_dig = function(pos,player) + local meta = minetest.env:get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("main") + end, +}) + +function hacky_swap_node(pos,name) + local node=minetest.env:get_node(pos) + local meta=minetest.env:get_meta(pos) + local meta0=meta:to_table() + node.name=name + minetest.env:add_node(pos, node) + local meta=minetest.env:get_meta(pos) + meta:from_table(meta0) +end + + + + + diff --git a/init.lua b/init.lua index 5b0187c..ce6bc3c 100644 --- a/init.lua +++ b/init.lua @@ -329,4 +329,6 @@ dofile(minetest.get_modpath("pipeworks").."/flowing_logic.lua") dofile(minetest.get_modpath("pipeworks").."/compat.lua") dofile(minetest.get_modpath("pipeworks").."/item_transport.lua") dofile(minetest.get_modpath("pipeworks").."/autocrafter.lua") +dofile(minetest.get_modpath("pipeworks").."/deployer.lua") +dofile(minetest.get_modpath("pipeworks").."/node_breaker.lua") print("Pipeworks loaded!") diff --git a/item_transport.lua b/item_transport.lua index c1d7315..665516e 100644 --- a/item_transport.lua +++ b/item_transport.lua @@ -9,8 +9,8 @@ minetest.register_craftitem("pipeworks:filter", { minetest.register_node("pipeworks:filter", { description = "filter", - tiles = {"filter_top.png", "filter_top.png", "filter_output.png", - "filter_input.png", "filter_side.png", "filter_top.png"}, + tiles = {"pipeworks_filter_top.png", "pipeworks_filter_top.png", "pipeworks_filter_output.png", + "pipeworks_filter_input.png", "pipeworks_filter_side.png", "pipeworks_filter_top.png"}, paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,tubedevice=1,mesecon=2}, legacy_facedir_simple = true, diff --git a/node_breaker.lua b/node_breaker.lua new file mode 100644 index 0000000..3af1902 --- /dev/null +++ b/node_breaker.lua @@ -0,0 +1,100 @@ +minetest.register_craft({ + output = 'pipeworks:nodebreaker_off 1', + recipe = { + {'default:wood', 'default:pick_mese','default:wood'}, + {'default:stone', 'mesecons:piston','default:stone'}, + {'default:stone', 'mesecons:mesecon','default:stone'}, + + } +}) + + +function hacky_swap_node(pos,name) + local node=minetest.env:get_node(pos) + local meta=minetest.env:get_meta(pos) + local meta0=meta:to_table() + node.name=name + minetest.env:add_node(pos, node) + local meta=minetest.env:get_meta(pos) + meta:from_table(meta0) +end + + +node_breaker_on = function(pos, node) + if node.name == "pipeworks:nodebreaker_off" then + hacky_swap_node(pos,"pipeworks:nodebreaker_on") + break_node (pos,node.param2) + nodeupdate(pos) + end +end + +node_breaker_off = function(pos, node) + if node.name == "pipeworks:nodebreaker_on" then + hacky_swap_node(pos,"pipeworks:nodebreaker_off") + nodeupdate(pos) + end +end + +minetest.register_node("pipeworks:nodebreaker_off", { + description = "Node Breaker", + tile_images = {"pipeworks_nodebreaker_top_off.png","pipeworks_nodebreaker_bottom_off.png","pipeworks_nodebreaker_side2_off.png","pipeworks_nodebreaker_side1_off.png", + "pipeworks_nodebreaker_back.png","pipeworks_nodebreaker_front_off.png"}, + is_ground_content = true, + paramtype2 = "facedir", + groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1}, + mesecons= {effector={action_on=node_breaker_on, action_off=node_breaker_off}}, + sounds = default.node_sound_stone_defaults(), + on_construct = function(pos) + local meta = minetest.env:get_meta(pos) + end, + +}) + +minetest.register_node("pipeworks:nodebreaker_on", { + description = "Node Breaker", + tile_images = {"pipeworks_nodebreaker_top_on.png","pipeworks_nodebreaker_bottom_on.png","pipeworks_nodebreaker_side2_on.png","pipeworks_nodebreaker_side1_on.png", + "pipeworks_nodebreaker_back.png","pipeworks_nodebreaker_front_on.png"}, + mesecons= {effector={action_on=node_breaker_on, action_off=node_breaker_off}}, + is_ground_content = true, + paramtype2 = "facedir", + groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1,not_in_creative_inventory=1}, + sounds = default.node_sound_stone_defaults(), +}) + +function break_node (pos,n_param) + local pos1={} + local pos2={} + pos1.x=pos.x + pos1.y=pos.y + pos1.z=pos.z + pos2.x=pos.x + pos2.y=pos.y + pos2.z=pos.z + + --param2 3=x+ 1=x- 2=z+ 0=z- + local x_velocity=0 + local z_velocity=0 + + if n_param==3 then pos2.x=pos2.x+1 pos1.x=pos1.x-1 x_velocity=-1 end + if n_param==2 then pos2.z=pos2.z+1 pos1.z=pos1.z-1 z_velocity=-1 end + if n_param==1 then pos2.x=pos2.x-1 pos1.x=pos1.x+1 x_velocity=1 end + if n_param==0 then pos2.z=pos2.z-1 pos1.x=pos1.z+1 z_velocity=1 end + + local node=minetest.env:get_node(pos2) + if node.name == "air" then return nil end + if node.name == "default:lava_source" then return nil end + if node.name == "default:lava_flowing" then return nil end + if node.name == "default:water_source" then minetest.env:remove_node(pos2) return nil end + if node.name == "default:water_flowing" then minetest.env:remove_node(pos2) return nil end + if node.name == "ignore" then minetest.env:remove_node(pos2) return nil end + local drops = minetest.get_node_drops(node.name, "default:pick_mese") + local _, dropped_item + for _, dropped_item in ipairs(drops) do + local item1=tube_item({x=pos.x,y=pos.y,z=pos.z},dropped_item) + item1:get_luaentity().start_pos = {x=pos.x,y=pos.y,z=pos.z} + item1:setvelocity({x=x_velocity, y=0, z=z_velocity}) + item1:setacceleration({x=0, y=0, z=0}) + end + minetest.env:remove_node(pos2) +end + diff --git a/textures/black.png b/textures/black.png deleted file mode 100644 index 9e58d8c..0000000 Binary files a/textures/black.png and /dev/null differ diff --git a/textures/blue.png b/textures/blue.png deleted file mode 100644 index aa346d4..0000000 Binary files a/textures/blue.png and /dev/null differ diff --git a/textures/filter_input.png b/textures/filter_input.png deleted file mode 100644 index ce532cb..0000000 Binary files a/textures/filter_input.png and /dev/null differ diff --git a/textures/filter_output.png b/textures/filter_output.png deleted file mode 100644 index 4b29690..0000000 Binary files a/textures/filter_output.png and /dev/null differ diff --git a/textures/filter_side.png b/textures/filter_side.png deleted file mode 100644 index 00fa44d..0000000 Binary files a/textures/filter_side.png and /dev/null differ diff --git a/textures/filter_top.png b/textures/filter_top.png deleted file mode 100644 index dca538e..0000000 Binary files a/textures/filter_top.png and /dev/null differ diff --git a/textures/green.png b/textures/green.png deleted file mode 100644 index 452aff0..0000000 Binary files a/textures/green.png and /dev/null differ diff --git a/textures/pipeworks_black.png b/textures/pipeworks_black.png new file mode 100644 index 0000000..9e58d8c Binary files /dev/null and b/textures/pipeworks_black.png differ diff --git a/textures/pipeworks_blue.png b/textures/pipeworks_blue.png new file mode 100644 index 0000000..aa346d4 Binary files /dev/null and b/textures/pipeworks_blue.png differ diff --git a/textures/pipeworks_deployer_back.png b/textures/pipeworks_deployer_back.png new file mode 100644 index 0000000..0bc8df9 Binary files /dev/null and b/textures/pipeworks_deployer_back.png differ diff --git a/textures/pipeworks_deployer_bottom.png b/textures/pipeworks_deployer_bottom.png new file mode 100644 index 0000000..ff1a2c6 Binary files /dev/null and b/textures/pipeworks_deployer_bottom.png differ diff --git a/textures/pipeworks_deployer_front_off.png b/textures/pipeworks_deployer_front_off.png new file mode 100644 index 0000000..d0f6f55 Binary files /dev/null and b/textures/pipeworks_deployer_front_off.png differ diff --git a/textures/pipeworks_deployer_front_on.png b/textures/pipeworks_deployer_front_on.png new file mode 100644 index 0000000..368ce32 Binary files /dev/null and b/textures/pipeworks_deployer_front_on.png differ diff --git a/textures/pipeworks_deployer_side.png b/textures/pipeworks_deployer_side.png new file mode 100644 index 0000000..aefd7c8 Binary files /dev/null and b/textures/pipeworks_deployer_side.png differ diff --git a/textures/pipeworks_deployer_side1.png b/textures/pipeworks_deployer_side1.png new file mode 100644 index 0000000..8cb8634 Binary files /dev/null and b/textures/pipeworks_deployer_side1.png differ diff --git a/textures/pipeworks_deployer_side2.png b/textures/pipeworks_deployer_side2.png new file mode 100644 index 0000000..c2855d0 Binary files /dev/null and b/textures/pipeworks_deployer_side2.png differ diff --git a/textures/pipeworks_deployer_top.png b/textures/pipeworks_deployer_top.png new file mode 100644 index 0000000..941d333 Binary files /dev/null and b/textures/pipeworks_deployer_top.png differ diff --git a/textures/pipeworks_filter_input.png b/textures/pipeworks_filter_input.png new file mode 100644 index 0000000..ce532cb Binary files /dev/null and b/textures/pipeworks_filter_input.png differ diff --git a/textures/pipeworks_filter_output.png b/textures/pipeworks_filter_output.png new file mode 100644 index 0000000..4b29690 Binary files /dev/null and b/textures/pipeworks_filter_output.png differ diff --git a/textures/pipeworks_filter_side.png b/textures/pipeworks_filter_side.png new file mode 100644 index 0000000..00fa44d Binary files /dev/null and b/textures/pipeworks_filter_side.png differ diff --git a/textures/pipeworks_filter_top.png b/textures/pipeworks_filter_top.png new file mode 100644 index 0000000..dca538e Binary files /dev/null and b/textures/pipeworks_filter_top.png differ diff --git a/textures/pipeworks_green.png b/textures/pipeworks_green.png new file mode 100644 index 0000000..452aff0 Binary files /dev/null and b/textures/pipeworks_green.png differ diff --git a/textures/pipeworks_nodebreaker_back.png b/textures/pipeworks_nodebreaker_back.png new file mode 100644 index 0000000..b669ef6 Binary files /dev/null and b/textures/pipeworks_nodebreaker_back.png differ diff --git a/textures/pipeworks_nodebreaker_bottom.png b/textures/pipeworks_nodebreaker_bottom.png new file mode 100644 index 0000000..ff1a2c6 Binary files /dev/null and b/textures/pipeworks_nodebreaker_bottom.png differ diff --git a/textures/pipeworks_nodebreaker_bottom_off.png b/textures/pipeworks_nodebreaker_bottom_off.png new file mode 100644 index 0000000..410617a Binary files /dev/null and b/textures/pipeworks_nodebreaker_bottom_off.png differ diff --git a/textures/pipeworks_nodebreaker_bottom_on.png b/textures/pipeworks_nodebreaker_bottom_on.png new file mode 100644 index 0000000..d6da4d8 Binary files /dev/null and b/textures/pipeworks_nodebreaker_bottom_on.png differ diff --git a/textures/pipeworks_nodebreaker_front_off.png b/textures/pipeworks_nodebreaker_front_off.png new file mode 100644 index 0000000..5a25b4c Binary files /dev/null and b/textures/pipeworks_nodebreaker_front_off.png differ diff --git a/textures/pipeworks_nodebreaker_front_on.png b/textures/pipeworks_nodebreaker_front_on.png new file mode 100644 index 0000000..97d22c3 Binary files /dev/null and b/textures/pipeworks_nodebreaker_front_on.png differ diff --git a/textures/pipeworks_nodebreaker_side.png b/textures/pipeworks_nodebreaker_side.png new file mode 100644 index 0000000..aefd7c8 Binary files /dev/null and b/textures/pipeworks_nodebreaker_side.png differ diff --git a/textures/pipeworks_nodebreaker_side1.png b/textures/pipeworks_nodebreaker_side1.png new file mode 100644 index 0000000..8cb8634 Binary files /dev/null and b/textures/pipeworks_nodebreaker_side1.png differ diff --git a/textures/pipeworks_nodebreaker_side1_off.png b/textures/pipeworks_nodebreaker_side1_off.png new file mode 100644 index 0000000..5e36d3a Binary files /dev/null and b/textures/pipeworks_nodebreaker_side1_off.png differ diff --git a/textures/pipeworks_nodebreaker_side1_on.png b/textures/pipeworks_nodebreaker_side1_on.png new file mode 100644 index 0000000..c76ccff Binary files /dev/null and b/textures/pipeworks_nodebreaker_side1_on.png differ diff --git a/textures/pipeworks_nodebreaker_side2.png b/textures/pipeworks_nodebreaker_side2.png new file mode 100644 index 0000000..c2855d0 Binary files /dev/null and b/textures/pipeworks_nodebreaker_side2.png differ diff --git a/textures/pipeworks_nodebreaker_side2_off.png b/textures/pipeworks_nodebreaker_side2_off.png new file mode 100644 index 0000000..622ff7c Binary files /dev/null and b/textures/pipeworks_nodebreaker_side2_off.png differ diff --git a/textures/pipeworks_nodebreaker_side2_on.png b/textures/pipeworks_nodebreaker_side2_on.png new file mode 100644 index 0000000..c54e467 Binary files /dev/null and b/textures/pipeworks_nodebreaker_side2_on.png differ diff --git a/textures/pipeworks_nodebreaker_top.png b/textures/pipeworks_nodebreaker_top.png new file mode 100644 index 0000000..941d333 Binary files /dev/null and b/textures/pipeworks_nodebreaker_top.png differ diff --git a/textures/pipeworks_nodebreaker_top_off.png b/textures/pipeworks_nodebreaker_top_off.png new file mode 100644 index 0000000..1f9b361 Binary files /dev/null and b/textures/pipeworks_nodebreaker_top_off.png differ diff --git a/textures/pipeworks_nodebreaker_top_on.png b/textures/pipeworks_nodebreaker_top_on.png new file mode 100644 index 0000000..d02ed10 Binary files /dev/null and b/textures/pipeworks_nodebreaker_top_on.png differ diff --git a/textures/pipeworks_red.png b/textures/pipeworks_red.png new file mode 100644 index 0000000..1275e5d Binary files /dev/null and b/textures/pipeworks_red.png differ diff --git a/textures/pipeworks_white.png b/textures/pipeworks_white.png new file mode 100644 index 0000000..8b83403 Binary files /dev/null and b/textures/pipeworks_white.png differ diff --git a/textures/pipeworks_yellow.png b/textures/pipeworks_yellow.png new file mode 100644 index 0000000..e6672bd Binary files /dev/null and b/textures/pipeworks_yellow.png differ diff --git a/textures/red.png b/textures/red.png deleted file mode 100644 index 1275e5d..0000000 Binary files a/textures/red.png and /dev/null differ diff --git a/textures/white.png b/textures/white.png deleted file mode 100644 index 8b83403..0000000 Binary files a/textures/white.png and /dev/null differ diff --git a/textures/yellow.png b/textures/yellow.png deleted file mode 100644 index e6672bd..0000000 Binary files a/textures/yellow.png and /dev/null differ diff --git a/tubes.lua b/tubes.lua index ee982e1..72390b9 100644 --- a/tubes.lua +++ b/tubes.lua @@ -315,12 +315,12 @@ register_tube("pipeworks:mese_tube","Mese pneumatic tube segment",mese_plain_tex "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;white.png]".. - "image[0,1;1,1;black.png]".. - "image[0,2;1,1;green.png]".. - "image[0,3;1,1;yellow.png]".. - "image[0,4;1,1;blue.png]".. - "image[0,5;1,1;red.png]".. + "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]".. @@ -344,12 +344,12 @@ register_tube("pipeworks:mese_tube","Mese pneumatic tube segment",mese_plain_tex "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;white.png]".. - "image[0,1;1,1;black.png]".. - "image[0,2;1,1;green.png]".. - "image[0,3;1,1;yellow.png]".. - "image[0,4;1,1;blue.png]".. - "image[0,5;1,1;red.png]" + "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