From f786784ba8cc2a641f0bcac5261f78752d58e928 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 9 Feb 2021 07:51:01 -0800 Subject: [PATCH 1/3] Update Maps Submodule (#787) Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps) from `2b22d20` to `ad7dad2`. - [Release notes](https://github.com/MT-CTF/maps/releases) - [Commits](https://github.com/MT-CTF/maps/compare/2b22d20362200b5be13e7c5174637842e827efd1...ad7dad2eea79939c5ef85572bc9842ffb00bda7e) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- mods/ctf/ctf_map/ctf_map_core/maps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 17278e22a44293bb18563059d21ce9d302b74127 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Tue, 9 Feb 2021 09:42:23 -0800 Subject: [PATCH 2/3] Reduce initial autovote delay to 50+ minutes --- mods/ctf/ctf_match/vote.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 4e3844bd0043880108332e1ecba693249c1591af Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Tue, 9 Feb 2021 12:10:35 -0800 Subject: [PATCH 3/3] Fix kill_assist percentage --- mods/pvp/kill_assist/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)