mirror of
https://github.com/joe7575/techpack.git
synced 2025-01-13 00:07:38 +01:00
Merge branch 'issue-67-revised' into issue-72
This commit is contained in:
commit
2af68b9f18
@ -186,33 +186,13 @@ local function register_lbm(name, nodenames)
|
|||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
local DirToSide = {"B", "R", "F", "L", "D", "U"}
|
|
||||||
|
|
||||||
local function dir_to_side(dir, param2)
|
|
||||||
if dir < 5 then
|
|
||||||
dir = (((dir - 1) - (param2 % 4)) % 4) + 1
|
|
||||||
end
|
|
||||||
return DirToSide[dir]
|
|
||||||
end
|
|
||||||
|
|
||||||
local SideToDir = {B=1, R=2, F=3, L=4, D=5, U=6}
|
|
||||||
|
|
||||||
local function side_to_dir(side, param2)
|
|
||||||
local dir = SideToDir[side]
|
|
||||||
if dir < 5 then
|
|
||||||
dir = (((dir - 1) + (param2 % 4)) % 4) + 1
|
|
||||||
end
|
|
||||||
return dir
|
|
||||||
end
|
|
||||||
|
|
||||||
local function get_dest_node(pos, side)
|
local function get_dest_node(pos, side)
|
||||||
local _,node = Tube:get_node(pos)
|
local _,node = Tube:get_node(pos)
|
||||||
local dir = side_to_dir(side, node.param2)
|
local dir = tubelib2.side_to_dir(side, node.param2)
|
||||||
local spos, sdir = Tube:get_connected_node_pos(pos, dir)
|
local spos, sdir = Tube:get_connected_node_pos(pos, dir)
|
||||||
if not (spos and sdir) then return end
|
if not (spos and sdir) then return end
|
||||||
_,node = Tube:get_node(spos)
|
_,node = Tube:get_node(spos)
|
||||||
local out_side = dir_to_side(tubelib2.Turn180Deg[sdir], node.param2)
|
local out_side = tubelib2.dir_to_side(tubelib2.Turn180Deg[sdir], node.param2)
|
||||||
return spos, out_side, Name2Name[node.name] or node.name
|
return spos, out_side, Name2Name[node.name] or node.name
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -39,12 +39,9 @@ minetest.register_node("tubelib_addons3:teleporter", {
|
|||||||
after_place_node = function(pos, placer)
|
after_place_node = function(pos, placer)
|
||||||
tubelib.add_node(pos, "tubelib_addons3:teleporter")
|
tubelib.add_node(pos, "tubelib_addons3:teleporter")
|
||||||
-- determine the tube side
|
-- determine the tube side
|
||||||
local tube_dir = ((minetest.dir_to_facedir(placer:get_look_dir()) + 1) % 4) + 1
|
local tube_dir = tubelib2.side_to_dir("R", minetest.dir_to_facedir(placer:get_look_dir()))
|
||||||
Tube:prepare_pairing(pos, tube_dir, sFormspec)
|
Tube:prepare_pairing(pos, tube_dir, sFormspec)
|
||||||
Tube:after_place_node(pos, {tube_dir})
|
Tube:after_place_node(pos, {tube_dir})
|
||||||
local meta = M(pos)
|
|
||||||
local valid_dirs = minetest.serialize({[tube_dir]=true})
|
|
||||||
meta:set_string('valid_dirs', valid_dirs)
|
|
||||||
end,
|
end,
|
||||||
|
|
||||||
on_receive_fields = function(pos, formname, fields, player)
|
on_receive_fields = function(pos, formname, fields, player)
|
||||||
@ -78,4 +75,4 @@ minetest.register_craft({
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
Tube:add_secondary_node_names({"tubelib_addons3:teleporter"})
|
Tube:add_secondary_node_names({"tubelib_addons3:teleporter"}, {B=false, R=true, F=false, L=false, D=false, U=false})
|
||||||
|
Loading…
Reference in New Issue
Block a user