Covnerted Event and Global

This commit is contained in:
Cooldude2606
2019-02-24 21:28:33 +00:00
parent fc279c42f8
commit 1cb2a3c3a0
35 changed files with 97 additions and 78 deletions

View File

@@ -17,7 +17,7 @@ local function get_allowed_afk_time(player)
return (role_count/role_index)*player_count
end
script.on_event(defines.events.on_tick,function(event)
Event.add(defines.events.on_tick,function(event)
if (game.tick%3600) ~= 0 then return end
for _,player in pairs(game.connected_players) do
local afk = #game.connected_players < 3 and 10 or get_allowed_afk_time(player)

View File

@@ -76,7 +76,7 @@ function ThisModule.search_player(player)
end
-- Event Handlers Define
script.on_event(defines.events.on_tick,function(event)
Event.add(defines.events.on_tick,function(event)
if (game.tick%900) == 0 then
local players = game.connected_players
if #players == 0 then return end

View File

@@ -37,11 +37,12 @@ local ThisModule = {
}
-- Global Define
local global = global{
local global = {
update=0,
delay=10,
interval=54000
}
Global.register(global,function(tbl) global = tbl end)
function ThisModule.update(tick)
local tick = is_type(tick,'table') and tick.tick or is_type(tick,'number') and tick or game.tick
@@ -110,14 +111,14 @@ ThisModule.Gui = Gui.left{
open_on_join=true
}
script.on_event(defines.events.on_tick,function(event)
Event.add(defines.events.on_tick,function(event)
if event.tick > global.update then
ThisModule.Gui()
global.update = event.tick + global.interval
end
end)
script.on_event(defines.events.on_gui_click,function(event)
Event.add(defines.events.on_gui_click,function(event)
-- lots of checks for it being valid
if event.element and event.element.valid
and event.element.parent and event.element.parent.parent and event.element.parent.parent.parent
@@ -136,8 +137,8 @@ script.on_event(defines.events.on_gui_click,function(event)
if Admin and AdminGui and Admin.allowed(event.player_index) then AdminGui(flow).caption = event.element.name end
end)
script.on_event(defines.events.on_player_joined_game,function() ThisModule.update() end)
script.on_event(defines.events.on_player_left_game,function() ThisModule.update() end)
Event.add(defines.events.on_player_joined_game,function() ThisModule.update() end)
Event.add(defines.events.on_player_left_game,function() ThisModule.update() end)
ThisModule.force_update = function() return ThisModule.Gui() end
-- when called it will queue an update to the player list

View File

@@ -1,6 +1,6 @@
local Role = require('ExpGamingCore.Role')
script.on_event(defines.events.on_role_change,self.update)
Event.add(defines.events.on_role_change,self.update)
return function()
local rtn = {}

View File

@@ -20,10 +20,11 @@ local ThisModule = {
}
-- Global Define
local global = global{
local global = {
active={},
old={}
}
Global.register(global,function(tbl) global = tbl end)
-- Function Define
local function _poll_data(question,answers)