From 36a6f4117ae81cd54a3588805dc3a8a2b12b6e7d Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Tue, 16 Mar 2021 16:41:34 -0700 Subject: [PATCH 1/8] Fix crash fix not fixing crash --- mods/ctf/ctf_classes/ranged.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ctf/ctf_classes/ranged.lua b/mods/ctf/ctf_classes/ranged.lua index 4939dda..7e1ae51 100644 --- a/mods/ctf/ctf_classes/ranged.lua +++ b/mods/ctf/ctf_classes/ranged.lua @@ -76,6 +76,7 @@ minetest.registered_entities["shooter_hook:hook"].on_step = function(self, dtime -- User left the game. Life is no longer worth living for this poor hook if not self.user then self.object:remove() + return end -- Remove entity if player has flag From 05fdcaa31eedde0f89d68f65ab0d321277567cf0 Mon Sep 17 00:00:00 2001 From: WINNIE <66524421+winniepee@users.noreply.github.com> Date: Wed, 17 Mar 2021 23:26:58 +0800 Subject: [PATCH 2/8] Lower Paxel Cooldown (#832) --- mods/ctf/ctf_classes/medic.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_classes/medic.lua b/mods/ctf/ctf_classes/medic.lua index 517dda7..189556c 100644 --- a/mods/ctf/ctf_classes/medic.lua +++ b/mods/ctf/ctf_classes/medic.lua @@ -133,7 +133,7 @@ minetest.override_item("ctf_bandages:bandage", { }) local diggers = {} -local DIG_COOLDOWN = 45 +local DIG_COOLDOWN = 30 local DIG_DIST_LIMIT = 30 local DIG_SPEED = 0.1 From 92104db90f54f41de82e78d7b76f1f3388f916ea Mon Sep 17 00:00:00 2001 From: _Lucy <80708819+Lucyucy@users.noreply.github.com> Date: Wed, 17 Mar 2021 16:34:32 +0100 Subject: [PATCH 3/8] Update random_messages (#833) * Update init.lua * Update init.lua Co-authored-by: LoneWolfHT --- mods/other/random_messages/init.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mods/other/random_messages/init.lua b/mods/other/random_messages/init.lua index c338e06..26c3fd0 100644 --- a/mods/other/random_messages/init.lua +++ b/mods/other/random_messages/init.lua @@ -56,7 +56,7 @@ function random_messages.read_messages() "You gain more score the better the opponent you defeat.", "Find weapons in chests or mine and use furnaces to make stronger swords.", "Players are immune to attack for 5 seconds after they respawn.", - "Access the pro section of the chest by achieving a 10k+ score and killing 3 people for every 2 deaths.", + "Access the pro section of the chest by achieving a 10k+ score, killing 3 people for every 2 deaths and capture the flag 10 times.", "Use team doors (steel) to stop the enemy walking into your base.", "Craft 6 cobbles and 1 steel ingot together to make reinforced cobble.", "Sprint by pressing the fast key (E) when you have stamina.", @@ -72,12 +72,14 @@ function random_messages.read_messages() "Use /r or /rn to check the rankings of the player in the given rank.", "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 to check scores of the current match and the previous match.", + "Use /mr to remove your marker.", + "Use /summary or /s to check scores of the current match and the previous match.", "Use /maps to view the maps catalog. It also contains license info and attribution details.", "Change your class in your base by right clicking the home flag or typing /class.", "Medics cause troops within 10 metres to regenerate health faster.", "Hitting your enemy does more damage than not hitting them.", "Press right mouse button or double-tap the screen to activate scope while wielding a sniper rifle.", + "Medics can dig pillars by right clicking the base of one with their paxel.", } end From e9f09c358774521a23d74195b6d64a0536a41414 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Thu, 18 Mar 2021 17:45:11 -0700 Subject: [PATCH 4/8] Send /me output to IRC --- mods/ctf/ctf_chat/init.lua | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mods/ctf/ctf_chat/init.lua b/mods/ctf/ctf_chat/init.lua index b00283f..f91c479 100644 --- a/mods/ctf/ctf_chat/init.lua +++ b/mods/ctf/ctf_chat/init.lua @@ -272,6 +272,8 @@ minetest.register_chatcommand("t", { end }) +local function me_func() end + if minetest.global_exists("irc") then function irc.playerMessage(name, message) local color = ctf_colors.get_irc_color(ctf.player(name)) @@ -286,6 +288,14 @@ if minetest.global_exists("irc") then local bbrace = color .. ">" .. clear return ("%s%s%s %s"):format(abrace, name, bbrace, message) end + + me_func = function(...) + local message = irc.playerMessage(...) + + message = "*" .. message:sub(message:find(" ")) + + irc.say(message) + end end local handler @@ -319,6 +329,7 @@ minetest.registered_chatcommands["me"].func = function(name, param) else name = "* ".. name end - + + me_func(name, param) minetest.chat_send_all(name .. " " .. param) end From ebd332a3c6c0fd59e89cb5f3fe7cad3f53d98603 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Thu, 18 Mar 2021 17:48:21 -0700 Subject: [PATCH 5/8] Appease luacheck --- mods/ctf/ctf_chat/init.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/ctf/ctf_chat/init.lua b/mods/ctf/ctf_chat/init.lua index f91c479..8ccfaae 100644 --- a/mods/ctf/ctf_chat/init.lua +++ b/mods/ctf/ctf_chat/init.lua @@ -288,12 +288,12 @@ if minetest.global_exists("irc") then local bbrace = color .. ">" .. clear return ("%s%s%s %s"):format(abrace, name, bbrace, message) end - + me_func = function(...) local message = irc.playerMessage(...) - + message = "*" .. message:sub(message:find(" ")) - + irc.say(message) end end @@ -329,7 +329,7 @@ minetest.registered_chatcommands["me"].func = function(name, param) else name = "* ".. name end - + me_func(name, param) minetest.chat_send_all(name .. " " .. param) end From 96147c7b9793d9c435bfe60e976a7a4e159a203a Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Thu, 18 Mar 2021 19:03:07 -0700 Subject: [PATCH 6/8] Log /me command when used and fix bug --- mods/ctf/ctf_chat/init.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mods/ctf/ctf_chat/init.lua b/mods/ctf/ctf_chat/init.lua index 8ccfaae..df69b01 100644 --- a/mods/ctf/ctf_chat/init.lua +++ b/mods/ctf/ctf_chat/init.lua @@ -323,6 +323,8 @@ end table.insert(minetest.registered_on_chat_messages, 1, handler) minetest.registered_chatcommands["me"].func = function(name, param) + me_func(name, param) + if ctf.player(name).team then local tcolor = ctf_colors.get_color(ctf.player(name)) name = minetest.colorize(tcolor.css, "* " .. name) @@ -330,6 +332,7 @@ minetest.registered_chatcommands["me"].func = function(name, param) name = "* ".. name end - me_func(name, param) + minetest.log("action", "[CHAT] "..name.." "..param) + minetest.chat_send_all(name .. " " .. param) end From 9e844d8d7164aa08e63dd7a75e594f69bb2b1824 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 19 Mar 2021 08:30:47 -0700 Subject: [PATCH 7/8] Update Maps Submodule (#836) Bumps [mods/ctf/ctf_map/ctf_map_core/maps](https://github.com/MT-CTF/maps) from `eb88118` to `bbf6007`. - [Release notes](https://github.com/MT-CTF/maps/releases) - [Commits](https://github.com/MT-CTF/maps/compare/eb881181cc54c3dac444cfa91fa63baf1557d02f...bbf60077855ee90b95ca68f1b9bc853f7d53ecf2) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- mods/ctf/ctf_map/ctf_map_core/maps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/ctf_map_core/maps b/mods/ctf/ctf_map/ctf_map_core/maps index eb88118..bbf6007 160000 --- a/mods/ctf/ctf_map/ctf_map_core/maps +++ b/mods/ctf/ctf_map/ctf_map_core/maps @@ -1 +1 @@ -Subproject commit eb881181cc54c3dac444cfa91fa63baf1557d02f +Subproject commit bbf60077855ee90b95ca68f1b9bc853f7d53ecf2 From 1568de3449a16c347b3803a1b954d497698518d1 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Fri, 19 Mar 2021 08:31:52 -0700 Subject: [PATCH 8/8] Fix crash --- mods/ctf/ctf_classes/ranged.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_classes/ranged.lua b/mods/ctf/ctf_classes/ranged.lua index 7e1ae51..81702d8 100644 --- a/mods/ctf/ctf_classes/ranged.lua +++ b/mods/ctf/ctf_classes/ranged.lua @@ -74,7 +74,7 @@ check_grapple("shooter_hook:grapple_hook") local old_grapple_step = minetest.registered_entities["shooter_hook:hook"].on_step minetest.registered_entities["shooter_hook:hook"].on_step = function(self, dtime, ...) -- User left the game. Life is no longer worth living for this poor hook - if not self.user then + if not self.user or not minetest.get_player_by_name(self.user) then self.object:remove() return end