aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-27 11:35:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Global Loading

Browse Source
This commit is contained in:
Cooldude2606
2018-10-14 20:17:54 +01:00
parent b221108f07
commit 99450cd02d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FactorioSoftmodManager.lua
View File

@@ -182,13 +182,12 @@ Manager.global=setmetatable({__defaults={},__global={
if not module_path or not module_name then return _G.global end
if type(default) == 'table' then Manager.verbose('Default global has been set for: global'..module_path:gsub('/','.')) rawset(rawget(tbl,'__defaults'),tostring(module_name),default) end
local path = 'global'
local new_dir = false
for dir in module_path:gmatch('%a+') do
path = path..'.'..dir
if not rawget(Global,dir) then new_dir=true Manager.verbose('Added Global Dir: '..path) rawset(Global,dir,{}) end
if not rawget(Global,dir) then Manager.verbose('Added Global Dir: '..path) rawset(Global,dir,{}) end
Global = rawget(Global,dir)
end
if (new_dir or default == true) and rawget(rawget(tbl,'__defaults'),tostring(module_name)) then
if default == true and rawget(rawget(tbl,'__defaults'),tostring(module_name)) then
Manager.verbose('Set Global Dir: '..path..' to its default')
-- cant set it to be equle otherwise it will lose its global propeity
local function deepcopy(tbl) if type(tbl) ~= 'table' then return tbl end local rtn = {} for key,value in pairs(tbl) do rtn[key] = deepcopy(value) end return rtn end
@@ -660,6 +659,7 @@ end)
script.on_load(function(...)
setmetatable(global,Manager.global.__global)
for module_name,default in pairs(Manager.global) do global(module_name) end
Manager.event(-2,...)
end)
--over rides for the base values; can be called though Event

4
modules/ExpGamingCore/Server/control.lua
View File

@@ -43,11 +43,11 @@ Server.uuid = add_metatable({},function()
if game then
global.uuid=global.uuid+1
uuid=global.uuid+pre_load_uuid
verbose('Game UUID Increased: '..uuid)
verbose('Game UUID Increased: '..global.uuid..' ('..uuid..')')
else
pre_load_uuid=pre_load_uuid+1
uuid=pre_load_uuid
verbose('Load UUID Increased: '..uuid)
verbose('Load UUID Increased: '..pre_load_uuid..' ('..uuid..')')
end
return add_metatable({uuid},nil,function(tbl) return string.to_hex(tostring(tbl[1])) end)
end,function()