From 59ac9780939b9c130bb70034bccb04ff1e99136d Mon Sep 17 00:00:00 2001 From: thetaepsilon-gamedev Date: Wed, 27 Sep 2017 15:19:20 +0100 Subject: pipes.lua: place old ABM code registration behind if-guard for new flag --- init.lua | 3 +++ 1 file changed, 3 insertions(+) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 2e05337..5094a13 100644 --- a/init.lua +++ b/init.lua @@ -111,6 +111,9 @@ dofile(pipeworks.modpath.."/filter-injector.lua") dofile(pipeworks.modpath.."/trashcan.lua") dofile(pipeworks.modpath.."/wielder.lua") +-- temporary flag to enable new flowing behaviour +pipeworks.enable_new_flow_logic = true + if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube.lua") end if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end -- cgit v1.2.3 From 69133818f7283ea3a8b14060b71df769cac9eb48 Mon Sep 17 00:00:00 2001 From: thetaepsilon-gamedev Date: Wed, 27 Sep 2017 17:00:18 +0100 Subject: pipes.lua: split out new flow logic registration and make it respect feature toggles --- init.lua | 3 +++ 1 file changed, 3 insertions(+) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 5094a13..6ceca65 100644 --- a/init.lua +++ b/init.lua @@ -117,6 +117,9 @@ pipeworks.enable_new_flow_logic = true if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube.lua") end if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end +-- individual enable flags also checked in register_flow_logic.lua +if pipeworks.enable_new_flow_logic then dofile(pipeworks.modpath.."/register_flow_logic.lua") end + if pipeworks.enable_redefines then dofile(pipeworks.modpath.."/compat-chests.lua") dofile(pipeworks.modpath.."/compat-furnaces.lua") -- cgit v1.2.3 From 2d70d2b6576a2f8d795eb1ce166c58c7ada8802c Mon Sep 17 00:00:00 2001 From: thetaepsilon-gamedev Date: Wed, 27 Sep 2017 17:37:46 +0100 Subject: init.lua: turn off by-default new flow logic for now --- init.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 6ceca65..80a83d3 100644 --- a/init.lua +++ b/init.lua @@ -14,14 +14,18 @@ pipeworks.worldpath = minetest.get_worldpath() pipeworks.modpath = minetest.get_modpath("pipeworks") dofile(pipeworks.modpath.."/default_settings.lua") - -- Read the external config file if it exists. + + 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!") +end -- Random variables @@ -111,9 +115,6 @@ dofile(pipeworks.modpath.."/filter-injector.lua") dofile(pipeworks.modpath.."/trashcan.lua") dofile(pipeworks.modpath.."/wielder.lua") --- temporary flag to enable new flowing behaviour -pipeworks.enable_new_flow_logic = true - if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube.lua") end if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end -- cgit v1.2.3 From 9d014824881c1f64c1846283f5e1af945cffc375 Mon Sep 17 00:00:00 2001 From: thetaepsilon-gamedev Date: Wed, 27 Sep 2017 17:53:08 +0100 Subject: init.lua: add missing dofile for new flow logic --- init.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 80a83d3..470db2e 100644 --- a/init.lua +++ b/init.lua @@ -119,7 +119,10 @@ if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube.lua") end if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end -- individual enable flags also checked in register_flow_logic.lua -if pipeworks.enable_new_flow_logic then dofile(pipeworks.modpath.."/register_flow_logic.lua") end +if pipeworks.enable_new_flow_logic then + dofile(pipeworks.modpath.."/new_flow_logic.lua") + dofile(pipeworks.modpath.."/register_flow_logic.lua") +end if pipeworks.enable_redefines then dofile(pipeworks.modpath.."/compat-chests.lua") -- cgit v1.2.3