diff --git a/mods/apis/mhud b/mods/apis/mhud index 056dbfbe71..1f529c357d 160000 --- a/mods/apis/mhud +++ b/mods/apis/mhud @@ -1 +1 @@ -Subproject commit 056dbfbe71e232927410c1b4d5d3cdfbdc8a74a3 +Subproject commit 1f529c357da5e5e7fdf006a9433becf1ac719e77 diff --git a/mods/ctf/ctf_modebase/features.lua b/mods/ctf/ctf_modebase/features.lua index 21f5d721bb..4d6e9255be 100644 --- a/mods/ctf/ctf_modebase/features.lua +++ b/mods/ctf/ctf_modebase/features.lua @@ -173,14 +173,18 @@ local teams_left local function calculate_killscore(player) local match_rank = recent_rankings.players()[player] or {} - local kd = (match_rank.kills or 1) / (match_rank.deaths or 1) - local flag_multiplier = 1 + local kills = (match_rank.kills or 1) + (match_rank.kill_assists or 0) / 4 + local deaths = match_rank.deaths or 1 + local kd = kills / deaths + local hd = (match_rank.hp_healed or 1) / deaths + local flag_multiplier = 1 for tname, carrier in pairs(ctf_modebase.flag_taken) do if carrier.p == player then flag_multiplier = flag_multiplier * 2 end end - return math.max(1, math.round(kd * 7 * flag_multiplier)) + + return math.max(1, math.round(kd * 7), math.round(hd * 0.12)) * flag_multiplier end local damage_group_textures = {