diff options
| author | Jeija <norrepli@gmail.com> | 2012-12-21 16:22:25 +0100 |
|---|---|---|
| committer | Jeija <norrepli@gmail.com> | 2012-12-21 16:22:25 +0100 |
| commit | 23bebfc054008d2b6796e3f10d3bc67bee8b31ed (patch) | |
| tree | 72b8a71d75b16cf0a8b5d82758d3269beedf50d9 /mesecons_pistons | |
| parent | 9019a4aff7a59bf5d6b4bc1efa177ffd45f6d125 (diff) | |
| parent | 973a9c650f72ce694bd31dfbc5d6030751ff7c05 (diff) | |
| download | mesecons-23bebfc054008d2b6796e3f10d3bc67bee8b31ed.tar mesecons-23bebfc054008d2b6796e3f10d3bc67bee8b31ed.tar.gz mesecons-23bebfc054008d2b6796e3f10d3bc67bee8b31ed.tar.bz2 mesecons-23bebfc054008d2b6796e3f10d3bc67bee8b31ed.tar.xz mesecons-23bebfc054008d2b6796e3f10d3bc67bee8b31ed.zip | |
Merge branch 'master' into nextgen
Conflicts:
mesecons/internal.lua
mesecons/wires.lua
mesecons_pistons/init.lua
Diffstat (limited to 'mesecons_pistons')
| -rw-r--r-- | mesecons_pistons/init.lua | 57 |
1 files changed, 16 insertions, 41 deletions
diff --git a/mesecons_pistons/init.lua b/mesecons_pistons/init.lua index 028eb54..e5228d4 100644 --- a/mesecons_pistons/init.lua +++ b/mesecons_pistons/init.lua @@ -192,28 +192,16 @@ minetest.register_node("mesecons_pistons:piston_normal", { paramtype2 = "facedir", after_destruct = destruct, on_timer = timer, - on_place = function(itemstack, placer, pointed_thing) - if pointed_thing.type ~= "node" then --can be placed only on nodes - return itemstack - end - if not placer then - return minetest.item_place(itemstack, placer, pointed_thing) + after_place_node = function(pos, placer) + if not placer then --not placed by player + return end - local dir = placer:get_look_dir() - if math.abs(dir.y) > math.sqrt(dir.x ^ 2 + dir.z ^ 2) then --vertical look direction is most significant - local fakestack - if dir.y > 0 then - fakestack = ItemStack("mesecons_pistons:piston_down_normal") - else - fakestack = ItemStack("mesecons_pistons:piston_up_normal") - end - local ret = minetest.item_place(fakestack, placer, pointed_thing) - if ret:is_empty() then - itemstack:take_item() - return itemstack - end + local pitch = placer:get_look_pitch() * (180 / math.pi) --placer pitch in degrees + if pitch > 45 then --looking upwards + minetest.env:add_node(pos, {name="mesecons_pistons:piston_down_normal"}) + elseif pitch < -45 then --looking downwards + minetest.env:add_node(pos, {name="mesecons_pistons:piston_up_normal"}) end - return minetest.item_place(itemstack, placer, pointed_thing) --place piston normally end, mesecons = {effector={ action_change = update, @@ -228,29 +216,16 @@ minetest.register_node("mesecons_pistons:piston_sticky", { paramtype2 = "facedir", after_destruct = destruct, on_timer = timer, - is_sticky_piston = true, - on_place = function(itemstack, placer, pointed_thing) - if pointed_thing.type ~= "node" then --can be placed only on nodes - return itemstack - end - if not placer then - return minetest.item_place(itemstack, placer, pointed_thing) + after_place_node = function(pos, placer) + if not placer then --not placed by player + return end - local dir = placer:get_look_dir() - if math.abs(dir.y) > math.sqrt(dir.x ^ 2 + dir.z ^ 2) then --vertical look direction is most significant - local fakestack - if dir.y > 0 then - fakestack = ItemStack("mesecons_pistons:piston_down_sticky") - else - fakestack = ItemStack("mesecons_pistons:piston_up_sticky") - end - local ret = minetest.item_place(fakestack, placer, pointed_thing) - if ret:is_empty() then - itemstack:take_item() - return itemstack - end + local pitch = placer:get_look_pitch() * (180 / math.pi) --placer pitch in degrees + if pitch > 45 then --looking upwards + minetest.env:add_node(pos, {name="mesecons_pistons:piston_down_sticky"}) + elseif pitch < -45 then --looking downwards + minetest.env:add_node(pos, {name="mesecons_pistons:piston_up_sticky"}) end - return minetest.item_place(itemstack, placer, pointed_thing) --place piston normally end, mesecons = {effector={ action_change = update, |