evert/fluid_lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved/more accurate Fluid_Pump Status's

Browse Source 
had my afluid/bfluid understanding around the wrong way
This commit is contained in:
Sirrobzeroone 2021-09-28 22:01:44 +10:00
parent 2aabe9240d
commit 5b7d61d7d9
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fluid_transfer/network.lua
View File

@ -214,8 +214,8 @@ function fluid_lib.transfer_timer_tick(pos, elapsed)
local changed = false local changed = false
if pp ~= nil then if pp ~= nil then
for bindex,bfluid in pairs(pp) do -- bfluid = source fluid name for bindex,bfluid in pairs(pp) do -- bfluid = destination fluid name
for aindex,afluid in pairs(buffers) do -- afluid = destination fluid name for aindex,afluid in pairs(buffers) do -- afluid = source fluid name
-- get fluid names for pump status -- get fluid names for pump status
local bfluid_des = "" local bfluid_des = ""
@ -234,29 +234,22 @@ function fluid_lib.transfer_timer_tick(pos, elapsed)
break break
end end
if (afluid == bfluid or bfluid == "") then -- S01 best guess "" = Water, unsure why. if (afluid == bfluid or bfluid == "") then -- bfluid = "", empty destiniation
local idef = destdef.node_io_room_for_liquid(pos, destnode, "", afluid, pcapability)
if afluid == "" and bfluid == "" then
meta:set_string("infotext", status.."\nStandby")
elseif bfluid == "" then
--bfluid_des = minetest.registered_nodes["default:water_source"].description
meta:set_string("infotext", status.."\nPumping Infrequently")
else
meta:set_string("infotext", status.."\nPumping "..bfluid_des)
end
local idef = destdef.node_io_room_for_liquid(pos, destnode, "", afluid, pcapability)
if idef > 0 then if idef > 0 then
local fluidcount = srcdef.node_io_get_liquid_stack(srcpos, srcnode, "", aindex):get_count() local fluidcount = srcdef.node_io_get_liquid_stack(srcpos, srcnode, "", aindex):get_count()
local defc = math.min(fluidcount, idef) local defc = math.min(fluidcount, idef)
local defi = srcdef.node_io_take_liquid(srcpos, srcnode, "", nil, afluid, defc) local defi = srcdef.node_io_take_liquid(srcpos, srcnode, "", nil, afluid, defc)
if defi and defi.millibuckets > 0 then if defi and defi.millibuckets > 0 then
local lo = destdef.node_io_put_liquid(pos, destnode, "", nil, afluid, defi.millibuckets) local lo = destdef.node_io_put_liquid(pos, destnode, "", nil, afluid, defi.millibuckets)
pumped = pumped + (defi.millibuckets - lo) pumped = pumped + (defi.millibuckets - lo)
meta:set_string("infotext", status.."\nPumping "..afluid_des)
changed = true changed = true
end end
else
meta:set_string("infotext", status.."\nStandby")
end end
end end
end end