mirror of
https://github.com/minetest-mods/mesecons.git
synced 2024-09-12 07:58:32 +02:00
Further piston improvements, the pistons now delay before retracting and play nice with invalid states.
This commit is contained in:
parent
931ac23ff3
commit
ff5dcda7c7
@ -1,9 +1,9 @@
|
|||||||
--PISTONS
|
--PISTONS
|
||||||
--registration normal one:
|
|
||||||
minetest.register_node("mesecons_pistons:piston_normal", {
|
minetest.register_node("mesecons_pistons:piston_normal", {
|
||||||
description = "Piston",
|
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"},
|
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},
|
groups = {cracky=3, mesecon=2},
|
||||||
paramtype2 = "facedir",
|
paramtype2 = "facedir",
|
||||||
after_destruct = function(pos, oldnode)
|
after_destruct = function(pos, oldnode)
|
||||||
local dir = mesecon:piston_get_direction(oldnode)
|
local dir = mesecon:piston_get_direction(oldnode)
|
||||||
@ -18,17 +18,20 @@ minetest.register_node("mesecons_pistons:piston_normal", {
|
|||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
on_timer = function(pos, elapsed)
|
on_timer = function(pos, elapsed)
|
||||||
mesecon:piston_push(pos, minetest.env:get_node(pos))
|
if mesecon:is_powered(pos) then
|
||||||
|
mesecon:piston_push(pos)
|
||||||
|
else
|
||||||
|
mesecon:piston_pull(pos)
|
||||||
|
end
|
||||||
return false
|
return false
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
mesecon:register_effector("mesecons_pistons:piston_normal", "mesecons_pistons:piston_normal")
|
mesecon:register_effector("mesecons_pistons:piston_normal", "mesecons_pistons:piston_normal")
|
||||||
|
|
||||||
--registration sticky one:
|
|
||||||
minetest.register_node("mesecons_pistons:piston_sticky", {
|
minetest.register_node("mesecons_pistons:piston_sticky", {
|
||||||
description = "Sticky Piston",
|
description = "Sticky Piston",
|
||||||
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"},
|
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},
|
groups = {cracky=3, mesecon=2},
|
||||||
paramtype2 = "facedir",
|
paramtype2 = "facedir",
|
||||||
after_destruct = function(pos, oldnode)
|
after_destruct = function(pos, oldnode)
|
||||||
local dir = mesecon:piston_get_direction(oldnode)
|
local dir = mesecon:piston_get_direction(oldnode)
|
||||||
@ -43,7 +46,11 @@ minetest.register_node("mesecons_pistons:piston_sticky", {
|
|||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
on_timer = function(pos, elapsed)
|
on_timer = function(pos, elapsed)
|
||||||
mesecon:piston_push(pos, minetest.env:get_node(pos))
|
if mesecon:is_powered(pos) then
|
||||||
|
mesecon:piston_push(pos)
|
||||||
|
else
|
||||||
|
mesecon:piston_pull(pos)
|
||||||
|
end
|
||||||
return false
|
return false
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
@ -120,54 +127,22 @@ 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_normal")
|
||||||
mesecon:register_mvps_stopper("mesecons_pistons:piston_pusher_sticky")
|
mesecon:register_mvps_stopper("mesecons_pistons:piston_pusher_sticky")
|
||||||
|
|
||||||
-- Push action
|
local update = function(pos, node)
|
||||||
mesecon:register_on_signal_on(function(pos, node)
|
|
||||||
if node.name ~= "mesecons_pistons:piston_normal" and node.name ~= "mesecons_pistons:piston_sticky" then
|
if node.name ~= "mesecons_pistons:piston_normal" and node.name ~= "mesecons_pistons:piston_sticky" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local timer = minetest.env:get_node_timer(pos)
|
local timer = minetest.env:get_node_timer(pos)
|
||||||
timer:set(1.0, 0)
|
timer:stop()
|
||||||
end)
|
timer:set(0.1, 0)
|
||||||
|
end
|
||||||
--Pull action
|
mesecon:register_on_signal_on(update) --push action
|
||||||
mesecon:register_on_signal_off(function(pos, node)
|
mesecon:register_on_signal_off(update) --pull action
|
||||||
if node.name ~= "mesecons_pistons:piston_normal" and node.name ~= "mesecons_pistons:piston_sticky" then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
|
function mesecon:piston_push(pos)
|
||||||
|
local node = minetest.env:get_node(pos)
|
||||||
local dir = mesecon:piston_get_direction(node)
|
local dir = mesecon:piston_get_direction(node)
|
||||||
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
|
pos = {x=pos.x + dir.x, y=pos.y + dir.y, z=pos.z + dir.z} --move to first node being pushed
|
||||||
|
|
||||||
--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:set_node(pos, checknode)
|
|
||||||
minetest.env:remove_node(checkpos)
|
|
||||||
mesecon:updatenode(checkpos)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
nodeupdate(pos)
|
|
||||||
end)
|
|
||||||
|
|
||||||
function mesecon:piston_push(pos, node)
|
|
||||||
local dir = mesecon:piston_get_direction(node)
|
|
||||||
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
|
--determine the number of nodes that need to be pushed
|
||||||
local count = 0
|
local count = 0
|
||||||
@ -197,10 +172,9 @@ function mesecon:piston_push(pos, node)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local checknode = minetest.env:get_node(pos)
|
local checknode = minetest.env:get_node(pos)
|
||||||
minetest.env:remove_node(pos) --remove the first node
|
|
||||||
mesecon:updatenode(pos)
|
|
||||||
|
|
||||||
--add pusher
|
--add pusher
|
||||||
|
minetest.env:dig_node(pos) --remove the first node
|
||||||
if node.name == "mesecons_pistons:piston_normal" then
|
if node.name == "mesecons_pistons:piston_normal" then
|
||||||
minetest.env:add_node(pos, {name="mesecons_pistons:piston_pusher_normal", param2=node.param2})
|
minetest.env:add_node(pos, {name="mesecons_pistons:piston_pusher_normal", param2=node.param2})
|
||||||
else
|
else
|
||||||
@ -211,15 +185,49 @@ function mesecon:piston_push(pos, node)
|
|||||||
for i = 1, count do
|
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
|
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
|
||||||
|
if mesecon:is_conductor_on(checknode.name) then
|
||||||
|
checknode.name = mesecon:get_conductor_off(checknode.name)
|
||||||
|
end
|
||||||
|
|
||||||
--move the node forward
|
--move the node forward
|
||||||
local nextnode = minetest.env:get_node(pos)
|
local nextnode = minetest.env:get_node(pos)
|
||||||
--minetest.env:dig_node(pos)
|
minetest.env:place_node(pos, checknode)
|
||||||
minetest.env:set_node(pos, checknode)
|
|
||||||
mesecon:updatenode(pos)
|
|
||||||
checknode = nextnode
|
checknode = nextnode
|
||||||
end
|
end
|
||||||
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:place_node(pos, checknode)
|
||||||
|
minetest.env:dig_node(checkpos)
|
||||||
|
mesecon:updatenode(checkpos)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
nodeupdate(pos)
|
||||||
|
end
|
||||||
|
|
||||||
-- get piston direction
|
-- get piston direction
|
||||||
function mesecon:piston_get_direction(node)
|
function mesecon:piston_get_direction(node)
|
||||||
if node.param2 == 3 then
|
if node.param2 == 3 then
|
||||||
|
Loading…
Reference in New Issue
Block a user