From eb73a2e0928184b5820d99ac111d24f38bc3f80f Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:36:30 -0500 Subject: [PATCH 1/9] Update admin.lua --- Addons/Commands/admin.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 90134d8c..637d425f 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -19,7 +19,7 @@ commands.add_command('report', 'Reports a player', {'player','reason',true}, fun Admin.report(player,event.player_index,reason) end) -commands.add_command('give-warning', 'Gives a player a warnings', {'player','reason',true}, function(event,args) +commands.add_command('give-warning', 'Gives a player a warning', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -27,7 +27,7 @@ commands.add_command('give-warning', 'Gives a player a warnings', {'player','rea Admin.give_warning(player,event.player_index,reason) end) -commands.add_command('temp-ban', 'Temp Ban A Player', {'player','reason',true}, function(event,args) +commands.add_command('temp-ban', 'Temp ban a player', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -42,16 +42,16 @@ commands.add_command('clear-warings', 'Clears the warnings on a player', {'playe Admin.clear_warings(player,event.player_index) end) -commands.add_command('clear-reports', 'Clears the reports from a player', {'player'}, function(event,args) +commands.add_command('clear-reports', 'Clears the reports on a player', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_reports(player,event.player_index) end) -commands.add_command('clear-player', 'Clears reports and reports and removes temp-ban', {'player'}, function(event,args) +commands.add_command('clear-player', 'Clears reports and warnings and removes temp-ban', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_player(player,event.player_index) -end) \ No newline at end of file +end) From 0635ca75919bbb237515c8c2f3200fbd03da470c Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:37:28 -0500 Subject: [PATCH 2/9] Update admin.lua --- Addons/Commands/admin.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 637d425f..993cc6a9 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -49,7 +49,7 @@ commands.add_command('clear-reports', 'Clears the reports on a player', {'player Admin.clear_reports(player,event.player_index) end) -commands.add_command('clear-player', 'Clears reports and warnings and removes temp-ban', {'player'}, function(event,args) +commands.add_command('clear-player', 'Clears reports and warnings, and removes temp-ban', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end From deeec002418eb20736ca6cface164c5069a9176b Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:37:56 -0500 Subject: [PATCH 3/9] Update kill.lua --- Addons/Commands/kill.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Commands/kill.lua b/Addons/Commands/kill.lua index 6d68f03b..08b190a3 100644 --- a/Addons/Commands/kill.lua +++ b/Addons/Commands/kill.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -commands.add_command('kill', 'Kills a player, must be either yourself (/kill self) or a person of a lower rank.', {'player'}, function(event,args) +commands.add_command('kill', 'Kills a player. Must be either yourself (/kill self) or a person of a lower rank.', {'player'}, function(event,args) local _player = Game.get_player(event) local player = Game.get_player(args.player) if args.player ~= 'self' and not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -18,4 +18,4 @@ commands.add_command('kill', 'Kills a player, must be either yourself (/kill sel if player.connected then else player_return({'commands.offline-player'}) return commands.error end if player.character then player.character.die() else player_return({'commands.dead-player'}) return commands.error end else player_return({'commands.unauthorized'}) return commands.error end -end) \ No newline at end of file +end) From af6c28da604a41d1077fedb2929fba9802d5743f Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:39:03 -0500 Subject: [PATCH 4/9] Update tags.lua --- Addons/Commands/tags.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Addons/Commands/tags.lua b/Addons/Commands/tags.lua index 6f4d3297..ee210800 100644 --- a/Addons/Commands/tags.lua +++ b/Addons/Commands/tags.lua @@ -11,14 +11,14 @@ Discord: https://discord.gg/r6dC2uK local const = 20 -- this is the max lenth of a tag -commands.add_command('tag', 'Give yourself a custom tag, use /tag-clear self, to remove tag.', {'tag',true}, function(event,args) +commands.add_command('tag', 'Give yourself a custom tag. Use /tag-clear self to remove tag.', {'tag',true}, function(event,args) local player = Game.get_player(event) local rank = Ranking.get_rank(player) if string.len(args.tag) > const then player_return({'commands.invalid-length',const}) return commands.error end player.tag = rank.tag..' - '..args.tag end) -commands.add_command('tag-clear', 'Removes a custom tag. Player can be self (/tag-clear self)', {'player'}, function(event,args) +commands.add_command('tag-clear', 'Removes a custom tag. Player can be self (/tag-clear self).', {'player'}, function(event,args) local _player = Game.get_player(event) local _rank = Ranking.get_rank(_player) local player = Game.get_player(args.player) @@ -27,4 +27,4 @@ commands.add_command('tag-clear', 'Removes a custom tag. Player can be self (/ta if args.player == 'self' or _player.name == player.name then _player.tag = _rank.tag elseif _rank.power < rank.power then player.tag = rank.tag else player_return({'commands.unauthorized'}) return commands.error end -end) \ No newline at end of file +end) From 2ac3c6bdc9bd8ddbee8d3e0e3e71619fb6e03fb3 Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:40:19 -0500 Subject: [PATCH 5/9] Update repair.lua --- Addons/Commands/repair.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Commands/repair.lua b/Addons/Commands/repair.lua index 961f59a5..1670110d 100644 --- a/Addons/Commands/repair.lua +++ b/Addons/Commands/repair.lua @@ -11,7 +11,7 @@ Discord: https://discord.gg/r6dC2uK local const = 100 -- given const = 100: admin+ has unlimited, admin has 100, mod has 50, member has 20 -commands.add_command('repair', 'Repairs all destoryed and damaged entites in an area', {'range'}, function(event,args) +commands.add_command('repair', 'Repairs all destoryed and damaged entites in an area.', {'range'}, function(event,args) local range = tonumber(args.range) local player = Game.get_player(event) local rank = Ranking.get_rank(player) @@ -27,4 +27,4 @@ commands.add_command('repair', 'Repairs all destoryed and damaged entites in an end end end -end) \ No newline at end of file +end) From a58a5e47dbda2af4ebf951909492210cd53355ac Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:41:06 -0500 Subject: [PATCH 6/9] Update admin.lua --- Addons/Commands/admin.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Addons/Commands/admin.lua b/Addons/Commands/admin.lua index 993cc6a9..d2fd7dca 100644 --- a/Addons/Commands/admin.lua +++ b/Addons/Commands/admin.lua @@ -8,7 +8,7 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -commands.add_command('report', 'Reports a player', {'player','reason',true}, function(event,args) +commands.add_command('report', 'Reports a player.', {'player','reason',true}, function(event,args) local _player = Game.get_player(event) local player = Game.get_player(args.player) local reason = args.reason @@ -19,7 +19,7 @@ commands.add_command('report', 'Reports a player', {'player','reason',true}, fun Admin.report(player,event.player_index,reason) end) -commands.add_command('give-warning', 'Gives a player a warning', {'player','reason',true}, function(event,args) +commands.add_command('give-warning', 'Gives a player a warning.', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -27,7 +27,7 @@ commands.add_command('give-warning', 'Gives a player a warning', {'player','reas Admin.give_warning(player,event.player_index,reason) end) -commands.add_command('temp-ban', 'Temp ban a player', {'player','reason',true}, function(event,args) +commands.add_command('temp-ban', 'Temporarily ban a player.', {'player','reason',true}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end @@ -35,21 +35,21 @@ commands.add_command('temp-ban', 'Temp ban a player', {'player','reason',true}, Admin.temp_ban(player,event.player_index,reason) end) -commands.add_command('clear-warings', 'Clears the warnings on a player', {'player'}, function(event,args) +commands.add_command('clear-warings', 'Clears the warnings on a player.', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_warings(player,event.player_index) end) -commands.add_command('clear-reports', 'Clears the reports on a player', {'player'}, function(event,args) +commands.add_command('clear-reports', 'Clears the reports on a player.', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.clear_reports(player,event.player_index) end) -commands.add_command('clear-player', 'Clears reports and warnings, and removes temp-ban', {'player'}, function(event,args) +commands.add_command('clear-player', 'Clears reports and warnings, and removes temp-ban.', {'player'}, function(event,args) local player = Game.get_player(args.player) local reason = args.reason if not player then player_return({'commands.invalid-player',args.player}) return commands.error end From 72ec302a6fbd73f736dadcc7b7c66e0326a7a7ad Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:41:19 -0500 Subject: [PATCH 7/9] Update cheat-mode.lua --- Addons/Commands/cheat-mode.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Commands/cheat-mode.lua b/Addons/Commands/cheat-mode.lua index a53ac99d..693255ab 100644 --- a/Addons/Commands/cheat-mode.lua +++ b/Addons/Commands/cheat-mode.lua @@ -8,8 +8,8 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -commands.add_command('cheat-mode', 'Toggles cheat mode for a player', {'player'}, function(event,args) +commands.add_command('cheat-mode', 'Toggles cheat mode for a player.', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if player.cheat_mode == true then player.cheat_mode = false else player.cheat_mode = true end -end) \ No newline at end of file +end) From 951c68707979bdddb8a0b7ca894bd9732f27ec0b Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:41:39 -0500 Subject: [PATCH 8/9] Update tp.lua --- Addons/Commands/tp.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Addons/Commands/tp.lua b/Addons/Commands/tp.lua index fdd4a74b..94be1a33 100644 --- a/Addons/Commands/tp.lua +++ b/Addons/Commands/tp.lua @@ -8,14 +8,14 @@ Discord: https://discord.gg/r6dC2uK ]] --Please Only Edit Below This Line----------------------------------------------------------- -commands.add_command('go-to', 'Go to a player\'s location', {'player'}, function(event,args) +commands.add_command('go-to', 'Go to a player\'s location.', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.go_to(player,event) end) -commands.add_command('bring', 'Bring a player to your location', {'player'}, function(event,args) +commands.add_command('bring', 'Bring a player to your location.', {'player'}, function(event,args) local player = Game.get_player(args.player) if not player then player_return({'commands.invalid-player',args.player}) return commands.error end Admin.bring(player,event) -end) \ No newline at end of file +end) From 48f9dad847f2ef5525ac9f9035503f468e63cbc2 Mon Sep 17 00:00:00 2001 From: Jonathan Baumgardner Date: Mon, 12 Mar 2018 22:45:55 -0500 Subject: [PATCH 9/9] Update reports.lua --- Addons/Admin/reports.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Addons/Admin/reports.lua b/Addons/Admin/reports.lua index a366d1e4..e6420b86 100644 --- a/Addons/Admin/reports.lua +++ b/Addons/Admin/reports.lua @@ -100,7 +100,7 @@ local function cheak_reports(player) local reports = count_reports(player) if reports >= reports_needed_for_jail and _reports().actions[player.name] ~= 'report-jail' and Ranking.get_rank(player).group.name ~= 'Jail' then _reports().actions[player.name] = actions.report - Admin.jail(player,'','To many user reports. Contact an Admin to be unjailed.') + Admin.jail(player,'','Too many user reports. Contact an Admin to be unjailed.') end end @@ -177,7 +177,7 @@ function Admin.clear_warings(player,by_player,no_emit) discord_emit{ title='Player Clear', color=Color.to_hex(defines.text_color.low), - description='A player had there warnings cleared.', + description='A player had their warnings cleared.', ['Player:']='<>'..player.name, ['By:']='<>'..by_player_name, } @@ -193,7 +193,7 @@ function Admin.clear_reports(player,by_player,no_emit) discord_emit{ title='Player Clear', color=Color.to_hex(defines.text_color.low), - description='A player had there reports cleared.', + description='A player had their reports cleared.', ['Player:']='<>'..player.name, ['By:']='<>'..by_player_name, } @@ -210,7 +210,7 @@ function Admin.clear_player(player,by_player) discord_emit{ title='Player Clear', color=Color.to_hex(defines.text_color.low), - description='A player had there reports and warnings cleared.', + description='A player had their reports and warnings cleared.', ['Player:']='<>'..player.name, ['By:']='<>'..by_player_name, } @@ -273,4 +273,4 @@ Event.register(defines.events.on_tick,function(event) end end end -end) \ No newline at end of file +end)