Implement fly/door controller improvements

This commit is contained in:
Joachim Stolberg 2022-06-10 10:59:59 +02:00
parent deb9678b54
commit f7d12dd79a
2 changed files with 39 additions and 4 deletions

View File

@ -292,7 +292,7 @@ local function entity_to_node(pos, obj)
local nvm = techage.get_nvm(self.base_pos) local nvm = techage.get_nvm(self.base_pos)
nvm.running = nil nvm.running = nil
end end
obj:remove() minetest.after(0.2, obj.remove, obj)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
local ndef1 = minetest.registered_nodes[name] local ndef1 = minetest.registered_nodes[name]
@ -330,7 +330,7 @@ local function node_to_entity(start_pos)
-- Block with other metadata -- Block with other metadata
node = minetest.get_node(start_pos) node = minetest.get_node(start_pos)
metadata = meta:to_table() metadata = meta:to_table()
minetest.remove_node(start_pos) minetest.after(0.2, minetest.remove_node, start_pos)
end end
local obj = minetest.add_entity(start_pos, "techage:move_item") local obj = minetest.add_entity(start_pos, "techage:move_item")
if obj then if obj then
@ -714,6 +714,39 @@ function flylib.rotate_nodes(pos, posses1, rot)
return posses2 return posses2
end end
function flylib.exchange_node(pos, name, param2)
local meta = M(pos)
local move_block
-- consider stored "objects"
if meta:contains("ta_move_block") then
move_block = meta:get_string("ta_move_block")
end
minetest.swap_node(pos, {name = name, param2 = param2})
if move_block then
meta:set_string("ta_move_block", move_block)
end
end
function flylib.remove_node(pos)
local meta = M(pos)
local move_block
-- consider stored "objects"
if meta:contains("ta_move_block") then
move_block = meta:get_string("ta_move_block")
end
minetest.remove_node(pos)
if move_block then
local node = minetest.deserialize(move_block)
minetest.add_node(pos, node)
meta:set_string("ta_move_block", "")
end
end
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
unlock_player(player) unlock_player(player)

View File

@ -17,6 +17,8 @@ local M = minetest.get_meta
local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
local S = techage.S local S = techage.S
local MP = minetest.get_modpath("techage")
local flylib = dofile(MP .. "/basis/fly_lib.lua")
local logic = techage.logic local logic = techage.logic
local MarkedNodes = {} -- t[player] = {{entity, pos},...} local MarkedNodes = {} -- t[player] = {{entity, pos},...}
@ -154,9 +156,9 @@ local function exchange_node(pos, item, param2)
local node = minetest.get_node_or_nil(pos) local node = minetest.get_node_or_nil(pos)
if node and is_simple_node(node.name) then if node and is_simple_node(node.name) then
if item and item:get_name() ~= "" and minetest.registered_nodes[item:get_name()] then if item and item:get_name() ~= "" and minetest.registered_nodes[item:get_name()] then
minetest.swap_node(pos, {name = item:get_name(), param2 = param2}) flylib.exchange_node(pos, item:get_name(), param2)
else else
minetest.remove_node(pos) flylib.remove_node(pos)
end end
if node.name ~= "air" then if node.name ~= "air" then
return ItemStack(node.name), node.param2 return ItemStack(node.name), node.param2