From c3627551b091d27819c242da204ed1e9dd8f15f0 Mon Sep 17 00:00:00 2001 From: thetaepsilon-gamedev Date: Sat, 30 Sep 2017 23:42:26 +0100 Subject: [PATCH] move all current new_flow_logic code to dedicated sub-directory --- init.lua | 11 ++++++----- .../abm_register.lua | 0 new_flow_logic.lua => new_flow_logic/abms.lua | 0 .../flowable_node_registry.lua | 0 .../register_local_pipes.lua | 0 5 files changed, 6 insertions(+), 5 deletions(-) rename register_flow_logic.lua => new_flow_logic/abm_register.lua (100%) rename new_flow_logic.lua => new_flow_logic/abms.lua (100%) rename flowable_node_registry.lua => new_flow_logic/flowable_node_registry.lua (100%) rename flowable_nodes_add_pipes.lua => new_flow_logic/register_local_pipes.lua (100%) diff --git a/init.lua b/init.lua index d70e4f4..a081759 100644 --- a/init.lua +++ b/init.lua @@ -115,17 +115,18 @@ dofile(pipeworks.modpath.."/filter-injector.lua") dofile(pipeworks.modpath.."/trashcan.lua") dofile(pipeworks.modpath.."/wielder.lua") +local logicdir = "/new_flow_logic/" -- note that pipes still don't appear until registered in the files below this one, so can still be turned off -dofile(pipeworks.modpath.."/flowable_node_registry.lua") +dofile(pipeworks.modpath..logicdir.."flowable_node_registry.lua") 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 flowable_nodes_add_pipes.lua +-- individual enable flags also checked in register_local_pipes.lua if pipeworks.enable_new_flow_logic then - dofile(pipeworks.modpath.."/new_flow_logic.lua") - dofile(pipeworks.modpath.."/register_flow_logic.lua") - dofile(pipeworks.modpath.."/flowable_nodes_add_pipes.lua") + dofile(pipeworks.modpath..logicdir.."abms.lua") + dofile(pipeworks.modpath..logicdir.."abm_register.lua") + dofile(pipeworks.modpath..logicdir.."register_local_pipes.lua") end if pipeworks.enable_redefines then diff --git a/register_flow_logic.lua b/new_flow_logic/abm_register.lua similarity index 100% rename from register_flow_logic.lua rename to new_flow_logic/abm_register.lua diff --git a/new_flow_logic.lua b/new_flow_logic/abms.lua similarity index 100% rename from new_flow_logic.lua rename to new_flow_logic/abms.lua diff --git a/flowable_node_registry.lua b/new_flow_logic/flowable_node_registry.lua similarity index 100% rename from flowable_node_registry.lua rename to new_flow_logic/flowable_node_registry.lua diff --git a/flowable_nodes_add_pipes.lua b/new_flow_logic/register_local_pipes.lua similarity index 100% rename from flowable_nodes_add_pipes.lua rename to new_flow_logic/register_local_pipes.lua