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-04-24 21:33:30 +02:00
commit 67214a79ab
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mods/ctf/ctf_bounties/init.lua
View file

@ -2,7 +2,11 @@ local bountied_player = nil
local bounty_score = 0 local bounty_score = 0
local function announce(name) local function announce(name)
local tcolor = ctf_colors.get_color(ctf.player(bountied_player)) local bountied = ctf.player(bountied_player)
if ctf.player(name).team == bountied.team then
return
end
local tcolor = ctf_colors.get_color(bountied)
minetest.chat_send_player(name, minetest.chat_send_player(name,
minetest.colorize("#fff326", "The next person to kill ") .. minetest.colorize("#fff326", "The next person to kill ") ..
minetest.colorize(tcolor.css, bountied_player) .. minetest.colorize(tcolor.css, bountied_player) ..
@ -14,10 +18,7 @@ end
local function announce_all() local function announce_all()
if bountied_player then if bountied_player then
for _, player in pairs(minetest.get_connected_players()) do for _, player in pairs(minetest.get_connected_players()) do
local pname = player:get_player_name() announce(player:get_player_name())
if ctf.player(pname).team ~= ctf.player(bountied_player).team then
announce(pname)
end
end end
end end
end end

3
mods/ctf/ctf_chat/init.lua
View file

@ -248,6 +248,9 @@ minetest.register_chatcommand("t", {
minetest.chat_send_player(name, "The team channel is disabled.") minetest.chat_send_player(name, "The team channel is disabled.")
return return
end end
if param == "" then
return false, "-!- Empty team message, see /help t"
end
local tname = ctf.player(name).team local tname = ctf.player(name).team
local team = ctf.team(tname) local team = ctf.team(tname)

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

@ -33,10 +33,12 @@ function ctf_match.vote_next(name)
minetest.chat_send_all("Vote to skip match passed, " .. minetest.chat_send_all("Vote to skip match passed, " ..
#results.yes .. " to " .. #results.no) #results.yes .. " to " .. #results.no)
can_vote_skip = false if can_vote_skip then
voted_skip = true can_vote_skip = false
if flags_hold <= 0 then voted_skip = true
skip() if flags_hold <= 0 then
skip()
end
end end
else else
minetest.chat_send_all("Vote to skip match failed, " .. minetest.chat_send_all("Vote to skip match failed, " ..