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

Minor bug fixes

Browse Source
This commit is contained in:
Cooldude2606
2019-05-26 15:32:52 +01:00
parent 7079f84a68
commit 6432326b1b
31 changed files with 130 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/commands/jail.lua
View File

@@ -1,7 +1,7 @@
local Commands = require 'expcore.commands'
local JailControl = require 'modules.addons.jail-control'
local format_chat_player_name = ext_require('expcore.common','format_chat_player_name')
require 'config.command_parse_roles'
require 'config.expcore-commands.parse_roles'
Commands.new_command('jail','Puts a player into jail and removes all other roles.')
:add_param('player',false,'player-role')
@@ -12,9 +12,9 @@ Commands.new_command('jail','Puts a player into jail and removes all other roles
local action_player_name_color = format_chat_player_name(action_player)
local by_player_name_color = format_chat_player_name(player)
if JailControl.jail_player(action_player,player.name) then
game.print{'exp-commands.jail-give',action_player_name_color,by_player_name_color,reason}
game.print{'expcom-jail.give',action_player_name_color,by_player_name_color,reason}
else
return Commands.error{'exp-commands.jail-already-jailed',action_player_name_color}
return Commands.error{'expcom-jail.already-jailed',action_player_name_color}
end
end)
@@ -26,9 +26,9 @@ Commands.new_command('unjail','Puts a player into jail and removes all other rol
local action_player_name_color = format_chat_player_name(action_player)
local by_player_name_color = format_chat_player_name(player)
if JailControl.unjail_player(action_player,player.name) then
game.print{'exp-commands.jail-remove',action_player_name_color,by_player_name_color}
game.print{'expcom-jail.remove',action_player_name_color,by_player_name_color}
else
return Commands.error{'exp-commands.jail-not-jailed',action_player_name_color}
return Commands.error{'expcom-jail.not-jailed',action_player_name_color}
end
end)
@@ -40,9 +40,9 @@ Commands.new_command('temp-ban','Temp bans a player until the next reset; this r
local action_player_name_color = format_chat_player_name(action_player)
local by_player_name_color = format_chat_player_name(player)
if JailControl.temp_ban_player(action_player,player.name,reason) then
game.print{'exp-commands.jail-temp-ban',action_player_name_color,by_player_name_color,reason}
game.print{'expcom-jail.temp-ban',action_player_name_color,by_player_name_color,reason}
else
return Commands.error{'exp-commands.jail-already-banned',action_player_name_color}
return Commands.error{'expcom-jail.already-banned',action_player_name_color}
end
end)
@@ -54,8 +54,8 @@ Commands.new_command('clear-temp-ban','Removes temp ban from a player; this will
local action_player_name_color = format_chat_player_name(action_player)
local by_player_name_color = format_chat_player_name(player)
if JailControl.clear_temp_ban_player(action_player,player.name) then
game.print{'exp-commands.jail-temp-ban-clear',action_player_name_color,by_player_name_color}
game.print{'expcom-jail.temp-ban-clear',action_player_name_color,by_player_name_color}
else
return Commands.error{'exp-commands.jail-not-temp-banned',action_player_name_color}
return Commands.error{'expcom-jail.not-temp-banned',action_player_name_color}
end
end)