diff --git a/mods/ctf/ctf_map/ctf_map_core/maps b/mods/ctf/ctf_map/ctf_map_core/maps index 2b22d20..ad7dad2 160000 --- a/mods/ctf/ctf_map/ctf_map_core/maps +++ b/mods/ctf/ctf_map/ctf_map_core/maps @@ -1 +1 @@ -Subproject commit 2b22d20362200b5be13e7c5174637842e827efd1 +Subproject commit ad7dad2eea79939c5ef85572bc9842ffb00bda7e diff --git a/mods/ctf/ctf_match/vote.lua b/mods/ctf/ctf_match/vote.lua index 743ba8d..c2738f4 100644 --- a/mods/ctf/ctf_match/vote.lua +++ b/mods/ctf/ctf_match/vote.lua @@ -82,5 +82,5 @@ ctf_match.register_on_build_time_end(function() can_skip = true matchskip_timer = 0 -- Set to initial vote time - matchskip_time = tonumber(minetest.settings:get("ctf_match.auto_skip_delay")) or 60 * 60 + matchskip_time = tonumber(minetest.settings:get("ctf_match.auto_skip_delay")) or 50 * 60 end) diff --git a/mods/pvp/kill_assist/init.lua b/mods/pvp/kill_assist/init.lua index 166daa0..7cabbb0 100644 --- a/mods/pvp/kill_assist/init.lua +++ b/mods/pvp/kill_assist/init.lua @@ -38,7 +38,7 @@ function kill_assist.reward_assists(victim, killer, reward) local color = "0x00FFFF" if name ~= killer then - standard = 0.5 + standard = 0.3 help_percent = math.min(help_percent, 0.75) else help_percent = math.min(help_percent, 1)