summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthetaepsilon-gamedev <thetaepsilon-gamedev@noreply.users.github.com>2017-10-01 00:00:33 +0100
committerthetaepsilon-gamedev <thetaepsilon-gamedev@noreply.users.github.com>2017-10-01 00:00:33 +0100
commit31741e33e20c2ed366f80c01c7d6b4a6a23e0d4c (patch)
tree41e3e42e99281c8ff9334ec3e2feb04453a90c6c
parent21892456f529e099a0c1d47ae780101d172f818a (diff)
downloadpipeworks-31741e33e20c2ed366f80c01c7d6b4a6a23e0d4c.tar
pipeworks-31741e33e20c2ed366f80c01c7d6b4a6a23e0d4c.tar.gz
pipeworks-31741e33e20c2ed366f80c01c7d6b4a6a23e0d4c.tar.bz2
pipeworks-31741e33e20c2ed366f80c01c7d6b4a6a23e0d4c.tar.xz
pipeworks-31741e33e20c2ed366f80c01c7d6b4a6a23e0d4c.zip
new_flow_logic/abms.lua: run_pump_intake(): use passed-in maxpressure instead of table lookup, pass through in abm_register.lua
-rw-r--r--new_flow_logic/abm_register.lua2
-rw-r--r--new_flow_logic/abms.lua5
2 files changed, 2 insertions, 5 deletions
diff --git a/new_flow_logic/abm_register.lua b/new_flow_logic/abm_register.lua
index e7bed6a..505ca4b 100644
--- a/new_flow_logic/abm_register.lua
+++ b/new_flow_logic/abm_register.lua
@@ -30,7 +30,7 @@ local register_abm_input = function(nodename, maxpressure)
interval = 1,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
- pipeworks.flowlogic.run_pump_intake(pos, node)
+ pipeworks.flowlogic.run_pump_intake(pos, node, maxpressure)
end
})
end
diff --git a/new_flow_logic/abms.lua b/new_flow_logic/abms.lua
index 7360668..ece81c1 100644
--- a/new_flow_logic/abms.lua
+++ b/new_flow_logic/abms.lua
@@ -89,13 +89,10 @@ end
-flowlogic.run_pump_intake = function(pos, node)
+flowlogic.run_pump_intake = function(pos, node, maxpressure)
-- 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)