Merge branch 'master' into tnt

Author: farooqkz

.github/workflows/build.yml

@@ -0,0 +1,10 @@
+name: luacheck
+on: [push, pull_request]
+jobs:
+  luacheck:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Luacheck
+        uses: lunarmodules/luacheck@master

.github/workflows/luacheck.yml

@@ -45,6 +45,7 @@ Note that this version may be slightly behind the git version, but it will be a
 * If you use Visual Studio Code we recommend these extensions:
   * https://marketplace.visualstudio.com/items?itemName=sumneko.lua
   * https://marketplace.visualstudio.com/items?itemName=dwenegar.vscode-luacheck
+  * https://marketplace.visualstudio.com/items?itemName=GreenXenith.minetest-tools
 
 ## License
 

README.md

@@ -687,15 +687,7 @@ return {
 
 		celebrate_team(pteam)
 
-		local text = " has captured the flag"
-		if many_teams then
-			text = " has captured the flag of team(s) " .. HumanReadable(teamnames)
-			minetest.chat_send_all(
-				minetest.colorize(tcolor, pname) ..
-				minetest.colorize(FLAG_MESSAGE_COLOR, text)
-			)
-		end
-		ctf_modebase.announce(string.format("Player %s (team %s)%s", pname, pteam, text))
+
 
 		ctf_modebase.flag_huds.untrack_capturer(pname)
 
@@ -706,7 +698,19 @@ return {
 			score = math.max(75, math.min(500, score))
 			capture_reward = capture_reward + score
 		end
-
+		local text = " has captured the flag"
+		if many_teams then
+			text = string.format(
+				" has captured the flag of team(s) %s and got %d points",
+				HumanReadable(teamnames),
+				capture_reward
+			)
+			minetest.chat_send_all(
+				minetest.colorize(tcolor, pname) ..
+				minetest.colorize(FLAG_MESSAGE_COLOR, text)
+			)
+		end
+		ctf_modebase.announce(string.format("Player %s (team %s)%s and got %d points", pname, pteam, text, capture_reward))
 		local team_score = team_scores[pteam].score
 		for teammate in pairs(ctf_teams.online_players[pteam].players) do
 			if teammate ~= pname then
@@ -721,12 +725,12 @@ return {
 		teams_left = teams_left - #teamnames
 
 		if teams_left <= 1 then
-			local capture_text = "Player %s captured"
+			local capture_text = "Player %s captured and got %d points"
 			if many_teams then
-				capture_text = "Player %s captured the last flag"
+				capture_text = "Player %s captured the last flag and got %d points"
 			end
 
-			ctf_modebase.summary.set_winner(string.format(capture_text, minetest.colorize(tcolor, pname)))
+			ctf_modebase.summary.set_winner(string.format(capture_text, minetest.colorize(tcolor, pname), capture_reward))
 
 			local win_text = HumanReadable(pteam) .. " Team Wins!"
 
@@ -746,7 +750,7 @@ return {
 
 				for lost_player in pairs(ctf_teams.online_players[lost_team].players) do
 					team_switch_after_capture = true
-						ctf_teams.allocate_player(lost_player)
+					ctf_teams.allocate_player(lost_player)
 					team_switch_after_capture = false
 				end
 			end

mods/ctf/ctf_modebase/features.lua

@@ -391,6 +391,10 @@ local function select_class(player, classname)
 	player = PlayerObj(player)
 	if not player then return end
 
+	if classname == classes.get_name(player) then
+		return
+	end
+
 	if ctf_modebase.current_mode == "classes" and dist_from_flag(player) <= 5 then
 		cooldowns:set(player, CLASS_SWITCH_COOLDOWN)
 		classes.set(player, classname)

mods/ctf/ctf_modes/ctf_mode_classes/classes.lua

@@ -0,0 +1,8 @@
+# textdomain: ctf_report
+<msg>=<mensaje>
+Report misconduct or bugs=Reportar falta de conducta o errores
+Please add a message to your report.=Por favor añade un mensaje a tu reporte
+If it's about (a) particular player(s), please also include their name(s).=Si trata sobre jugadores en especifico, por favor incluye sus nombres.
+If you're reporting a player,=Si estás reportando a un jugador,
+you should also include a reason why (e.g. swearing, griefing, spawnkilling, etc.).=también debes de incluir el motivo (p.j., decir malas palabras, destrucción, matar tan rápido que un jugador aparezca, etc.)
+Report has been sent.=El reporte ha sido enviado.

mods/ctf/ctf_report/locale/ctf_report.es.tr

@@ -0,0 +1,3 @@
+# textdomain: afkkick
+Allow to AFK without being kicked=Permite estar inactivo sin ser sacado del juego
+Warning, you have @1 seconds to move or be kicked=Advertencia, tienes @1 segundo(s) para moverte o ser sacado del juego

mods/other/afkkick/locale/afkkick.es.tr

@@ -0,0 +1,34 @@
+# textdomain: random_messages
+
+To talk to only your team, start your messages with /t. For example, /t Hello team!=Para hablar únicamente a tu equipo, comienza tus mensajes con /t. Por ejemplo, /t ¡Hola equipo!
+Use apples to quickly restore your health.=Use manzanas para restaurar tu salud rápidamente
+Moving or fighting can avoid an inactivity kick.=Moverse o pelear puede evitar ser sacado por inactividad
+Gain more score by killing more than you die, by healing teammates with bandages, or by capturing the flag.=Gana más puntos por tener más asesinatos que muertes, dando vida a tus compañeros de equipo con vendajes, o capturando la bandera.
+You gain more score the better the opponent you defeat.=Obtendrás mejor puntuación cuanto mejor sea el oponente que derrotes.
+Find weapons in chests or mine and use furnaces to make stronger swords.=Encuentra armas en los cofres o mina y use hornos para crear espadas más fuertes.
+Use team doors (steel) to stop the enemy walking into your base.=Use puertas del equipo (hierro) para prevenir al enemigo entrar a tu base.
+Sprint by pressing the fast key (E) when you have stamina.=Corre presionando la tecla de rápido (E) cuando tengas resistencia.
+Like CTF? Give feedback using /report, and consider donating at rubenwardy.com/donate=¿Te gusta CTF? De su opinión usando /report, y considere donar en rubenwardy.com/donate
+Want to submit your own map? Visit https://github.com/MT-CTF/maps to get involved.=¿Quieres publicar tu propio mapa? Visita https://github.com/MT-CTF/maps para participar.
+Using limited resources for building structures that don't strengthen your base's defences is discouraged.=Usar recursos limitades para construir estructuras que no fortalezcan las defensas de tu base no esta aconsejado.
+To report misbehaving players to moderators, please use /report <name> <action>=Para reportar jugadores que se porten mal a los moderadores, por favor use /report <nombre> <acción>
+Swearing, trolling and being rude will not be tolerated and strict action will be taken.=Decir maldiciones, engañar y ser grosero no será tolerado y se tomarán medidas estrictas.
+Trapping team mates on purpose is strictly against the rules and you will be kicked immediately.=Atrapar a tus compañeros de equipo a propósito esta estrictamente en contra de las reglas y serás sacado fuera inmediatamente.
+Help your team claim victory by storing extra weapons in the team chest, and never taking more than you need.=Ayuda a tu equipo reclamar la victoria guardando armas adicionales en el cofre del equipo, y nunca tomar más de lo que necesites.
+Excessive spawn-killing is a direct violation of the rules - appropriate punishments will be given.=Matar a otros jugadores que acaban de aparecer excesivamente es una violación directa de las reglas - se darán los castigos necesarios.
+Use /r to check your rank and other statistics.=Use /r para ver tu clasificación y otras estadísticas.
+Use /r <playername> to check the rankings of another player.=Use /r <nombredejugador> para ver las clasificaciones de otro jugador.
+Use bandages on team-mates to heal them by 3-4 HP if their health is below 15 HP.=Use vendajes en tus compañeros de equipo para darles 3-4 de vida si su salud esta debajo de 15 de vida.
+Use /m to add a team marker at pointed location, that's visible only to team-mates.=Use /m para añadir un marcador en la ubicación señalada, que es solamente visible para tus compañeros de equipo.
+Use /summary (or /s) to check scores of the current match and the previous match.=Use /summary (o /s) para ver las puntuaciones de la partida actual y de la partida anterior.
+Strengthen your team by capturing enemy flags.=Fortalece tu equipo capturando banderas enemigas.
+Hitting your enemy does more damage than not hitting them.=Pegarle a tu enemigo hace más daño que no pegarle.
+Use /top50 command to see the leaderboard.=Use /top50 para ver la tabla de clasificación.
+Use /top50 <mode:technical modename> to see the leaderboard on another mode. For example: /top50 mode:nade_fight.=Use /top50 <modo:nombre de modo técnico> para ver la tabla de clasificación en otro modo. Por ejemplo: /top50 mode:nade_fight.
+To check someone's rank on another mode use /r <mode:technical modename> <playername>. For example: /r mode:nade_fight randomplayer.=Para ver la clasificación de alguien en otro modo use /r <modo:nombre de modo técnico> <nombredejugador>. Por ejemplo: /r mode:nade_fight jugador
+To check someone's team use /team player <player_name>.=Para ver a que equipo pertenecé alguien use /team player <nombre_de_jugador>.
+To check all team members use /team.=Para ver todos los miembros de tu equipo use /team.
+You can capture multiple enemy flags at once!=¡Puedes capturar multiples banderas enemigas al mismo tiempo!
+Consider joining our Discord server at https://discord.gg/vcZTRPX=Considera unirte a nuestro servidor de Discord en https://discord.gg/vcZTRPX
+You can press sneak while jumping, to jump up two blocks.=Puedes presionar sneak mientras brincas, para brincar dos bloques.
+Use /donate <playername> <score> to reward a team-mate for their work.=Use /donate <nombredejugador> <puntos> para recompensar a un compañero del equipo por su trabajo.

mods/other/random_messages/locale/random_messages.es.tr

@@ -0,0 +1,34 @@
+# textdomain: random_messages
+
+To talk to only your team, start your messages with /t. For example, /t Hello team!=
+Use apples to quickly restore your health.=
+Moving or fighting can avoid an inactivity kick.=
+Gain more score by killing more than you die, by healing teammates with bandages, or by capturing the flag.=
+You gain more score the better the opponent you defeat.=
+Find weapons in chests or mine and use furnaces to make stronger swords.=
+Use team doors (steel) to stop the enemy walking into your base.=
+Sprint by pressing the fast key (E) when you have stamina.=
+Like CTF? Give feedback using /report, and consider donating at rubenwardy.com/donate=
+Want to submit your own map? Visit https://github.com/MT-CTF/maps to get involved.=
+Using limited resources for building structures that don't strengthen your base's defences is discouraged.=
+To report misbehaving players to moderators, please use /report <name> <action>=
+Swearing, trolling and being rude will not be tolerated and strict action will be taken.=
+Trapping team mates on purpose is strictly against the rules and you will be kicked immediately.=
+Help your team claim victory by storing extra weapons in the team chest, and never taking more than you need.=
+Excessive spawn-killing is a direct violation of the rules - appropriate punishments will be given.=
+Use /r to check your rank and other statistics.=
+Use /r <playername> to check the rankings of another player.=
+Use bandages on team-mates to heal them by 3-4 HP if their health is below 15 HP.=
+Use /m to add a team marker at pointed location, that's visible only to team-mates.=
+Use /summary (or /s) to check scores of the current match and the previous match.=
+Strengthen your team by capturing enemy flags.=
+Hitting your enemy does more damage than not hitting them.=
+Use /top50 command to see the leaderboard.=
+Use /top50 <mode:technical modename> to see the leaderboard on another mode. For example: /top50 mode:nade_fight.=
+To check someone's rank on another mode use /r <mode:technical modename> <playername>. For example: /r mode:nade_fight randomplayer.=
+To check someone's team use /team player <player_name>.=
+To check all team members use /team.=
+You can capture multiple enemy flags at once!=
+Consider joining our Discord server at https://discord.gg/vcZTRPX=
+You can press sneak while jumping, to jump up two blocks.=
+Use /donate <playername> <score> to reward a team-mate for their work.=

mods/other/random_messages/locale/template.txt

@@ -1,4 +1,5 @@
-# textdomain:select_item
+# textdomain: select_item
+
 Cancel=Abbrechen
 Page @1/@2=Seite @1/@2
 Select an item:=Wählen Sie einen Gegenstand:

mods/other/select_item/locale/select_item.de.tr

@@ -0,0 +1,6 @@
+# textdomain: select_item
+
+Cancel=Cancelar
+Page @1/@2=Página @1/@2
+Select an item:=Selecciona un artículo:
+There are no items to choose from.=No hay artículos para elegir.

mods/other/select_item/locale/select_item.es.tr

@@ -1,4 +1,5 @@
-# textdomain:select_item
+# textdomain: select_item
+
 Cancel=
 Page @1/@2=
 Select an item:=

mods/other/select_item/locale/template.txt

@@ -0,0 +1,3 @@
+# textdomain: throwable_snow
+@1 hit you with a snowball!=¡@1 te pegó con una bola de nieve!
+Snowball=Bola de nieve