init.lua: move non-destructive new_flow_logic code outside if-guard

This commit is contained in:
thetaepsilon-gamedev 2017-09-30 23:55:16 +01:00
parent c3627551b0
commit 21892456f5

View File

@ -116,7 +116,10 @@ dofile(pipeworks.modpath.."/trashcan.lua")
dofile(pipeworks.modpath.."/wielder.lua") dofile(pipeworks.modpath.."/wielder.lua")
local logicdir = "/new_flow_logic/" 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
-- note that even with these files the new flow logic is not yet default
dofile(pipeworks.modpath..logicdir.."abms.lua")
dofile(pipeworks.modpath..logicdir.."abm_register.lua")
dofile(pipeworks.modpath..logicdir.."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_pipes then dofile(pipeworks.modpath.."/pipes.lua") end
@ -124,8 +127,6 @@ if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube
if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end
-- individual enable flags also checked in register_local_pipes.lua -- individual enable flags also checked in register_local_pipes.lua
if pipeworks.enable_new_flow_logic then if pipeworks.enable_new_flow_logic then
dofile(pipeworks.modpath..logicdir.."abms.lua")
dofile(pipeworks.modpath..logicdir.."abm_register.lua")
dofile(pipeworks.modpath..logicdir.."register_local_pipes.lua") dofile(pipeworks.modpath..logicdir.."register_local_pipes.lua")
end end