From 1cb2a3c3a01449a56186a86526a7bf91a1b659c5 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 24 Feb 2019 21:28:33 +0000 Subject: [PATCH] Covnerted Event and Global --- modules/AdvancedStartingItems/control.lua | 2 +- modules/ChatPopup/control.lua | 2 +- modules/DamagePopup/control.lua | 2 +- modules/DeathMarkers/control.lua | 7 ++++--- modules/ExpGamingAdmin/Reports/control.lua | 3 ++- modules/ExpGamingAdmin/Warnings/control.lua | 5 +++-- modules/ExpGamingAdmin/control.lua | 3 ++- modules/ExpGamingBot/autoChat/control.lua | 2 +- modules/ExpGamingBot/discordAlerts/control.lua | 2 +- modules/ExpGamingCommands/bonus/control.lua | 11 ++++++----- modules/ExpGamingCommands/home/control.lua | 3 ++- modules/ExpGamingCore/Group/control.lua | 2 +- modules/ExpGamingCore/Gui/center/control.lua | 6 +++--- modules/ExpGamingCore/Gui/control.lua | 7 ++++--- modules/ExpGamingCore/Gui/inputs/control.lua | 2 +- modules/ExpGamingCore/Gui/left/control.lua | 7 ++++--- modules/ExpGamingCore/Gui/popup/control.lua | 2 +- modules/ExpGamingCore/Gui/toolbar/control.lua | 2 +- modules/ExpGamingCore/Role/control.lua | 11 ++++++----- modules/ExpGamingCore/Role/src/sync.lua | 2 +- modules/ExpGamingCore/Server/control.lua | 13 +++++++------ modules/ExpGamingCore/Sync/control.lua | 11 ++++++----- modules/ExpGamingCore/Sync/src/gui.lua | 4 ++-- modules/ExpGamingInfo/Rockets/control.lua | 5 +++-- modules/ExpGamingInfo/Science/control.lua | 5 +++-- modules/ExpGamingInfo/Tasklist/control.lua | 3 ++- modules/ExpGamingPlayer/afkKick/control.lua | 2 +- modules/ExpGamingPlayer/inventorySearch/control.lua | 2 +- modules/ExpGamingPlayer/playerList/control.lua | 11 ++++++----- modules/ExpGamingPlayer/playerList/src/ranking.lua | 2 +- modules/ExpGamingPlayer/polls/control.lua | 3 ++- modules/PlayerAutoColor/control.lua | 5 +++-- modules/SpawnArea/control.lua | 7 ++++--- modules/WarpPoints/control.lua | 10 +++++----- modules/WornPaths/control.lua | 9 +++++---- 35 files changed, 97 insertions(+), 78 deletions(-) diff --git a/modules/AdvancedStartingItems/control.lua b/modules/AdvancedStartingItems/control.lua index 31c1e718..c97ebec2 100644 --- a/modules/AdvancedStartingItems/control.lua +++ b/modules/AdvancedStartingItems/control.lua @@ -28,7 +28,7 @@ local module_verbose = false local ThisModule = {} -- Event Handlers Define -script.on_event(defines.events.on_player_created, function(event) +Event.add(defines.events.on_player_created, function(event) local player = game.players[event.player_index] if event.player_index == 1 then player.force.friendly_fire = false diff --git a/modules/ChatPopup/control.lua b/modules/ChatPopup/control.lua index 6ab99fd3..992fcda8 100644 --- a/modules/ChatPopup/control.lua +++ b/modules/ChatPopup/control.lua @@ -31,7 +31,7 @@ function ChatPopup.sendFlyingText(player, text) end end -script.on_event(defines.events.on_console_chat, function(event) +Event.add(defines.events.on_console_chat, function(event) if not event.player_index then return end local player = game.players[event.player_index] if not player then return end diff --git a/modules/DamagePopup/control.lua b/modules/DamagePopup/control.lua index b75b2003..d172b8e3 100644 --- a/modules/DamagePopup/control.lua +++ b/modules/DamagePopup/control.lua @@ -9,7 +9,7 @@ local Color = require('FactorioStdLib.Color') local DamagePopup = {} -script.on_event(defines.events.on_entity_damaged, function(event) +Event.add(defines.events.on_entity_damaged, function(event) local entity = event.entity local cause = event.cause local damage = event.original_damage_amount diff --git a/modules/DeathMarkers/control.lua b/modules/DeathMarkers/control.lua index 051e5eb3..3e0e9004 100644 --- a/modules/DeathMarkers/control.lua +++ b/modules/DeathMarkers/control.lua @@ -9,12 +9,13 @@ local module_verbose = false local ThisModule = {} -- Global Define -local global = global{ +local global = { corpses={} } +Global.register(global,function(tbl) global = tbl end) -- Event Handlers Define -script.on_event(defines.events.on_player_died, function(event) +Event.add(defines.events.on_player_died, function(event) local player = game.players[event.player_index] local tag = player.force.add_chart_tag(player.surface,{ position=player.position, @@ -24,7 +25,7 @@ script.on_event(defines.events.on_player_died, function(event) table.insert(global.corpses,tag) 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 if not global.corpses then global.corpses = {} end local key = 1 diff --git a/modules/ExpGamingAdmin/Reports/control.lua b/modules/ExpGamingAdmin/Reports/control.lua index 56fad0ba..521397ae 100644 --- a/modules/ExpGamingAdmin/Reports/control.lua +++ b/modules/ExpGamingAdmin/Reports/control.lua @@ -22,10 +22,11 @@ local ThisModule = { } -- Global Define -local global = global{ +local global = { reports={}, verified={} } +Global.register(global,function(tbl) global = tbl end) -- Local Variables local report_to_warnings = 1 -- used in count_reports diff --git a/modules/ExpGamingAdmin/Warnings/control.lua b/modules/ExpGamingAdmin/Warnings/control.lua index 07cd6994..f10bc95a 100644 --- a/modules/ExpGamingAdmin/Warnings/control.lua +++ b/modules/ExpGamingAdmin/Warnings/control.lua @@ -57,7 +57,8 @@ local ThisModule = { } -- Global Define -local global = global{} +local global = {} +Global.register(global,function(tbl) global = tbl end) -- Function Define local function give_punishment(player,by_player,reason) @@ -120,7 +121,7 @@ function Admin.clear_warnings(player,by_player,no_emit) end -- Event Handlers Define -script.on_event(defines.events.on_tick,function(event) +Event.add(defines.events.on_tick,function(event) if (game.tick % min_time_to_remove_warning) == 0 then for name,warnings in pairs(global) do if warnings > 0 then diff --git a/modules/ExpGamingAdmin/control.lua b/modules/ExpGamingAdmin/control.lua index af9d31c2..9642ee9b 100644 --- a/modules/ExpGamingAdmin/control.lua +++ b/modules/ExpGamingAdmin/control.lua @@ -28,9 +28,10 @@ local Admin = { } -- Global Define -local global = global{ +local global = { banned = {} } +Global.register(global,function(tbl) global = tbl end) -- Function Define function Admin.valid_players(player,by_player) diff --git a/modules/ExpGamingBot/autoChat/control.lua b/modules/ExpGamingBot/autoChat/control.lua index b56bc760..ed4aa492 100644 --- a/modules/ExpGamingBot/autoChat/control.lua +++ b/modules/ExpGamingBot/autoChat/control.lua @@ -136,7 +136,7 @@ local ThisModule = { } -- Event Handlers Define -script.on_event(defines.events.on_console_chat,function(event) +Event.add(defines.events.on_console_chat,function(event) local player = Game.get_player(event) if not player then return end local player_message = event.message:lower():gsub("%s+", "") diff --git a/modules/ExpGamingBot/discordAlerts/control.lua b/modules/ExpGamingBot/discordAlerts/control.lua index a7069d21..f3ba31f9 100644 --- a/modules/ExpGamingBot/discordAlerts/control.lua +++ b/modules/ExpGamingBot/discordAlerts/control.lua @@ -14,7 +14,7 @@ local module_verbose = false local ThisModule = {} -- Event Handlers Define -script.on_event(defines.events.on_console_command,function(event) +Event.add(defines.events.on_console_command,function(event) local command = event.command local args = {} if event.parameters then for word in event.parameters:gmatch('%S+') do table.insert(args,word) end end diff --git a/modules/ExpGamingCommands/bonus/control.lua b/modules/ExpGamingCommands/bonus/control.lua index e772de80..97fc3f72 100644 --- a/modules/ExpGamingCommands/bonus/control.lua +++ b/modules/ExpGamingCommands/bonus/control.lua @@ -3,7 +3,8 @@ -- @author Cooldude2606 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -local global = global{} +local global = {} +Global.register(global,function(tbl) global = tbl end) local Game = require('FactorioStdLib.Game') -- these are the settings which are changed with scale being as +100% @@ -29,7 +30,7 @@ commands.add_command('bonus', 'Set your player bonus (default is 20, guest has 0 player_return('Bonus set to: '..math.floor(bonus)..'%') end).default_admin_only = true -script.on_event(defines.events.on_player_respawned,function(event) +Event.add(defines.events.on_player_respawned,function(event) local player = Game.get_player(event) local bonus = global[player.index] if bonus then @@ -38,7 +39,7 @@ script.on_event(defines.events.on_player_respawned,function(event) end) -- overridden by ExpGamingCore.Role if present -script.on_event(defines.events.on_pre_player_died,function(event) +Event.add(defines.events.on_pre_player_died,function(event) local player = Game.get_player(event) if player.admin then player.ticks_to_respawn = 120 @@ -57,7 +58,7 @@ return { if loaded_modules['ExpGamingCore.Role'] then local Role = require('ExpGamingCore.Role') -- instant respawn - script.on_event(defines.events.on_pre_player_died,function(event) + Event.add(defines.events.on_pre_player_died,function(event) local player = Game.get_player(event) if Role.allowed(player,'bonus-respawn') then player.ticks_to_respawn = 120 @@ -71,7 +72,7 @@ return { end end) -- either clears or adds default when rank changed - script.on_event(defines.events.role_change,function(event) + Event.add(defines.events.role_change,function(event) local player = Game.get_player(event) if Role.allowed(player,'bonus') then for key,setting in pairs(settings) do player[key] = setting*0.2 end diff --git a/modules/ExpGamingCommands/home/control.lua b/modules/ExpGamingCommands/home/control.lua index 5edc3fbb..a30f9087 100644 --- a/modules/ExpGamingCommands/home/control.lua +++ b/modules/ExpGamingCommands/home/control.lua @@ -4,7 +4,8 @@ -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE local Game = require('FactorioStdLib.Game') -local global = global{} +local global = {} +Global.register(global,function(tbl) global = tbl end) --- Sets the home for a player -- @command set-home diff --git a/modules/ExpGamingCore/Group/control.lua b/modules/ExpGamingCore/Group/control.lua index 3506fdf7..97843d35 100644 --- a/modules/ExpGamingCore/Group/control.lua +++ b/modules/ExpGamingCore/Group/control.lua @@ -171,7 +171,7 @@ end -- Event Handlers Define -- creates all permission groups and links them -script.on_event('on_init',function() +Event.add('on_init',function() for name,group in pairs(Group.groups) do local _group = game.permissions.create_group(name) verbose('Created Permission Group: '..name) diff --git a/modules/ExpGamingCore/Gui/center/control.lua b/modules/ExpGamingCore/Gui/center/control.lua index eb3b8da0..50b46d01 100644 --- a/modules/ExpGamingCore/Gui/center/control.lua +++ b/modules/ExpGamingCore/Gui/center/control.lua @@ -208,14 +208,14 @@ function center._prototype:add_tab(name,caption,tooltip,callback) end -- used so that when gui close key is pressed this will close the gui -script.on_event(defines.events.on_gui_closed,function(event) +Event.add(defines.events.on_gui_closed,function(event) if event.element and event.element.valid then event.element.destroy() end end) -script.on_event(defines.events.on_player_respawned,center.clear) +Event.add(defines.events.on_player_respawned,center.clear) function center.on_init() - if loaded_modules['ExpGamingCore.Role'] then script.on_event(defines.events.on_role_change,center.clear) end + if loaded_modules['ExpGamingCore.Role'] then Event.add(defines.events.on_role_change,center.clear) end end -- calling will attempt to add a new gui return setmetatable(center,{__call=function(self,...) return self.add(...) end}) \ No newline at end of file diff --git a/modules/ExpGamingCore/Gui/control.lua b/modules/ExpGamingCore/Gui/control.lua index 0877c322..1ffe615f 100644 --- a/modules/ExpGamingCore/Gui/control.lua +++ b/modules/ExpGamingCore/Gui/control.lua @@ -9,7 +9,8 @@ local Color = require('FactorioStdLib.Color') local Server -- ExpGamingCore.Server@?^4.0.0 local Gui = {} -local global = global() +local global = {} +Global.register(global,function(tbl) global = tbl end) --- Used to set and get data about different guis -- @usage Gui.data[location] -- returns the gui data for that gui location ex center -- @usage Gui.data(location,gui_name,gui_data) -- adds gui data for a gui at a location @@ -140,7 +141,7 @@ function Gui.cam_link(data) return data.cam end -script.on_event('on_tick', function(event) +Event.add('on_tick', function(event) if loaded_modules['ExpGamingCore.Server'] then return end if global.cams and is_type(global.cams,'table') and #global.cams > 0 then local update = 4 @@ -158,7 +159,7 @@ script.on_event('on_tick', function(event) end end) -script.on_event('on_player_respawned',function(event) +Event.add('on_player_respawned',function(event) if loaded_modules['ExpGamingCore.Server'] then return end if global.players and is_type(global.players,'table') and #global.players > 0 and global.players[event.player_index] then local remove = {} diff --git a/modules/ExpGamingCore/Gui/inputs/control.lua b/modules/ExpGamingCore/Gui/inputs/control.lua index 54abfe48..9d6aab03 100644 --- a/modules/ExpGamingCore/Gui/inputs/control.lua +++ b/modules/ExpGamingCore/Gui/inputs/control.lua @@ -136,7 +136,7 @@ function inputs._event_handler(event) end end -script.on_event(inputs.events,inputs._event_handler) +Event.add(inputs.events,inputs._event_handler) inputs.events.error = {} -- the following functions are just to make inputs easier but if what you want is not include use inputs.add(obj) diff --git a/modules/ExpGamingCore/Gui/left/control.lua b/modules/ExpGamingCore/Gui/left/control.lua index 7de7a904..ac281d58 100644 --- a/modules/ExpGamingCore/Gui/left/control.lua +++ b/modules/ExpGamingCore/Gui/left/control.lua @@ -27,7 +27,8 @@ left.hide = Gui.inputs{ end end) -local global = global() +local global = {} +Global.register(global,function(tbl) global = tbl end) -- used for debugging function left.override_open(state) @@ -212,7 +213,7 @@ function left._prototype:toggle(player) return left_frame.style.visible end -script.on_event(defines.events.on_player_joined_game,function(event) +Event.add(defines.events.on_player_joined_game,function(event) -- draws the left guis when a player first joins, fake_event is just because i am lazy local player = Game.get_player(event) local frames = Gui.data.left or {} @@ -231,7 +232,7 @@ script.on_event(defines.events.on_player_joined_game,function(event) end end) -script.on_event(defines.events.on_tick,function(event) +Event.add(defines.events.on_tick,function(event) if ((event.tick+10)/(3600*game.speed)) % 15 == 0 then left.update() end diff --git a/modules/ExpGamingCore/Gui/popup/control.lua b/modules/ExpGamingCore/Gui/popup/control.lua index 7a49bae3..a773c901 100644 --- a/modules/ExpGamingCore/Gui/popup/control.lua +++ b/modules/ExpGamingCore/Gui/popup/control.lua @@ -124,7 +124,7 @@ function popup.on_post() end) end -script.on_event(defines.events.on_player_joined_game,popup.flow) +Event.add(defines.events.on_player_joined_game,popup.flow) -- calling will attempt to add a new popup style return setmetatable(popup,{__call=function(self,...) return self.add(...) end}) \ No newline at end of file diff --git a/modules/ExpGamingCore/Gui/toolbar/control.lua b/modules/ExpGamingCore/Gui/toolbar/control.lua index cae2f467..a31f2d98 100644 --- a/modules/ExpGamingCore/Gui/toolbar/control.lua +++ b/modules/ExpGamingCore/Gui/toolbar/control.lua @@ -85,6 +85,6 @@ function toolbar.on_init() if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end end -script.on_event({defines.events.on_role_change,defines.events.on_player_joined_game},toolbar.draw) +Event.add({defines.events.on_role_change,defines.events.on_player_joined_game},toolbar.draw) -- calling with only a player will draw the toolbar for that player, more params will attempt to add a button return setmetatable(toolbar,{__call=function(self,player,extra,...) if extra then return self.add(player,extra,...) else self.draw(player) end end}) \ No newline at end of file diff --git a/modules/ExpGamingCore/Role/control.lua b/modules/ExpGamingCore/Role/control.lua index 77e9d204..fa049446 100644 --- a/modules/ExpGamingCore/Role/control.lua +++ b/modules/ExpGamingCore/Role/control.lua @@ -61,7 +61,7 @@ local Role = { _RoleSelfReference=Role -- Global Define -local global = global{ +local global = { change_cache_length=15, changes={}, latest_change={}, @@ -69,7 +69,8 @@ local global = global{ players={}, roles={} } -RoleGlobal = global +Global.register(global,function(tbl) RoleGlobal = tbl end) + -- Function Define --- Used to set default roles for players who join @@ -459,7 +460,7 @@ function Role._prototype:remove_player(player,by_player,batch) end -- Event Handlers Define -script.on_event(role_change_event_id,function(event) +Event.add(role_change_event_id,function(event) -- variable init local player = Game.get_player(event) local by_player = Game.get_player(event.by_player_index) or SERVER @@ -505,7 +506,7 @@ script.on_event(role_change_event_id,function(event) end end) -script.on_event(defines.events.on_player_created,function(event) +Event.add(defines.events.on_player_created,function(event) local player = Game.get_player(event) local highest = Role.get_highest(player) or Role.meta.default Group.assign(player,highest.group) @@ -514,7 +515,7 @@ script.on_event(defines.events.on_player_created,function(event) if Role.preassign[player.name:lower()] then Role.assign(player,Role.preassign[player.name:lower()]) end end) -script.on_event(defines.events.on_tick,function(event) +Event.add(defines.events.on_tick,function(event) if game.tick%(3600*5) ~= 0 then return end -- every 5 minutes for _,player in pairs(game.connected_players) do if not Role.has_flag(player,'block_auto_promote') then diff --git a/modules/ExpGamingCore/Role/src/sync.lua b/modules/ExpGamingCore/Role/src/sync.lua index 36f0fdbe..6f5361ad 100644 --- a/modules/ExpGamingCore/Role/src/sync.lua +++ b/modules/ExpGamingCore/Role/src/sync.lua @@ -65,7 +65,7 @@ if Sync.add_to_gui then end -- adds a discord emit for rank changing -script.on_event('on_role_change',function(event) +Event.add('on_role_change',function(event) local role = Role.get(event.role_name) local player = Game.get_player(event) local by_player = Game.get_player(event.by_player_index) or SERVER diff --git a/modules/ExpGamingCore/Server/control.lua b/modules/ExpGamingCore/Server/control.lua index bcc6d57c..33523468 100644 --- a/modules/ExpGamingCore/Server/control.lua +++ b/modules/ExpGamingCore/Server/control.lua @@ -22,7 +22,7 @@ local module_verbose = false --true|false -- @field print_to contains players that event details will be printed to -- @field uuid contains the random number generator for the uuid system local pre_load_uuid = 0 -local global = global{ +local global = { all={_n=0}, queue={}, tick={}, @@ -33,6 +33,7 @@ local global = global{ print_to={}, uuid=0 } +Global.register(global,function(tbl) global = tbl end) --- Used to generate a new uuid for the thread system -- @usage local uuid = tostring(Server.uuid) -- calling tostring locks the value @@ -155,9 +156,9 @@ function Server._thread_debuger(player,event,state) else print_to[player.index][event] = true end end ---- Calls all threads on a certain game event (used with script.on_event) +--- Calls all threads on a certain game event (used with Event.add) -- @local Server._thread_handler --- @usage script.on_event(defines.events,Server._thread_handler) -- adds this handler +-- @usage Event.add(defines.events,Server._thread_handler) -- adds this handler -- @tparam table event the event that is called function Server._thread_handler(event) -- returns to players who have set _thread_debuger to true @@ -195,7 +196,7 @@ function Server.add_thread_handler(event) local threads = global if not threads.events[event] then threads.events[event] = {} - script.on_event(event,Server._thread_handler) + Event.add(event,Server._thread_handler) return true end return false @@ -485,7 +486,7 @@ function Server._thread:on_event(event,callback) return self end -script.on_event(defines.events.on_tick,function(event) +Event.add(defines.events.on_tick,function(event) -- uses its own on_tick event so that other actions can be tested for if event.tick < 10 then return end if #global.tick > 0 then Server.run_tick_threads() end -- on tick events @@ -505,7 +506,7 @@ script.on_load(function(event) end) function Server:on_init() - for name,id in pairs(defines.events) do if not script.get_event_handler(id) then script.on_event(id,Server._thread_handler) end end + for name,id in pairs(defines.events) do if not script.get_event_handler(id) then Event.add(id,Server._thread_handler) end end if loaded_modules['ExpGamingCore.Command'] then verbose('ExpGamingCore.Command is installed; Loading commands src') require(module_path..'/src/commands',{Server=Server}) end end diff --git a/modules/ExpGamingCore/Sync/control.lua b/modules/ExpGamingCore/Sync/control.lua index bfd91b43..4a780a95 100644 --- a/modules/ExpGamingCore/Sync/control.lua +++ b/modules/ExpGamingCore/Sync/control.lua @@ -24,7 +24,7 @@ local module_verbose = false --true|false -- @field ranks a list of player ranks -- @field rockets the number of rockets launched -- @field mods the mods which are loaded -local global = global{ +local global = { server_name='Factorio Server', server_description='A factorio server for everyone', reset_time='On Demand', @@ -47,6 +47,7 @@ local global = global{ rockets=0, mods={'Offline'} } +Global.register(global,function(tbl) global = tbl end) --- Player sub-table -- @table global.players @@ -316,14 +317,14 @@ Sync.time=add_metatable({},function(full,date) end,function() local info = Sync.info return info.time..' (+'..(game.tick-info.time_set[1])..' Ticks)' end) -- will auto replace the file every 5 min by default -script.on_event('on_tick',function(event) +Event.add('on_tick',function(event) local time = Sync.info.time_period[1] if (event.tick%time)==0 then Sync.emit_update() end end) -script.on_event('on_player_joined_game',Sync.emit_update) -script.on_event('on_pre_player_left_game',Sync.emit_update) -script.on_event('on_rocket_launched',Sync.emit_update) +Event.add('on_player_joined_game',Sync.emit_update) +Event.add('on_pre_player_left_game',Sync.emit_update) +Event.add('on_rocket_launched',Sync.emit_update) 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,module_path=module_path}) end diff --git a/modules/ExpGamingCore/Sync/src/gui.lua b/modules/ExpGamingCore/Sync/src/gui.lua index f01ebf2a..72c256dd 100644 --- a/modules/ExpGamingCore/Sync/src/gui.lua +++ b/modules/ExpGamingCore/Sync/src/gui.lua @@ -96,11 +96,11 @@ Sync.info_gui = Gui.center{ }.style.font='default-small' end} -script.on_event(defines.events.on_gui_click,function(event) +Event.add(defines.events.on_gui_click,function(event) local element = event.element if element and element.valid and element.caption and element.caption == 'Press Ecs or E to close; this is only visible once!' then Gui.center.clear(event) end end) -script.on_event(defines.events.on_player_joined_game,function(event) Sync.info_gui(event) end) \ No newline at end of file +Event.add(defines.events.on_player_joined_game,function(event) Sync.info_gui(event) end) \ No newline at end of file diff --git a/modules/ExpGamingInfo/Rockets/control.lua b/modules/ExpGamingInfo/Rockets/control.lua index 6edd2130..d11f558d 100644 --- a/modules/ExpGamingInfo/Rockets/control.lua +++ b/modules/ExpGamingInfo/Rockets/control.lua @@ -17,7 +17,7 @@ local ThisModule = { } -- Global Define -local global = global{ +local global = { update=0, first=0, _last=0, @@ -25,6 +25,7 @@ local global = global{ fastest=0, milestones={m1=0,m2=0,m5=0,m10=0,m20=0,m50=0,m100=0,m200=0,m500=0,m1000=0,m2000=0,m5000=0} } +Global.register(global,function(tbl) global = tbl end) -- Function Define ThisModule.Gui = Gui.left{ @@ -97,7 +98,7 @@ ThisModule.Gui = Gui.left{ } -- Event Define -script.on_event(defines.events.on_rocket_launched,function(event) Gui.left.update('rockets') end) +Event.add(defines.events.on_rocket_launched,function(event) Gui.left.update('rockets') end) -- Module Return -- when called will toggle the gui for that player, updates gui if no player given diff --git a/modules/ExpGamingInfo/Science/control.lua b/modules/ExpGamingInfo/Science/control.lua index 74118960..9edfa55f 100644 --- a/modules/ExpGamingInfo/Science/control.lua +++ b/modules/ExpGamingInfo/Science/control.lua @@ -28,7 +28,7 @@ local ThisModule = { } -- Global Define -local global = global{ +local global = { _base={ update=0, _update=0, @@ -36,6 +36,7 @@ local global = global{ _made={0,0,0,0,0,0,0} } } +Global.register(global,function(tbl) global = tbl end) -- Function Define ThisModule.Gui = Gui.left{ @@ -98,7 +99,7 @@ ThisModule.Gui = Gui.left{ } -- Event Define -script.on_event(defines.events.on_research_finished,function(event) Gui.left.update('science') end) +Event.add(defines.events.on_research_finished,function(event) Gui.left.update('science') end) -- Module Return -- when called will toggle the gui for that player, if no player it will update the gui diff --git a/modules/ExpGamingInfo/Tasklist/control.lua b/modules/ExpGamingInfo/Tasklist/control.lua index 5754742d..d8dbe8b5 100644 --- a/modules/ExpGamingInfo/Tasklist/control.lua +++ b/modules/ExpGamingInfo/Tasklist/control.lua @@ -14,7 +14,7 @@ local module_verbose = false local ThisModule = {} -- Global Define -local global = global{ +local global = { tasks={}, _edit={}, _base={ @@ -23,6 +23,7 @@ local global = global{ _editing={} } } +Global.register(global,function(tbl) global = tbl end) -- Function Define local edit = Gui.inputs{ diff --git a/modules/ExpGamingPlayer/afkKick/control.lua b/modules/ExpGamingPlayer/afkKick/control.lua index aa8f1c11..1add91c9 100644 --- a/modules/ExpGamingPlayer/afkKick/control.lua +++ b/modules/ExpGamingPlayer/afkKick/control.lua @@ -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) diff --git a/modules/ExpGamingPlayer/inventorySearch/control.lua b/modules/ExpGamingPlayer/inventorySearch/control.lua index 12318f15..b2313f14 100644 --- a/modules/ExpGamingPlayer/inventorySearch/control.lua +++ b/modules/ExpGamingPlayer/inventorySearch/control.lua @@ -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 diff --git a/modules/ExpGamingPlayer/playerList/control.lua b/modules/ExpGamingPlayer/playerList/control.lua index 886e3139..536519f2 100644 --- a/modules/ExpGamingPlayer/playerList/control.lua +++ b/modules/ExpGamingPlayer/playerList/control.lua @@ -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 diff --git a/modules/ExpGamingPlayer/playerList/src/ranking.lua b/modules/ExpGamingPlayer/playerList/src/ranking.lua index 7ef48a58..266741b9 100644 --- a/modules/ExpGamingPlayer/playerList/src/ranking.lua +++ b/modules/ExpGamingPlayer/playerList/src/ranking.lua @@ -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 = {} diff --git a/modules/ExpGamingPlayer/polls/control.lua b/modules/ExpGamingPlayer/polls/control.lua index 1f187437..fa9ed01e 100644 --- a/modules/ExpGamingPlayer/polls/control.lua +++ b/modules/ExpGamingPlayer/polls/control.lua @@ -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) diff --git a/modules/PlayerAutoColor/control.lua b/modules/PlayerAutoColor/control.lua index b4776c9e..3dc7a494 100644 --- a/modules/PlayerAutoColor/control.lua +++ b/modules/PlayerAutoColor/control.lua @@ -12,7 +12,7 @@ local module_verbose = false local ThisModule = {} -- Global Define -local global = global{ +local global = { BADgamerNL={r=255,g=20,b=147}, arty714={r=150,g=68,b=161}, Cooldude2606={r=57,g=192,b=207}, @@ -26,9 +26,10 @@ local global = global{ cydes={r=82,g=249,b=155}, UUBlueFire={r=0,g=204,b=255} } +Global.register(global,function(tbl) global = tbl end) -- Event Handlers Define -script.on_event(defines.events.on_player_created, function(event) +Event.add(defines.events.on_player_created, function(event) local player = game.players[event.player_index] local colours = table.keys(defines.color) player.color = defines.color.black diff --git a/modules/SpawnArea/control.lua b/modules/SpawnArea/control.lua index d32258fd..0e9e1d2c 100644 --- a/modules/SpawnArea/control.lua +++ b/modules/SpawnArea/control.lua @@ -26,12 +26,13 @@ local ThisModule = {} -- Global Define -- location of auto refill turrets -local global = global{ +local global = { {1,-3,-3}, {1,-3,3}, {1,3,-3}, {1,3,3} } +Global.register(global,function(tbl) global = tbl end) -- Function Define function ThisModule.afk_belt(surface,offset) @@ -71,14 +72,14 @@ end -- Event Handlers Define if turret_enabled then - script.on_event(defines.events.on_tick,function(event) + Event.add(defines.events.on_tick,function(event) if event.tick % 3600 then ThisModule.auto_turret() end end) end -script.on_event(defines.events.on_player_created, function(event) +Event.add(defines.events.on_player_created, function(event) if event.player_index == 1 then local player = Game.get_player(event) local surface = player.surface diff --git a/modules/WarpPoints/control.lua b/modules/WarpPoints/control.lua index 16c150f9..19b5a9ad 100644 --- a/modules/WarpPoints/control.lua +++ b/modules/WarpPoints/control.lua @@ -22,7 +22,6 @@ local global_offset = {x=0,y=0} local warp_min_distance = 25 -- Module Define -local _global = global local global local module_verbose = false local ThisModule = { @@ -33,10 +32,11 @@ local ThisModule = { } -- Global Define -global = _global{ +global = { warps={}, -- 0,0 is always a warp cooldowns={} } +Global.register(global,function(tbl) global = tbl end) -- Function Define @@ -210,7 +210,7 @@ ThisModule.Gui = Gui.left{ } -- Event Handlers Define -script.on_event(defines.events.on_tick,function(event) +Event.add(defines.events.on_tick,function(event) if not (event.tick % 60 == 0) then return end for index,time in pairs(global.cooldowns) do if time > 0 then @@ -220,7 +220,7 @@ script.on_event(defines.events.on_tick,function(event) end end) -script.on_event(defines.events.on_player_changed_position, function(event) +Event.add(defines.events.on_player_changed_position, function(event) local player = Game.get_player(event) local cooldown = global.cooldowns[player.index] or 0 local tile = player.surface.get_tile(player.position).name @@ -233,7 +233,7 @@ script.on_event(defines.events.on_player_changed_position, function(event) end end) -script.on_event(defines.events.on_player_created, function(event) +Event.add(defines.events.on_player_created, function(event) if event.player_index == 1 then local player = Game.get_player(event) player.force.chart(player.surface, {{player.position.x - 20, player.position.y - 20}, {player.position.x + 20, player.position.y + 20}}) diff --git a/modules/WornPaths/control.lua b/modules/WornPaths/control.lua index 1ccf1830..0459de26 100644 --- a/modules/WornPaths/control.lua +++ b/modules/WornPaths/control.lua @@ -21,7 +21,8 @@ local module_verbose = false local ThisModule = {} -- Global Define -local global = global() +local global = {} +Global.register(global,function(tbl) global = tbl end) -- Function Define local function global_key(surface,pos) @@ -42,7 +43,7 @@ function ThisModule.down_grade(surface,pos) end -- Event Handlers Define -script.on_event({defines.events.on_player_built_tile,defines.events.on_robot_built_tile}, function(event) +Event.add({defines.events.on_player_built_tile,defines.events.on_robot_built_tile}, function(event) local surface = event.surface_index and game.surfaces[event.surface_index] or event.robot and event.robot.surface local old_tiles = event.tiles for _,old_tile in pairs(old_tiles) do @@ -52,7 +53,7 @@ script.on_event({defines.events.on_player_built_tile,defines.events.on_robot_bui end end) -script.on_event(defines.events.on_player_changed_position, function(event) +Event.add(defines.events.on_player_changed_position, function(event) local player = Game.get_player(event) if not player or not player.valid or game.tick < 10 then return end if player.afk_time > 300 then return end @@ -73,7 +74,7 @@ script.on_event(defines.events.on_player_changed_position, function(event) end end) -script.on_event({defines.events.on_built_entity,on_robot_built_entity}, function(event) +Event.add({defines.events.on_built_entity,on_robot_built_entity}, function(event) local entity = event.created_entity local surface = entity.surface if entities[entity.name] then