aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-30 20:41:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Added cant-report-ban to admin commands

Browse Source
This commit is contained in:
Cooldude2606
2018-04-27 17:14:18 +01:00
parent 7d760ceb57
commit 12e0f3adc7
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Addons/Commands/admin.lua
View File

@@ -13,7 +13,8 @@ commands.add_command('report', 'Reports a player.', {'player','reason',true}, fu
local player = Game.get_player(args.player) local player = Game.get_player(args.player)
local reason = args.reason local reason = args.reason
if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if not player then player_return({'commands.invalid-player',args.player}) return commands.error end
if Ranking.get_rank(player):allowed('no-report') or Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end
if Ranking.get_rank(player):allowed('no-report') then player_return({'reports.cant-report',args.player}) return commands.error end
for _,report in pairs(global.addons.reports.reports) do if report[1] == _player.name then player_return({'reports.cant-report',args.player}) return commands.error end end for _,report in pairs(global.addons.reports.reports) do if report[1] == _player.name then player_return({'reports.cant-report',args.player}) return commands.error end end
for _,report in pairs(global.addons.reports.varified) do if report[1] == _player.name then player_return({'reports.cant-report',args.player}) return commands.error end end for _,report in pairs(global.addons.reports.varified) do if report[1] == _player.name then player_return({'reports.cant-report',args.player}) return commands.error end end
Admin.report(player,event.player_index,reason) Admin.report(player,event.player_index,reason)
@@ -23,7 +24,8 @@ commands.add_command('warn', 'Gives a player a warnings', {'player','reason',tru
local player = Game.get_player(args.player) local player = Game.get_player(args.player)
local reason = args.reason local reason = args.reason
if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if not player then player_return({'commands.invalid-player',args.player}) return commands.error end
if Ranking.get_rank(player):allowed('no-report') or Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end
if Ranking.get_rank(player):allowed('no-report') then player_return({'reports.cant-report',args.player}) return commands.error end
Admin.give_warning(player,event.player_index,reason) Admin.give_warning(player,event.player_index,reason)
end) end)
@@ -31,13 +33,15 @@ commands.add_command('jail', 'Jails a player', {'player','reason',true}, functio
local player = Game.get_player(args.player) local player = Game.get_player(args.player)
local reason = args.reason local reason = args.reason
if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if not player then player_return({'commands.invalid-player',args.player}) return commands.error end
if Ranking.get_rank(player):allowed('no-report') or Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end if Ranking.get_rank(player):allowed('no-report') then player_return({'reports.cant-report',args.player}) return commands.error end
if Admin.is_banned(player) then player_return({'commands.cant-report-ban',args.player}) return commands.error end
Admin.jail(player,event.player_index,reason) Admin.jail(player,event.player_index,reason)
end) end)
commands.add_command('unjail', 'Returns the players old rank', {'player',true}, function(event,args) commands.add_command('unjail', 'Returns the players old rank', {'player',true}, function(event,args)
local player = Game.get_player(args.player) local player = Game.get_player(args.player)
if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if not player then player_return({'commands.invalid-player',args.player}) return commands.error end
if Admin.is_banned(player) then player_return({'commands.cant-report-ban',args.player}) return commands.error end
Ranking.revert(player,event.player_index) Ranking.revert(player,event.player_index)
end) end)
@@ -45,25 +49,28 @@ commands.add_command('temp-ban', 'Temporarily ban a player.', {'player','reason'
local player = Game.get_player(args.player) local player = Game.get_player(args.player)
local reason = args.reason local reason = args.reason
if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if not player then player_return({'commands.invalid-player',args.player}) return commands.error end
if Admin.is_banned(player) then player_return({'reports.cant-report',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end
Admin.temp_ban(player,event.player_index,reason) Admin.temp_ban(player,event.player_index,reason)
end) end)
commands.add_command('clear-inv', 'Clears the player\'s invetory', {'player'}, function(event,args) commands.add_command('clear-inv', 'Clears the player\'s invetory', {'player'}, function(event,args)
local player = Game.get_player(args.player) local player = Game.get_player(args.player)
if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if not player then player_return({'commands.invalid-player',args.player}) return commands.error end
if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end
Admin.move_inventory(player) Admin.move_inventory(player)
end) 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 player = Game.get_player(args.player)
if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if not player then player_return({'commands.invalid-player',args.player}) return commands.error end
if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end
Admin.clear_warings(player,event.player_index) Admin.clear_warings(player,event.player_index)
end) 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 player = Game.get_player(args.player)
if not player then player_return({'commands.invalid-player',args.player}) return commands.error end if not player then player_return({'commands.invalid-player',args.player}) return commands.error end
if Admin.is_banned(player) then player_return({'reports.cant-report-ban',args.player}) return commands.error end
Admin.clear_reports(player,event.player_index) Admin.clear_reports(player,event.player_index)
end) end)

1
locale/en/reports.cfg
View File

@@ -3,6 +3,7 @@ name=Report Player
low-print=__1__ has been reported by a user for: __2__ low-print=__1__ has been reported by a user for: __2__
high-print=__1__ has been reported by __2__ for: __3__ high-print=__1__ has been reported by __2__ for: __3__
cant-report=This player can not be reported. cant-report=This player can not be reported.
cant-report-ban=Invalid player as player is banned; Either unban or use /clear-all <player_name>
warning-given-by=This warning was given by: __1__ warning-given-by=This warning was given by: __1__
player-warning=__1__ was given a warning by __2__ for: __3__ player-warning=__1__ was given a warning by __2__ for: __3__
temp-ban=__1__ was temporary banned by __2__ and will remain in jail until next reset temp-ban=__1__ was temporary banned by __2__ and will remain in jail until next reset