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

server clean

Browse Source
This commit is contained in:
Cooldude2606
2017-10-15 20:00:57 +01:00
parent c1145342fe
commit 61a8d79e33
2 changed files with 56 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
locale/ExpGaming-Core/ExpGaming - Lib.lua
View File

@@ -34,6 +34,12 @@ end
function tick_to_min (tick) function tick_to_min (tick)
return math.floor(tick/(3600*game.speed)) return math.floor(tick/(3600*game.speed))
end end
--used to make uuids but may be useful else where
function string.tohex(str)
return (str:gsub('.', function (c)
return string.format('%02X', string.byte(c))
end))
end
--I stole this from somewhere a long time ago but this and the other two functions convert a table into a string --I stole this from somewhere a long time ago but this and the other two functions convert a table into a string
function table.val_to_str ( v ) function table.val_to_str ( v )
if "string" == type( v ) then if "string" == type( v ) then

91
locale/ExpGaming-Core/ExpGaming - Server Interface.lua
View File

@@ -7,6 +7,7 @@ Any changes that you may make to the code are yours but that does not make the s
Discord: https://discord.gg/XSsBV6b Discord: https://discord.gg/XSsBV6b
]] ]]
--Please Only Edit Below This Line----------------------------------------------------------- --Please Only Edit Below This Line-----------------------------------------------------------
local server = {}
--this command is just a way or using loadstring from in game while keeping achievements --this command is just a way or using loadstring from in game while keeping achievements
define_command('server-interface',{'server-interface.command-help'},{'command',true},function(player,event,args) define_command('server-interface',{'server-interface.command-help'},{'command',true},function(player,event,args)
if player == '<server>' then if player == '<server>' then
@@ -25,82 +26,90 @@ define_command('debug',{'server-interface.debug-command-help'},{'command',true},
debug_write({'START'},game.tick..' '..event.parameter) debug_write({'START'},game.tick..' '..event.parameter)
global.exp_core.debug.triggered = false global.exp_core.debug.triggered = false
local returned,value = pcall(loadstring(event.parameter)) local returned,value = pcall(loadstring(event.parameter))
if global.exp_core.debug.triggered and #global.exp_core.sudo.commands == 0 then debug_write({'END'},game.tick) global.exp_core.debug.state = false end if global.exp_core.debug.triggered and #global.exp_core.server.callbacks == 0 then debug_write({'END'},game.tick) global.exp_core.debug.state = false end
end) end)
--this is used when changing permission groups when the person does not have permsion to, can also be used to split a large event accross multiple ticks --this is used when changing permission groups when the person does not have permsion to, can also be used to split a large event accross multiple ticks
local commands_per_iteration = 50 --number of sudo commands ran every sudo iteration local commands_per_iteration = 50 --number of sudo commands ran every sudo iteration
local ticks_per_iteration = 1 --the number of ticks break before the next sudo iteration local ticks_per_iteration = 1 --the number of ticks break before the next sudo iteration
local temp_var_time = 1000/commands_per_iteration*ticks_per_iteration --temp vars allow sudo funnctions to share data local temp_var_time = 1000/commands_per_iteration*ticks_per_iteration --temp vars allow sudo funnctions to share data
function sudo(command,args,custom_return_name) --adds a call back function to the queue uuid can be provided
function server.queue_callback(callback,args,uuid)
if type(command) == 'function' then if type(command) == 'function' then
local args = args or {} local args = args or {}
local return_name = custom_return_name or tostring(game.tick)..tostring(command)..tostring(#global.exp_core.sudo.commands) local uuid = uuid or server.get_uuid(callback)
debug_write({'SUDO','ADD'},return_name) debug_write({'sudo','ADD'},return_name)
table.insert(global.exp_core.sudo.commands,{fun=command,args=args,return_name=return_name}) table.insert(global.exp_core.server.callbacks,{fun=command,args=args,uuid=uuid})
refresh_temp_var(return_name,'temp-var-temp-value') server.refresh_uuid(uuid)
return {sudo='sudo-temp-var',name=return_name} return uuid
end end
end end
--turns a string into the temp var format so that it can be used -- clears all temp values and call backs in queue
function format_as_temp_var(string) function server.clear_callbacks()
refresh_temp_var(string) global.exp_core.server = {callbacks={},temp_varibles={}}
return {sudo='sudo-temp-var',name=tostring(string)} end
-- converts any value into the uuid the script will use
function server.get_uuid(var)
if type(var) == 'string' then uuid = var
else uuid = tostring(var)..tostring(#global.exp_core.server.callbacks) end
server.refresh_uuid(uuid)
return string.tohex('uuid'..uuid)
end end
--update the time on a temp var or add it as a new one --update the time on a temp var or add it as a new one
function refresh_temp_var(name,value,offset) function server.refresh_uuid(uuid,data,offset)
local offset = offset or temp_var_time local offset = offset or temp_var_time
if global.exp_core.sudo.temp_varibles[name] and not value then if global.exp_core.server.temp_varibles[uuid] and not data then
global.exp_core.sudo.temp_varibles[name].remove_time = game.tick+offset global.exp_core.server.temp_varibles[uuid].remove_time = game.tick+offset
else else
global.exp_core.sudo.temp_varibles[name] = {data=value,remove_time=game.tick+offset} local data = data or 'temp-var-temp-value'
global.exp_core.server.temp_varibles[uuid] = {data=data,remove_time=game.tick+offset}
end end
end end
-- gets the data stored in a temp varible -- gets the data stored in a temp varible
function get_temp_var_data(var) function server.get_uuid_data(uuid)
local to_return = nil if global.exp_core.server.temp_varibles[uuid] then
if global.exp_core.sudo.temp_varibles[var] then to_return = global.exp_core.sudo.temp_varibles[var].data debug_write({'SUDO','TEMP-VAR'},var) server.refresh_uuid(uuid)
elseif var.name and global.exp_core.sudo.temp_varibles[var.name] then to_return = global.exp_core.sudo.temp_varibles[var.name].data debug_write({'SUDO','TEMP-VAR'},var.name) end debug_write({'sudo','TEMP-VAR'},uuid)
return to_return return global.exp_core.server.temp_varibles[uuid].data
end return nil
end end
-- returns the lenth of the temp varible list and command queue, is string is true then it is retured as a string -- returns the lenth of the temp varible list and command queue, is string is true then it is retured as a string
function get_sudo_info(string) function server.get_callback_queue_info(string)
local lenth = 0 local lenth = 0
for _,v in pairs(global.exp_core.sudo.temp_varibles) do lenth = lenth + 1 end for _,v in pairs(global.exp_core.server.temp_varibles) do lenth = lenth + 1 end
if string then return {'server-interface.sudo-info',game.tick,#global.exp_core.sudo.commands,lenth} if string then return {'server-interface.sudo-info',game.tick,#global.exp_core.server.callbacks,lenth}
else return {tick=game.tick,commands=#global.exp_core.sudo.commands,temp_varibles=#global.exp_core.sudo.temp_varibles} end else return {tick=game.tick,commands=#global.exp_core.server.callbacks,temp_varibles=#global.exp_core.server.temp_varibles} end
end
-- stops all sudo commands
function clear_sudo()
global.exp_core.sudo = {commands={},temp_varibles={}}
end end
--sudo main loop --sudo main loop
Event.register(defines.events.on_tick, function(event) Event.register(defines.events.on_tick, function(event)
--used with debug command will stop debuging once atleast one message is send to file and there are no commands in sudo --used with debug command will stop debuging once atleast one message is send to file and there are no commands in sudo
if global.exp_core.debug.state and global.exp_core.debug.triggered and #global.exp_core.sudo.commands == 0 then debug_write({'END'},game.tick) global.exp_core.debug.state = global.exp_core.debug.focre end if global.exp_core.debug.state and global.exp_core.debug.triggered and #global.exp_core.server.callbacks == 0 then debug_write({'END'},game.tick) global.exp_core.debug.state = global.exp_core.debug.focre end
-- runs the commands in sudo -- runs the commands in sudo
debug_write({'SUDO'},get_sudo_info(true),true) debug_write({'sudo'},server.get_callback_queue_info(true),true)
if game.tick % ticks_per_iteration == 0 and global.exp_core.sudo.commands and #global.exp_core.sudo.commands > 0 then if game.tick % ticks_per_iteration == 0 and global.exp_core.server.callbacks and #global.exp_core.server.callbacks > 0 then
-- gets the number of call backs to run
local length = nil local length = nil
if #global.exp_core.sudo.commands > commands_per_iteration then length = commands_per_iteration else length = #global.exp_core.sudo.commands end if #global.exp_core.server.callbacks > commands_per_iteration then length = commands_per_iteration else length = #global.exp_core.server.callbacks end
-- runs the right number of commands as set -- runs the right number of commands as set
for i = 1,length do for i = 1,length do
local command=table.remove(global.exp_core.sudo.commands,1) local callback=table.remove(global.exp_core.server.callbacks,1)
if command and command.fun and type(command.fun) == 'function' then if callback and callback.fun and type(callback.fun) == 'function' then
local args = {} local args = {}
-- retrives and temp varibles -- retrives any temp varibles
for n,value in pairs(command.args) do for n,value in pairs(callback.args) do
if type(value) == 'table' and not value.__self and value.sudo and value.sudo == 'sudo-temp-var' then args[n] = {data=global.exp_core.sudo.temp_varibles[value.name].data,temp_var_name=value.name} if type(value) == 'string' and global.exp_core.server.temp_varibles[value]
then args[n] = server.get_uuid_data(value)
else args[n] = value end else args[n] = value end
end end
-- makes new temp value and runs command -- makes new temp value and runs command
local returns = {command.fun(unpack(args))} or {} local returns = {command.fun(unpack(args))} or {}
refresh_temp_var(command.return_name,returns) server.refresh_uuid(callback.uuid,returns)
end end
end end
end end
-- removes old temp varibles -- removes old temp varibles
for name,data in pairs(global.exp_core.sudo.temp_varibles) do for uuid,data in pairs(global.exp_core.server.temp_varibles) do
if data.remove_time <= game.tick then global.exp_core.sudo.temp_varibles[name] = nil end if data.remove_time <= game.tick then global.exp_core.server.temp_varibles[uuid] = nil end
end end
end) end)
Event.register(Event.soft_init,function() global.exp_core.sudo = {commands={},temp_varibles={}} end) Event.register(Event.soft_init,function() global.exp_core.server = {callbacks={},temp_varibles={}} end)
return server