From 40f7d00cbe283179fa7c157c7ccba0060493765c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 14 Aug 2020 16:07:34 +0100 Subject: [PATCH 01/14] Added ligten to player colours --- modules/data/player-colours.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/data/player-colours.lua b/modules/data/player-colours.lua index aff392a8..9ee9b547 100644 --- a/modules/data/player-colours.lua +++ b/modules/data/player-colours.lua @@ -26,6 +26,11 @@ local function compact(colour) } end +--- Returns a colour that is a bit lighter than the one given +local function lighten(c) + return {r = 1 - (1 - c.r) * 0.5, g = 1 - (1 - c.g) * 0.5, b = 1 - (1 - c.b) * 0.5, a = 1} +end + --- When your data loads apply the players colour, or a random on if none is saved PlayerColours:on_load(function(player_name, player_colour) if not player_colour then @@ -37,7 +42,7 @@ PlayerColours:on_load(function(player_name, player_colour) while config.disallow[colour_name] do colour_name = table.get_random_dictionary_entry(Colours, true) end - player_colour = {Colours[colour_name], Colours[colour_name]} + player_colour = {Colours[colour_name], lighten(Colours[colour_name])} end end From ad457343a4f645f777de80a93af42e61bacc1708 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 14 Aug 2020 16:13:44 +0100 Subject: [PATCH 02/14] Added check for nil cause for damaged --- modules/data/statistics.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/data/statistics.lua b/modules/data/statistics.lua index b350d3b7..709610fb 100644 --- a/modules/data/statistics.lua +++ b/modules/data/statistics.lua @@ -89,7 +89,7 @@ if config.DamageDealt then local stat = Statistics:combine('DamageDealt') Event.add(defines.events.on_entity_damaged, function(event) local character = event.cause -- Check character is valid - if not character.valid or character.type ~= 'character' then return end + if not character or not character.valid or character.type ~= 'character' then return end local player = character.player -- Check player is valid if not player.valid or not player.connected then return end local entity = event.entity -- Check entity is valid From 7939d8d3f72e168dd534d367f28547826338ea30 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 14 Aug 2020 16:18:02 +0100 Subject: [PATCH 03/14] Added check for nil player for role get_players --- expcore/roles.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/expcore/roles.lua b/expcore/roles.lua index 477a5fb5..6076bd5f 100644 --- a/expcore/roles.lua +++ b/expcore/roles.lua @@ -946,7 +946,7 @@ function Roles._prototype:get_players(online) if role_name == self.name then local player = game.players[player_name] -- Filter by online state if required - if online == nil or player.connected == online then + if player and (online == nil or player.connected == online) then players[#players+1] = player end break From f5a2f7ed702b1271a78d019ad8a2ae4b1d310bd4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 14 Aug 2020 16:23:22 +0100 Subject: [PATCH 04/14] Fixed role auto promote --- expcore/roles.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/expcore/roles.lua b/expcore/roles.lua index 6076bd5f..c2236f8c 100644 --- a/expcore/roles.lua +++ b/expcore/roles.lua @@ -1001,7 +1001,7 @@ Event.add(defines.events.on_player_joined_game, role_update) -- Every 60 seconds the auto promote check is preformed Event.on_nth_tick(3600, function() local promotes = {} - for _, player in ipairs(game.connected_players) do + for _, player in pairs(game.connected_players) do for _, role in ipairs(Roles.config.roles) do if role.auto_promote_condition then local success, err = pcall(role.auto_promote_condition, player) From 1172baf2b9e789b7045a69ef7c02972fb302d275 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 14 Aug 2020 16:49:55 +0100 Subject: [PATCH 05/14] Fixed role event emit --- expcore/roles.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/expcore/roles.lua b/expcore/roles.lua index c2236f8c..f97771a7 100644 --- a/expcore/roles.lua +++ b/expcore/roles.lua @@ -153,12 +153,11 @@ local function emit_player_roles_updated(player, type, roles, by_player_name, sk event = Roles.events.on_role_unassigned end -- convert the roles to objects and get the names of the roles - local index, role_names, valid_roles = 0, {}, {} + local index, role_names = 0, {} for _, role in ipairs(roles) do role = Roles.get_role_from_any(role) if role then index = index + 1 - valid_roles[index] = role role_names[index] = role.name end end @@ -176,7 +175,7 @@ local function emit_player_roles_updated(player, type, roles, by_player_name, sk tick=game.tick, player_index=player.index, by_player_index=by_player_index, - roles=valid_roles + roles=role_names }) write_json('log/roles.log', { player_name=player.name, From e3a0376b30b0c38214e8bb877b9b02ee9e54ee10 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 16 Aug 2020 17:45:04 +0100 Subject: [PATCH 06/14] Fixed bug with nil index for decon --- modules/addons/tree-decon.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/addons/tree-decon.lua b/modules/addons/tree-decon.lua index da32b298..29e13707 100644 --- a/modules/addons/tree-decon.lua +++ b/modules/addons/tree-decon.lua @@ -17,6 +17,7 @@ end) Event.add(defines.events.on_marked_for_deconstruction, function(event) -- Check which type of decon a player is allowed local index = event.player_index + if not index then return end if chache[index] == nil then local player = game.players[index] if Roles.player_allowed(player, 'fast-tree-decon') then chache[index] = 'fast' From 48d924d69dfbf8fa589be7ea858959d9b1f18467 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 16 Aug 2020 19:00:29 +0100 Subject: [PATCH 07/14] Fixed player data error --- expcore/player_data.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/expcore/player_data.lua b/expcore/player_data.lua index e05caa6c..2eba29f5 100644 --- a/expcore/player_data.lua +++ b/expcore/player_data.lua @@ -128,6 +128,7 @@ end) Event.add(defines.events.on_player_joined_game, function(event) local player = game.players[event.player_index] Async.wait(300, check_data_loaded, player) + PlayerData:raw_set(player.name) PlayerData:request(player) end) @@ -135,7 +136,7 @@ end) Event.add(defines.events.on_player_left_game, function(event) local player = game.players[event.player_index] local player_data = PlayerData:get(player) - if player_data.valid == true then + if player_data and player_data.valid == true then PlayerData:unload(player) else PlayerData:raw_set(player.name) end end) From aa5946e3d2123fc13a38806ac2af447d7e8ae6bc Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 16 Aug 2020 19:01:50 +0100 Subject: [PATCH 08/14] Fixed call to invalid entity during warp removal --- modules/control/warps.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/control/warps.lua b/modules/control/warps.lua index 07be1b0f..b846460a 100644 --- a/modules/control/warps.lua +++ b/modules/control/warps.lua @@ -229,7 +229,7 @@ function Warps.remove_warp_area(warp_id) {position.x+radius, position.y+radius} } } - for _, entity in pairs(entities) do if entity.name ~= 'player' then entity.destroy() end end + for _, entity in pairs(entities) do if entity and entity.valid and entity.name ~= 'player' then entity.destroy() end end end --[[-- Set a warp to be the spawn point for a force, force must own this warp From 4ade68b7dff8faf417468b20041232f8f746647e Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 16 Aug 2020 19:45:08 +0100 Subject: [PATCH 09/14] Merge pull request #172 from tovernaar123/feature/rename_changes This will fix the bug where already named station get renamed --- modules/addons/station-auto-name.lua | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/addons/station-auto-name.lua b/modules/addons/station-auto-name.lua index 6b3d28e5..15a9f21b 100644 --- a/modules/addons/station-auto-name.lua +++ b/modules/addons/station-auto-name.lua @@ -21,13 +21,29 @@ local function Angle(entity) return direction end end + return 'W' end +local custom_string = ' *' +local custom_string_len = #custom_string + local function station_name_changer(event) local entity = event.created_entity local name = entity.name + if name == "entity-ghost" then + if entity.ghost_name ~= "train-stop" then return end + local backername = entity.backer_name + if backername ~= '' then + entity.backer_name = backername..custom_string + end + + elseif name == "train-stop" then --only do the event if its a train stop + local backername = entity.backer_name + if backername:sub(-custom_string_len) == custom_string then + entity.backer_name = backername:sub(1, -custom_string_len) + return + end - if name == "train-stop" then --only do the event if its a train stop local boundingBox = entity.bounding_box -- expanded box for recourse search: local bounding2 = { {boundingBox.left_top.x -100 ,boundingBox.left_top.y -100} , {boundingBox.right_bottom.x +100, boundingBox.right_bottom.y +100 } } From 868f6a28e56902d95c6939e28a01474ce61ca4bb Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 16 Aug 2020 19:46:40 +0100 Subject: [PATCH 10/14] Automatic Doc Update --- docs/addons/Advanced-Start.html | 2 +- docs/addons/Chat-Popups.html | 2 +- docs/addons/Chat-Reply.html | 2 +- docs/addons/Compilatron.html | 2 +- docs/addons/Damage-Popups.html | 2 +- docs/addons/Death-Logger.html | 2 +- docs/addons/Discord-Alerts.html | 2 +- docs/addons/Inventory-Clear.html | 2 +- docs/addons/Pollution-Grading.html | 2 +- docs/addons/Scorched-Earth.html | 2 +- docs/addons/Spawn-Area.html | 2 +- docs/addons/Tree-Decon.html | 2 +- docs/commands/Admin-Chat.html | 2 +- docs/commands/Cheat-Mode.html | 2 +- docs/commands/Clear-Inventory.html | 2 +- docs/commands/Connect.html | 2 +- docs/commands/Debug.html | 2 +- docs/commands/Find.html | 2 +- docs/commands/Help.html | 2 +- docs/commands/Home.html | 2 +- docs/commands/Interface.html | 2 +- docs/commands/Jail.html | 2 +- docs/commands/Kill.html | 2 +- docs/commands/Me.html | 2 +- docs/commands/Rainbow.html | 2 +- docs/commands/Repair.html | 2 +- docs/commands/Reports.html | 2 +- docs/commands/Roles.html | 2 +- docs/commands/Spawn.html | 2 +- docs/commands/Teleport.html | 2 +- docs/commands/Warnings.html | 2 +- docs/configs/Advanced-Start.html | 2 +- docs/configs/Bonuses.html | 2 +- docs/configs/Chat-Reply.html | 2 +- docs/configs/Commands-Auth-Admin.html | 2 +- docs/configs/Commands-Auth-Roles.html | 2 +- docs/configs/Commands-Auth-Runtime-Disable.html | 2 +- docs/configs/Commands-Parse-Roles.html | 2 +- docs/configs/Commands-Parse.html | 2 +- docs/configs/Compilatron.html | 2 +- docs/configs/Death-Logger.html | 2 +- docs/configs/Discord-Alerts.html | 2 +- docs/configs/File-Loader.html | 2 +- docs/configs/Permission-Groups.html | 2 +- docs/configs/Player-List.html | 2 +- docs/configs/Pollution-Grading.html | 2 +- docs/configs/Popup-Messages.html | 2 +- docs/configs/Preset-Player-Colours.html | 2 +- docs/configs/Preset-Player-Quickbar.html | 2 +- docs/configs/Repair.html | 2 +- docs/configs/Rockets.html | 2 +- docs/configs/Roles.html | 2 +- docs/configs/Science.html | 2 +- docs/configs/Scorched-Earth.html | 2 +- docs/configs/Spawn-Area.html | 2 +- docs/configs/Statistics.html | 2 +- docs/configs/Tasks.html | 2 +- docs/configs/Warnings.html | 2 +- docs/configs/Warps.html | 2 +- docs/configs/inventory_clear.html | 2 +- docs/control/Jail.html | 2 +- docs/control/Production.html | 2 +- docs/control/Reports.html | 2 +- docs/control/Rockets.html | 2 +- docs/control/Tasks.html | 2 +- docs/control/Warnings.html | 2 +- docs/control/Warps.html | 2 +- docs/core/Async.html | 2 +- docs/core/Commands.html | 2 +- docs/core/Common.html | 2 +- docs/core/Datastore.html | 2 +- docs/core/External.html | 2 +- docs/core/Groups.html | 2 +- docs/core/Gui.html | 2 +- docs/core/PlayerData.html | 2 +- docs/core/Roles.html | 2 +- docs/data/Alt-View.html | 2 +- docs/data/Bonus.html | 2 +- docs/data/Greetings.html | 2 +- docs/data/Player-Colours.html | 2 +- docs/data/Quickbar.html | 2 +- docs/data/Tag.html | 2 +- docs/guis/Player-List.html | 2 +- docs/guis/Readme.html | 2 +- docs/guis/Rocket-Info.html | 2 +- docs/guis/Science-Info.html | 2 +- docs/guis/Task-List.html | 2 +- docs/guis/Warps-List.html | 2 +- docs/guis/server-ups.html | 2 +- docs/index.html | 2 +- docs/modules/control.html | 2 +- docs/modules/modules.addons.station-auto-name.html | 2 +- docs/modules/overrides.debug.html | 2 +- docs/modules/overrides.math.html | 2 +- docs/modules/overrides.table.html | 2 +- docs/modules/utils.event.html | 2 +- docs/modules/utils.event_core.html | 2 +- docs/modules/utils.task.html | 2 +- docs/topics/LICENSE.html | 2 +- docs/topics/README.md.html | 2 +- 100 files changed, 100 insertions(+), 100 deletions(-) diff --git a/docs/addons/Advanced-Start.html b/docs/addons/Advanced-Start.html index 0ae92446..e39cc41a 100644 --- a/docs/addons/Advanced-Start.html +++ b/docs/addons/Advanced-Start.html @@ -335,7 +335,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/addons/Chat-Popups.html b/docs/addons/Chat-Popups.html index 9797dfb8..038ad34e 100644 --- a/docs/addons/Chat-Popups.html +++ b/docs/addons/Chat-Popups.html @@ -364,7 +364,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/addons/Chat-Reply.html b/docs/addons/Chat-Reply.html index f6575c97..7700c0ec 100644 --- a/docs/addons/Chat-Reply.html +++ b/docs/addons/Chat-Reply.html @@ -363,7 +363,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/addons/Compilatron.html b/docs/addons/Compilatron.html index 4d89e6ee..c7c56433 100644 --- a/docs/addons/Compilatron.html +++ b/docs/addons/Compilatron.html @@ -572,7 +572,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/addons/Damage-Popups.html b/docs/addons/Damage-Popups.html index d18ba76e..13d77b1e 100644 --- a/docs/addons/Damage-Popups.html +++ b/docs/addons/Damage-Popups.html @@ -364,7 +364,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/addons/Death-Logger.html b/docs/addons/Death-Logger.html index 16a8c53f..259dd255 100644 --- a/docs/addons/Death-Logger.html +++ b/docs/addons/Death-Logger.html @@ -391,7 +391,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/addons/Discord-Alerts.html b/docs/addons/Discord-Alerts.html index 286706dd..0763204a 100644 --- a/docs/addons/Discord-Alerts.html +++ b/docs/addons/Discord-Alerts.html @@ -447,7 +447,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/addons/Inventory-Clear.html b/docs/addons/Inventory-Clear.html index 1643260a..ab750555 100644 --- a/docs/addons/Inventory-Clear.html +++ b/docs/addons/Inventory-Clear.html @@ -363,7 +363,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/addons/Pollution-Grading.html b/docs/addons/Pollution-Grading.html index 4a53971e..fa9ed33c 100644 --- a/docs/addons/Pollution-Grading.html +++ b/docs/addons/Pollution-Grading.html @@ -335,7 +335,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/addons/Scorched-Earth.html b/docs/addons/Scorched-Earth.html index 8fd9740d..c0eb6e5a 100644 --- a/docs/addons/Scorched-Earth.html +++ b/docs/addons/Scorched-Earth.html @@ -391,7 +391,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/addons/Spawn-Area.html b/docs/addons/Spawn-Area.html index 3eea837e..18445593 100644 --- a/docs/addons/Spawn-Area.html +++ b/docs/addons/Spawn-Area.html @@ -363,7 +363,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/addons/Tree-Decon.html b/docs/addons/Tree-Decon.html index 194844b5..a3d37895 100644 --- a/docs/addons/Tree-Decon.html +++ b/docs/addons/Tree-Decon.html @@ -363,7 +363,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Admin-Chat.html b/docs/commands/Admin-Chat.html index 0f6f8a52..a41b3d91 100644 --- a/docs/commands/Admin-Chat.html +++ b/docs/commands/Admin-Chat.html @@ -403,7 +403,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Cheat-Mode.html b/docs/commands/Cheat-Mode.html index 897e7924..fc6e1d17 100644 --- a/docs/commands/Cheat-Mode.html +++ b/docs/commands/Cheat-Mode.html @@ -376,7 +376,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Clear-Inventory.html b/docs/commands/Clear-Inventory.html index 6f842a60..0fefd137 100644 --- a/docs/commands/Clear-Inventory.html +++ b/docs/commands/Clear-Inventory.html @@ -403,7 +403,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Connect.html b/docs/commands/Connect.html index d0d077ad..d094c476 100644 --- a/docs/commands/Connect.html +++ b/docs/commands/Connect.html @@ -606,7 +606,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Debug.html b/docs/commands/Debug.html index 64f4e610..0fc1441e 100644 --- a/docs/commands/Debug.html +++ b/docs/commands/Debug.html @@ -380,7 +380,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Find.html b/docs/commands/Find.html index 1c8e1688..ff73a2fd 100644 --- a/docs/commands/Find.html +++ b/docs/commands/Find.html @@ -375,7 +375,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Help.html b/docs/commands/Help.html index d0e3f209..31d69ca4 100644 --- a/docs/commands/Help.html +++ b/docs/commands/Help.html @@ -419,7 +419,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Home.html b/docs/commands/Home.html index b139e681..ad004957 100644 --- a/docs/commands/Home.html +++ b/docs/commands/Home.html @@ -473,7 +473,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Interface.html b/docs/commands/Interface.html index c3d2d5fc..24e698e1 100644 --- a/docs/commands/Interface.html +++ b/docs/commands/Interface.html @@ -403,7 +403,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Jail.html b/docs/commands/Jail.html index 65b7f63d..ae6bb899 100644 --- a/docs/commands/Jail.html +++ b/docs/commands/Jail.html @@ -626,7 +626,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Kill.html b/docs/commands/Kill.html index 64fd8afc..bd1044a8 100644 --- a/docs/commands/Kill.html +++ b/docs/commands/Kill.html @@ -404,7 +404,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Me.html b/docs/commands/Me.html index a61efb80..8c777251 100644 --- a/docs/commands/Me.html +++ b/docs/commands/Me.html @@ -375,7 +375,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Rainbow.html b/docs/commands/Rainbow.html index e9547dd5..75b8b06d 100644 --- a/docs/commands/Rainbow.html +++ b/docs/commands/Rainbow.html @@ -403,7 +403,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Repair.html b/docs/commands/Repair.html index 144d09fb..83654ca4 100644 --- a/docs/commands/Repair.html +++ b/docs/commands/Repair.html @@ -336,7 +336,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Reports.html b/docs/commands/Reports.html index 1a9226ea..7ed3df6a 100644 --- a/docs/commands/Reports.html +++ b/docs/commands/Reports.html @@ -600,7 +600,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Roles.html b/docs/commands/Roles.html index f68e93cd..aea73b9f 100644 --- a/docs/commands/Roles.html +++ b/docs/commands/Roles.html @@ -572,7 +572,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Spawn.html b/docs/commands/Spawn.html index eb37b52e..314c46b7 100644 --- a/docs/commands/Spawn.html +++ b/docs/commands/Spawn.html @@ -404,7 +404,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Teleport.html b/docs/commands/Teleport.html index 115d2a32..b8106d0e 100644 --- a/docs/commands/Teleport.html +++ b/docs/commands/Teleport.html @@ -499,7 +499,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/commands/Warnings.html b/docs/commands/Warnings.html index 88d69db6..0a50ac10 100644 --- a/docs/commands/Warnings.html +++ b/docs/commands/Warnings.html @@ -584,7 +584,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Advanced-Start.html b/docs/configs/Advanced-Start.html index 6a784705..6c0412d3 100644 --- a/docs/configs/Advanced-Start.html +++ b/docs/configs/Advanced-Start.html @@ -521,7 +521,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Bonuses.html b/docs/configs/Bonuses.html index 1f74c162..77c828fe 100644 --- a/docs/configs/Bonuses.html +++ b/docs/configs/Bonuses.html @@ -252,7 +252,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Chat-Reply.html b/docs/configs/Chat-Reply.html index 6d179ad0..e32e3c56 100644 --- a/docs/configs/Chat-Reply.html +++ b/docs/configs/Chat-Reply.html @@ -500,7 +500,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Commands-Auth-Admin.html b/docs/configs/Commands-Auth-Admin.html index 40ffd332..44b6b162 100644 --- a/docs/configs/Commands-Auth-Admin.html +++ b/docs/configs/Commands-Auth-Admin.html @@ -309,7 +309,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Commands-Auth-Roles.html b/docs/configs/Commands-Auth-Roles.html index daac8570..08c2bcaf 100644 --- a/docs/configs/Commands-Auth-Roles.html +++ b/docs/configs/Commands-Auth-Roles.html @@ -335,7 +335,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Commands-Auth-Runtime-Disable.html b/docs/configs/Commands-Auth-Runtime-Disable.html index baeea3b0..537a5d3f 100644 --- a/docs/configs/Commands-Auth-Runtime-Disable.html +++ b/docs/configs/Commands-Auth-Runtime-Disable.html @@ -457,7 +457,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Commands-Parse-Roles.html b/docs/configs/Commands-Parse-Roles.html index e722023a..09e6ad24 100644 --- a/docs/configs/Commands-Parse-Roles.html +++ b/docs/configs/Commands-Parse-Roles.html @@ -369,7 +369,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Commands-Parse.html b/docs/configs/Commands-Parse.html index 02965626..430492ea 100644 --- a/docs/configs/Commands-Parse.html +++ b/docs/configs/Commands-Parse.html @@ -325,7 +325,7 @@ see ./expcore/commands.lua for more details

generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Compilatron.html b/docs/configs/Compilatron.html index a36a83de..145677ad 100644 --- a/docs/configs/Compilatron.html +++ b/docs/configs/Compilatron.html @@ -369,7 +369,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Death-Logger.html b/docs/configs/Death-Logger.html index 19477c82..49463ce0 100644 --- a/docs/configs/Death-Logger.html +++ b/docs/configs/Death-Logger.html @@ -431,7 +431,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Discord-Alerts.html b/docs/configs/Discord-Alerts.html index a818acbd..c2b32cf8 100644 --- a/docs/configs/Discord-Alerts.html +++ b/docs/configs/Discord-Alerts.html @@ -252,7 +252,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/File-Loader.html b/docs/configs/File-Loader.html index 6e960d6a..21eb6b51 100644 --- a/docs/configs/File-Loader.html +++ b/docs/configs/File-Loader.html @@ -255,7 +255,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Permission-Groups.html b/docs/configs/Permission-Groups.html index 97164ddc..f75ca882 100644 --- a/docs/configs/Permission-Groups.html +++ b/docs/configs/Permission-Groups.html @@ -310,7 +310,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Player-List.html b/docs/configs/Player-List.html index f0dffa28..27ce8116 100644 --- a/docs/configs/Player-List.html +++ b/docs/configs/Player-List.html @@ -771,7 +771,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Pollution-Grading.html b/docs/configs/Pollution-Grading.html index 1b3c3bd1..e219946a 100644 --- a/docs/configs/Pollution-Grading.html +++ b/docs/configs/Pollution-Grading.html @@ -399,7 +399,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Popup-Messages.html b/docs/configs/Popup-Messages.html index e696e323..5d581107 100644 --- a/docs/configs/Popup-Messages.html +++ b/docs/configs/Popup-Messages.html @@ -429,7 +429,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Preset-Player-Colours.html b/docs/configs/Preset-Player-Colours.html index 1877467a..d3b203d1 100644 --- a/docs/configs/Preset-Player-Colours.html +++ b/docs/configs/Preset-Player-Colours.html @@ -339,7 +339,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Preset-Player-Quickbar.html b/docs/configs/Preset-Player-Quickbar.html index 9d37bc4f..2954415c 100644 --- a/docs/configs/Preset-Player-Quickbar.html +++ b/docs/configs/Preset-Player-Quickbar.html @@ -252,7 +252,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Repair.html b/docs/configs/Repair.html index 8f0e583a..29686338 100644 --- a/docs/configs/Repair.html +++ b/docs/configs/Repair.html @@ -429,7 +429,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Rockets.html b/docs/configs/Rockets.html index 3e998547..66650cb3 100644 --- a/docs/configs/Rockets.html +++ b/docs/configs/Rockets.html @@ -849,7 +849,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Roles.html b/docs/configs/Roles.html index 5b8a355f..b52de4f9 100644 --- a/docs/configs/Roles.html +++ b/docs/configs/Roles.html @@ -307,7 +307,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Science.html b/docs/configs/Science.html index 5d890570..7ee719a3 100644 --- a/docs/configs/Science.html +++ b/docs/configs/Science.html @@ -369,7 +369,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Scorched-Earth.html b/docs/configs/Scorched-Earth.html index 30120fbc..d589f814 100644 --- a/docs/configs/Scorched-Earth.html +++ b/docs/configs/Scorched-Earth.html @@ -403,7 +403,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Spawn-Area.html b/docs/configs/Spawn-Area.html index 6a89e672..2c7c3172 100644 --- a/docs/configs/Spawn-Area.html +++ b/docs/configs/Spawn-Area.html @@ -759,7 +759,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Statistics.html b/docs/configs/Statistics.html index ade704a1..25fa0414 100644 --- a/docs/configs/Statistics.html +++ b/docs/configs/Statistics.html @@ -639,7 +639,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Tasks.html b/docs/configs/Tasks.html index 56038642..990e08a0 100644 --- a/docs/configs/Tasks.html +++ b/docs/configs/Tasks.html @@ -399,7 +399,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Warnings.html b/docs/configs/Warnings.html index 1f6266c4..9b96c1da 100644 --- a/docs/configs/Warnings.html +++ b/docs/configs/Warnings.html @@ -370,7 +370,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/Warps.html b/docs/configs/Warps.html index 6d70a375..12708074 100644 --- a/docs/configs/Warps.html +++ b/docs/configs/Warps.html @@ -789,7 +789,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/configs/inventory_clear.html b/docs/configs/inventory_clear.html index 0bcfeaa3..05b602e4 100644 --- a/docs/configs/inventory_clear.html +++ b/docs/configs/inventory_clear.html @@ -252,7 +252,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/control/Jail.html b/docs/control/Jail.html index 431f3831..7cad6c81 100644 --- a/docs/control/Jail.html +++ b/docs/control/Jail.html @@ -1223,7 +1223,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/control/Production.html b/docs/control/Production.html index 3c7dbf88..a7ac2843 100644 --- a/docs/control/Production.html +++ b/docs/control/Production.html @@ -1344,7 +1344,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/control/Reports.html b/docs/control/Reports.html index 26746583..66af4afd 100644 --- a/docs/control/Reports.html +++ b/docs/control/Reports.html @@ -1157,7 +1157,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/control/Rockets.html b/docs/control/Rockets.html index 9287bf31..9d036302 100644 --- a/docs/control/Rockets.html +++ b/docs/control/Rockets.html @@ -999,7 +999,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/control/Tasks.html b/docs/control/Tasks.html index e37ec184..a96bb150 100644 --- a/docs/control/Tasks.html +++ b/docs/control/Tasks.html @@ -985,7 +985,7 @@ Tasks.update_task(task_id, 'We need more iron!', gam generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/control/Warnings.html b/docs/control/Warnings.html index 3ff7402a..253a4a99 100644 --- a/docs/control/Warnings.html +++ b/docs/control/Warnings.html @@ -1540,7 +1540,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/control/Warps.html b/docs/control/Warps.html index c58c38bd..df2dc465 100644 --- a/docs/control/Warps.html +++ b/docs/control/Warps.html @@ -1522,7 +1522,7 @@ Warps.make_warp_tag(warp_id) generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/core/Async.html b/docs/core/Async.html index 6d6500bf..5a636e87 100644 --- a/docs/core/Async.html +++ b/docs/core/Async.html @@ -613,7 +613,7 @@ Async.register(function(player, message) generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/core/Commands.html b/docs/core/Commands.html index a1c029a6..2b4c62db 100644 --- a/docs/core/Commands.html +++ b/docs/core/Commands.html @@ -2428,7 +2428,7 @@ nb: use error(error_message) within your callback to trigger do not trigger dire generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/core/Common.html b/docs/core/Common.html index 79b9fe1a..a7b8e9dc 100644 --- a/docs/core/Common.html +++ b/docs/core/Common.html @@ -2767,7 +2767,7 @@ https://github.com/Refactorio/RedMew/blob/9184b2940f311d8c9c891e83429fc57ec7e0c4 generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/core/Datastore.html b/docs/core/Datastore.html index 79e91704..09f67ac7 100644 --- a/docs/core/Datastore.html +++ b/docs/core/Datastore.html @@ -2964,7 +2964,7 @@ ExampleData:on_update(function(key, value) generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/core/External.html b/docs/core/External.html index a176a1ba..15aac6c9 100644 --- a/docs/core/External.html +++ b/docs/core/External.html @@ -748,7 +748,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/core/Groups.html b/docs/core/Groups.html index 599eac39..06a15fcd 100644 --- a/docs/core/Groups.html +++ b/docs/core/Groups.html @@ -1443,7 +1443,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/core/Gui.html b/docs/core/Gui.html index 1b275c08..c1543fcc 100644 --- a/docs/core/Gui.html +++ b/docs/core/Gui.html @@ -4421,7 +4421,7 @@ Gui.left_toolbar_button('entity/inserter', generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/core/PlayerData.html b/docs/core/PlayerData.html index d8138add..861adf09 100644 --- a/docs/core/PlayerData.html +++ b/docs/core/PlayerData.html @@ -531,7 +531,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/core/Roles.html b/docs/core/Roles.html index f8088315..02bc5181 100644 --- a/docs/core/Roles.html +++ b/docs/core/Roles.html @@ -3350,7 +3350,7 @@ nb: this is one way, failing false after already gaining the role will not revok generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html index 7f59f8d8..b8d4ae49 100644 --- a/docs/data/Alt-View.html +++ b/docs/data/Alt-View.html @@ -335,7 +335,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/data/Bonus.html b/docs/data/Bonus.html index 5443c76b..1bbcf745 100644 --- a/docs/data/Bonus.html +++ b/docs/data/Bonus.html @@ -487,7 +487,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/data/Greetings.html b/docs/data/Greetings.html index 336c9ad8..9138960f 100644 --- a/docs/data/Greetings.html +++ b/docs/data/Greetings.html @@ -430,7 +430,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/data/Player-Colours.html b/docs/data/Player-Colours.html index 8c05c831..2a636fe0 100644 --- a/docs/data/Player-Colours.html +++ b/docs/data/Player-Colours.html @@ -391,7 +391,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/data/Quickbar.html b/docs/data/Quickbar.html index 4768099a..ff73cff3 100644 --- a/docs/data/Quickbar.html +++ b/docs/data/Quickbar.html @@ -408,7 +408,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/data/Tag.html b/docs/data/Tag.html index 73ff0329..5020e1de 100644 --- a/docs/data/Tag.html +++ b/docs/data/Tag.html @@ -486,7 +486,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/guis/Player-List.html b/docs/guis/Player-List.html index 871f5a67..2ccddc26 100644 --- a/docs/guis/Player-List.html +++ b/docs/guis/Player-List.html @@ -706,7 +706,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/guis/Readme.html b/docs/guis/Readme.html index 2a0370af..50ecc877 100644 --- a/docs/guis/Readme.html +++ b/docs/guis/Readme.html @@ -998,7 +998,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/guis/Rocket-Info.html b/docs/guis/Rocket-Info.html index ceed633d..ae7a1d6f 100644 --- a/docs/guis/Rocket-Info.html +++ b/docs/guis/Rocket-Info.html @@ -706,7 +706,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/guis/Science-Info.html b/docs/guis/Science-Info.html index dff480cd..26695b53 100644 --- a/docs/guis/Science-Info.html +++ b/docs/guis/Science-Info.html @@ -585,7 +585,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/guis/Task-List.html b/docs/guis/Task-List.html index 65efee25..78d230d2 100644 --- a/docs/guis/Task-List.html +++ b/docs/guis/Task-List.html @@ -771,7 +771,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/guis/Warps-List.html b/docs/guis/Warps-List.html index aaae6147..b12f4c78 100644 --- a/docs/guis/Warps-List.html +++ b/docs/guis/Warps-List.html @@ -1042,7 +1042,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/guis/server-ups.html b/docs/guis/server-ups.html index 5acf4317..c86bad41 100644 --- a/docs/guis/server-ups.html +++ b/docs/guis/server-ups.html @@ -508,7 +508,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/index.html b/docs/index.html index 68e9ba92..94d322ac 100644 --- a/docs/index.html +++ b/docs/index.html @@ -550,7 +550,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/modules/control.html b/docs/modules/control.html index 5b8b7bf3..06abd897 100644 --- a/docs/modules/control.html +++ b/docs/modules/control.html @@ -310,7 +310,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/modules/modules.addons.station-auto-name.html b/docs/modules/modules.addons.station-auto-name.html index 6ff15a55..413f735b 100644 --- a/docs/modules/modules.addons.station-auto-name.html +++ b/docs/modules/modules.addons.station-auto-name.html @@ -308,7 +308,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/modules/overrides.debug.html b/docs/modules/overrides.debug.html index 5d34cbfa..f2e173a2 100644 --- a/docs/modules/overrides.debug.html +++ b/docs/modules/overrides.debug.html @@ -669,7 +669,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/modules/overrides.math.html b/docs/modules/overrides.math.html index 94f8ce18..35205dfc 100644 --- a/docs/modules/overrides.math.html +++ b/docs/modules/overrides.math.html @@ -368,7 +368,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/modules/overrides.table.html b/docs/modules/overrides.table.html index 5331ac95..a123cbb3 100644 --- a/docs/modules/overrides.table.html +++ b/docs/modules/overrides.table.html @@ -2023,7 +2023,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/modules/utils.event.html b/docs/modules/utils.event.html index d944ff68..1475565f 100644 --- a/docs/modules/utils.event.html +++ b/docs/modules/utils.event.html @@ -1307,7 +1307,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/modules/utils.event_core.html b/docs/modules/utils.event_core.html index fdaa7391..09726346 100644 --- a/docs/modules/utils.event_core.html +++ b/docs/modules/utils.event_core.html @@ -449,7 +449,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/modules/utils.task.html b/docs/modules/utils.task.html index fbfd4b7d..1cb66846 100644 --- a/docs/modules/utils.task.html +++ b/docs/modules/utils.task.html @@ -666,7 +666,7 @@ generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/topics/LICENSE.html b/docs/topics/LICENSE.html index e63700ba..99f695c6 100644 --- a/docs/topics/LICENSE.html +++ b/docs/topics/LICENSE.html @@ -804,7 +804,7 @@ Public License instead of this License. But first, please read generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
diff --git a/docs/topics/README.md.html b/docs/topics/README.md.html index f5b1810a..a8da112f 100644 --- a/docs/topics/README.md.html +++ b/docs/topics/README.md.html @@ -356,7 +356,7 @@ Please report these errors to [the issues page](issues). generated by LDoc
- Last updated 2020-08-14 02:51:06 UTC + Last updated 2020-08-16 18:39:39 UTC
From 0cb77601be8c8ee99431ae57ee492e006058b0c1 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 16 Aug 2020 19:56:55 +0100 Subject: [PATCH 11/14] Readme Update --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 851be090..08e9c873 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,7 @@ All are welcome to make pull requests and issues for this scenario, if you are i | Scenario Version* | Version Name | Factorio Version** | |---|---|---| +| [v6.1][s6.1] | External Data Overhaul | [v1.0.0][f1.0.0] | | [v6.0][s6.0] | Gui / 0.18 Overhaul | [v0.18.17][f0.18.17] | | [v5.10][s5.10] | Data Store Rewrite | [v0.17.71][f0.17.71] | | [v5.9][s5.9] | Control Modules and Documentation | [v0.17.63][f0.17.63] | @@ -80,6 +81,7 @@ All are welcome to make pull requests and issues for this scenario, if you are i \*\* Factorio versions show the version they were made for, often the minimum requirement. +[s6.1]: https://github.com/explosivegaming/scenario/releases/tag/6.1.0 [s6.0]: https://github.com/explosivegaming/scenario/releases/tag/6.0.0 [s5.10]: https://github.com/explosivegaming/scenario/releases/tag/5.10.0 [s5.9]: https://github.com/explosivegaming/scenario/releases/tag/5.9.0 @@ -98,6 +100,7 @@ All are welcome to make pull requests and issues for this scenario, if you are i [s1.0]: https://github.com/explosivegaming/scenario/releases/tag/v1.0 [s0.1]: https://github.com/explosivegaming/scenario/releases/tag/v0.1 +[f1.0.0]: https://wiki.factorio.com/Version_history/1.0.0#1.0.0 [f0.18.17]: https://wiki.factorio.com/Version_history/0.18.0#0.18.17 [f0.17.71]: https://wiki.factorio.com/Version_history/0.17.0#0.17.71 [f0.17.63]: https://wiki.factorio.com/Version_history/0.17.0#0.17.63 From ad1686ad604c3d236e419068426ef2cc211e5215 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 16 Aug 2020 21:12:29 +0100 Subject: [PATCH 12/14] Fixed player list colours --- modules/data/player-colours.lua | 4 ++-- modules/gui/player-list.lua | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/data/player-colours.lua b/modules/data/player-colours.lua index 9ee9b547..f32aa7ff 100644 --- a/modules/data/player-colours.lua +++ b/modules/data/player-colours.lua @@ -28,7 +28,7 @@ end --- Returns a colour that is a bit lighter than the one given local function lighten(c) - return {r = 1 - (1 - c.r) * 0.5, g = 1 - (1 - c.g) * 0.5, b = 1 - (1 - c.b) * 0.5, a = 1} + return {r = 255 - (255 - c.r) * 0.5, g = 255 - (255 - c.g) * 0.5, b = 255 - (255 - c.b) * 0.5, a = 255} end --- When your data loads apply the players colour, or a random on if none is saved @@ -36,7 +36,7 @@ PlayerColours:on_load(function(player_name, player_colour) if not player_colour then local preset = config.players[player_name] if preset then - player_colour = {preset, preset} + player_colour = {preset, lighten(preset)} else local colour_name = 'white' while config.disallow[colour_name] do diff --git a/modules/gui/player-list.lua b/modules/gui/player-list.lua index ab9bb13d..f0923073 100644 --- a/modules/gui/player-list.lua +++ b/modules/gui/player-list.lua @@ -324,6 +324,7 @@ local function get_player_list_order() end --[[Adds fake players to the player list + local tick = game.tick+1 for i = 1, 10 do local online_time = math.random(1, tick) local afk_time = math.random(online_time-(tick/10), tick) @@ -337,7 +338,7 @@ local function get_player_list_order() caption = caption, tooltip = tooltip } - end]] + end--]] return player_list_order end From 5ad4301f6788291472f31946269c96fa979ab57e Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 17 Aug 2020 15:18:34 +0100 Subject: [PATCH 13/14] Better sandboxing for /interface --- modules/commands/interface.lua | 85 +++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/modules/commands/interface.lua b/modules/commands/interface.lua index 41d2942d..a95d66be 100644 --- a/modules/commands/interface.lua +++ b/modules/commands/interface.lua @@ -31,67 +31,75 @@ Global.register(interface_env, function(tbl) interface_env = tbl end) ---- Adds a callback function when the interface command is used --- nb: returned value is saved in the env that the interface uses --- @tparam string name the name that the value is loaded under, cant use upvalues --- @tparam function callback the function that will run whent he command is used +--- Adds a static module that can be accessed with the interface +-- @tparam string name The name that the value is assigned to +-- @tparam any value The value that will be accessible in the interface env -- callback param - player: LuaPlayer - the player who used the command +local function add_interface_module(name, value) + interface_modules[name] = value +end + +--- Adds a dynamic value that is calculated when the interface is used +-- @tparam string name The name that the value is assigned to +-- @tparam function callback The function that will be called to get the value local function add_interface_callback(name, callback) if type(callback) == 'function' then interface_callbacks[name] = callback end end --- this is a meta function for __index when self[key] is nil +--- Internal, this is a meta function for __index when self[key] is nil local function get_index(_, key) if interface_env[key] then return interface_env[key] elseif interface_modules[key] then return interface_modules[key] + elseif _G[key] then + return _G[key] end end ---- Sends an innovation to be ran and returns the result. +--- Sends an invocation to be ran and returns the result. -- @command interface --- @tparam string innovation the command that will be run -Commands.new_command('interface', 'Sends an innovation to be ran and returns the result.') -:add_param('innovation', false) +-- @tparam string invocation the command that will be run +Commands.new_command('interface', 'Sends an invocation to be ran and returns the result.') +:add_param('invocation', false) :enable_auto_concat() :set_flag('admin_only') -:register(function(player, innovation) - if not innovation:find('%s') and not innovation:find('return') then - -- if there are no spaces and return is not present then return is appended to the start - innovation='return '..innovation +:register(function(player, invocation) + -- If the invocation has no white space then prepend return to it + if not invocation:find('%s') and not invocation:find('return') then + invocation = 'return '..invocation end - -- temp_env will index to interface_env and interface_modules if value not found - local temp_env = setmetatable({}, {__index=get_index}) - if player then -- player can be nil when it is the server + + -- _env will be the new _ENV that the invocation will run inside of + local _env = setmetatable({}, { + __index = get_index, + __newindex = interface_env + }) + + -- If the command is ran by a player then load the dynamic values + if player then for name, callback in pairs(interface_callbacks) do - -- loops over callbacks and loads the values returned local _, rtn = pcall(callback, player) - temp_env[name]=rtn + rawset(_env, name, rtn) end end - -- sets the global metatable to prevent new values being made - -- global will index to temp_env and new indexes saved to interface_sandbox - local old_mt = getmetatable(_G) - setmetatable(_G, {__index=temp_env, __newindex=interface_env}) - -- runs the innovation and returns values to the player - innovation = loadstring(innovation) - local success, rtn = pcall(innovation) - setmetatable(_G, old_mt) + + -- Compile the invocation with the custom _env value + local invocation_func, compile_error = load(invocation, 'interface', nil, _env) + if compile_error then return Commands.error(compile_error) end + + -- Run the invocation + local success, rtn = pcall(invocation_func) if not success then - if type(rtn) == 'string' then - -- there may be stack trace that must be removed to avoid desyncs - rtn = rtn:gsub('%.%.%..-/temp/currently%-playing', '') - end - return Commands.error(rtn) - else - return Commands.success(rtn) + local err = rtn:gsub('%.%.%..-/temp/currently%-playing', '') + return Commands.error(err) end + return Commands.success(rtn) end) --- adds some basic callbacks for the interface +-- Adds some basic callbacks for the interface add_interface_callback('player', function(player) return player end) add_interface_callback('surface', function(player) return player.surface end) add_interface_callback('force', function(player) return player.force end) @@ -99,9 +107,10 @@ add_interface_callback('position', function(player) return player.position end) add_interface_callback('entity', function(player) return player.selected end) add_interface_callback('tile', function(player) return player.surface.get_tile(player.position) end) +-- Module Return return { - add_interface_callback=add_interface_callback, - interface_env=interface_env, - interface_callbacks=interface_callbacks, - clean_stack_trace=function(str) return str:gsub('%.%.%..-/temp/currently%-playing', '') end + add_interface_module = add_interface_module, + add_interface_callback = add_interface_callback, + interface_env = interface_env, + clean_stack_trace = function(str) return str:gsub('%.%.%..-/temp/currently%-playing', '') end } \ No newline at end of file From f98599ca8245076185d20bc4e7202a5aefe2f4b7 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 17 Aug 2020 15:20:08 +0100 Subject: [PATCH 14/14] Fixed sups not showing when set to visible --- modules/gui/server-ups.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/server-ups.lua b/modules/gui/server-ups.lua index 798ac45e..9d294b36 100644 --- a/modules/gui/server-ups.lua +++ b/modules/gui/server-ups.lua @@ -33,7 +33,7 @@ Gui.element{ UsesServerUps:on_load(function(player_name, visible) local player = game.players[player_name] local label = player.gui.screen[server_ups.name] - if not global.ext or not global.ext.server_ups then visible = false end + if not External.valid() or not global.ext.var.server_ups then visible = false end label.visible = visible end)