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

move flowable registration for flow sensor to devices.lua near node definition

Browse Source
This commit is contained in:
thetaepsilon-gamedev 2017-10-01 18:34:55 +01:00
parent de44593b41
commit df3d54f58a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devices.lua
View File

@ -518,10 +518,15 @@ minetest.register_node(nodename_sensor_loaded, {
mesecons = pipereceptor_on, mesecons = pipereceptor_on,
on_rotate = pipeworks.fix_after_rotation on_rotate = pipeworks.fix_after_rotation
}) })
-- FIXME requires-directionality
new_flow_logic_register.simple(nodename_sensor_empty)
new_flow_logic_register.simple(nodename_sensor_loaded)
-- tanks -- tanks
-- TODO: these don't currently do anything under the new flow logic. -- TODO flow-logic-stub: these don't currently do anything under the new flow logic.
for fill = 0, 10 do for fill = 0, 10 do
local filldesc="empty" local filldesc="empty"
local sgroups = {snappy=3, pipe=1, tankfill=fill+1} local sgroups = {snappy=3, pipe=1, tankfill=fill+1}
@ -592,6 +597,7 @@ end
-- fountainhead -- fountainhead
-- TODO flow-logic-stub: fountainheads currently non-functional under new flow logic
local nodename_fountain_empty = "pipeworks:fountainhead" local nodename_fountain_empty = "pipeworks:fountainhead"
minetest.register_node(nodename_fountain_empty, { minetest.register_node(nodename_fountain_empty, {
description = "Fountainhead", description = "Fountainhead",

5
pipes.lua
View File

@ -188,9 +188,8 @@ if REGISTER_COMPATIBILITY then
}) })
end end
-- appropriate registration for both old and new flow logic follows
-- FIXME/TODO: these aren't really "simple", they have directionality.
local valve_on = "pipeworks:valve_on_empty" local valve_on = "pipeworks:valve_on_empty"
local valve_off = "pipeworks:valve_off_empty" local valve_off = "pipeworks:valve_off_empty"
local entry_panel_empty = "pipeworks:entry_panel_empty" local entry_panel_empty = "pipeworks:entry_panel_empty"
@ -200,7 +199,6 @@ table.insert(pipes_empty_nodenames, valve_on)
table.insert(pipes_empty_nodenames, valve_off) table.insert(pipes_empty_nodenames, valve_off)
table.insert(pipes_empty_nodenames, entry_panel_empty) table.insert(pipes_empty_nodenames, entry_panel_empty)
table.insert(pipes_empty_nodenames, flow_sensor_empty) table.insert(pipes_empty_nodenames, flow_sensor_empty)
new_flow_logic_register.simple(flow_sensor_empty)
local valve_on_loaded = "pipeworks:valve_on_loaded" local valve_on_loaded = "pipeworks:valve_on_loaded"
local entry_panel_loaded = "pipeworks:entry_panel_loaded" local entry_panel_loaded = "pipeworks:entry_panel_loaded"
@ -208,7 +206,6 @@ local flow_sensor_loaded = "pipeworks:flow_sensor_loaded"
table.insert(pipes_full_nodenames, valve_on_loaded) table.insert(pipes_full_nodenames, valve_on_loaded)
table.insert(pipes_full_nodenames, entry_panel_loaded) table.insert(pipes_full_nodenames, entry_panel_loaded)
table.insert(pipes_full_nodenames, flow_sensor_loaded) table.insert(pipes_full_nodenames, flow_sensor_loaded)
new_flow_logic_register.simple(flow_sensor_loaded)
pipeworks.pipes_full_nodenames = pipes_full_nodenames pipeworks.pipes_full_nodenames = pipes_full_nodenames
pipeworks.pipes_empty_nodenames = pipes_empty_nodenames pipeworks.pipes_empty_nodenames = pipes_empty_nodenames