nalc
/
pipeworks
forked from mtcontrib/pipeworks
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A few fixes

This commit is contained in:
Novatux 2013-12-21 08:46:55 +01:00
parent f697b94dae
commit 61d7bde79a
1 changed files with 34 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
item_transport.lua
View File

@ -231,107 +231,75 @@ function pipeworks.notvel(tbl,vel)
end end
local function go_next(pos,velocity,stack) local function go_next(pos,velocity,stack)
local chests={} local chests = {}
local tubes={} local tubes = {}
local cnode=minetest.get_node(pos) local cnode = minetest.get_node(pos)
local cmeta=minetest.get_meta(pos) local cmeta = minetest.get_meta(pos)
local node local node
local meta local meta
local tubelike local tubelike
local tube_receiver local tube_receiver
local len=1 local len = 1
local n local n
local can_go local can_go
local speed=math.abs(velocity.x+velocity.y+velocity.z) local speed = math.abs(velocity.x+velocity.y+velocity.z)
local vel={x=velocity.x/speed,y=velocity.y/speed,z=velocity.z/speed,speed=speed} local vel = {x=velocity.x/speed,y=velocity.y/speed,z=velocity.z/speed,speed=speed}
if speed>=4.1 then if speed >= 4.1 then
speed=4 speed = 4
elseif speed>=1.1 then elseif speed >= 1.1 then
speed=speed-0.1 speed = speed-0.1
else else
speed=1 speed = 1
end end
vel.speed=speed vel.speed=speed
if minetest.registered_nodes[cnode.name] and minetest.registered_nodes[cnode.name].tube and minetest.registered_nodes[cnode.name].tube.can_go then if minetest.registered_nodes[cnode.name] and minetest.registered_nodes[cnode.name].tube and minetest.registered_nodes[cnode.name].tube.can_go then
can_go=minetest.registered_nodes[cnode.name].tube.can_go(pos,node,vel,stack) can_go = minetest.registered_nodes[cnode.name].tube.can_go(pos,node,vel,stack)
else else
can_go=pipeworks.notvel(adjlist,vel) can_go = pipeworks.notvel(adjlist,vel)
end end
local meta = nil local meta = nil
for _,vect in ipairs(can_go) do for _,vect in ipairs(can_go) do
local npos=addVect(pos,vect) local npos = addVect(pos,vect)
local node=minetest.get_node(npos) local node = minetest.get_node(npos)
local tube_receiver=minetest.get_item_group(node.name,"tubedevice_receiver") local tube_receiver = minetest.get_item_group(node.name,"tubedevice_receiver")
meta=minetest.get_meta(npos) meta = minetest.get_meta(npos)
local tubelike=meta:get_int("tubelike") local tubelike = meta:get_int("tubelike")
if tube_receiver==1 then if tube_receiver == 1 then
if minetest.registered_nodes[node.name].tube and if minetest.registered_nodes[node.name].tube and
minetest.registered_nodes[node.name].tube.can_insert and minetest.registered_nodes[node.name].tube.can_insert and
minetest.registered_nodes[node.name].tube.can_insert(npos,node,stack,vect) then minetest.registered_nodes[node.name].tube.can_insert(npos,node,stack,vect) then
local i=1 local i = #chests + 1
repeat
if chests[i]==nil then break end
i=i+1
until false
chests[i]={} chests[i]={}
chests[i].pos=npos chests[i].pos=npos
chests[i].vect=vect chests[i].vect=vect
end end
elseif tubelike==1 then elseif tubelike == 1 then
local i=1 local i = #tubes + 1
repeat
if tubes[i]==nil then break end
i=i+1
until false
tubes[i]={} tubes[i]={}
tubes[i].pos=npos tubes[i].pos=npos
tubes[i].vect=vect tubes[i].vect=vect
end end
end end
if chests[1]==nil then--no chests found if chests[1] == nil then--no chests found
if tubes[1]==nil then if tubes[1] == nil then
return 0 return 0
else else
local i=1 n = (meta:get_int("tubedir")%(#tubes)) + 1
repeat
if tubes[i]==nil then break end
i=i+1
until false
n=meta:get_int("tubedir")+1
repeat
if n>=i then
n=n-i+1
else
break
end
until false
if pipeworks.enable_cyclic_mode then if pipeworks.enable_cyclic_mode then
meta:set_int("tubedir",n) meta:set_int("tubedir",n)
end end
velocity.x=tubes[n].vect.x*vel.speed velocity.x = tubes[n].vect.x*vel.speed
velocity.y=tubes[n].vect.y*vel.speed velocity.y = tubes[n].vect.y*vel.speed
velocity.z=tubes[n].vect.z*vel.speed velocity.z = tubes[n].vect.z*vel.speed
end end
else else
local i=1 n = (meta:get_int("tubedir")%(#chests))+1
repeat
if chests[i]==nil then break end
i=i+1
until false
n=meta:get_int("tubedir")+1
repeat
if n>=i then
n=n-i+1
else
break
end
until false
if pipeworks.enable_cyclic_mode then if pipeworks.enable_cyclic_mode then
meta:set_int("tubedir",n) meta:set_int("tubedir",n)
end end
velocity.x=chests[n].vect.x*speed velocity.x = chests[n].vect.x*speed
velocity.y=chests[n].vect.y*speed velocity.y = chests[n].vect.y*speed
velocity.z=chests[n].vect.z*speed velocity.z = chests[n].vect.z*speed
end end
return 1 return 1
end end
@ -485,7 +453,7 @@ minetest.register_entity("pipeworks:tubed_item", {
end end
if moved then if moved then
if go_next (self.start_pos, velocity, stack)==0 then if go_next (self.start_pos, velocity, stack) == 0 then
drop_pos=minetest.find_node_near({x=self.start_pos.x+velocity.x,y=self.start_pos.y+velocity.y,z=self.start_pos.z+velocity.z}, 1, "air") drop_pos=minetest.find_node_near({x=self.start_pos.x+velocity.x,y=self.start_pos.y+velocity.y,z=self.start_pos.z+velocity.z}, 1, "air")
if drop_pos then if drop_pos then
minetest.item_drop(stack, "", drop_pos) minetest.item_drop(stack, "", drop_pos)
@ -503,5 +471,3 @@ minetest.register_entity("pipeworks:tubed_item", {
end end
}) })