Merge branch 'master' of https://github.com/MT-CTF/capturetheflag
Conflicts: mods/ctf/ctf_map/ctf_map_core/chest.lua mods/ctf/ctf_stats/init.lua
This commit is contained in:
commit
9de5000fb8
2 changed files with 6 additions and 1 deletions
|
@ -49,7 +49,7 @@ local function check_grapple(itemname)
|
||||||
on_use = function(itemstack, user, ...)
|
on_use = function(itemstack, user, ...)
|
||||||
if not ctf_classes.get(user).properties.allow_grapples then
|
if not ctf_classes.get(user).properties.allow_grapples then
|
||||||
minetest.chat_send_player(user:get_player_name(),
|
minetest.chat_send_player(user:get_player_name(),
|
||||||
"Your class can't use that weapon! Change your class at spawn")
|
"Your class can't use that weapon! Change your class at base")
|
||||||
|
|
||||||
return itemstack
|
return itemstack
|
||||||
end
|
end
|
||||||
|
|
|
@ -246,6 +246,11 @@ minetest.register_chatcommand("makepro", {
|
||||||
modified = true
|
modified = true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if stats.captures < 10 then
|
||||||
|
stats.captures = 10
|
||||||
|
modified = true
|
||||||
|
end
|
||||||
|
|
||||||
if modified then
|
if modified then
|
||||||
ctf_stats.request_save()
|
ctf_stats.request_save()
|
||||||
return true, "Made " .. param .. " a pro!"
|
return true, "Made " .. param .. " a pro!"
|
||||||
|
|
Loading…
Reference in a new issue