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

pressure logic: abms.lua: refactor balance_pressure() to move responsiblity for checking neighbour flow classes to get_neighbour_positions

Browse Source
This commit is contained in:
thetaepsilon-gamedev 2017-10-17 22:20:13 +01:00
parent d68d3d5852
commit 909b321f3c
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pressure_logic/abms.lua
View File

@ -148,7 +148,20 @@ local get_neighbour_positions = function(pos, node)
end
end
return candidates
-- then, check each possible neighbour to see if they can be reached from this node.
-- for now, just check if it's in the simple table.
-- TODO: will need to add a single-face direction checking function for directional nodes
local connections = {}
for index, npos in ipairs(candidates) do
local nodename = minetest.get_node(npos).name
local is_simple = (pipeworks.flowables.list.simple[nodename])
if is_simple then
local neighbour = get_pressure_access(npos)
table.insert(connections, neighbour)
end
end
return connections
end
@ -164,24 +177,14 @@ flowlogic.balance_pressure = function(pos, node, currentpressure)
local totalv = currentpressure
local totalc = 1
local candidates = get_neighbour_positions(pos, node)
local connections = get_neighbour_positions(pos, node)
-- then handle neighbours, but if not a pressure node don't consider them at all
for _, npos in ipairs(candidates) do
local nodename = minetest.get_node(npos).name
-- for now, just check if it's in the simple table.
-- TODO: the "can flow from" logic in flowable_node_registry.lua
local haspressure = (pipeworks.flowables.list.simple[nodename])
if haspressure then
local neighbour = get_pressure_access(npos)
--pipeworks.logger("balance_pressure @ "..formatvec(pos).." "..nodename.." "..formatvec(npos).." added to neighbour set")
-- for each neighbour, add neighbour's pressure to the total to balance out
for _, neighbour in ipairs(connections) do
local n = neighbour.get()
table.insert(connections, neighbour)
totalv = totalv + n
totalc = totalc + 1
end
end
local average = totalv / totalc
for _, target in ipairs(connections) do
target.set(average)