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

new flow logic: abms.lua: remove intake limit coercion causing water to be vanished

Browse Source
This commit is contained in:
thetaepsilon-gamedev
2017-10-01 20:27:30 +01:00
parent 9abdeb3d62
commit dc13ec619f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
new_flow_logic/abms.lua
View File

@@ -29,6 +29,8 @@ end
--local formatvec = function(vec) local sep="," return "("..tostring(vec.x)..sep..tostring(vec.y)..sep..tostring(vec.z)..")" end
-- new version of liquid check
-- accepts a limit parameter to only delete water blocks that the receptacle can accept,
-- and returns it so that the receptacle can update it's pressure values.
@@ -43,14 +45,13 @@ local check_for_liquids_v2 = function(pos, limit)
total = total + 1
end
end
--pipeworks.logger("check_for_liquids_v2@"..formatvec(pos).." total "..total)
return total
end
flowlogic.check_for_liquids_v2 = check_for_liquids_v2
--local formatvec = function(vec) local sep="," return "("..tostring(vec.x)..sep..tostring(vec.y)..sep..tostring(vec.z)..")" end
local label_pressure = "pipeworks.water_pressure"
flowlogic.balance_pressure = function(pos, node)
-- debuglog("balance_pressure() "..node.name.." at "..pos.x.." "..pos.y.." "..pos.z)
@@ -100,8 +101,8 @@ flowlogic.run_input = function(pos, node, maxpressure, intakefn)
if intake_limit <= 0 then return end
local actual_intake = intakefn(pos, intake_limit)
--pipeworks.logger("run_input@"..formatvec(pos).." oldpressure "..currentpressure.." intake_limit "..intake_limit.." actual_intake "..actual_intake)
if actual_intake <= 0 then return end
if actual_intake >= intake_limit then actual_intake = intake_limit end
local newpressure = actual_intake + currentpressure
-- debuglog("oldpressure "..currentpressure.." intake_limit "..intake_limit.." actual_intake "..actual_intake.." newpressure "..newpressure)