Award kill to attacker if victim leaves/suicides (#679)

* Award kill to attacker if player leaves/suicides

* Fix death check

* Prevent immune players from entering combat

mods/ctf/ctf_events/init.lua

@@ -131,6 +131,12 @@ ctf.register_on_killedplayer(function(victim, killer, stack, tool_caps)
 		type = "bullet"
 	end
 
+	if tool_caps.damage_groups.combat_log then
+		victim = victim .. " (Combat Log)"
+	elseif tool_caps.damage_groups.suicide then
+		victim = victim .. " (Suicide)"
+	end
+
 	ctf_events.post("kill_" .. type, killer, victim)
 	ctf_events.update_all()
 end)

mods/pvp/anticoward/init.lua

@@ -1,4 +1,10 @@
 -- Capture The Flag mod: anticoward
+
+local potential_cowards = {}
+local TIMER_UPDATE_INTERVAL = 2
+local COMBAT_TIMEOUT_TIME = 10
+
+-- Prevent fall damage from killing players
 minetest.register_on_player_hpchange(function(player, hp_change, reason)
 	if reason.type == "fall" and player:get_hp() + hp_change <= 0 then
 		return (-player:get_hp()) + 1
@@ -6,3 +12,136 @@ minetest.register_on_player_hpchange(function(player, hp_change, reason)
 
 	return hp_change
 end, true)
+
+--
+--- Make suicides and combat logs award last puncher with kill
+--
+
+minetest.register_on_punchplayer(function(player, hitter,
+time_from_last_punch, tool_capabilities, dir, damage)
+	if player and hitter then
+		local pname = player:get_player_name()
+		local hname = hitter:get_player_name()
+
+		local to = ctf.player(pname)
+		local from = ctf.player(hname)
+
+		if to.team == from.team and to.team ~= "" and
+				to.team ~= nil and to.name ~= from.name then
+			return
+		end
+
+		if ctf_respawn_immunity.is_immune(player) then
+			return
+		end
+
+		local hp = player:get_hp() - damage
+		if hp <= 0 then
+			if potential_cowards[pname] then
+				player:hud_remove(potential_cowards[pname].hud or 0)
+				potential_cowards[pname] = nil
+			end
+
+			return false
+		end
+
+		if not potential_cowards[pname] then
+			potential_cowards[pname] = {
+				hud = player:hud_add({
+					hud_elem_type = "text",
+					position = {x=1, y=0.3},
+					name = "combat_hud",
+					scale = {x = 2, y = 2},
+					text = "You are in combat. If you leave/suicide your attacker will get the kill",
+					number = 0xff0000,
+					direction = 0,
+					alignment = {x=-1, y=1},
+					size = {x=1},
+					z_index = 100,
+				})
+			}
+			potential_cowards[pname].player = pname
+		end
+
+		potential_cowards[pname].timer = 0
+		potential_cowards[pname].puncher = hname
+		potential_cowards[pname].toolcaps = tool_capabilities
+	end
+end)
+
+minetest.register_on_dieplayer(function(player, reason)
+	local pname = player:get_player_name()
+
+	if reason.type == "node_damage" then
+		if potential_cowards[pname] then
+			local last_attacker = minetest.get_player_by_name(potential_cowards[pname].puncher)
+
+			if not last_attacker then return end
+
+			potential_cowards[pname].toolcaps.damage_groups.suicide = 1
+
+			for i = 1, #ctf.registered_on_killedplayer do
+				ctf.registered_on_killedplayer[i](
+					pname,
+					potential_cowards[pname].puncher,
+					last_attacker:get_wielded_item(),
+					potential_cowards[pname].toolcaps
+				)
+			end
+
+			player:hud_remove(potential_cowards[pname].hud or 0)
+			potential_cowards[pname] = nil
+		end
+	elseif reason.type ~= "punch" then
+		if potential_cowards[pname] then
+			player:hud_remove(potential_cowards[pname].hud or 0)
+			potential_cowards[pname] = nil
+		end
+	end
+end)
+
+minetest.register_on_leaveplayer(function(player)
+	local pname = player:get_player_name()
+
+	if potential_cowards[pname] then
+		local last_attacker = minetest.get_player_by_name(potential_cowards[pname].puncher)
+
+		if not last_attacker then return end
+
+		potential_cowards[pname].toolcaps.damage_groups.combat_log = 1
+
+		for i = 1, #ctf.registered_on_killedplayer do
+			ctf.registered_on_killedplayer[i](
+				pname,
+				potential_cowards[pname].puncher,
+				last_attacker:get_wielded_item(),
+				potential_cowards[pname].toolcaps
+			)
+		end
+
+		potential_cowards[pname] = nil
+	end
+end)
+
+local globtimer = 0
+minetest.register_globalstep(function(dtime)
+	globtimer = globtimer + dtime
+
+	if globtimer >= TIMER_UPDATE_INTERVAL then
+		for k in pairs(potential_cowards) do
+			potential_cowards[k].timer = potential_cowards[k].timer + globtimer
+
+			if potential_cowards[k].timer >= COMBAT_TIMEOUT_TIME then
+				local player = minetest.get_player_by_name(potential_cowards[k].player)
+
+				if player then
+					player:hud_remove(potential_cowards[k].hud or 0)
+				end
+
+				potential_cowards[k] = nil
+			end
+		end
+
+		globtimer = 0
+	end
+end)