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 
 Conflicts:
	mods/ctf/ctf_map/ctf_map_core/chest.lua
	mods/other/random_messages/init.lua
This commit is contained in:
philipmi 2021-02-25 21:10:28 +01:00
commit 90a5f37496
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mods/ctf/ctf_inventory/init.lua
View file

@ -1,4 +1,4 @@
local color = "#66A0FF" color = "#66A0FF"
local items = { local items = {
"", "",
color .. "Game Play", color .. "Game Play",
@ -10,8 +10,8 @@ local items = {
"* Use medkits to replenish health gradually.", "* Use medkits to replenish health gradually.",
"* Gain more score by killing more than you die, or by capturing the flag.", "* Gain more score by killing more than you die, or by capturing the flag.",
"* Players are immune for 5 seconds after they respawn.", "* Players are immune for 5 seconds after they respawn.",
"* Access the pro section of the chest by achieving a 2k+ score and", "* Access the pro section of the chest by achieving 2k+ score,",
" killing 2 people for every death.", " killing 3 people for every 2 deaths, and capturing the flag at least 10 times",
"", "",
color .. "Team Co-op", color .. "Team Co-op",
@ -30,7 +30,12 @@ local items = {
color .. "Contact Moderators", color .. "Contact Moderators",
"", "",
"* Report people who sabotage using /report." "* Report people using /report or the #reports channel in Discord",
"",
color .. "Other",
"",
"* Capture The Flag Discord: https://discord.gg/vcZTRPX",
} }
for i = 1, #items do for i = 1, #items do
items[i] = minetest.formspec_escape(items[i]) items[i] = minetest.formspec_escape(items[i])

2
mods/ctf/ctf_map/ctf_map_core/chest.lua
View file

@ -100,7 +100,7 @@ for _, chest_color in pairs(colors) do
"label[5,-0.2;" .. "label[5,-0.2;" ..
minetest.formspec_escape("Pro players only") .. "]" minetest.formspec_escape("Pro players only") .. "]"
else else
formspec = formspec .. "label[4.5,2.75;" .. formspec = formspec .. "label[4.75,3;" ..
minetest.formspec_escape("You need at least 10000" .. minetest.formspec_escape("You need at least 10000" ..
"\nscore and 1.3+ KD, 10+\ncaptures and a Capture\nRate of at least 33%" .. "\nscore and 1.3+ KD, 10+\ncaptures and a Capture\nRate of at least 33%" ..
"\nto access the pro section") .. "]" "\nto access the pro section") .. "]"