From 04c78f0886fcc49c6a145c2b79ca59850961ffe7 Mon Sep 17 00:00:00 2001 From: Timo Smit Date: Sat, 21 Jan 2017 18:04:31 +0100 Subject: [PATCH] Fixed !stats command on legacymod (refs #46) --- luamods/wolfadmin/commands/admin/stats.lua | 40 ++++++++++++++-------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/luamods/wolfadmin/commands/admin/stats.lua b/luamods/wolfadmin/commands/admin/stats.lua index 51cc806..a6cf7d9 100644 --- a/luamods/wolfadmin/commands/admin/stats.lua +++ b/luamods/wolfadmin/commands/admin/stats.lua @@ -16,9 +16,11 @@ -- along with this program. If not, see . local auth = require (wolfa_getLuaPath()..".auth.auth") -local util = require (wolfa_getLuaPath()..".util.util") + local commands = require (wolfa_getLuaPath()..".commands.commands") +local util = require (wolfa_getLuaPath()..".util.util") + function commandShowStats(clientId, cmdArguments) if cmdArguments[1] == nil then et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dstats usage: "..commands.getadmin("stats")["syntax"].."\";") @@ -41,24 +43,32 @@ function commandShowStats(clientId, cmdArguments) end local stats = { - ["name"] = et.gentity_get(cmdClient, "pers.netname"), - ["cleanname"] = et.gentity_get(cmdClient, "pers.netname"):gsub("%^[^^]", ""), - ["codedsname"] = et.gentity_get(cmdClient, "pers.netname"):gsub("%^([^^])", "^^2%1"), - ["slot"] = cmdClient, + ["name"] = et.gentity_get(cmdClient, "pers.netname"), + ["cleanname"] = et.gentity_get(cmdClient, "pers.netname"):gsub("%^[^^]", ""), + ["codedsname"] = et.gentity_get(cmdClient, "pers.netname"):gsub("%^([^^])", "^^2%1"), + ["slot"] = cmdClient, ["team"] = et.gentity_get(cmdClient, "sess.sessionTeam"), - ["class"] = et.gentity_get(cmdClient, "sess.playerType"), + ["class"] = et.gentity_get(cmdClient, "sess.playerType"), ["health"] = et.gentity_get(cmdClient, "health"), ["kills"] = et.gentity_get(cmdClient, "sess.kills"), - ["teamkills"] = et.gentity_get(cmdClient, "sess.team_kills"), - ["totalkills"] = et.gentity_get(cmdClient, "sess.kills") + et.gentity_get(cmdClient, "sess.team_kills"), - ["damage"] = et.gentity_get(cmdClient, "sess.damage_given"), - ["damagereceived"] = et.gentity_get(cmdClient, "sess.damage_received"), - ["teamdamage"] = et.gentity_get(cmdClient, "sess.team_damage"), - -- ["teamdamagereceived"] = et.gentity_get(cmdClient, "sess.team_received"), -- ETPro only - ["totaldamage"] = et.gentity_get(cmdClient, "sess.damage_given") + et.gentity_get(cmdClient, "sess.team_damage"), - ["deaths"] = et.gentity_get(cmdClient, "sess.deaths"), - ["suicides"] = et.gentity_get(cmdClient, "sess.suicides") + ["teamkills"] = et.gentity_get(cmdClient, "sess.team_kills"), + ["totalkills"] = et.gentity_get(cmdClient, "sess.kills") + et.gentity_get(cmdClient, "sess.team_kills"), + ["damage"] = et.gentity_get(cmdClient, "sess.damage_given"), + ["damagereceived"] = et.gentity_get(cmdClient, "sess.damage_received"), + ["deaths"] = et.gentity_get(cmdClient, "sess.deaths") } + + if et.trap_Cvar_Get("fs_game") == "legacy" then + stats["teamdamage"] = et.gentity_get(cmdClient, "sess.team_damage_given") + stats["totaldamage"] = et.gentity_get(cmdClient, "sess.damage_given") + et.gentity_get(cmdClient, "sess.team_damage_given") + stats["suicides"] = et.gentity_get(cmdClient, "sess.self_kills") + elseif settings.get("fs_game") == "etpro" then + stats["teamdamagereceived"] = et.gentity_get(cmdClient, "sess.team_received") -- ETPro only + else + stats["teamdamage"] = et.gentity_get(cmdClient, "sess.team_damage") + stats["totaldamage"] = et.gentity_get(cmdClient, "sess.damage_given") + et.gentity_get(cmdClient, "sess.team_damage") + stats["suicides"] = et.gentity_get(cmdClient, "sess.suicides") + end if stats["totalkills"] == 0 then stats["totalkills"] = 1 end if stats["totaldamage"] == 0 then stats["totaldamage"] = 1 end