From e1087caa9a3720627c3f8c795ddd6b19e66906f4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 17 Aug 2020 14:39:40 +0000 Subject: [PATCH 1/6] 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 | 8 ++++---- 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 | 9 ++++++--- 100 files changed, 108 insertions(+), 105 deletions(-) diff --git a/docs/addons/Advanced-Start.html b/docs/addons/Advanced-Start.html index e39cc41a..535e9bfd 100644 --- a/docs/addons/Advanced-Start.html +++ b/docs/addons/Advanced-Start.html @@ -335,7 +335,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/addons/Chat-Popups.html b/docs/addons/Chat-Popups.html index 038ad34e..3f442536 100644 --- a/docs/addons/Chat-Popups.html +++ b/docs/addons/Chat-Popups.html @@ -364,7 +364,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/addons/Chat-Reply.html b/docs/addons/Chat-Reply.html index 7700c0ec..6db112ae 100644 --- a/docs/addons/Chat-Reply.html +++ b/docs/addons/Chat-Reply.html @@ -363,7 +363,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/addons/Compilatron.html b/docs/addons/Compilatron.html index c7c56433..bda49f7a 100644 --- a/docs/addons/Compilatron.html +++ b/docs/addons/Compilatron.html @@ -572,7 +572,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/addons/Damage-Popups.html b/docs/addons/Damage-Popups.html index 13d77b1e..003e30f8 100644 --- a/docs/addons/Damage-Popups.html +++ b/docs/addons/Damage-Popups.html @@ -364,7 +364,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/addons/Death-Logger.html b/docs/addons/Death-Logger.html index 259dd255..601263fa 100644 --- a/docs/addons/Death-Logger.html +++ b/docs/addons/Death-Logger.html @@ -391,7 +391,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/addons/Discord-Alerts.html b/docs/addons/Discord-Alerts.html index 0763204a..b0d5befb 100644 --- a/docs/addons/Discord-Alerts.html +++ b/docs/addons/Discord-Alerts.html @@ -447,7 +447,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/addons/Inventory-Clear.html b/docs/addons/Inventory-Clear.html index ab750555..81417800 100644 --- a/docs/addons/Inventory-Clear.html +++ b/docs/addons/Inventory-Clear.html @@ -363,7 +363,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/addons/Pollution-Grading.html b/docs/addons/Pollution-Grading.html index fa9ed33c..0683847c 100644 --- a/docs/addons/Pollution-Grading.html +++ b/docs/addons/Pollution-Grading.html @@ -335,7 +335,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/addons/Scorched-Earth.html b/docs/addons/Scorched-Earth.html index c0eb6e5a..118b6491 100644 --- a/docs/addons/Scorched-Earth.html +++ b/docs/addons/Scorched-Earth.html @@ -391,7 +391,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/addons/Spawn-Area.html b/docs/addons/Spawn-Area.html index 18445593..8b40d24b 100644 --- a/docs/addons/Spawn-Area.html +++ b/docs/addons/Spawn-Area.html @@ -363,7 +363,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/addons/Tree-Decon.html b/docs/addons/Tree-Decon.html index a3d37895..be69c732 100644 --- a/docs/addons/Tree-Decon.html +++ b/docs/addons/Tree-Decon.html @@ -363,7 +363,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/commands/Admin-Chat.html b/docs/commands/Admin-Chat.html index a41b3d91..36f3cb7a 100644 --- a/docs/commands/Admin-Chat.html +++ b/docs/commands/Admin-Chat.html @@ -403,7 +403,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/commands/Cheat-Mode.html b/docs/commands/Cheat-Mode.html index fc6e1d17..f5e8e341 100644 --- a/docs/commands/Cheat-Mode.html +++ b/docs/commands/Cheat-Mode.html @@ -376,7 +376,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/commands/Clear-Inventory.html b/docs/commands/Clear-Inventory.html index 0fefd137..13ecb39a 100644 --- a/docs/commands/Clear-Inventory.html +++ b/docs/commands/Clear-Inventory.html @@ -403,7 +403,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/commands/Connect.html b/docs/commands/Connect.html index d094c476..d1d7e478 100644 --- a/docs/commands/Connect.html +++ b/docs/commands/Connect.html @@ -606,7 +606,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/commands/Debug.html b/docs/commands/Debug.html index 0fc1441e..7cf7af9a 100644 --- a/docs/commands/Debug.html +++ b/docs/commands/Debug.html @@ -380,7 +380,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/commands/Find.html b/docs/commands/Find.html index ff73a2fd..b2d8c3c6 100644 --- a/docs/commands/Find.html +++ b/docs/commands/Find.html @@ -375,7 +375,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/commands/Help.html b/docs/commands/Help.html index 31d69ca4..55d85b6d 100644 --- a/docs/commands/Help.html +++ b/docs/commands/Help.html @@ -419,7 +419,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/commands/Home.html b/docs/commands/Home.html index ad004957..200237e7 100644 --- a/docs/commands/Home.html +++ b/docs/commands/Home.html @@ -473,7 +473,7 @@ generated by LDoc
- Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
diff --git a/docs/commands/Interface.html b/docs/commands/Interface.html index 24e698e1..3f6ab5eb 100644 --- a/docs/commands/Interface.html +++ b/docs/commands/Interface.html @@ -274,7 +274,7 @@ interface - Sends an innovation to be ran and returns the result. + Sends an invocation to be ran and returns the result. @@ -348,7 +348,7 @@
-

Sends an innovation to be ran and returns the result.

+

Sends an invocation to be ran and returns the result.

@@ -362,7 +362,7 @@
  • - innovation + invocation : @@ -403,7 +403,7 @@ generated by LDoc
    • - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/commands/Jail.html b/docs/commands/Jail.html index ae6bb899..3e1719ab 100644 --- a/docs/commands/Jail.html +++ b/docs/commands/Jail.html @@ -626,7 +626,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/commands/Kill.html b/docs/commands/Kill.html index bd1044a8..043d511c 100644 --- a/docs/commands/Kill.html +++ b/docs/commands/Kill.html @@ -404,7 +404,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/commands/Me.html b/docs/commands/Me.html index 8c777251..4f483e18 100644 --- a/docs/commands/Me.html +++ b/docs/commands/Me.html @@ -375,7 +375,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/commands/Rainbow.html b/docs/commands/Rainbow.html index 75b8b06d..e18bab98 100644 --- a/docs/commands/Rainbow.html +++ b/docs/commands/Rainbow.html @@ -403,7 +403,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/commands/Repair.html b/docs/commands/Repair.html index 83654ca4..2a80c500 100644 --- a/docs/commands/Repair.html +++ b/docs/commands/Repair.html @@ -336,7 +336,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/commands/Reports.html b/docs/commands/Reports.html index 7ed3df6a..2dc4b160 100644 --- a/docs/commands/Reports.html +++ b/docs/commands/Reports.html @@ -600,7 +600,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/commands/Roles.html b/docs/commands/Roles.html index aea73b9f..9261bfe7 100644 --- a/docs/commands/Roles.html +++ b/docs/commands/Roles.html @@ -572,7 +572,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/commands/Spawn.html b/docs/commands/Spawn.html index 314c46b7..42a8ca98 100644 --- a/docs/commands/Spawn.html +++ b/docs/commands/Spawn.html @@ -404,7 +404,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/commands/Teleport.html b/docs/commands/Teleport.html index b8106d0e..b5a24b0a 100644 --- a/docs/commands/Teleport.html +++ b/docs/commands/Teleport.html @@ -499,7 +499,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/commands/Warnings.html b/docs/commands/Warnings.html index 0a50ac10..1acded09 100644 --- a/docs/commands/Warnings.html +++ b/docs/commands/Warnings.html @@ -584,7 +584,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Advanced-Start.html b/docs/configs/Advanced-Start.html index 6c0412d3..5312c2fa 100644 --- a/docs/configs/Advanced-Start.html +++ b/docs/configs/Advanced-Start.html @@ -521,7 +521,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Bonuses.html b/docs/configs/Bonuses.html index 77c828fe..e5d87a51 100644 --- a/docs/configs/Bonuses.html +++ b/docs/configs/Bonuses.html @@ -252,7 +252,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Chat-Reply.html b/docs/configs/Chat-Reply.html index e32e3c56..5c7b01d6 100644 --- a/docs/configs/Chat-Reply.html +++ b/docs/configs/Chat-Reply.html @@ -500,7 +500,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Commands-Auth-Admin.html b/docs/configs/Commands-Auth-Admin.html index 44b6b162..2b3a8e1b 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Commands-Auth-Roles.html b/docs/configs/Commands-Auth-Roles.html index 08c2bcaf..20eb3109 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Commands-Auth-Runtime-Disable.html b/docs/configs/Commands-Auth-Runtime-Disable.html index 537a5d3f..11984c79 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Commands-Parse-Roles.html b/docs/configs/Commands-Parse-Roles.html index 09e6ad24..e62239d9 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Commands-Parse.html b/docs/configs/Commands-Parse.html index 430492ea..d6317fc3 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Compilatron.html b/docs/configs/Compilatron.html index 145677ad..aab7d220 100644 --- a/docs/configs/Compilatron.html +++ b/docs/configs/Compilatron.html @@ -369,7 +369,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Death-Logger.html b/docs/configs/Death-Logger.html index 49463ce0..7995c602 100644 --- a/docs/configs/Death-Logger.html +++ b/docs/configs/Death-Logger.html @@ -431,7 +431,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Discord-Alerts.html b/docs/configs/Discord-Alerts.html index c2b32cf8..d328ccb8 100644 --- a/docs/configs/Discord-Alerts.html +++ b/docs/configs/Discord-Alerts.html @@ -252,7 +252,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/File-Loader.html b/docs/configs/File-Loader.html index 21eb6b51..41edc429 100644 --- a/docs/configs/File-Loader.html +++ b/docs/configs/File-Loader.html @@ -255,7 +255,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Permission-Groups.html b/docs/configs/Permission-Groups.html index f75ca882..65701525 100644 --- a/docs/configs/Permission-Groups.html +++ b/docs/configs/Permission-Groups.html @@ -310,7 +310,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Player-List.html b/docs/configs/Player-List.html index 27ce8116..5fdf4cf2 100644 --- a/docs/configs/Player-List.html +++ b/docs/configs/Player-List.html @@ -771,7 +771,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Pollution-Grading.html b/docs/configs/Pollution-Grading.html index e219946a..3823f6a0 100644 --- a/docs/configs/Pollution-Grading.html +++ b/docs/configs/Pollution-Grading.html @@ -399,7 +399,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Popup-Messages.html b/docs/configs/Popup-Messages.html index 5d581107..a8d55d58 100644 --- a/docs/configs/Popup-Messages.html +++ b/docs/configs/Popup-Messages.html @@ -429,7 +429,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Preset-Player-Colours.html b/docs/configs/Preset-Player-Colours.html index d3b203d1..7adb3974 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Preset-Player-Quickbar.html b/docs/configs/Preset-Player-Quickbar.html index 2954415c..1d158db0 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Repair.html b/docs/configs/Repair.html index 29686338..eeef92dc 100644 --- a/docs/configs/Repair.html +++ b/docs/configs/Repair.html @@ -429,7 +429,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Rockets.html b/docs/configs/Rockets.html index 66650cb3..ddad5eca 100644 --- a/docs/configs/Rockets.html +++ b/docs/configs/Rockets.html @@ -849,7 +849,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Roles.html b/docs/configs/Roles.html index b52de4f9..a6b6b5e7 100644 --- a/docs/configs/Roles.html +++ b/docs/configs/Roles.html @@ -307,7 +307,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Science.html b/docs/configs/Science.html index 7ee719a3..a74159a3 100644 --- a/docs/configs/Science.html +++ b/docs/configs/Science.html @@ -369,7 +369,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Scorched-Earth.html b/docs/configs/Scorched-Earth.html index d589f814..358d6ab6 100644 --- a/docs/configs/Scorched-Earth.html +++ b/docs/configs/Scorched-Earth.html @@ -403,7 +403,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Spawn-Area.html b/docs/configs/Spawn-Area.html index 2c7c3172..6e5a52cc 100644 --- a/docs/configs/Spawn-Area.html +++ b/docs/configs/Spawn-Area.html @@ -759,7 +759,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Statistics.html b/docs/configs/Statistics.html index 25fa0414..a7b2ec84 100644 --- a/docs/configs/Statistics.html +++ b/docs/configs/Statistics.html @@ -639,7 +639,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Tasks.html b/docs/configs/Tasks.html index 990e08a0..9194d7c8 100644 --- a/docs/configs/Tasks.html +++ b/docs/configs/Tasks.html @@ -399,7 +399,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Warnings.html b/docs/configs/Warnings.html index 9b96c1da..c306d3f1 100644 --- a/docs/configs/Warnings.html +++ b/docs/configs/Warnings.html @@ -370,7 +370,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/Warps.html b/docs/configs/Warps.html index 12708074..8215cf4c 100644 --- a/docs/configs/Warps.html +++ b/docs/configs/Warps.html @@ -789,7 +789,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/configs/inventory_clear.html b/docs/configs/inventory_clear.html index 05b602e4..bec18e6f 100644 --- a/docs/configs/inventory_clear.html +++ b/docs/configs/inventory_clear.html @@ -252,7 +252,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/control/Jail.html b/docs/control/Jail.html index 7cad6c81..18ae5fca 100644 --- a/docs/control/Jail.html +++ b/docs/control/Jail.html @@ -1223,7 +1223,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/control/Production.html b/docs/control/Production.html index a7ac2843..a9242949 100644 --- a/docs/control/Production.html +++ b/docs/control/Production.html @@ -1344,7 +1344,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/control/Reports.html b/docs/control/Reports.html index 66af4afd..6103bd77 100644 --- a/docs/control/Reports.html +++ b/docs/control/Reports.html @@ -1157,7 +1157,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/control/Rockets.html b/docs/control/Rockets.html index 9d036302..03734968 100644 --- a/docs/control/Rockets.html +++ b/docs/control/Rockets.html @@ -999,7 +999,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/control/Tasks.html b/docs/control/Tasks.html index a96bb150..b82f48a1 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/control/Warnings.html b/docs/control/Warnings.html index 253a4a99..50f158af 100644 --- a/docs/control/Warnings.html +++ b/docs/control/Warnings.html @@ -1540,7 +1540,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/control/Warps.html b/docs/control/Warps.html index df2dc465..6d8f1f9d 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/core/Async.html b/docs/core/Async.html index 5a636e87..bc1d3caa 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/core/Commands.html b/docs/core/Commands.html index 2b4c62db..0411c950 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/core/Common.html b/docs/core/Common.html index a7b8e9dc..355d0dc2 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/core/Datastore.html b/docs/core/Datastore.html index 09f67ac7..062ec7f0 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/core/External.html b/docs/core/External.html index 15aac6c9..5618848d 100644 --- a/docs/core/External.html +++ b/docs/core/External.html @@ -748,7 +748,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/core/Groups.html b/docs/core/Groups.html index 06a15fcd..7493f83d 100644 --- a/docs/core/Groups.html +++ b/docs/core/Groups.html @@ -1443,7 +1443,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/core/Gui.html b/docs/core/Gui.html index c1543fcc..323744e8 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/core/PlayerData.html b/docs/core/PlayerData.html index 861adf09..e911c5ce 100644 --- a/docs/core/PlayerData.html +++ b/docs/core/PlayerData.html @@ -531,7 +531,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/core/Roles.html b/docs/core/Roles.html index 02bc5181..09bd9cb7 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html index b8d4ae49..5e4d30f6 100644 --- a/docs/data/Alt-View.html +++ b/docs/data/Alt-View.html @@ -335,7 +335,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/data/Bonus.html b/docs/data/Bonus.html index 1bbcf745..8ab2f5af 100644 --- a/docs/data/Bonus.html +++ b/docs/data/Bonus.html @@ -487,7 +487,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/data/Greetings.html b/docs/data/Greetings.html index 9138960f..4666859a 100644 --- a/docs/data/Greetings.html +++ b/docs/data/Greetings.html @@ -430,7 +430,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/data/Player-Colours.html b/docs/data/Player-Colours.html index 2a636fe0..9fc2a1bd 100644 --- a/docs/data/Player-Colours.html +++ b/docs/data/Player-Colours.html @@ -391,7 +391,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/data/Quickbar.html b/docs/data/Quickbar.html index ff73cff3..b14526c5 100644 --- a/docs/data/Quickbar.html +++ b/docs/data/Quickbar.html @@ -408,7 +408,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/data/Tag.html b/docs/data/Tag.html index 5020e1de..17b9557f 100644 --- a/docs/data/Tag.html +++ b/docs/data/Tag.html @@ -486,7 +486,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/guis/Player-List.html b/docs/guis/Player-List.html index 2ccddc26..1116c164 100644 --- a/docs/guis/Player-List.html +++ b/docs/guis/Player-List.html @@ -706,7 +706,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/guis/Readme.html b/docs/guis/Readme.html index 50ecc877..b01eee7f 100644 --- a/docs/guis/Readme.html +++ b/docs/guis/Readme.html @@ -998,7 +998,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/guis/Rocket-Info.html b/docs/guis/Rocket-Info.html index ae7a1d6f..772e09cf 100644 --- a/docs/guis/Rocket-Info.html +++ b/docs/guis/Rocket-Info.html @@ -706,7 +706,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/guis/Science-Info.html b/docs/guis/Science-Info.html index 26695b53..23f47c99 100644 --- a/docs/guis/Science-Info.html +++ b/docs/guis/Science-Info.html @@ -585,7 +585,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/guis/Task-List.html b/docs/guis/Task-List.html index 78d230d2..2ec7904b 100644 --- a/docs/guis/Task-List.html +++ b/docs/guis/Task-List.html @@ -771,7 +771,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/guis/Warps-List.html b/docs/guis/Warps-List.html index b12f4c78..453645fd 100644 --- a/docs/guis/Warps-List.html +++ b/docs/guis/Warps-List.html @@ -1042,7 +1042,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/guis/server-ups.html b/docs/guis/server-ups.html index c86bad41..5f7167be 100644 --- a/docs/guis/server-ups.html +++ b/docs/guis/server-ups.html @@ -508,7 +508,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/index.html b/docs/index.html index 94d322ac..02711460 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/modules/control.html b/docs/modules/control.html index 06abd897..7609ff89 100644 --- a/docs/modules/control.html +++ b/docs/modules/control.html @@ -310,7 +310,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/modules/modules.addons.station-auto-name.html b/docs/modules/modules.addons.station-auto-name.html index 413f735b..2393a067 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/modules/overrides.debug.html b/docs/modules/overrides.debug.html index f2e173a2..e01332f3 100644 --- a/docs/modules/overrides.debug.html +++ b/docs/modules/overrides.debug.html @@ -669,7 +669,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/modules/overrides.math.html b/docs/modules/overrides.math.html index 35205dfc..d841d36a 100644 --- a/docs/modules/overrides.math.html +++ b/docs/modules/overrides.math.html @@ -368,7 +368,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/modules/overrides.table.html b/docs/modules/overrides.table.html index a123cbb3..cfe9d613 100644 --- a/docs/modules/overrides.table.html +++ b/docs/modules/overrides.table.html @@ -2023,7 +2023,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/modules/utils.event.html b/docs/modules/utils.event.html index 1475565f..31375b50 100644 --- a/docs/modules/utils.event.html +++ b/docs/modules/utils.event.html @@ -1307,7 +1307,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/modules/utils.event_core.html b/docs/modules/utils.event_core.html index 09726346..58fbb756 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/modules/utils.task.html b/docs/modules/utils.task.html index 1cb66846..4911d741 100644 --- a/docs/modules/utils.task.html +++ b/docs/modules/utils.task.html @@ -666,7 +666,7 @@ generated by LDoc
    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/topics/LICENSE.html b/docs/topics/LICENSE.html index 99f695c6..6caaa821 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-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    diff --git a/docs/topics/README.md.html b/docs/topics/README.md.html index a8da112f..dea00046 100644 --- a/docs/topics/README.md.html +++ b/docs/topics/README.md.html @@ -265,6 +265,7 @@ Please report these errors to [the issues page](issues).

    ## Releases

    | 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] | @@ -284,7 +285,8 @@ Please report these errors to [the issues page](issues). | [v0.1][s0.1] | First Tracked Version | [v0.14][f0.14] |

    \* Scenario patch versions have been omitted.

    \*\* Factorio versions show the version they were made for, often the minimum requirement. -

    [s6.0]: https://github.com/explosivegaming/scenario/releases/tag/6.0.0 +

    [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 [s5.8]: https://github.com/explosivegaming/scenario/releases/tag/5.8.0 @@ -301,7 +303,8 @@ Please report these errors to [the issues page](issues). [s2.0]: https://github.com/explosivegaming/scenario/releases/tag/v2.0 [s1.0]: https://github.com/explosivegaming/scenario/releases/tag/v1.0 [s0.1]: https://github.com/explosivegaming/scenario/releases/tag/v0.1 -

    [f0.18.17]: https://wiki.factorio.com/Version_history/0.18.0#0.18.17 +

    [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 [f0.17.49]: https://wiki.factorio.com/Version_history/0.17.0#0.17.49 @@ -356,7 +359,7 @@ Please report these errors to [the issues page](issues). generated by LDoc

    - Last updated 2020-08-16 18:39:39 UTC + Last updated 2020-08-17 14:39:39 UTC
    From 8ff7ad5019e57089190d6f4aff7e06e65a039714 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 3 Sep 2020 17:42:06 +0100 Subject: [PATCH 2/6] Fixed auto promote --- expcore/roles.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/expcore/roles.lua b/expcore/roles.lua index f97771a7..3e826005 100644 --- a/expcore/roles.lua +++ b/expcore/roles.lua @@ -1000,8 +1000,8 @@ 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 pairs(game.connected_players) do - for _, role in ipairs(Roles.config.roles) do + for _, player in ipairs(game.connected_players) do + for _, role in pairs(Roles.config.roles) do if role.auto_promote_condition then local success, err = pcall(role.auto_promote_condition, player) if not success then From bdf94bf2753cef5c656221308edd8d01f8a42c0c Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 3 Sep 2020 17:55:57 +0100 Subject: [PATCH 3/6] Fixed maps played not being counted --- config/statistics.lua | 2 +- modules/data/statistics.lua | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/config/statistics.lua b/config/statistics.lua index 856af59d..8693e486 100644 --- a/config/statistics.lua +++ b/config/statistics.lua @@ -3,6 +3,7 @@ local e = defines.events -- order as per lua api as it was easier just to go down the list return { + MapsPlayed = true, --- @setting MapsPlayed If the number of maps which a player has played should be tracked Playtime = true, --- @setting Playtime If playtime is tracked for a player, play time measured in minutes AfkTime = true, --- @setting AfkTime If afk time is tracked for a player, play time measured in minutes, afk is once a player does nothing for 5 minutes DistanceTravelled = true, --- @setting DistanceTravelled If distance Travelled is checked, only counts if not afk @@ -21,7 +22,6 @@ return { ItemsPickedUp = e.on_picked_up_item, TilesBuilt = e.on_player_built_tile, ItemsCrafted = e.on_player_crafted_item, - MapsPlayed = e.on_player_created, DeconstructionPlannerUsed = e.on_player_deconstructed_area, Deaths = e.on_player_died, JoinCount = e.on_player_joined_game, diff --git a/modules/data/statistics.lua b/modules/data/statistics.lua index 709610fb..f3549add 100644 --- a/modules/data/statistics.lua +++ b/modules/data/statistics.lua @@ -1,10 +1,17 @@ local Event = require 'utils.event' ---@dep utils.event +local Global = require 'utils.global' ---@dep utils.global local config = require 'config.statistics' ---@dep config.statistics local format_time = _C.format_time local floor = math.floor local afk_required = 5*3600 -- 5 minutes +--- Stores players who have been created, required to avoid loss of data +local new_players, MapsPlayed = {}, nil +Global.register(new_players, function(tbl) + new_players = tbl +end) + --- Stores the statistics on a player local PlayerData = require 'expcore.player_data' --- @dep expcore.player_data local AllPlayerData = PlayerData.All @@ -18,6 +25,7 @@ Statistics:on_load(function(player_name, player_statistics) local existing_data = AllPlayerData:get(player_name) if existing_data and existing_data.valid then return end local counters = config.counters + -- Merge all data from before you data loaded for key, value in pairs(Statistics:get(player_name, {})) do if config[key] or counters[key] then if not player_statistics[key] then @@ -27,6 +35,11 @@ Statistics:on_load(function(player_name, player_statistics) end end end + -- Increment your maps played if this is your first time on this map + if new_players[player_name] then + new_players[player_name] = nil + MapsPlayed:increment(player_name) + end return player_statistics end) @@ -39,6 +52,16 @@ local function format_minutes(value) }) end +--- Add MapsPlayed if it is enabled +if config.MapsPlayed then + MapsPlayed = Statistics:combine('MapsPlayed') + MapsPlayed:set_metadata{unit=' maps'} + Event.add(defines.events.on_player_joined_game, function(event) + local player = game.players[event.player_index] + new_players[player.name] = true + end) +end + --- Add Playtime and AfkTime if it is enabled if config.Playtime or config.AfkTime then local playtime, afk_time From a84c42aa3cc7f543aae3abb326761aab7ac1de97 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 8 Sep 2020 18:40:33 +0100 Subject: [PATCH 4/6] Improved Auto Assign --- config/expcore/roles.lua | 4 ++- expcore/roles.lua | 75 +++++++++++++++++++++++++--------------- 2 files changed, 51 insertions(+), 28 deletions(-) diff --git a/config/expcore/roles.lua b/config/expcore/roles.lua index df059559..92aa1d4e 100644 --- a/config/expcore/roles.lua +++ b/config/expcore/roles.lua @@ -174,6 +174,7 @@ Roles.new_role('Veteran','Vet') 'command/chat-bot', } :set_auto_assign_condition(function(player) + game.print('Checked auto assign vet') if player.online_time > 10*216000 then return true end @@ -204,6 +205,7 @@ Roles.new_role('Regular','Reg') 'standard-decon' } :set_auto_assign_condition(function(player) + game.print('Checked auto assign reg') if player.online_time > 3*216000 then return true end @@ -238,7 +240,7 @@ local default = Roles.new_role('Guest','') Roles.new_role('Jail') :set_permission_group('Restricted') :set_custom_color{r=50,g=50,b=50} -:set_block_auto_promote(true) +:set_block_auto_assign(true) :disallow(default.allowed) --- System defaults which are required to be set diff --git a/expcore/roles.lua b/expcore/roles.lua index 3e826005..edcc989e 100644 --- a/expcore/roles.lua +++ b/expcore/roles.lua @@ -123,7 +123,8 @@ local Roles = { roles = {}, -- Contains the raw info for the roles, indexed by role name flags = {}, -- Contains functions that run when a flag is added/removed from a player internal = {}, -- Contains all internally accessed roles, such as root, default - players = {} -- Contains the roles that players have + players = {}, -- Contains the roles that players have + auto_assign = {} -- Contains references to all roles which have auto assign conditions }, events = { on_role_assigned = script.generate_event_name(), @@ -807,7 +808,7 @@ end --[[-- Sets an auto assign condition that is checked every 60 seconds, if true is returned then the player will receive the role nb: this is one way, failing false after already gaining the role will not revoke the role -@tparam function callback receives only one param which is player to promote, return true to promote the player +@tparam function callback receives only one param which is player to assign, return true to assign the player @treturn Roles._prototype allows chaining @usage-- Give this role to a user if there are admin, ran every 60 seconds @@ -818,21 +819,33 @@ end) ]] function Roles._prototype:set_auto_assign_condition(callback) _C.error_if_runtime() - self.auto_promote_condition = callback + self.auto_assign_condition = true + Roles.config.auto_assign[self.name] = callback return self end +--[[-- Get the auto assign condition for this role, returns nil if no condition is set +@treturn function The callback which was assigned as the auto assign condition + +@usage-- Give this role to a user if there are admin, ran every 60 seconds +local condition = role:get_auto_assign_condition() + +]] +function Roles._prototype:get_auto_assign_condition() + return Roles.config.auto_assign[self.name] +end + --[[-- Sets the role to not allow players to have auto assign effect them, useful to keep people locked to a role @tparam[opt=true] boolean state when true the players with this role will not be auto assigned to other roles @treturn Roles._prototype allows chaining @usage-- Make a role stop players from being auto assigned to other roles -role:set_block_auto_promote() +role:set_block_auto_assign() ]] -function Roles._prototype:set_block_auto_promote(state) +function Roles._prototype:set_block_auto_assign(state) if state == nil then state = true end - self.block_auto_promote = not not state -- forces a boolean value + self.block_auto_assign = not not state -- forces a boolean value return self end @@ -993,35 +1006,43 @@ local function role_update(event) end end +--- Used internally to test if a player should be auto assigned a role +local function auto_assign(event) + local player = game.players[event.player_index] + local roles = Roles.config.players[player.name] or {} + + local lookup = {} + for _, role in ipairs(roles) do lookup[role] = true end + + local assigns, ctn = {}, 0 + for role, condition in pairs(Roles.config.auto_assign) do + if not lookup[role] then + local success, rtn = pcall(condition, player) + if not success then + log{'expcore-roles.error-log-format-assign', role.name, rtn} + elseif rtn == true then + ctn = ctn + 1 + assigns[ctn] = role + end + end + end + + if ctn > 0 then Roles.assign_player(player, assigns) end +end + --- When a player joined or has a role change then the update is triggered Event.add(Roles.events.on_role_assigned, role_update) Event.add(Roles.events.on_role_unassigned, role_update) Event.add(defines.events.on_player_joined_game, role_update) --- Every 60 seconds the auto promote check is preformed + +--- Every 60 seconds and on join auto role assignment is checked +Event.add(defines.events.on_player_joined_game, auto_assign) Event.on_nth_tick(3600, function() - local promotes = {} for _, player in ipairs(game.connected_players) do - for _, role in pairs(Roles.config.roles) do - if role.auto_promote_condition then - local success, err = pcall(role.auto_promote_condition, player) - if not success then - log{'expcore-roles.error-log-format-promote', role.name, err} - else - if err == true and not Roles.player_has_role(player, role) then - if promotes[player.name] then - table.insert(promotes[player.name], role.name) - else - promotes[player.name] = {role.name} - end - end - end - end - end - end - for player_name, roles in pairs(promotes) do - Roles.assign_player(player_name, roles) + auto_assign{ player_index = player.index } end end) + -- Return Roles return Roles \ No newline at end of file From d317751a1010db654b84084017539a897968508b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 8 Sep 2020 18:55:13 +0100 Subject: [PATCH 5/6] Added play time and maps played check --- config/expcore/roles.lua | 18 ++++++++++++++---- locale/en/expcore.cfg | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/config/expcore/roles.lua b/config/expcore/roles.lua index 92aa1d4e..e28ac848 100644 --- a/config/expcore/roles.lua +++ b/config/expcore/roles.lua @@ -2,6 +2,8 @@ -- @config Roles local Roles = require 'expcore.roles' --- @dep expcore.roles +local PlayerData = require 'expcore.player_data' --- @dep expcore.player_data +local Statistics = PlayerData.Statistics --- Role flags that will run when a player changes roles Roles.define_flag_trigger('is_admin',function(player,state) @@ -166,6 +168,7 @@ Roles.new_role('Partner','Part') 'command/unjail' } +local hours10, hours250 = 10*216000, 250*60 Roles.new_role('Veteran','Vet') :set_permission_group('Trusted') :set_custom_color{r=140,g=120,b=200} @@ -174,9 +177,12 @@ Roles.new_role('Veteran','Vet') 'command/chat-bot', } :set_auto_assign_condition(function(player) - game.print('Checked auto assign vet') - if player.online_time > 10*216000 then + if player.online_time >= hours10 then return true + else + local stats = Statistics:get(player, {}) + local playTime, afkTime, mapCount = stats.Playtime or 0, stats.AfkTime or 0, stats.MapsPlayed or 0 + return playTime - afkTime >= hours250 and mapCount >= 25 end end) @@ -193,6 +199,7 @@ Roles.new_role('Member','Mem') 'command/save-quickbar' } +local hours3, hours15 = 3*216000, 15*60 Roles.new_role('Regular','Reg') :set_permission_group('Standard') :set_custom_color{r=79,g=155,b=163} @@ -205,9 +212,12 @@ Roles.new_role('Regular','Reg') 'standard-decon' } :set_auto_assign_condition(function(player) - game.print('Checked auto assign reg') - if player.online_time > 3*216000 then + if player.online_time >= hours3 then return true + else + local stats = Statistics:get(player, {}) + local playTime, afkTime, mapCount = stats.Playtime or 0, stats.AfkTime or 0, stats.MapsPlayed or 0 + return playTime - afkTime >= hours15 and mapCount >= 5 end end) diff --git a/locale/en/expcore.cfg b/locale/en/expcore.cfg index e5fc44df..3c3280d6 100644 --- a/locale/en/expcore.cfg +++ b/locale/en/expcore.cfg @@ -25,7 +25,7 @@ command-error-log-format=[ERROR] command/__1__ :: __2__ [expcore-roles] error-log-format-flag=[ERROR] roleFlag/__1__ :: __2__ -error-log-format-promote=[ERROR] rolePromote/__1__ :: __2__ +error-log-format-assign=[ERROR] rolePromote/__1__ :: __2__ game-message-assign=__1__ has been assigned to __2__ by __3__ game-message-unassign=__1__ has been unassigned from __2__ by __3__ reject-role=Invalid Role Name. From b264974457adf2d309361703ec5886188782af14 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 8 Sep 2020 19:00:56 +0100 Subject: [PATCH 6/6] Fixed Maps Played Again --- modules/data/statistics.lua | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/data/statistics.lua b/modules/data/statistics.lua index f3549add..da0071c6 100644 --- a/modules/data/statistics.lua +++ b/modules/data/statistics.lua @@ -7,7 +7,7 @@ local floor = math.floor local afk_required = 5*3600 -- 5 minutes --- Stores players who have been created, required to avoid loss of data -local new_players, MapsPlayed = {}, nil +local new_players = {} Global.register(new_players, function(tbl) new_players = tbl end) @@ -25,6 +25,7 @@ Statistics:on_load(function(player_name, player_statistics) local existing_data = AllPlayerData:get(player_name) if existing_data and existing_data.valid then return end local counters = config.counters + -- Merge all data from before you data loaded for key, value in pairs(Statistics:get(player_name, {})) do if config[key] or counters[key] then @@ -35,11 +36,14 @@ Statistics:on_load(function(player_name, player_statistics) end end end + -- Increment your maps played if this is your first time on this map if new_players[player_name] then new_players[player_name] = nil - MapsPlayed:increment(player_name) + local ctn = player_statistics.MapsPlayed + player_statistics.MapsPlayed = ctn and ctn + 1 or 1 end + return player_statistics end) @@ -54,9 +58,8 @@ end --- Add MapsPlayed if it is enabled if config.MapsPlayed then - MapsPlayed = Statistics:combine('MapsPlayed') - MapsPlayed:set_metadata{unit=' maps'} - Event.add(defines.events.on_player_joined_game, function(event) + Statistics:combine('MapsPlayed') + Event.add(defines.events.on_player_created, function(event) local player = game.players[event.player_index] new_players[player.name] = true end)