From 86cb53e185be1bc47af0e3de9b9151ef3fee9e50 Mon Sep 17 00:00:00 2001 From: ClobberXD Date: Mon, 31 Dec 2018 22:30:52 +0530 Subject: [PATCH] Handle kill weapon type in ctf_events instead of ctf_pvp_engine --- mods/ctf_events/init.lua | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mods/ctf_events/init.lua b/mods/ctf_events/init.lua index e81bd8e..773c159 100644 --- a/mods/ctf_events/init.lua +++ b/mods/ctf_events/init.lua @@ -151,7 +151,20 @@ function ctf_events.update_all() end end -ctf.register_on_killedplayer(function(victim, killer, type) +ctf.register_on_killedplayer(function(victim, killer, stack) + local sname = stack:get_name() + local tool_caps = stack:get_tool_capabilities() + local type = "sword" + if sname:sub(1, 8) == "shooter:" then + if sname == "shooter:grenade" then + type = "grenade" + else + type = "bullet" + end + end + if tool_caps.damage_groups.grenade then + type = "grenade" + end ctf_events.post("kill_" .. type, killer, victim) ctf_events.update_all() end)