etlegacy/wolfadmin
0
0
Fork 0
mirror of https://github.com/etlegacy/wolfadmin.git synced 2024-11-24 21:21:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Parametrized !shuffle command (fixes #101)

Browse source
This commit is contained in:
Timo Smit 2019-03-25 18:55:38 +01:00
parent 30dd74965d
commit 2bef5f87db
2 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
luascripts/wolfadmin/commands/admin/shuffle.lua
View file

@ -19,11 +19,29 @@ local auth = wolfa_requireModule("auth.auth")
local commands = wolfa_requireModule("commands.commands") local commands = wolfa_requireModule("commands.commands")
local settings = wolfa_requireModule("util.settings") local settings = wolfa_requireModule("util.settings")
function commandShuffle(clientId, command) function commandShuffle(clientId, command, type)
et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dshuffle: ^9teams were shuffled by XP.\";") if type == "xp" then
et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dshuffle: ^9teams were shuffled by XP.\";")
et.trap_SendConsoleCommand(et.EXEC_APPEND, "shuffle_teams") et.trap_SendConsoleCommand(et.EXEC_APPEND, "shuffle_teams")
elseif type == "sr" then
et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dshuffle: ^9teams were shuffled by SR.\";")
et.trap_SendConsoleCommand(et.EXEC_APPEND, "shuffle_teams_sr")
elseif type == nil then
if settings.get("fs_game") == "legacy" then
et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dshuffle: ^9teams were shuffled by SR.\";")
et.trap_SendConsoleCommand(et.EXEC_APPEND, "shuffle_teams_sr")
else
et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dshuffle: ^9teams were shuffled by XP.\";")
et.trap_SendConsoleCommand(et.EXEC_APPEND, "shuffle_teams")
end
else
et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dshuffle usage: "..commands.getadmin("shuffle")["syntax"].."\";")
end
return true return true
end end
commands.addadmin("shuffle", commandShuffle, auth.PERM_SHUFFLE, "shuffle the teams by XP to try and even them", nil, nil, (settings.get("g_standalone") == 0)) commands.addadmin("shuffle", commandShuffle, auth.PERM_SHUFFLE, "shuffle the teams to try and even them", "^2!shuffle ^9(^hxp|sr^9)", nil, (settings.get("g_standalone") == 0))

29
luascripts/wolfadmin/commands/admin/shufflesr.lua
View file

@ -1,29 +0,0 @@
-- WolfAdmin module for Wolfenstein: Enemy Territory servers.
-- Copyright (C) 2015-2019 Timo 'Timothy' Smit
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation, either version 3 of the License, or
-- at your option any later version.
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
local auth = wolfa_requireModule("auth.auth")
local commands = wolfa_requireModule("commands.commands")
local settings = wolfa_requireModule("util.settings")
function commandShuffleSR(clientId, command)
et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dshuffle: ^9teams were shuffled by Skill Rating.\";")
et.trap_SendConsoleCommand(et.EXEC_APPEND, "shuffle_teams_sr")
return true
end
commands.addadmin("shufflesr", commandShuffleSR, auth.PERM_SHUFFLE, "shuffle the teams by Skill Rating to try and even them", nil, nil, (settings.get("fs_game") ~= "legacy"))