minetest/capturetheflag
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MT-CTF/capturetheflag

Browse source
This commit is contained in:
philipmi 2021-02-09 21:34:41 +01:00
commit 03767c1dc5
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mods/ctf/ctf_map/ctf_map_core/maps

@ -1 +1 @@
Subproject commit 2b22d20362200b5be13e7c5174637842e827efd1 Subproject commit ad7dad2eea79939c5ef85572bc9842ffb00bda7e

2
mods/ctf/ctf_match/vote.lua
View file

@ -82,5 +82,5 @@ ctf_match.register_on_build_time_end(function()
can_skip = true can_skip = true
matchskip_timer = 0 matchskip_timer = 0
-- Set to initial vote time -- 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) end)

2
mods/pvp/kill_assist/init.lua
View file

@ -38,7 +38,7 @@ function kill_assist.reward_assists(victim, killer, reward)
local color = "0x00FFFF" local color = "0x00FFFF"
if name ~= killer then if name ~= killer then
standard = 0.5 standard = 0.3
help_percent = math.min(help_percent, 0.75) help_percent = math.min(help_percent, 0.75)
else else
help_percent = math.min(help_percent, 1) help_percent = math.min(help_percent, 1)