From 5fb5df446c89516c93a9375125cdd6ffd5db4054 Mon Sep 17 00:00:00 2001 From: Jeija Date: Sat, 15 Dec 2012 21:23:38 +0100 Subject: [PATCH 1/4] Bugfix, use param2 for conductors when turning them on/off --- mesecons/internal.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesecons/internal.lua b/mesecons/internal.lua index 0249728..de05bec 100644 --- a/mesecons/internal.lua +++ b/mesecons/internal.lua @@ -281,7 +281,7 @@ function mesecon:turnon(pos) if mesecon:is_conductor_off(node.name) then local rules = mesecon:conductor_get_rules(node) - minetest.env:add_node(pos, {name = mesecon:get_conductor_on(node.name)}) + minetest.env:add_node(pos, {name = mesecon:get_conductor_on(node.name), param2 = node.param2}) for _, rule in ipairs(rules) do local np = mesecon:addPosRule(pos, rule) @@ -305,7 +305,7 @@ function mesecon:turnoff(pos) if mesecon:is_conductor_on(node.name) then local rules = mesecon:conductor_get_rules(node) - minetest.env:add_node(pos, {name = mesecon:get_conductor_off(node.name)}) + minetest.env:add_node(pos, {name = mesecon:get_conductor_off(node.name), param2 = node.param2}) for _, rule in ipairs(rules) do local np = mesecon:addPosRule(pos, rule) From b5f5beeb3d450940e9eb465e7764ce68c6f913fd Mon Sep 17 00:00:00 2001 From: Anthony Zhang Date: Sat, 15 Dec 2012 17:53:03 -0500 Subject: [PATCH 2/4] Attempt to update the wire crossing. --- mesecons_extrawires/crossing.lua | 147 ++++++------------------------- 1 file changed, 28 insertions(+), 119 deletions(-) diff --git a/mesecons_extrawires/crossing.lua b/mesecons_extrawires/crossing.lua index 53f12b2..2b35af1 100644 --- a/mesecons_extrawires/crossing.lua +++ b/mesecons_extrawires/crossing.lua @@ -1,126 +1,35 @@ -- CODE NOT ACTIVE -for x=-1, 1 do for z=-1, 1 do - rules = {} - nodename = "mesecons_extrawires:crossing" - if x == -1 then - nodename = nodename .. "A" - table.insert(rules, {x=-1, y=0, z=0}) - end - if z == 1 then - nodename = nodename .. "B" - table.insert(rules, {x=0, y=0, z=1}) - end - if x == 1 then - nodename = nodename .. "C" - table.insert(rules, {x=1, y=0, z=0}) - end - if z == -1 then - nodename = nodename .. "D" - table.insert(rules, {x=0, y=0, z=-1}) - end - mesecon:add_rules(nodename, rules) - mesecon:register_effector(nodename, nodename, all_rules) - if nodename == "mesecons_extrawires:crossing" then - description = "Insulated Crossing" - groups = {dig_immediate = 3, mesecon = 3, mesecon_conductor_craftable=1} - else - description = "You hacker you!" - drop = "mesecons_extrawires:crossing" - groups = {dig_immediate = 3, not_in_creative_inventory=1, mesecon = 3} - mesecon:add_receptor_node(nodename, rules) - end - minetest.register_node(nodename, { - drawtype = "nodebox", - description = description, - tiles = { - "jeija_insulated_wire_sides.png", - }, - paramtype = "light", - walkable = false, - stack_max = 99, - selection_box = { - type = "fixed", - fixed = { -16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001 }, - }, - node_box = { - type = "fixed", - fixed = { - { -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 }, - { -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 }, - { -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 }, - { -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 }, - { -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 }, - { -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 }, - }, - }, - groups = groups, - drop = drop, - }) -end end - -function receptor_set(pos, rules, on) - if on then - mesecon:receptor_on(pos, rules) - else - mesecon:receptor_off(pos, rules) - end +local crossing_get_rules = function(node) + --TODO: calculate the real port states and use rules to link to them only if end -function update_plus(pos, name) - vL = { - a = string.find(name, "A")~=nil, - b = string.find(name, "B")~=nil, - c = string.find(name, "C")~=nil, - d = string.find(name, "D")~=nil, - } - rL = yc_get_real_portstates(pos) - L = { - a = rL.c and not vL.c, - b = rL.d and not vL.d, - c = rL.a and not vL.a, - d = rL.b and not vL.b, - } - newname = "mesecons_extrawires:crossing" - if L.a then newname = newname .. "A" end - if L.b then newname = newname .. "B" end - if L.c then newname = newname .. "C" end - if L.d then newname = newname .. "D" end - if newname ~= name then - minetest.env:add_node(pos, {name = newname}) - end - if L.a ~= vL.a then - receptor_set(pos, mesecon:get_rules("mesecons_extrawires:crossingA"), L.a) - if not L.a and yc_get_real_portstates(pos).a then - --catch signal changing direction while on - update_plus(pos, newname) - end - end - if L.b ~= vL.b then - receptor_set(pos, mesecon:get_rules("mesecons_extrawires:crossingB"), L.b) - if not L.b and yc_get_real_portstates(pos).b then - update_plus(pos, newname) - end - end - if L.c ~= vL.c then - receptor_set(pos, mesecon:get_rules("mesecons_extrawires:crossingC"), L.c) - if not L.c and yc_get_real_portstates(pos).c then - update_plus(pos, newname) - end - end - if L.d ~= vL.d then - receptor_set(pos, mesecon:get_rules("mesecons_extrawires:crossingD"), L.d) - if not L.c and yc_get_real_portstates(pos).d then - update_plus(pos, newname) - end - end -end - -mesecon:register_on_signal_change(function(pos, node) - if string.find(node.name, "mesecons_extrawires:crossing")~=nil then - update_plus(pos, node.name) - end -end) +minetest.register_node("mesecons_extrawires:crossing_on", { + drawtype = "nodebox", + tiles = {"jeija_insulated_wire_sides.png"}, + paramtype = "light", + walkable = false, + stack_max = 99, + selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}}, + node_box = { + type = "fixed", + fixed = { + { -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 }, + { -3/32, -17/32, -16/32-0.001, 3/32, -13/32, -6/32 }, + { -3/32, -13/32, -9/32, 3/32, -6/32, -6/32 }, + { -3/32, -9/32, -9/32, 3/32, -6/32, 9/32 }, + { -3/32, -13/32, 6/32, 3/32, -6/32, 9/32 }, + { -3/32, -17/32, 6/32, 3/32, -13/32, 16/32+0.001 }, + }, + }, + groups = {dig_immediate=3, mesecon=3, mesecon_conductor_craftable=1, not_in_creative_inventory=1}, + mesecons = { + receptor = { + state = mesecon.state.on, + rules = crossing_get_rules, + } + }, +}) minetest.register_craft({ type = "shapeless", From aab0d4d9439d8a0fbc0b4bb6792e0d27fc69c1cc Mon Sep 17 00:00:00 2001 From: Anthony Zhang Date: Sat, 15 Dec 2012 19:12:20 -0500 Subject: [PATCH 3/4] Place up/down pistons automatically depending on the player look direction, remove the craft recipes for up/down pistons, and unify all the pushing/pulling behaviors into mesecon:piston_push(pos) and mesecon:piston_pull(pos). --- mesecons_pistons/init.lua | 527 +++++++++++++++++++++--------- mesecons_pistons/pistons_down.lua | 214 ------------ mesecons_pistons/pistons_up.lua | 202 ------------ 3 files changed, 373 insertions(+), 570 deletions(-) delete mode 100644 mesecons_pistons/pistons_down.lua delete mode 100644 mesecons_pistons/pistons_up.lua diff --git a/mesecons_pistons/init.lua b/mesecons_pistons/init.lua index dd3f599..c2358de 100644 --- a/mesecons_pistons/init.lua +++ b/mesecons_pistons/init.lua @@ -1,38 +1,214 @@ --PISTONS +--starts the timer to make the piston update to its new state local update = function(pos, node) local timer = minetest.env:get_node_timer(pos) timer:stop() timer:start(0) end +--on_destruct callback, removes the piston pusher if it is present +local destruct = function(pos, oldnode) + local dir = mesecon:piston_get_direction(oldnode) + pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to first node to check + + --ensure piston is extended + local checknode = minetest.env:get_node(pos) + if checknode.name == "mesecons_pistons:piston_pusher_normal" + or checknode.name == "mesecons_pistons:piston_pusher_sticky" then + if checknode.param2 == oldnode.param2 then --pusher is facing the same direction as the piston + minetest.env:remove_node(pos) --remove the pusher + end + elseif oldnode.name == "mesecons_pistons:piston_up_normal" or oldnode.name == "mesecons_pistons:piston_up_sticky" then + if checknode.name == "mesecons_pistons:piston_up_pusher_normal" or checknode.name == "mesecons_pistons:piston_up_pusher_sticky" then + minetest.env:remove_node(pos) --remove the pusher + end + elseif oldnode.name == "mesecons_pistons:piston_down_normal" or oldnode.name == "mesecons_pistons:piston_down_sticky" then + if checknode.name == "mesecons_pistons:piston_down_pusher_normal" or checknode.name == "mesecons_pistons:piston_down_pusher_sticky" then + minetest.env:remove_node(pos) --remove the pusher + end + end +end + +--node timer callback, pushes/pulls the piston depending on whether it is powered +local timer = function(pos, elapsed) + if mesecon:is_powered(pos) then + mesecon:piston_push(pos) + else + mesecon:piston_pull(pos) + end + return false +end + +--piston push action +function mesecon:piston_push(pos) + local node = minetest.env:get_node(pos) + local dir = mesecon:piston_get_direction(node) + pos = {x=pos.x + dir.x, y=pos.y + dir.y, z=pos.z + dir.z} --move to first node being pushed + + --determine the number of nodes that need to be pushed + local count = 0 + local checkpos = {x=pos.x, y=pos.y, z=pos.z} --first node being pushed + while true do + local checknode = minetest.env:get_node(checkpos) + + --check for collision with stopper or bounds + if mesecon:is_mvps_stopper(checknode.name) or checknode.name == "ignore" then + return + end + + --check for column end + if checknode.name == "air" + or not(minetest.registered_nodes[checknode.name].liquidtype == "none") then + break + end + + --limit piston pushing capacity + count = count + 1 + if count > 15 then + return + end + + checkpos.x, checkpos.y, checkpos.z = checkpos.x + dir.x, checkpos.y + dir.y, checkpos.z + dir.z + end + + local checknode = minetest.env:get_node(pos) + + --add pusher + if node.name == "mesecons_pistons:piston_normal" then + minetest.env:add_node(pos, {name="mesecons_pistons:piston_pusher_normal", param2=node.param2}) + elseif node.name == "mesecons_pistons:piston_sticky" then + minetest.env:add_node(pos, {name="mesecons_pistons:piston_pusher_sticky", param2=node.param2}) + elseif node.name == "mesecons_pistons:piston_up_normal" then + minetest.env:add_node(pos, {name="mesecons_pistons:piston_up_pusher_normal"}) + elseif node.name == "mesecons_pistons:piston_up_sticky" then + minetest.env:add_node(pos, {name="mesecons_pistons:piston_up_pusher_sticky"}) + elseif node.name == "mesecons_pistons:piston_down_normal" then + minetest.env:add_node(pos, {name="mesecons_pistons:piston_down_pusher_normal"}) + elseif node.name == "mesecons_pistons:piston_down_sticky" then + minetest.env:add_node(pos, {name="mesecons_pistons:piston_down_pusher_sticky"}) + end + + --move nodes forward + for i = 1, count do + pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to the next node + + --check for conductor --wip: not sure if still needed + if mesecon:is_conductor_on(checknode.name) then + checknode.name = mesecon:get_conductor_off(checknode.name) + end + + --move the node forward + local nextnode = minetest.env:get_node(pos) + minetest.env:add_node(pos, checknode) + checknode = nextnode + end + + --update nodes + for i = 1, count do + mesecon:updatenode(pos) + nodeupdate(pos) + + pos.x, pos.y, pos.z = pos.x - dir.x, pos.y - dir.y, pos.z - dir.z --move to the previous node + end +end + +--piston pull action +function mesecon:piston_pull(pos) + local node = minetest.env:get_node(pos) + local dir = mesecon:piston_get_direction(node) + pos = {x=pos.x + dir.x, y=pos.y + dir.y, z=pos.z + dir.z} --move to first node being replaced + + --ensure piston is extended + local checknode = minetest.env:get_node(pos) + if node.name == "mesecons_pistons:piston_up_normal" or node.name == "mesecons_pistons:piston_up_sticky" then --up piston + if checknode.name ~= "mesecons_pistons:piston_up_pusher_normal" and checknode.name ~= "mesecons_pistons:piston_up_pusher_sticky" then + return --piston is not extended + end + elseif node.name == "mesecons_pistons:piston_down_normal" or node.name == "mesecons_pistons:piston_down_sticky" then --down piston + if checknode.name ~= "mesecons_pistons:piston_down_pusher_normal" and checknode.name ~= "mesecons_pistons:piston_down_pusher_sticky" then + return --piston is not extended + end + else --horizontal piston + if checknode.name ~= "mesecons_pistons:piston_pusher_normal" and checknode.name ~= "mesecons_pistons:piston_pusher_sticky" then + return --piston is not extended + end + if checknode.param2 ~= node.param2 then --pusher is not facing the same direction as the piston + return --piston is not extended + end + end + + --retract piston + minetest.env:remove_node(pos) --remove pusher + if node.name == "mesecons_pistons:piston_sticky" + or node.name == "mesecons_pistons:piston_up_sticky" + or node.name == "mesecons_pistons:piston_down_sticky" then --retract block if piston is sticky + local checkpos = {x=pos.x + dir.x, y=pos.y + dir.y, z=pos.z + dir.z} --move to the node to be retracted + checknode = minetest.env:get_node(checkpos) + if checknode.name ~= "air" + and checknode.name ~= "ignore" + and minetest.registered_nodes[checknode.name].liquidtype == "none" + and not mesecon:is_mvps_stopper(checknode.name) then + minetest.env:add_node(pos, checknode) + minetest.env:remove_node(checkpos) + mesecon:updatenode(checkpos) + nodeupdate(checkpos) + end + end + mesecon:updatenode(pos) + nodeupdate(pos) +end + +--push direction of a piston +function mesecon:piston_get_direction(node) + if node.name == "mesecons_pistons:piston_up_normal" or node.name == "mesecons_pistons:piston_up_sticky" then + return {x=0, y=1, z=0} + elseif node.name == "mesecons_pistons:piston_down_normal" or node.name == "mesecons_pistons:piston_down_sticky" then + return {x=0, y=-1, z=0} + elseif node.param2 == 3 then + return {x=1, y=0, z=0} + elseif node.param2 == 2 then + return {x=0, y=0, z=1} + elseif node.param2 == 1 then + return {x=-1, y=0, z=0} + else --node.param2 == 0 + return {x=0, y=0, z=-1} + end +end + +--horizontal pistons minetest.register_node("mesecons_pistons:piston_normal", { description = "Piston", tiles = {"jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_side.png"}, groups = {cracky=3, mesecon=2}, paramtype2 = "facedir", - after_destruct = function(pos, oldnode) - local dir = mesecon:piston_get_direction(oldnode) - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to first node to check - - --ensure piston is extended - local checknode = minetest.env:get_node(pos) - if checknode.name == "mesecons_pistons:piston_pusher_normal" then - if checknode.param2 == oldnode.param2 then --pusher is facing the same direction as the piston - minetest.env:remove_node(pos) --remove the pusher + 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) + end + local dir = placer:get_look_dir() + if math.abs(dir.y) > math.abs(dir.x) and math.abs(dir.y) > math.abs(dir.z) 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 end - end, - on_timer = function(pos, elapsed) - if mesecon:is_powered(pos) then - mesecon:piston_push(pos) - else - mesecon:piston_pull(pos) - end - return false + return minetest.item_place(itemstack, placer, pointed_thing) --place piston normally end, mesecons = {effector={ - action_change = update + action_change = update }} }) @@ -41,48 +217,36 @@ minetest.register_node("mesecons_pistons:piston_sticky", { tiles = {"jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_sticky_side.png"}, groups = {cracky=3, mesecon=2}, paramtype2 = "facedir", - after_destruct = function(pos, oldnode) - local dir = mesecon:piston_get_direction(oldnode) - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to first node to check - - --ensure piston is extended - local checknode = minetest.env:get_node(pos) - if checknode.name == "mesecons_pistons:piston_pusher_sticky" then - if checknode.param2 == oldnode.param2 then --pusher is facing the same direction as the piston - minetest.env:remove_node(pos) --remove the pusher + 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) + end + local dir = placer:get_look_dir() + if math.abs(dir.y) > math.abs(dir.x) and math.abs(dir.y) > math.abs(dir.z) 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 end - end, - on_timer = function(pos, elapsed) - if mesecon:is_powered(pos) then - mesecon:piston_push(pos) - else - mesecon:piston_pull(pos) - end - return false + return minetest.item_place(itemstack, placer, pointed_thing) --place piston normally end, mesecons = {effector={ - action_change = update + action_change = update }} }) -minetest.register_craft({ - output = '"mesecons_pistons:piston_normal" 2', - recipe = { - {"default:wood", "default:wood", "default:wood"}, - {"default:cobble", "default:steel_ingot", "default:cobble"}, - {"default:cobble", "group:mesecon_conductor_craftable", "default:cobble"}, - } -}) - -minetest.register_craft({ - output = "mesecons_pistons:piston_sticky", - recipe = { - {"mesecons_materials:glue"}, - {"mesecons_pistons:piston_normal"}, - } -}) - minetest.register_node("mesecons_pistons:piston_pusher_normal", { drawtype = "nodebox", tiles = {"jeija_piston_pusher_normal.png"}, @@ -137,115 +301,170 @@ minetest.register_node("mesecons_pistons:piston_pusher_sticky", { mesecon:register_mvps_stopper("mesecons_pistons:piston_pusher_normal") mesecon:register_mvps_stopper("mesecons_pistons:piston_pusher_sticky") -function mesecon:piston_push(pos) - local node = minetest.env:get_node(pos) - local dir = mesecon:piston_get_direction(node) - pos = {x=pos.x + dir.x, y=pos.y + dir.y, z=pos.z + dir.z} --move to first node being pushed +--up pistons +minetest.register_node("mesecons_pistons:piston_up_normal", { + tiles = {"jeija_piston_side.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png"}, + groups = {cracky=3, mesecon=2}, + after_destruct = destruct, + on_timer = timer, + mesecons = {effector={ + action_change = update + }}, + drop = "mesecons_pistons:piston_normal", +}) - --determine the number of nodes that need to be pushed - local count = 0 - local checkpos = {x=pos.x, y=pos.y, z=pos.z} --first node being pushed - while true do - local checknode = minetest.env:get_node(checkpos) +minetest.register_node("mesecons_pistons:piston_up_sticky", { + tiles = {"jeija_piston_sticky_side.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png"}, + groups = {cracky=3, mesecon=2}, + after_destruct = destruct, + on_timer = timer, + mesecons = {effector={ + action_change = update + }}, + drop = "mesecons_pistons:piston_sticky", +}) - --check for collision with stopper or bounds - if mesecon:is_mvps_stopper(checknode.name) or checknode.name == "ignore" then - return - end +minetest.register_node("mesecons_pistons:piston_up_pusher_normal", { + drawtype = "nodebox", + tiles = {"jeija_piston_pusher_normal.png"}, + paramtype = "light", + diggable = false, + selection_box = { + type = "fixed", + fixed = { + {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2}, + {-0.5, 0.3, -0.5, 0.5, 0.5, 0.5}, + }, + }, + node_box = { + type = "fixed", + fixed = { + {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2}, + {-0.5, 0.3, -0.5, 0.5, 0.5, 0.5}, + }, + }, +}) - --check for column end - if checknode.name == "air" - or not(minetest.registered_nodes[checknode.name].liquidtype == "none") then - break - end +minetest.register_node("mesecons_pistons:piston_up_pusher_sticky", { + drawtype = "nodebox", + tiles = { + "jeija_piston_pusher_sticky.png", + "jeija_piston_pusher_normal.png", + "jeija_piston_pusher_normal.png", + "jeija_piston_pusher_normal.png", + "jeija_piston_pusher_normal.png", + "jeija_piston_pusher_normal.png" + }, + paramtype = "light", + diggable = false, + selection_box = { + type = "fixed", + fixed = { + {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2}, + {-0.5, 0.3, -0.5, 0.5, 0.5, 0.5}, + }, + }, + node_box = { + type = "fixed", + fixed = { + {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2}, + {-0.5, 0.3, -0.5, 0.5, 0.5, 0.5}, + }, + }, +}) - --limit piston pushing capacity - count = count + 1 - if count > 15 then - return - end +mesecon:register_mvps_stopper("mesecons_pistons:piston_up_pusher_normal") +mesecon:register_mvps_stopper("mesecons_pistons:piston_up_pusher_sticky") - checkpos.x, checkpos.y, checkpos.z = checkpos.x + dir.x, checkpos.y + dir.y, checkpos.z + dir.z - end +--down pistons +minetest.register_node("mesecons_pistons:piston_down_normal", { + tiles = {"jeija_piston_tb.png", "jeija_piston_side.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png"}, + groups = {cracky=3, mesecon=2}, + after_destruct = destruct, + on_timer = timer, + mesecons = {effector={ + action_change = update + }}, + drop = "mesecons_pistons:piston_normal", +}) - local checknode = minetest.env:get_node(pos) +minetest.register_node("mesecons_pistons:piston_down_sticky", { + tiles = {"jeija_piston_tb.png", "jeija_piston_sticky_side.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png"}, + groups = {cracky=3, mesecon=2}, + after_destruct = destruct, + on_timer = timer, + mesecons = {effector={ + action_change = update + }}, + drop = "mesecons_pistons:piston_sticky", +}) - --add pusher - if node.name == "mesecons_pistons:piston_normal" then - minetest.env:add_node(pos, {name="mesecons_pistons:piston_pusher_normal", param2=node.param2}) - else - minetest.env:add_node(pos, {name="mesecons_pistons:piston_pusher_sticky", param2=node.param2}) - end +minetest.register_node("mesecons_pistons:piston_down_pusher_normal", { + drawtype = "nodebox", + tiles = {"jeija_piston_pusher_normal.png"}, + paramtype = "light", + diggable = false, + selection_box = { + type = "fixed", + fixed = { + {-0.2, -0.3, -0.2, 0.2, 0.5, 0.2}, + {-0.5, -0.5, -0.5, 0.5, -0.3, 0.5}, + }, + }, + node_box = { + type = "fixed", + fixed = { + {-0.2, -0.3, -0.2, 0.2, 0.5, 0.2}, + {-0.5, -0.5, -0.5, 0.5, -0.3, 0.5}, + }, + }, +}) - --move nodes forward - for i = 1, count do - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to the next node +minetest.register_node("mesecons_pistons:piston_down_pusher_sticky", { + drawtype = "nodebox", + tiles = { + "jeija_piston_pusher_normal.png", + "jeija_piston_pusher_sticky.png", + "jeija_piston_pusher_normal.png", + "jeija_piston_pusher_normal.png", + "jeija_piston_pusher_normal.png", + "jeija_piston_pusher_normal.png" + }, + paramtype = "light", + diggable = false, + selection_box = { + type = "fixed", + fixed = { + {-0.2, -0.3, -0.2, 0.2, 0.5, 0.2}, + {-0.5, -0.5, -0.5, 0.5, -0.3, 0.5}, + }, + }, + node_box = { + type = "fixed", + fixed = { + {-0.2, -0.3, -0.2, 0.2, 0.5, 0.2}, + {-0.5, -0.5, -0.5, 0.5, -0.3, 0.5}, + }, + }, +}) - --check for conductor - if mesecon:is_conductor_on(checknode.name) then - checknode.name = mesecon:get_conductor_off(checknode.name) - end +mesecon:register_mvps_stopper("mesecons_pistons:piston_down_pusher_normal") +mesecon:register_mvps_stopper("mesecons_pistons:piston_down_pusher_sticky") - --move the node forward - local nextnode = minetest.env:get_node(pos) - minetest.env:add_node(pos, checknode) - checknode = nextnode - end +--craft recipes +minetest.register_craft({ + output = '"mesecons_pistons:piston_normal" 2', + recipe = { + {"default:wood", "default:wood", "default:wood"}, + {"default:cobble", "default:steel_ingot", "default:cobble"}, + {"default:cobble", "group:mesecon_conductor_craftable", "default:cobble"}, + } +}) - --update nodes - for i = 1, count do - mesecon:updatenode(pos) - nodeupdate(pos) - - pos.x, pos.y, pos.z = pos.x - dir.x, pos.y - dir.y, pos.z - dir.z --move to the previous node - end -end - -function mesecon:piston_pull(pos) - local node = minetest.env:get_node(pos) - local dir = mesecon:piston_get_direction(node) - pos = {x=pos.x + dir.x, y=pos.y + dir.y, z=pos.z + dir.z} --move to first node being replaced - - --ensure piston is extended - local checknode = minetest.env:get_node(pos) - if checknode.name ~= "mesecons_pistons:piston_pusher_normal" and checknode.name ~= "mesecons_pistons:piston_pusher_sticky" then - return - end - if checknode.param2 ~= node.param2 then --pusher is not facing the same direction as the piston - return --piston is not extended - end - - --retract piston - minetest.env:remove_node(pos) --remove pusher - if node.name == "mesecons_pistons:piston_sticky" then --retract block - local checkpos = {x=pos.x + dir.x, y=pos.y + dir.y, z=pos.z + dir.z} --move to the node to be retracted - checknode = minetest.env:get_node(checkpos) - if checknode.name ~= "air" - and checknode.name ~= "ignore" - and minetest.registered_nodes[checknode.name].liquidtype == "none" - and not mesecon:is_mvps_stopper(checknode.name) then - minetest.env:add_node(pos, checknode) - minetest.env:remove_node(checkpos) - mesecon:updatenode(checkpos) - nodeupdate(checkpos) - end - end - mesecon:updatenode(pos) - nodeupdate(pos) -end - --- get piston direction -function mesecon:piston_get_direction(node) - if node.param2 == 3 then - return {x=1, y=0, z=0} - elseif node.param2 == 2 then - return {x=0, y=0, z=1} - elseif node.param2 == 1 then - return {x=-1, y=0, z=0} - else --node.param2 == 0 - return {x=0, y=0, z=-1} - end -end - -dofile(minetest.get_modpath("mesecons_pistons").."/pistons_down.lua") -dofile(minetest.get_modpath("mesecons_pistons").."/pistons_up.lua") +minetest.register_craft({ + output = "mesecons_pistons:piston_sticky", + recipe = { + {"mesecons_materials:glue"}, + {"mesecons_pistons:piston_normal"}, + } +}) \ No newline at end of file diff --git a/mesecons_pistons/pistons_down.lua b/mesecons_pistons/pistons_down.lua deleted file mode 100644 index fb16c6f..0000000 --- a/mesecons_pistons/pistons_down.lua +++ /dev/null @@ -1,214 +0,0 @@ ---PISTONS ---registration normal one: -minetest.register_node("mesecons_pistons:piston_down_normal", { - description = "Piston DOWN", - tiles = {"jeija_piston_tb.png", "jeija_piston_side.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png"}, - groups = {cracky=3, mesecon = 2}, - after_dig_node = function(pos, oldnode) - local dir = {x=0, y=-1, z=0} - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to first node to check - - --ensure piston is extended - local checknode = minetest.env:get_node(pos) - if checknode.name == "mesecons_pistons:piston_down_pusher_normal" then - if checknode.param2 == oldnode.param2 then --pusher is facing the same direction as the piston - minetest.env:remove_node(pos) --remove the pusher - end - end - end, -}) - -mesecon:register_effector("mesecons_pistons:piston_down_normal", "mesecons_pistons:piston_down_normal") - ---registration sticky one: -minetest.register_node("mesecons_pistons:piston_down_sticky", { - description = "Sticky Piston DOWN", - tiles = {"jeija_piston_tb.png", "jeija_piston_sticky_side.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png"}, - groups = {cracky=3, mesecon = 2}, - after_dig_node = function(pos, oldnode) - local dir = {x=0, y=-1, z=0} - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to first node to check - - --ensure piston is extended - local checknode = minetest.env:get_node(pos) - if checknode.name == "mesecons_pistons:piston_down_pusher_sticky" then - if checknode.param2 == oldnode.param2 then --pusher is facing the same direction as the piston - minetest.env:remove_node(pos) --remove the pusher - end - end - end, -}) - -mesecon:register_effector("mesecons_pistons:piston_down_sticky", "mesecons_pistons:piston_down_sticky") - -minetest.register_craft({ - output = "mesecons_pistons:piston_down_normal", - recipe = { - {"mesecons_pistons:piston_up_normal"}, - } -}) -minetest.register_craft({ - output = "mesecons_pistons:piston_normal", - recipe = { - {"mesecons_pistons:piston_down_normal"}, - } -}) -minetest.register_craft({ - output = "mesecons_pistons:piston_down_sticky", - recipe = { - {"mesecons_pistons:piston_up_sticky"}, - } -}) -minetest.register_craft({ - output = "mesecons_pistons:piston_sticky", - recipe = { - {"mesecons_pistons:piston_down_sticky"}, - } -}) - -minetest.register_node("mesecons_pistons:piston_down_pusher_normal", { - drawtype = "nodebox", - tiles = {"jeija_piston_pusher_normal.png"}, - paramtype = "light", - diggable = false, - selection_box = { - type = "fixed", - fixed = { - {-0.2, -0.3, -0.2, 0.2, 0.5, 0.2}, - {-0.5, -0.5, -0.5, 0.5, -0.3, 0.5}, - }, - }, - node_box = { - type = "fixed", - fixed = { - {-0.2, -0.3, -0.2, 0.2, 0.5, 0.2}, - {-0.5, -0.5, -0.5, 0.5, -0.3, 0.5}, - }, - }, -}) - -mesecon:register_mvps_stopper("mesecons_pistons:piston_down_pusher_normal") -mesecon:register_mvps_stopper("mesecons_pistons:piston_down_pusher_sticky") - -minetest.register_node("mesecons_pistons:piston_down_pusher_sticky", { - drawtype = "nodebox", - tiles = { - "jeija_piston_pusher_sticky.png", - "jeija_piston_pusher_normal.png", - "jeija_piston_pusher_normal.png", - "jeija_piston_pusher_normal.png", - "jeija_piston_pusher_normal.png", - "jeija_piston_pusher_normal.png" - }, - paramtype = "light", - diggable = false, - selection_box = { - type = "fixed", - fixed = { - {-0.2, -0.3, -0.2, 0.2, 0.5, 0.2}, - {-0.5, -0.5, -0.5, 0.5, -0.3, 0.5}, - }, - }, - node_box = { - type = "fixed", - fixed = { - {-0.2, -0.3, -0.2, 0.2, 0.5, 0.2}, - {-0.5, -0.5, -0.5, 0.5, -0.3, 0.5}, - }, - }, -}) - --- Push action -mesecon:register_on_signal_on(function(pos, node) - if node.name ~= "mesecons_pistons:piston_down_normal" and node.name ~= "mesecons_pistons:piston_down_sticky" then - return - end - - local dir = {x=0, y=-1, z=0} - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to first node being pushed - - --determine the number of nodes that need to be pushed - local count = 0 - local checkpos = {x=pos.x, y=pos.y, z=pos.z} --first node being pushed - while true do - local checknode = minetest.env:get_node(checkpos) - - --check for collision with stopper or bounds - if mesecon:is_mvps_stopper(checknode.name) or checknode.name == "ignore" then - return - end - - --check for column end - if checknode.name == "air" - or not(minetest.registered_nodes[checknode.name].liquidtype == "none") then - break - end - - --limit piston pushing capacity - count = count + 1 - if count > 15 then - return - end - - checkpos.x, checkpos.y, checkpos.z = checkpos.x + dir.x, checkpos.y + dir.y, checkpos.z + dir.z - end - - local checknode = minetest.env:get_node(pos) - minetest.env:remove_node(pos) --remove the first node - mesecon:updatenode(pos) - - --add pusher - if node.name == "mesecons_pistons:piston_down_normal" then - minetest.env:add_node(pos, {name="mesecons_pistons:piston_down_pusher_normal", param2=node.param2}) - else - minetest.env:add_node(pos, {name="mesecons_pistons:piston_down_pusher_sticky", param2=node.param2}) - end - - --move nodes forward - for i = 1, count do - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to the next node - - --move the node forward - local nextnode = minetest.env:get_node(pos) - --minetest.env:dig_node(pos) - minetest.env:set_node(pos, checknode) - mesecon:updatenode(pos) - checknode = nextnode - end -end) - ---Pull action -mesecon:register_on_signal_off(function(pos, node) - if node.name ~= "mesecons_pistons:piston_down_normal" and node.name ~= "mesecons_pistons:piston_down_sticky" then - return - end - - local dir = {x=0, y=-1, z=0} - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to the node to be replaced - - --ensure piston is extended - local checknode = minetest.env:get_node(pos) - if checknode.name ~= "mesecons_pistons:piston_down_pusher_normal" and checknode.name ~= "mesecons_pistons:piston_down_pusher_sticky" then - return - end - if checknode.param2 ~= node.param2 then --pusher is not facing the same direction as the piston - return --piston is not extended - end - - --retract piston - minetest.env:remove_node(pos) --remove pusher - if node.name == "mesecons_pistons:piston_down_sticky" then --retract block - local checkpos = {x=pos.x + dir.x, y=pos.y + dir.y, z=pos.z + dir.z} --move to the node to be retracted - checknode = minetest.env:get_node(checkpos) - if checknode.name ~= "air" - and checknode.name ~= "ignore" - and minetest.registered_nodes[checknode.name].liquidtype == "none" - and not mesecon:is_mvps_stopper(checknode.name) then - minetest.env:remove_node(checkpos) - mesecon:updatenode(checkpos) - minetest.env:set_node(pos, checknode) - mesecon:updatenode(pos) - end - end - nodeupdate(pos) -end) diff --git a/mesecons_pistons/pistons_up.lua b/mesecons_pistons/pistons_up.lua deleted file mode 100644 index cbee277..0000000 --- a/mesecons_pistons/pistons_up.lua +++ /dev/null @@ -1,202 +0,0 @@ ---PISTONS ---registration normal one: -minetest.register_node("mesecons_pistons:piston_up_normal", { - description = "Piston UP", - tiles = {"jeija_piston_side.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png"}, - groups = {cracky=3, mesecon = 2}, - after_dig_node = function(pos, oldnode) - local dir = {x=0, y=1, z=0} - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to first node to check - - --ensure piston is extended - local checknode = minetest.env:get_node(pos) - if checknode.name == "mesecons_pistons:piston_up_pusher_normal" then - if checknode.param2 == oldnode.param2 then --pusher is facing the same direction as the piston - minetest.env:remove_node(pos) --remove the pusher - end - end - end, -}) - -mesecon:register_effector("mesecons_pistons:piston_up_normal", "mesecons_pistons:piston_up_normal") - ---registration sticky one: -minetest.register_node("mesecons_pistons:piston_up_sticky", { - description = "Sticky Piston UP", - tiles = {"jeija_piston_sticky_side.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png"}, - groups = {cracky=3, mesecon = 2}, - after_dig_node = function(pos, oldnode) - local dir = {x=0, y=1, z=0} - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to first node to check - - --ensure piston is extended - local checknode = minetest.env:get_node(pos) - if checknode.name == "mesecons_pistons:piston_up_pusher_sticky" then - if checknode.param2 == oldnode.param2 then --pusher is facing the same direction as the piston - minetest.env:remove_node(pos) --remove the pusher - end - end - end, -}) - -mesecon:register_effector("mesecons_pistons:piston_up_sticky", "mesecons_pistons:piston_up_sticky") - -minetest.register_craft({ - output = "mesecons_pistons:piston_up_normal", - recipe = { - {"mesecons_pistons:piston_normal"}, - } -}) -minetest.register_craft({ - output = "mesecons_pistons:piston_up_sticky", - recipe = { - {"mesecons_pistons:piston_sticky"}, - } -}) - -minetest.register_node("mesecons_pistons:piston_up_pusher_normal", { - drawtype = "nodebox", - tiles = {"jeija_piston_pusher_normal.png"}, - paramtype = "light", - diggable = false, - selection_box = { - type = "fixed", - fixed = { - {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2}, - {-0.5, 0.3, -0.5, 0.5, 0.5, 0.5}, - }, - }, - node_box = { - type = "fixed", - fixed = { - {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2}, - {-0.5, 0.3, -0.5, 0.5, 0.5, 0.5}, - }, - }, -}) - -mesecon:register_mvps_stopper("mesecons_pistons:piston_up_pusher_normal") -mesecon:register_mvps_stopper("mesecons_pistons:piston_up_pusher_sticky") - -minetest.register_node("mesecons_pistons:piston_up_pusher_sticky", { - drawtype = "nodebox", - tiles = { - "jeija_piston_pusher_normal.png", - "jeija_piston_pusher_sticky.png", - "jeija_piston_pusher_normal.png", - "jeija_piston_pusher_normal.png", - "jeija_piston_pusher_normal.png", - "jeija_piston_pusher_normal.png" - }, - paramtype = "light", - diggable = false, - selection_box = { - type = "fixed", - fixed = { - {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2}, - {-0.5, 0.3, -0.5, 0.5, 0.5, 0.5}, - }, - }, - node_box = { - type = "fixed", - fixed = { - {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2}, - {-0.5, 0.3, -0.5, 0.5, 0.5, 0.5}, - }, - }, -}) - --- Push action -mesecon:register_on_signal_on(function(pos, node) - if node.name ~= "mesecons_pistons:piston_up_normal" and node.name ~= "mesecons_pistons:piston_up_sticky" then - return - end - - local dir = {x=0, y=1, z=0} - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to first node being pushed - - --determine the number of nodes that need to be pushed - local count = 0 - local checkpos = {x=pos.x, y=pos.y, z=pos.z} --first node being pushed - while true do - local checknode = minetest.env:get_node(checkpos) - - --check for collision with stopper or bounds - if mesecon:is_mvps_stopper(checknode.name) or checknode.name == "ignore" then - return - end - - --check for column end - if checknode.name == "air" - or not(minetest.registered_nodes[checknode.name].liquidtype == "none") then - break - end - - --limit piston pushing capacity - count = count + 1 - if count > 15 then - return - end - - checkpos.x, checkpos.y, checkpos.z = checkpos.x + dir.x, checkpos.y + dir.y, checkpos.z + dir.z - end - - local checknode = minetest.env:get_node(pos) - minetest.env:remove_node(pos) --remove the first node - mesecon:updatenode(pos) - - --add pusher - if node.name == "mesecons_pistons:piston_up_normal" then - minetest.env:add_node(pos, {name="mesecons_pistons:piston_up_pusher_normal", param2=node.param2}) - else - minetest.env:add_node(pos, {name="mesecons_pistons:piston_up_pusher_sticky", param2=node.param2}) - end - - --move nodes forward - for i = 1, count do - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to the next node - - --move the node forward - local nextnode = minetest.env:get_node(pos) - --minetest.env:dig_node(pos) - minetest.env:set_node(pos, checknode) - mesecon:updatenode(pos) - checknode = nextnode - end -end) - ---Pull action -mesecon:register_on_signal_off(function(pos, node) - if node.name ~= "mesecons_pistons:piston_up_normal" and node.name ~= "mesecons_pistons:piston_up_sticky" then - return - end - - local dir = {x=0, y=1, z=0} - pos.x, pos.y, pos.z = pos.x + dir.x, pos.y + dir.y, pos.z + dir.z --move to the node to be replaced - - --ensure piston is extended - local checknode = minetest.env:get_node(pos) - if checknode.name ~= "mesecons_pistons:piston_up_pusher_normal" and checknode.name ~= "mesecons_pistons:piston_up_pusher_sticky" then - return - end - if checknode.param2 ~= node.param2 then --pusher is not facing the same direction as the piston - return --piston is not extended - end - - --retract piston - minetest.env:remove_node(pos) --remove pusher - if node.name == "mesecons_pistons:piston_up_sticky" then --retract block - local checkpos = {x=pos.x + dir.x, y=pos.y + dir.y, z=pos.z + dir.z} --move to the node to be retracted - checknode = minetest.env:get_node(checkpos) - if checknode.name ~= "air" - and checknode.name ~= "ignore" - and minetest.registered_nodes[checknode.name].liquidtype == "none" - and not mesecon:is_mvps_stopper(checknode.name) then - minetest.env:remove_node(checkpos) - mesecon:updatenode(checkpos) - minetest.env:set_node(pos, checknode) - mesecon:updatenode(pos) - end - end - nodeupdate(pos) -end) From 9dee0c020c9d0807594a4de9f3728dd6b0e20223 Mon Sep 17 00:00:00 2001 From: Anthony Zhang Date: Sat, 15 Dec 2012 19:16:59 -0500 Subject: [PATCH 4/4] Fix placing while facing diagonally. --- mesecons_pistons/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesecons_pistons/init.lua b/mesecons_pistons/init.lua index c2358de..840cce2 100644 --- a/mesecons_pistons/init.lua +++ b/mesecons_pistons/init.lua @@ -192,7 +192,7 @@ minetest.register_node("mesecons_pistons:piston_normal", { return minetest.item_place(itemstack, placer, pointed_thing) end local dir = placer:get_look_dir() - if math.abs(dir.y) > math.abs(dir.x) and math.abs(dir.y) > math.abs(dir.z) then --vertical look direction is most significant + 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") @@ -227,7 +227,7 @@ minetest.register_node("mesecons_pistons:piston_sticky", { return minetest.item_place(itemstack, placer, pointed_thing) end local dir = placer:get_look_dir() - if math.abs(dir.y) > math.abs(dir.x) and math.abs(dir.y) > math.abs(dir.z) then --vertical look direction is most significant + 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")