diff --git a/config/action_buttons.lua b/config/action_buttons.lua index 4e821e1f..f48606d3 100644 --- a/config/action_buttons.lua +++ b/config/action_buttons.lua @@ -8,7 +8,7 @@ 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.addons.warnings-control' +local Warnings = require 'modules.addons.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') @@ -135,7 +135,7 @@ local function warn_player_callback(player,reason) local action_player_name,action_player_name_color = get_action_player_name(player) local by_player_name_color = format_chat_player_name(player) game.print{'expcom-warnings.received',action_player_name_color,by_player_name_color,reason} - Warnings.add_warnings(action_player_name,player.name) + Warnings.add_warning(action_player_name,player.name,reason) end -- jails the action player, requires a reason diff --git a/config/warnings.lua b/config/warnings.lua index 7fd627a4..73696544 100644 --- a/config/warnings.lua +++ b/config/warnings.lua @@ -14,6 +14,6 @@ return { game.ban_player(player,{'warnings.received',by_player_name,number_of_warnings,{'warnings.ban',{'links.website'}}}) end }, - temp_warning_cool_down=30, -- time for a temp warning (given by script) to be removed (in minutes) - temp_warning_limit=5 -- the number of temp warnings (given by script) that are allowed before full warnings are given + script_warning_cool_down=30, -- time for a script warning (given by script) to be removed (in minutes) + script_warning_limit=5 -- the number of script warnings (given by script) that are allowed before full warnings are given } \ No newline at end of file diff --git a/doc/index.html b/doc/index.html index 13ec6e62..6e2fc4e9 100644 --- a/doc/index.html +++ b/doc/index.html @@ -278,12 +278,17 @@ Jail Control Module - Jail - Adds a way to jail players and temp ban players. + - Adds a way to jail players and temp ban players. Reports Control Module - Reports - Adds a way to report players and store report messages. + - Adds a way to report players and store report messages. + + + Warnings + Control Module - Warnings + - Adds a way to give and remove warnings to players. modules.gui.player-list @@ -375,7 +380,7 @@ generated by LDoc diff --git a/doc/modules/Jail.html b/doc/modules/Jail.html index 5af00326..f36043a8 100644 --- a/doc/modules/Jail.html +++ b/doc/modules/Jail.html @@ -42,6 +42,7 @@