From: Vanessa Ezekowitz Date: Fri, 4 Jan 2013 06:34:25 +0000 (-0500) Subject: Made pipes able to carry water! X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=0a1f90c391dcc4907665e1211c666310d36a740b;p=zefram%2Fminetest%2Fpipeworks.git Made pipes able to carry water! It was just a minor logic error resulting from moving the water flowing code into it's own file when I originally imported it. Many thanks to Mauvebic for writing it! --- diff --git a/flowing_logic.lua b/flowing_logic.lua index 95162a3..d58d124 100644 --- a/flowing_logic.lua +++ b/flowing_logic.lua @@ -86,22 +86,22 @@ local spigot_check = function(pos,node) end minetest.register_abm({ - nodenames = empty_nodenames, - interval = 15, + nodenames = pipes_empty_nodenames, + interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) check4inflows(pos,node) end }) minetest.register_abm({ - nodenames = full_nodenames, - interval = 10, + nodenames = pipes_full_nodenames, + interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) checksources(pos,node) end }) minetest.register_abm({ nodenames = {'pipeworks:outlet','pipeworks:spigot'}, - interval = 10, + interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) if node.name == 'pipeworks:outlet' then update_outlet(pos) diff --git a/init.lua b/init.lua index fe85f40..d7da236 100644 --- a/init.lua +++ b/init.lua @@ -135,8 +135,8 @@ end -- now define the nodes! -local empty_nodenames = {} -local full_nodenames = {} +pipes_empty_nodenames = {} +pipes_full_nodenames = {} for xm = 0, 1 do for xp = 0, 1 do @@ -310,8 +310,8 @@ for zp = 0, 1 do pipe_scanforobjects(pos) end }) - table.insert(empty_nodenames,"pipeworks:pipe_"..pname.."_empty") -- for the abms - table.insert(full_nodenames,"pipeworks:pipe_"..pname.."_loaded") -- for bacon + table.insert(pipes_empty_nodenames,"pipeworks:pipe_"..pname.."_empty") -- for the abms + table.insert(pipes_full_nodenames,"pipeworks:pipe_"..pname.."_loaded") -- for bacon end end end