diff --git a/config/action_buttons.lua b/config/action_buttons.lua index a98208f3..dadf057b 100644 --- a/config/action_buttons.lua +++ b/config/action_buttons.lua @@ -3,15 +3,15 @@ -- if a reason callback is used then Store.set(action_name_store,player.name,'BUTTON_NAME') should be called during on_click -- buttons can be removed from the gui by commenting them out of the config at the bottom of this file -- the key used for the name of the button is the permission name used by the role system -local Gui = require 'expcore.gui' -local Roles = require 'expcore.roles' -local Store = require 'expcore.store' -local Game = require 'utils.game' -local Reports = require 'modules.control.reports' -local Warnings = require 'modules.control.warnings' -local Jail = require 'modules.control.jail' -local Colors = require 'resources.color_presets' -local format_chat_player_name = ext_require('expcore.common','format_chat_player_name') +local Gui = require 'expcore.gui' --- @dep expcore.gui +local Roles = require 'expcore.roles' --- @dep expcore.roles +local Store = require 'expcore.store' --- @dep expcore.store +local Game = require 'utils.game' --- @dep utils.game +local Reports = require 'modules.control.reports' --- @dep modules.control.reports +local Warnings = require 'modules.control.warnings' --- @dep modules.control.warnings +local Jail = require 'modules.control.jail' --- @dep modules.control.jail +local Colors = require 'resources.color_presets' --- @dep resources.color_presets +local format_chat_player_name = ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common local action_player_store = 'gui.left.player-list.action-player' local action_name_store = 'gui.left.player-list.action-name' diff --git a/config/chat_reply.lua b/config/chat_reply.lua index db6d38d8..536548cf 100644 --- a/config/chat_reply.lua +++ b/config/chat_reply.lua @@ -1,5 +1,5 @@ --- This file defines the different triggers for the chat bot -local format_time = ext_require('expcore.common','format_time') +local format_time = ext_require('expcore.common','format_time') --- @dep expcore.common return { allow_command_prefix_for_messages = true, -- when true any message trigger will print to all player when prefixed messages = { -- will trigger when ever the word is said diff --git a/config/expcore-commands/auth_admin.lua b/config/expcore-commands/auth_admin.lua index 19ef9198..331a55d9 100644 --- a/config/expcore-commands/auth_admin.lua +++ b/config/expcore-commands/auth_admin.lua @@ -1,7 +1,7 @@ --- This is a very simple config file which adds a admin only auth function -- not much to change here its more so it can be enabled and disabled from ./config/file_loader.lua -- either way you can change the requirements to be "admin" if you wanted to -local Commands = require 'expcore.commands' +local Commands = require 'expcore.commands' --- @dep expcore.commands Commands.add_authenticator(function(player,command,tags,reject) if tags.admin_only then diff --git a/config/expcore-commands/auth_roles.lua b/config/expcore-commands/auth_roles.lua index 3011166e..071d07a2 100644 --- a/config/expcore-commands/auth_roles.lua +++ b/config/expcore-commands/auth_roles.lua @@ -1,6 +1,6 @@ --- This will make commands only work if the role has been allowed it in the role config -local Commands = require 'expcore.commands' -local Roles = require 'expcore.roles' +local Commands = require 'expcore.commands' --- @dep expcore.commands +local Roles = require 'expcore.roles' --- @dep expcore.roles Commands.add_authenticator(function(player,command,tags,reject) if Roles.player_allowed(player,'command/'..command) then diff --git a/config/expcore-commands/auth_runtime_disable.lua b/config/expcore-commands/auth_runtime_disable.lua index 0f4861fb..016c115d 100644 --- a/config/expcore-commands/auth_runtime_disable.lua +++ b/config/expcore-commands/auth_runtime_disable.lua @@ -1,7 +1,7 @@ --- This config for command auth allows commands to be globally enabled and disabled during runtime -- this config adds Commands.disable and Commands.enable to enable and disable commands for all users -local Commands = require 'expcore.commands' -local Global = require 'utils.global' +local Commands = require 'expcore.commands' --- @dep expcore.commands +local Global = require 'utils.global' --- @dep utils.global local disabled_commands = {} Global.register(disabled_commands,function(tbl) diff --git a/config/expcore-commands/parse_general.lua b/config/expcore-commands/parse_general.lua index 513aa845..8a9817ae 100644 --- a/config/expcore-commands/parse_general.lua +++ b/config/expcore-commands/parse_general.lua @@ -3,8 +3,8 @@ -- as such you need to be confident with lua but you edit this config file -- use Commands.add_parse('name',function(input,player,reject) end) to add a parse -- see ./expcore/commands.lua for more details -local Commands = require 'expcore.commands' -local Game = require 'utils.game' +local Commands = require 'expcore.commands' --- @dep expcore.commands +local Game = require 'utils.game' --- @dep utils.game --[[ >>>>Adds Parses: diff --git a/config/expcore-commands/parse_roles.lua b/config/expcore-commands/parse_roles.lua index 3d468aaf..9071a7db 100644 --- a/config/expcore-commands/parse_roles.lua +++ b/config/expcore-commands/parse_roles.lua @@ -1,7 +1,7 @@ --- Adds some parse functions that can be used with the role system -local Commands = require 'expcore.commands' -local Roles = require 'expcore.roles' -local auto_complete = ext_require('expcore.common','auto_complete') +local Commands = require 'expcore.commands' --- @dep expcore.commands +local Roles = require 'expcore.roles' --- @dep expcore.roles +local auto_complete = ext_require('expcore.common','auto_complete') --- @dep expcore.common require 'config.expcore-commands.parse_general' Commands.add_parse('role',function(input,player,reject) diff --git a/config/permission_groups.lua b/config/permission_groups.lua index 9b2ac4f1..95c4c221 100644 --- a/config/permission_groups.lua +++ b/config/permission_groups.lua @@ -2,9 +2,9 @@ -- start with Permission_Groups.new_group('name') -- then use either :allow_all() or :disallow_all() to set the default for non specified actions -- then use :allow{} and :disallow{} to specify certain actions to allow/disallow -local Event = require 'utils.event' -local Game = require 'utils.game' -local Permission_Groups = require 'expcore.permission_groups' +local Event = require 'utils.event' --- @dep utils.event +local Game = require 'utils.game' --- @dep utils.game +local Permission_Groups = require 'expcore.permission_groups' --- @dep expcore.permission_groups Permission_Groups.new_group('Admin') :allow_all() diff --git a/config/roles.lua b/config/roles.lua index 93fe875e..551e2866 100644 --- a/config/roles.lua +++ b/config/roles.lua @@ -1,5 +1,5 @@ --- This is the main config file for the role system; file includes defines for roles and role flags and default values -local Roles = require 'expcore.roles' +local Roles = require 'expcore.roles' --- @dep expcore.roles -- Use these to adjust for ticks ie game.tick < 5*minutes local seconds, minutes, hours = 60, 3600, 216000 diff --git a/control.lua b/control.lua index 29d79064..64636ae1 100644 --- a/control.lua +++ b/control.lua @@ -18,15 +18,15 @@ require 'utils.print_override' require 'utils.math' -- Global Debug and make sure our version file is registered -Debug = require 'utils.debug' +Debug = require 'utils.debug' --- @dep utils.debug require 'resources.version' -- Global require function used to extract parts of a module, because simply being in common is not good enough -ext_require = require('expcore.common').ext_require +ext_require = require 'expcore.common' --- @dep expcore.common.ext_require -- Please go to config/file_loader.lua to edit the files that are loaded log('[INFO] Getting file loader config') -local files = require 'config._file_loader' +local files = require 'config._file_loader' --- @dep config._file_loader -- Loads all files from the config and logs that they are loaded local total_file_count = string.format('%3d',#files) diff --git a/doc/control/Jail.html b/doc/control/Jail.html index d4e42066..1dfe56b7 100644 --- a/doc/control/Jail.html +++ b/doc/control/Jail.html @@ -96,7 +96,7 @@ - + @@ -119,6 +119,7 @@ + @@ -183,8 +184,8 @@

Usage


     -- import the module from the control modules
-    local Jail = require 'modules.control.jail'
-
+    local Jail = require 'modules.control.jail' --- @dep modules.control.jail
+
     -- This will move 'MrBiter' to the jail role and remove all other roles from them
     -- the player name and reason are only so they can be included in the event for user feedback
     Jail.jail_player('MrBiter','Cooldude2606','Likes biters too much')
@@ -209,19 +210,15 @@
     
     
     expcore.roles
-    Allows moving players into the jail role
     
     
     utils.game
-    Allows accessing a player from any value
     
     
     utils.global
-    Allows storing data in the global table
     
     
     expcore.common
-    Use of move_items to clear inventroies
     
     
     
@@ -306,8 +303,6 @@
     
-

Allows moving players into the jail role

-

@@ -333,8 +328,6 @@
-

Allows accessing a player from any value

-

@@ -360,8 +353,6 @@
-

Allows storing data in the global table

-

@@ -387,8 +378,6 @@
-

Use of move_items to clear inventroies

-

@@ -1164,7 +1153,7 @@ generated by LDoc
diff --git a/doc/control/Production.html b/doc/control/Production.html index acb4cdbc..56aea2e7 100644 --- a/doc/control/Production.html +++ b/doc/control/Production.html @@ -96,7 +96,7 @@ - + @@ -119,6 +119,7 @@ + @@ -183,8 +184,8 @@

Usage


     -- import the module from the control modules
-    local Production = require 'modules.control.production'
-
+    local Production = require 'modules.control.production' --- @dep modules.control.production
+
     -- This will return the less precise index from the one given
     -- this means that one_second will return one_minute or ten_hours will return fifty_hours
     -- the other precision work like wise
@@ -220,11 +221,9 @@
     
     
     resources.color_presets
-    Provides colors for Production.get_color
     
     
     util
-    Provides format_number function to add surfixs
     
     
     
@@ -313,8 +312,6 @@
     
-

Provides colors for Production.get_color

-

@@ -340,8 +337,6 @@
-

Provides format_number function to add surfixs

-

@@ -1279,7 +1274,7 @@ generated by LDoc
diff --git a/doc/control/Reports.html b/doc/control/Reports.html index f013b057..6ba71b6a 100644 --- a/doc/control/Reports.html +++ b/doc/control/Reports.html @@ -96,7 +96,7 @@ - + @@ -119,6 +119,7 @@ + @@ -183,8 +184,8 @@

Usage


     -- import the module from the control modules
-    local Reports = require 'modules.control.reports'
-
+    local Reports = require 'modules.control.reports' --- @dep modules.control.reports
+
     -- This will place a report on "MrBiter" (must be a valid player) the report will have been made
     -- by "Cooldude2606" (must be the player name) with the reason 'Liking biters too much' this can be
     -- seen by using Reports.get_report.
@@ -213,11 +214,9 @@
     
     
     utils.game
-    Allows getting player from any value
     
     
     utils.global
-    Allows storing of data in global table
     
     
     
@@ -298,8 +297,6 @@
     
-

Allows getting player from any value

-

@@ -325,8 +322,6 @@
-

Allows storing of data in global table

-

@@ -1028,7 +1023,7 @@ generated by LDoc
diff --git a/doc/control/Rockets.html b/doc/control/Rockets.html index 58c6133b..611993cb 100644 --- a/doc/control/Rockets.html +++ b/doc/control/Rockets.html @@ -95,7 +95,7 @@ - + @@ -118,6 +118,7 @@ + @@ -181,8 +182,8 @@

Usage


     -- import the module from the control modules
-    local Rockets = require 'modules.control.rockets'
-
+    local Rockets = require 'modules.control.rockets' --- @dep modules.control.rockets
+
     -- Some basic information is stored for each silo that has been built
     -- the data includes: the tick it was built, the rockets launched from it and more
     Rockets.get_silo_data(rocket_silo_entity)
@@ -211,15 +212,12 @@
     
     
     utils.event
-    Allows registering event handlers
     
     
     utils.global
-    Allows storing in the global table
     
     
     config.rockets
-    Contains the config for this module
     
     
     
@@ -296,8 +294,6 @@
     
-

Allows registering event handlers

-

@@ -323,8 +319,6 @@
-

Allows storing in the global table

-

@@ -350,8 +344,6 @@
-

Contains the config for this module

-

@@ -937,7 +929,7 @@ generated by LDoc
diff --git a/doc/control/Tasks.html b/doc/control/Tasks.html index 7c59bb8f..afe73055 100644 --- a/doc/control/Tasks.html +++ b/doc/control/Tasks.html @@ -95,7 +95,7 @@ - + @@ -118,6 +118,7 @@ + @@ -181,8 +182,8 @@

Usage


     -- import the module from the control modules
-    local Tasks = require 'modules.control.tasks'
-
+    local Tasks = require 'modules.control.tasks' --- @dep modules.control.tasks
+
     -- To create a new task all you need is the name of the force you want to add the task to
     -- you can give a place to add it but this is optional
     Tasks.new_task('player')
@@ -211,15 +212,12 @@
     
     
     expcore.store
-    Allows storing of task ids
     
     
     utils.global
-    Allows storing in the global table
     
     
     utils.token
-    Allows non conflicting task ids
     
     
     
@@ -292,8 +290,6 @@
     
-

Allows storing of task ids

-

@@ -319,8 +315,6 @@
-

Allows storing in the global table

-

@@ -346,8 +340,6 @@
-

Allows non conflicting task ids

-

@@ -992,7 +984,7 @@ generated by LDoc
diff --git a/doc/control/Warnings.html b/doc/control/Warnings.html index 5eea7b5d..8fe52f2a 100644 --- a/doc/control/Warnings.html +++ b/doc/control/Warnings.html @@ -95,7 +95,7 @@ - + @@ -118,6 +118,7 @@ + @@ -181,8 +182,8 @@

Usage


     -- import the module from the control modules
-    local Warnings = require 'modules.control.warnings'
-
+    local Warnings = require 'modules.control.warnings' --- @dep modules.control.warnings
+
     -- This will add a warning to the player
     Warnings.add_warning('MrBiter','Cooldude2606','Killed too many biters')
 
@@ -208,19 +209,15 @@
     
     
     utils.event
-    Allows registering of custom events
     
     
     utils.game
-    Allows getting player from any value
     
     
     utils.global
-    Allows storing in the global table
     
     
     config.warnings
-    Config file for this module
     
     
     
@@ -313,8 +310,6 @@
     
-

Allows registering of custom events

-

@@ -340,8 +335,6 @@
-

Allows getting player from any value

-

@@ -367,8 +360,6 @@
-

Allows storing in the global table

-

@@ -394,8 +385,6 @@
-

Config file for this module

-

@@ -1421,7 +1410,7 @@ generated by LDoc
diff --git a/doc/control/Warps.html b/doc/control/Warps.html index a4d89c30..18781f8c 100644 --- a/doc/control/Warps.html +++ b/doc/control/Warps.html @@ -96,7 +96,7 @@ - + @@ -119,6 +119,7 @@ + @@ -183,8 +184,8 @@

Usage


     -- import the module from the control modules
-    local Warps = require 'modules.control.warps'
-
+    local Warps = require 'modules.control.warps' --- @dep modules.control.warps
+
     -- Adding a warp require a force, surface and postion, and the option to set this as the spawn
     -- this function will also create the warp area unless set other wise
     Warps.new_warp('player',surface,{x=0,y=0})
@@ -213,23 +214,18 @@
     
     
     expcore.store
-    Allows storing of warp ids
     
     
     utils.global
-    Allows storing of warp details
     
     
     utils.token
-    Allows non conflicting warp ids
     
     
-    expcore.store
-    Config for the warps
+    config.warps
     
     
     expcore.common
-    Access to table_values and table_keysort
     
     
     
@@ -326,8 +322,6 @@
     
-

Allows storing of warp ids

-

@@ -353,8 +347,6 @@
-

Allows storing of warp details

-

@@ -380,8 +372,6 @@
-

Allows non conflicting warp ids

-

@@ -400,15 +390,13 @@
- # - expcore.store + # + config.warps
-

Config for the warps

-

@@ -434,8 +422,6 @@
-

Access to table_values and table_keysort

-

@@ -1372,7 +1358,7 @@ generated by LDoc
diff --git a/doc/index.html b/doc/index.html index a552d766..cffbbd68 100644 --- a/doc/index.html +++ b/doc/index.html @@ -95,7 +95,7 @@ each button has the button define(s) given along side an auth function, and optional reason callback if a reason callback is used then Store.set(action_name_store,player.name,'BUTTON_NAME') should be called during on_click buttons can be removed from the gui by commenting them out of the config at the bottom of this file - the key used for the name of the button is the permision name used by the role system + the key used for the name of the button is the permission name used by the role system config.advanced_start @@ -199,7 +199,7 @@ expcore.gui This file is used to require all the different elements of the gui module - each module has an outline here but for more details see their seperate files in ./gui + each module has an outline here but for more details see their separate files in ./gui expcore.gui.concepts.center @@ -234,13 +234,13 @@ [[ - expcore.gui.elements.checkboxs - Gui class define for checkboxs and radiobuttons + expcore.gui.elements.checkbox + Gui class define for checkbox and radiobuttons [[ expcore.gui.elements.dropdown - Gui class define for dropdowns and list boxs + Gui class define for dropdowns and list box [[ @@ -250,17 +250,17 @@ expcore.gui.elements.progress-bar - Gui element define for progess bars + Gui element define for progress bars [[ expcore.gui.elements.slider - Gui class define for silders + Gui class define for sliders [[ expcore.gui.elements.text - Gui class define for text fields and text boxs + Gui class define for text fields and text boxes [[ @@ -275,8 +275,8 @@ expcore.gui.test - This file creates a teste gui that is used to test every input method - note that this does not cover every permutation only features in indepentance + This file creates a test gui that is used to test every input method + note that this does not cover every permutation only features in independence for example store in most cases is just by player name, but other store methods are tested with checkbox @@ -335,12 +335,16 @@ utils.core - Measures distance between pos1 and pos2 + This file contains core utilities used by the redmew scenario. utils.debug + utils.dump_env + A small debugging tool that writes the contents of _ENV to a file when the game loads. + + utils.event This Module allows for registering multiple handlers to the same event, overcoming the limitation of script.register. @@ -354,7 +358,7 @@ utils.recipe_locker - Locks recipes, preventing them from being enabled by research. + A module to prevent recipes from being unlocked by research. utils.state_machine @@ -366,8 +370,8 @@ utils.task - Allows you to set a timer (in ticks) after which the tokened function will be run with params given as an argument - Cannot be called before init + Threading simulation module + Task.sleep() utils.timestamp @@ -401,7 +405,7 @@ generated by LDoc diff --git a/doc/modules/config._file_loader.html b/doc/modules/config._file_loader.html index dbc972de..329adaa8 100644 --- a/doc/modules/config._file_loader.html +++ b/doc/modules/config._file_loader.html @@ -71,7 +71,7 @@ - + @@ -94,6 +94,7 @@ + @@ -184,7 +185,7 @@ generated by LDoc diff --git a/doc/modules/config.action_buttons.html b/doc/modules/config.action_buttons.html index 6159b590..d3aed518 100644 --- a/doc/modules/config.action_buttons.html +++ b/doc/modules/config.action_buttons.html @@ -37,6 +37,14 @@ +