summaryrefslogtreecommitdiff
path: root/new_flow_logic.lua
diff options
context:
space:
mode:
Diffstat (limited to 'new_flow_logic.lua')
-rw-r--r--new_flow_logic.lua15
1 files changed, 6 insertions, 9 deletions
diff --git a/new_flow_logic.lua b/new_flow_logic.lua
index 3fd1bb6..1b4abf4 100644
--- a/new_flow_logic.lua
+++ b/new_flow_logic.lua
@@ -3,14 +3,6 @@
--- global values and thresholds for water behaviour
--- TODO: add some way of setting this per-world
-local thresholds = {}
--- limit on pump pressure - will not absorb more than can be taken
-thresholds.pump_pressure = 2
-
-
-
-- borrowed from above: might be useable to replace the above coords tables
local make_coords_offsets = function(pos, include_base)
local coords = {
@@ -95,9 +87,14 @@ end
pipeworks.run_pump_intake = function(pos, node)
-- try to absorb nearby water nodes, but only up to limit.
-- NB: check_for_liquids_v2 handles zero or negative from the following subtraction
+
+ local properties = pipeworks.flowables.inputs.list[node.name]
+ local maxpressure = properties.maxpressure
+
local meta = minetest.get_meta(pos)
local currentpressure = meta:get_float(label_pressure)
- local intake_limit = thresholds.pump_pressure - currentpressure
+
+ local intake_limit = maxpressure - currentpressure
local actual_intake = pipeworks.check_for_liquids_v2(pos, intake_limit)
local newpressure = actual_intake + currentpressure
-- debuglog("oldpressure "..currentpressure.." intake_limit "..intake_limit.." actual_intake "..actual_intake.." newpressure "..newpressure)