From 053fa59739f4b772174bf0a090969b3395ab3f98 Mon Sep 17 00:00:00 2001 From: kpoppel <poulsen.kim@gmail.com> Date: Tue, 02 Jul 2013 00:19:06 +0200 Subject: [PATCH] Merge pull request #38 from kpoppel/master --- technic/frames.lua | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/technic/frames.lua b/technic/frames.lua index 820a308..565a2ef 100644 --- a/technic/frames.lua +++ b/technic/frames.lua @@ -97,6 +97,10 @@ type = "fixed", fixed=nodeboxes, }, + selection_box = { + type="fixed", + fixed={-0.5,-0.5,-0.5,0.5,0.5,0.5} + }, paramtype = "light", frame=1, drop="technic:frame_111111", @@ -298,7 +302,7 @@ minetest.register_node("technic:frame_motor4",{ description = "Frame motor 4", tiles = {"technic_lv_cable.png", "technic_lv_cable.png", "technic_lv_cable.png", - "technic_lv_cable.png", "technic_lv_cable.png", "pipeworks_filter_top.png"}, + "technic_lv_cable.png", "technic_lv_cable.png", "pipeworks_filter_top.png^[transformR180"}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,mesecon=2}, paramtype2 = "facedir", mesecons={effector={action_on=frame_motor4_on}}, @@ -314,7 +318,7 @@ minetest.register_node("technic:frame_motor5",{ description = "Frame motor 5", tiles = {"technic_lv_cable.png", "technic_lv_cable.png", "technic_lv_cable.png", - "technic_lv_cable.png", "technic_lv_cable.png", "pipeworks_filter_top.png"}, + "technic_lv_cable.png", "technic_lv_cable.png", "pipeworks_filter_top.png^[transformR90"}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,mesecon=2}, paramtype2 = "facedir", mesecons={effector={action_on=frame_motor5_on}}, @@ -330,7 +334,7 @@ minetest.register_node("technic:frame_motor6",{ description = "Frame motor 6", tiles = {"technic_lv_cable.png", "technic_lv_cable.png", "technic_lv_cable.png", - "technic_lv_cable.png", "technic_lv_cable.png", "pipeworks_filter_top.png"}, + "technic_lv_cable.png", "technic_lv_cable.png", "pipeworks_filter_top.png^[transformR270"}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,mesecon=2}, paramtype2 = "facedir", mesecons={effector={action_on=frame_motor6_on}}, @@ -364,7 +368,6 @@ local node=minetest.env:get_node(pos) local meta=minetest.env:get_meta(pos):to_table() nodelist[#(nodelist)+1]={pos=pos,node=node,meta=meta} - minetest.env:remove_node(pos) end objects={} for _,pos in ipairs(poslist) do @@ -374,8 +377,8 @@ end for _,obj in ipairs(objects) do obj:setpos(addVect(obj:getpos(),vect)) - if obj:get_luaentity().name == "pipeworks:tubed_item" then - le=obj:get_luaentity() + le=obj:get_luaentity() + if le and le.name == "pipeworks:tubed_item" then le.start_pos=addVect(le.start_pos,vect) end end @@ -384,6 +387,15 @@ minetest.env:set_node(npos,n.node) local meta=minetest.env:get_meta(npos) meta:from_table(n.meta) + for __,pos in ipairs(poslist) do + if npos.x==pos.x and npos.y==pos.y and npos.z==pos.z then + table.remove(poslist, __) + break + end + end + end + for __,pos in ipairs(poslist) do + minetest.env:remove_node(pos) end end -- Gitblit v1.8.0