mirror of
https://github.com/joe7575/tubelib2.git
synced 2024-08-20 13:34:05 +02:00
Valid face check moved from walk_tube_line to get_next_teleport_node, added more checks to is_valid_dir in favor of using get_secondary_node
This commit is contained in:
parent
7c94decc10
commit
9018df6113
@ -387,6 +387,10 @@ end
|
|||||||
function Tube:get_next_teleport_node(pos, dir)
|
function Tube:get_next_teleport_node(pos, dir)
|
||||||
if pos then
|
if pos then
|
||||||
local npos = vector.add(pos, Dir6dToVector[dir or 0])
|
local npos = vector.add(pos, Dir6dToVector[dir or 0])
|
||||||
|
local node = self:get_node_lvm(npos)
|
||||||
|
if self:is_valid_dir(node, Turn180Deg[dir]) == false then
|
||||||
|
return
|
||||||
|
end
|
||||||
local meta = M(npos)
|
local meta = M(npos)
|
||||||
local s = meta:get_string("tele_pos")
|
local s = meta:get_string("tele_pos")
|
||||||
if s ~= "" then
|
if s ~= "" then
|
||||||
@ -413,10 +417,6 @@ function Tube:walk_tube_line(pos, dir)
|
|||||||
local cnt = 0
|
local cnt = 0
|
||||||
if dir then
|
if dir then
|
||||||
while cnt <= self.max_tube_length do
|
while cnt <= self.max_tube_length do
|
||||||
local secondary = self:get_secondary_node(pos, dir)
|
|
||||||
if secondary and self:is_valid_dir(secondary, Turn180Deg[dir]) == false then
|
|
||||||
break
|
|
||||||
end
|
|
||||||
local new_pos, new_dir, num = self:get_next_tube(pos, dir)
|
local new_pos, new_dir, num = self:get_next_tube(pos, dir)
|
||||||
if not new_pos then break end
|
if not new_pos then break end
|
||||||
if cnt > 0 and num ~= 2 and self:is_primary_node(new_pos, new_dir) then
|
if cnt > 0 and num ~= 2 and self:is_primary_node(new_pos, new_dir) then
|
||||||
|
@ -239,7 +239,7 @@ end
|
|||||||
-- Checks if a particular node can be connected to
|
-- Checks if a particular node can be connected to
|
||||||
-- from a particular direction, taking into account orientation
|
-- from a particular direction, taking into account orientation
|
||||||
function Tube:is_valid_dir(node, dir)
|
function Tube:is_valid_dir(node, dir)
|
||||||
if dir ~= nil then
|
if node and dir ~= nil and self.secondary_node_names[node.name] then
|
||||||
local side = tubelib2.dir_to_side(dir, node.param2)
|
local side = tubelib2.dir_to_side(dir, node.param2)
|
||||||
return self:is_valid_side(node.name, side)
|
return self:is_valid_side(node.name, side)
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user