From 98bf1bb3c18e575753be33e4bba0f275d7b3bde4 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 23 Jan 2018 18:39:53 +0000 Subject: [PATCH] A few edits to warning system --- Addons/Admin/discord.lua | 3 ++- Addons/Admin/reports.lua | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Addons/Admin/discord.lua b/Addons/Admin/discord.lua index e02ee49c..87652f70 100644 --- a/Addons/Admin/discord.lua +++ b/Addons/Admin/discord.lua @@ -15,6 +15,7 @@ Event.register(defines.events.on_console_command,function(event) local data = {} data.title = string.gsub(command,'^%l',string.upper) data.by = event.player_index and game.players[event.player_index].name or '' + if data.by == '' then return end if command == 'config' or command == 'banlist' then discord_emit{ title='Edit To '..data.title, @@ -28,7 +29,7 @@ Event.register(defines.events.on_console_command,function(event) data.colour = Color.to_hex(defines.text_color.crit) data.reason = table.concat(args,' ',2) elseif command == 'kick' then - data.colour = Color.to_hex(defines.text_color.med) + data.colour = Color.to_hex(defines.text_color.high) data.reason = table.concat(args,' ',2) elseif command == 'unban' then data.colour = Color.to_hex(defines.text_color.low) elseif command == 'mute' then data.colour = Color.to_hex(defines.text_color.med) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index 868efba2..a842b5e0 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -121,13 +121,13 @@ local function give_punishment(player,by_player,reason) report_message(player,'',reason) elseif punishment[1] == 'kick' then _reports().actions[player.name] = actions.kick - Admin.kick(player,by_player,'Too Many Warnings: '..warnings-(take_action-2)..' Also: '..reason) + Admin.kick(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) elseif punishment[1] == 'temp-ban' then _reports().actions[player.name] = actions.temp - Admin.temp_ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-2)..' Also: '..reason) + Admin.temp_ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) elseif punishment[1] == 'ban' then _reports().actions[player.name] = actions.ban - Admin.ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-2)..' Also: '..reason) + Admin.ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) end end @@ -256,7 +256,9 @@ Event.register(defines.events.on_tick,function(event) local time_to_remove = _reports().remove_warnings_time[rank.power] if (game.tick % time_to_remove) == 0 then _reports().warnings[name]=warnings-1 - player_return({'reports.remove-warn',_reports().warnings[name],tick_to_display_format(time_to_remove)},defines.text_color.low,name) + if _reports().warnings[name] > 5 then + player_return({'reports.remove-warn',_reports().warnings[name],tick_to_display_format(time_to_remove)},defines.text_color.low,name) + end end end end