diff --git a/mods/capturetheflag/ctf/gui.lua b/mods/capturetheflag/ctf/gui.lua index ad33d2f..23ed81e 100644 --- a/mods/capturetheflag/ctf/gui.lua +++ b/mods/capturetheflag/ctf/gui.lua @@ -248,7 +248,15 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) ctf.team(ctf.players[name].team).data.color = fields.color ctf.save() else - minetest.chat_send_player(name,"Color "..fields.color.." does not exist!") + local colors = "" + for color, code in pairs(ctf.flag_colors) do + if color ~= "" then + color ..= ", " + end + color ..= color + end + minetest.chat_send_player(name,"Color "..fields.color.. + " does not exist! Available: " .. colors) end end return true diff --git a/mods/capturetheflag/ctf/init.lua b/mods/capturetheflag/ctf/init.lua index efd38c1..f7fe39c 100644 --- a/mods/capturetheflag/ctf/init.lua +++ b/mods/capturetheflag/ctf/init.lua @@ -23,9 +23,18 @@ minetest.register_privilege("ctf_admin", { -- Colors ctf.flag_colors = { - red = "0xFF0000", + red = "0xFF0000", + cyan = "0x00FFFF", + blue = "0x0000FF", + purple = "0x800080", + yellow = "0xFFFF00", green = "0x00FF00", - blue = "0x0000FF" + pink = "0xFF00FF", + silver = "0xC0C0C0", + gray = "0x808080", + black = "0x000000", + orange = "0xFFA500", + gold = "0x808000" } -- Modules diff --git a/mods/capturetheflag/ctf_flag/textures/flag_black.png b/mods/capturetheflag/ctf_flag/textures/flag_black.png new file mode 100644 index 0000000..47e9a9a Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_black.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_black2.png b/mods/capturetheflag/ctf_flag/textures/flag_black2.png new file mode 100644 index 0000000..72bacfc Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_black2.png differ diff --git a/mods/capturetheflag/ctf/textures/flag_blue.png b/mods/capturetheflag/ctf_flag/textures/flag_blue.png similarity index 100% rename from mods/capturetheflag/ctf/textures/flag_blue.png rename to mods/capturetheflag/ctf_flag/textures/flag_blue.png diff --git a/mods/capturetheflag/ctf/textures/flag_blue2.png b/mods/capturetheflag/ctf_flag/textures/flag_blue2.png similarity index 100% rename from mods/capturetheflag/ctf/textures/flag_blue2.png rename to mods/capturetheflag/ctf_flag/textures/flag_blue2.png diff --git a/mods/capturetheflag/ctf_flag/textures/flag_cyan.png b/mods/capturetheflag/ctf_flag/textures/flag_cyan.png new file mode 100644 index 0000000..9cfc186 Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_cyan.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_cyan2.png b/mods/capturetheflag/ctf_flag/textures/flag_cyan2.png new file mode 100644 index 0000000..4ee3a29 Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_cyan2.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_gold.png b/mods/capturetheflag/ctf_flag/textures/flag_gold.png new file mode 100644 index 0000000..0969ba7 Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_gold.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_gold2.png b/mods/capturetheflag/ctf_flag/textures/flag_gold2.png new file mode 100644 index 0000000..c5cec33 Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_gold2.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_gray.png b/mods/capturetheflag/ctf_flag/textures/flag_gray.png new file mode 100644 index 0000000..eef45d5 Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_gray.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_gray2.png b/mods/capturetheflag/ctf_flag/textures/flag_gray2.png new file mode 100644 index 0000000..3a71ca8 Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_gray2.png differ diff --git a/mods/capturetheflag/ctf/textures/flag_green.png b/mods/capturetheflag/ctf_flag/textures/flag_green.png similarity index 100% rename from mods/capturetheflag/ctf/textures/flag_green.png rename to mods/capturetheflag/ctf_flag/textures/flag_green.png diff --git a/mods/capturetheflag/ctf/textures/flag_green2.png b/mods/capturetheflag/ctf_flag/textures/flag_green2.png similarity index 100% rename from mods/capturetheflag/ctf/textures/flag_green2.png rename to mods/capturetheflag/ctf_flag/textures/flag_green2.png diff --git a/mods/capturetheflag/ctf_flag/textures/flag_orange.png b/mods/capturetheflag/ctf_flag/textures/flag_orange.png new file mode 100644 index 0000000..9d99418 Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_orange.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_orange2.png b/mods/capturetheflag/ctf_flag/textures/flag_orange2.png new file mode 100644 index 0000000..b135b9d Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_orange2.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_pink.png b/mods/capturetheflag/ctf_flag/textures/flag_pink.png new file mode 100644 index 0000000..36b85d3 Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_pink.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_pink2.png b/mods/capturetheflag/ctf_flag/textures/flag_pink2.png new file mode 100644 index 0000000..b5899cd Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_pink2.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_purple.png b/mods/capturetheflag/ctf_flag/textures/flag_purple.png new file mode 100644 index 0000000..86bb33d Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_purple.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_purple2.png b/mods/capturetheflag/ctf_flag/textures/flag_purple2.png new file mode 100644 index 0000000..6930dde Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_purple2.png differ diff --git a/mods/capturetheflag/ctf/textures/flag_red.png b/mods/capturetheflag/ctf_flag/textures/flag_red.png similarity index 100% rename from mods/capturetheflag/ctf/textures/flag_red.png rename to mods/capturetheflag/ctf_flag/textures/flag_red.png diff --git a/mods/capturetheflag/ctf/textures/flag_red2.png b/mods/capturetheflag/ctf_flag/textures/flag_red2.png similarity index 100% rename from mods/capturetheflag/ctf/textures/flag_red2.png rename to mods/capturetheflag/ctf_flag/textures/flag_red2.png diff --git a/mods/capturetheflag/ctf_flag/textures/flag_silver.png b/mods/capturetheflag/ctf_flag/textures/flag_silver.png new file mode 100644 index 0000000..bede48d Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_silver.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_silver2.png b/mods/capturetheflag/ctf_flag/textures/flag_silver2.png new file mode 100644 index 0000000..fe856e6 Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_silver2.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_yellow.png b/mods/capturetheflag/ctf_flag/textures/flag_yellow.png new file mode 100644 index 0000000..80e1b29 Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_yellow.png differ diff --git a/mods/capturetheflag/ctf_flag/textures/flag_yellow2.png b/mods/capturetheflag/ctf_flag/textures/flag_yellow2.png new file mode 100644 index 0000000..642f527 Binary files /dev/null and b/mods/capturetheflag/ctf_flag/textures/flag_yellow2.png differ