diff options
| -rw-r--r-- | init.lua | 8 | ||||
| -rw-r--r-- | new_flow_logic/flowable_node_registry_install.lua | 8 | ||||
| -rw-r--r-- | pipes.lua | 2 |
3 files changed, 10 insertions, 8 deletions
@@ -17,14 +17,16 @@ dofile(pipeworks.modpath.."/default_settings.lua") -- Read the external config file if it exists. +-- please add any new feature toggles to be a flag in this table... +pipeworks.toggles = {} local worldsettingspath = pipeworks.worldpath.."/pipeworks_settings.txt" local worldsettingsfile = io.open(worldsettingspath, "r") if worldsettingsfile then worldsettingsfile:close() dofile(worldsettingspath) end -if pipeworks.enable_new_flow_logic then - minetest.log("warning", "pipeworks new_flow_logic is WIP and incomplete!") +if pipeworks.toggles.pressure_logic then + minetest.log("warning", "pipeworks pressure-based logic is WIP and incomplete!") end -- Random variables @@ -123,7 +125,7 @@ local logicdir = "/new_flow_logic/" -- note that even with these files the new flow logic is not yet default. -- registration will take place but no actual ABMs/node logic will be installed, --- unless pipeworks.enable_new_flow_logic has been set. +-- unless the toggle flag is specifically enabled in the per-world settings flag. dofile(pipeworks.modpath..logicdir.."flowable_node_registry.lua") dofile(pipeworks.modpath..logicdir.."abms.lua") dofile(pipeworks.modpath..logicdir.."abm_register.lua") diff --git a/new_flow_logic/flowable_node_registry_install.lua b/new_flow_logic/flowable_node_registry_install.lua index ac305dc..defe877 100644 --- a/new_flow_logic/flowable_node_registry_install.lua +++ b/new_flow_logic/flowable_node_registry_install.lua @@ -24,7 +24,7 @@ end local regwarning = function(kind, nodename) local tail = "" - if not pipeworks.enable_new_flow_logic then tail = " but new_flow_logic not enabled" end + if not pipeworks.toggles.pressure_logic then tail = " but pressure logic not enabled" end pipeworks.logger(kind.." flow logic registry requested for "..nodename..tail) end @@ -35,7 +35,7 @@ register.simple = function(nodename) insertbase(nodename) pipeworks.flowables.list.simple[nodename] = true table.insert(pipeworks.flowables.list.simple_nodenames, nodename) - if pipeworks.enable_new_flow_logic then + if pipeworks.toggles.pressure_logic then abmregister.balance(nodename) end regwarning("simple", nodename) @@ -54,7 +54,7 @@ register.intake_simple = function(nodename, maxpressure) checkbase(nodename) pipeworks.flowables.inputs.list[nodename] = { maxpressure=maxpressure } table.insert(pipeworks.flowables.inputs.nodenames, nodename) - if pipeworks.enable_new_flow_logic then + if pipeworks.toggles.pressure_logic then abmregister.input(nodename, maxpressure, pipeworks.flowlogic.check_for_liquids_v2) end regwarning("simple intake", nodename) @@ -66,7 +66,7 @@ end register.output = function(nodename, threshold, outputfn) checkbase(nodename) pipeworks.flowables.outputs.list[nodename] = { threshold=threshold, outputfn=outputfn } - if pipeworks.enable_new_flow_logic then + if pipeworks.toggles.pressure_logic then abmregister.output(nodename, threshold, outputfn) end regwarning("output node", nodename) @@ -213,7 +213,7 @@ pipeworks.pipes_empty_nodenames = pipes_empty_nodenames -if not pipeworks.enable_new_flow_logic then +if not pipeworks.toggles.pressure_logic then |