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

Updated sync to update on leave and join

Browse Source
This commit is contained in:
Cooldude2606
2018-09-04 21:13:21 +01:00
parent 480b548f5f
commit ae95bb2a66
2 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
FactorioSoftmodManager.lua
View File

@@ -172,7 +172,7 @@ Manager.global=setmetatable({__defaults={},__global={
end end
}},{ }},{
__call=function(tbl,default,tbl2) __call=function(tbl,default,tbl2)
local global = _G.global local Global = _G.global
local tbl2 = type(tbl2) == 'table' and getmetatable(tbl2) or nil local tbl2 = type(tbl2) == 'table' and getmetatable(tbl2) or nil
local module_name = type(default) == 'string' and default or tbl2 and tbl2.name or module_name local module_name = type(default) == 'string' and default or tbl2 and tbl2.name or module_name
local module_path = type(default) == 'string' and moduleIndex[default] or tbl2 and tbl2.path or module_path local module_path = type(default) == 'string' and moduleIndex[default] or tbl2 and tbl2.path or module_path
@@ -182,23 +182,23 @@ Manager.global=setmetatable({__defaults={},__global={
local new_dir = false local new_dir = false
for dir in module_path:gmatch('%a+') do for dir in module_path:gmatch('%a+') do
path = path..'.'..dir 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 new_dir=true Manager.verbose('Added Global Dir: '..path) rawset(Global,dir,{}) end
global = rawget(global,dir) Global = rawget(Global,dir)
end end
if (new_dir or default == true) and rawget(rawget(tbl,'__defaults'),tostring(module_name)) then if (new_dir or default == true) and rawget(rawget(tbl,'__defaults'),tostring(module_name)) then
Manager.verbose('Set Global Dir: '..path..' to its default') Manager.verbose('Set Global Dir: '..path..' to its default')
-- cant set it to be equle otherwise it will lose its global propeity -- 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 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
for key,value in pairs(global) do rawset(global,key,nil) end for key,value in pairs(Global) do rawset(Global,key,nil) end
for key,value in pairs(rawget(rawget(tbl,'__defaults'),tostring(module_name))) do rawset(global,key,deepcopy(value)) end for key,value in pairs(rawget(rawget(tbl,'__defaults'),tostring(module_name))) do rawset(Global,key,deepcopy(value)) end
end end
return setmetatable(global,{ return setmetatable(Global,{
__call=function(tbl,default) return Manager.global(default,tbl) end, __call=function(tbl,default) return Manager.global(default,tbl) end,
__index=function(tbl,key) return rawget(Manager.global(),key) or tbl(key) end, __index=function(tbl,key) return rawget(Manager.global(),key) or moduleIndex[key] and Manager.global(key) end,
path=module_path,name=module_name path=module_path,name=module_name
}) })
end, end,
__index=function(tbl,key) return rawget(tbl(),key) or rawget(_G.global,key) or tbl(key) end, __index=function(tbl,key) return rawget(tbl(),key) or rawget(_G.global,key) or moduleIndex[key] and Manager.global(key) end,
__newindex=function(tbl,key,value) rawset(tbl(),key,value) end, __newindex=function(tbl,key,value) rawset(tbl(),key,value) end,
__pairs=function(tbl) __pairs=function(tbl)
local tbl = Manager.global() local tbl = Manager.global()
@@ -519,7 +519,8 @@ Manager.event = setmetatable({
__init=script.on_init, __init=script.on_init,
__load=script.on_load, __load=script.on_load,
__config=script.on_configuration_changed, __config=script.on_configuration_changed,
events=defines.events events=defines.events,
error_chache={}
},{ },{
__metatable=false, __metatable=false,
__call=function(tbl,event_name,new_callback,...) __call=function(tbl,event_name,new_callback,...)
@@ -542,7 +543,20 @@ Manager.event = setmetatable({
-- loops over the call backs and which module it is from -- loops over the call backs and which module it is from
if type(callback) ~= 'function' then error('Invalid Event Callback: "'..event_name..'/'..module_name..'"') end if type(callback) ~= 'function' then error('Invalid Event Callback: "'..event_name..'/'..module_name..'"') end
local sandbox, success, err = Manager.sandbox(callback,{module_name=setupModuleName(module_name),module_path=moduleIndex[tostring(module_name)]},new_callback,...) local sandbox, success, err = Manager.sandbox(callback,{module_name=setupModuleName(module_name),module_path=moduleIndex[tostring(module_name)]},new_callback,...)
if not success then Manager.verbose('Event Failed: "'..module_name..'/'..tbl.names[event_name]..'" ('..err..')','errorCaught') error('Event Failed: "'..module_name..'/'..tbl.names[event_name]..'" ('..err..')') end if not success then
local chache = tbl.error_chache
local error_message = 'Event Failed: "'..module_name..'/'..tbl.names[event_name]..'" ('..err..')'
if not chache[error_message] then Manager.verbose(error_message,'errorCaught') error(error_message) end
if tbl.names[event_name] == 'on_tick' then
if not chache[error_message] then chache[error_message] = {game.tick,1} end
if chache[error_message][1] >= game.tick-10 then chache[error_message] = {game.tick,chache[error_message][2]+1}
else chache[error_message] = nil end
if chache[error_message] and chache[error_message][2] > 100 then
Manager.verbose('There was an error happening every tick for 100 ticks, the event handler has been removed!','errorCaught')
tbl[event_name][module_name] = nil
end
end
end
-- if stop constant is returned then stop further processing -- if stop constant is returned then stop further processing
if err == rawget(tbl,'__stop') then Manager.verbose('Event Haulted By: "'..module_name..'"','errorCaught') break end if err == rawget(tbl,'__stop') then Manager.verbose('Event Haulted By: "'..module_name..'"','errorCaught') break end
end end

11
modules/ExpGamingCore/Sync/control.lua
View File

@@ -278,6 +278,12 @@ function Sync.emit_data()
game.write_file('server-info.json',table.json(info),false,0) game.write_file('server-info.json',table.json(info),false,0)
end end
--- Updates the info and emits the data to a file
-- @usage Sync.emit_update()
function Sync.emit_update()
Sync.update() Sync.emit_data()
end
--- Used to return and set the current IRL time; not very good need a better way to do this --- Used to return and set the current IRL time; not very good need a better way to do this
-- @usage Sync.time('Sun Apr 1 18:44:30 UTC 2018') -- @usage Sync.time('Sun Apr 1 18:44:30 UTC 2018')
-- @usage Sync.time -- string -- @usage Sync.time -- string
@@ -295,9 +301,12 @@ end,function() local info = Sync.info return info.time..' (+'..(game.tick-info.t
-- will auto replace the file every 5 min by default -- will auto replace the file every 5 min by default
script.on_event('on_tick',function(event) script.on_event('on_tick',function(event)
local time = Sync.info.time_period[1] local time = Sync.info.time_period[1]
if (event.tick%time)==0 then Sync.update() Sync.emit_data() end if (event.tick%time)==0 then Sync.emit_update() end
end) end)
script.on_event('on_player_joined_game',Sync.emit_update)
script.on_event('on_pre_player_left_game',Sync.emit_update)
function Sync:on_init() function Sync:on_init()
if loaded_modules['ExpGamingCore.Gui'] then verbose('ExpGamingCore.Gui is installed; Loading gui src') require(module_path..'/src/gui',{Sync=Sync}) end if loaded_modules['ExpGamingCore.Gui'] then verbose('ExpGamingCore.Gui is installed; Loading gui src') require(module_path..'/src/gui',{Sync=Sync}) end
if loaded_modules['ExpGamingCore.Ranking'] then verbose('ExpGamingCore.Ranking is installed; Loading ranking src') require(module_path..'/src/ranking',{Sync=Sync}) end if loaded_modules['ExpGamingCore.Ranking'] then verbose('ExpGamingCore.Ranking is installed; Loading ranking src') require(module_path..'/src/ranking',{Sync=Sync}) end