devices.lua: replace calls to add_node() with swap_node() to preserve node metadata

This commit is contained in:
thetaepsilon-gamedev 2017-09-27 16:42:15 +01:00
parent c3708b154c
commit d6dcd51302
1 changed files with 11 additions and 10 deletions

View File

@ -68,7 +68,7 @@ function pipeworks.rotate_on_place(itemstack, placer, pointed_thing)
local placednode = string.gsub(itemstack:get_name(), "_loaded", "_empty") local placednode = string.gsub(itemstack:get_name(), "_loaded", "_empty")
placednode = string.gsub(placednode, "_on", "_off") placednode = string.gsub(placednode, "_on", "_off")
minetest.add_node(pos1, {name = placednode, param2 = fdir }) minetest.swap_node(pos1, {name = placednode, param2 = fdir })
pipeworks.scan_for_pipe_objects(pos1) pipeworks.scan_for_pipe_objects(pos1)
if not pipeworks.expect_infinite_stacks then if not pipeworks.expect_infinite_stacks then
@ -149,16 +149,17 @@ for s in ipairs(states) do
drop = "pipeworks:pump_off", drop = "pipeworks:pump_off",
mesecons = {effector = { mesecons = {effector = {
action_on = function (pos, node) action_on = function (pos, node)
minetest.add_node(pos,{name="pipeworks:pump_on", param2 = node.param2}) minetest.swap_node(pos,{name="pipeworks:pump_on", param2 = node.param2})
end, end,
action_off = function (pos, node) action_off = function (pos, node)
minetest.add_node(pos,{name="pipeworks:pump_off", param2 = node.param2}) minetest.swap_node(pos,{name="pipeworks:pump_off", param2 = node.param2})
end end
}}, }},
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
local fdir = node.param2 local fdir = node.param2
minetest.add_node(pos, { name = "pipeworks:pump_"..states[3-s], param2 = fdir }) minetest.swap_node(pos, { name = "pipeworks:pump_"..states[3-s], param2 = fdir })
end, end,
-- FIXME - does this preserve metadata? need to look at this
on_rotate = screwdriver.rotate_simple on_rotate = screwdriver.rotate_simple
}) })
@ -188,15 +189,15 @@ for s in ipairs(states) do
drop = "pipeworks:valve_off_empty", drop = "pipeworks:valve_off_empty",
mesecons = {effector = { mesecons = {effector = {
action_on = function (pos, node) action_on = function (pos, node)
minetest.add_node(pos,{name="pipeworks:valve_on_empty", param2 = node.param2}) minetest.swap_node(pos,{name="pipeworks:valve_on_empty", param2 = node.param2})
end, end,
action_off = function (pos, node) action_off = function (pos, node)
minetest.add_node(pos,{name="pipeworks:valve_off_empty", param2 = node.param2}) minetest.swap_node(pos,{name="pipeworks:valve_off_empty", param2 = node.param2})
end end
}}, }},
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
local fdir = node.param2 local fdir = node.param2
minetest.add_node(pos, { name = "pipeworks:valve_"..states[3-s].."_empty", param2 = fdir }) minetest.swap_node(pos, { name = "pipeworks:valve_"..states[3-s].."_empty", param2 = fdir })
end, end,
on_rotate = pipeworks.fix_after_rotation on_rotate = pipeworks.fix_after_rotation
}) })
@ -228,15 +229,15 @@ minetest.register_node("pipeworks:valve_on_loaded", {
drop = "pipeworks:valve_off_empty", drop = "pipeworks:valve_off_empty",
mesecons = {effector = { mesecons = {effector = {
action_on = function (pos, node) action_on = function (pos, node)
minetest.add_node(pos,{name="pipeworks:valve_on_empty", param2 = node.param2}) minetest.swap_node(pos,{name="pipeworks:valve_on_empty", param2 = node.param2})
end, end,
action_off = function (pos, node) action_off = function (pos, node)
minetest.add_node(pos,{name="pipeworks:valve_off_empty", param2 = node.param2}) minetest.swap_node(pos,{name="pipeworks:valve_off_empty", param2 = node.param2})
end end
}}, }},
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
local fdir = node.param2 local fdir = node.param2
minetest.add_node(pos, { name = "pipeworks:valve_off_empty", param2 = fdir }) minetest.swap_node(pos, { name = "pipeworks:valve_off_empty", param2 = fdir })
end, end,
on_rotate = pipeworks.fix_after_rotation on_rotate = pipeworks.fix_after_rotation
}) })