Compare commits
No commits in common. "ed65ddb6d067118f0538f409ed552575d23cc2e6" and "327504b1316acc2b66df401ee7d4d1c22ef86f28" have entirely different histories.
ed65ddb6d0
...
327504b131
5 changed files with 7 additions and 23 deletions
|
@ -272,8 +272,6 @@ minetest.register_chatcommand("t", {
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
||||||
local function me_func() end
|
|
||||||
|
|
||||||
if minetest.global_exists("irc") then
|
if minetest.global_exists("irc") then
|
||||||
function irc.playerMessage(name, message)
|
function irc.playerMessage(name, message)
|
||||||
local color = ctf_colors.get_irc_color(ctf.player(name))
|
local color = ctf_colors.get_irc_color(ctf.player(name))
|
||||||
|
@ -288,14 +286,6 @@ if minetest.global_exists("irc") then
|
||||||
local bbrace = color .. ">" .. clear
|
local bbrace = color .. ">" .. clear
|
||||||
return ("%s%s%s %s"):format(abrace, name, bbrace, message)
|
return ("%s%s%s %s"):format(abrace, name, bbrace, message)
|
||||||
end
|
end
|
||||||
|
|
||||||
me_func = function(...)
|
|
||||||
local message = irc.playerMessage(...)
|
|
||||||
|
|
||||||
message = "*" .. message:sub(message:find(" "))
|
|
||||||
|
|
||||||
irc.say(message)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local handler
|
local handler
|
||||||
|
@ -323,8 +313,6 @@ end
|
||||||
table.insert(minetest.registered_on_chat_messages, 1, handler)
|
table.insert(minetest.registered_on_chat_messages, 1, handler)
|
||||||
|
|
||||||
minetest.registered_chatcommands["me"].func = function(name, param)
|
minetest.registered_chatcommands["me"].func = function(name, param)
|
||||||
me_func(name, param)
|
|
||||||
|
|
||||||
if ctf.player(name).team then
|
if ctf.player(name).team then
|
||||||
local tcolor = ctf_colors.get_color(ctf.player(name))
|
local tcolor = ctf_colors.get_color(ctf.player(name))
|
||||||
name = minetest.colorize(tcolor.css, "* " .. name)
|
name = minetest.colorize(tcolor.css, "* " .. name)
|
||||||
|
@ -332,7 +320,5 @@ minetest.registered_chatcommands["me"].func = function(name, param)
|
||||||
name = "* ".. name
|
name = "* ".. name
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.log("action", "[CHAT] "..name.." "..param)
|
|
||||||
|
|
||||||
minetest.chat_send_all(name .. " " .. param)
|
minetest.chat_send_all(name .. " " .. param)
|
||||||
end
|
end
|
||||||
|
|
|
@ -133,7 +133,7 @@ minetest.override_item("ctf_bandages:bandage", {
|
||||||
})
|
})
|
||||||
|
|
||||||
local diggers = {}
|
local diggers = {}
|
||||||
local DIG_COOLDOWN = 30
|
local DIG_COOLDOWN = 45
|
||||||
local DIG_DIST_LIMIT = 30
|
local DIG_DIST_LIMIT = 30
|
||||||
local DIG_SPEED = 0.1
|
local DIG_SPEED = 0.1
|
||||||
|
|
||||||
|
|
|
@ -74,9 +74,8 @@ check_grapple("shooter_hook:grapple_hook")
|
||||||
local old_grapple_step = minetest.registered_entities["shooter_hook:hook"].on_step
|
local old_grapple_step = minetest.registered_entities["shooter_hook:hook"].on_step
|
||||||
minetest.registered_entities["shooter_hook:hook"].on_step = function(self, dtime, ...)
|
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
|
-- User left the game. Life is no longer worth living for this poor hook
|
||||||
if not self.user or not minetest.get_player_by_name(self.user) then
|
if not self.user then
|
||||||
self.object:remove()
|
self.object:remove()
|
||||||
return
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Remove entity if player has flag
|
-- Remove entity if player has flag
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit bbf60077855ee90b95ca68f1b9bc853f7d53ecf2
|
Subproject commit eb881181cc54c3dac444cfa91fa63baf1557d02f
|
|
@ -60,7 +60,7 @@ function random_messages.read_messages()
|
||||||
"Use team doors (steel) to stop the enemy walking into your base.",
|
"Use team doors (steel) to stop the enemy walking into your base.",
|
||||||
"Craft 6 cobbles and 1 steel ingot together to make reinforced cobble.",
|
"Craft 6 cobbles and 1 steel ingot together to make reinforced cobble.",
|
||||||
"Sprint by pressing the fast key (E) when you have stamina.",
|
"Sprint by pressing the fast key (E) when you have stamina.",
|
||||||
"Like CTF? Give feedback using /report, and consider joining the Discord",
|
"Like CTF? Give feedback using /report, and consider donating at rubenwardy.com/donate",
|
||||||
"Want to submit your own map? Visit ctf.rubenwardy.com to get involved.",
|
"Want to submit your own map? Visit ctf.rubenwardy.com to get involved.",
|
||||||
"Using limited resources for building structures that don't strengthen your base's defences is discouraged.",
|
"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>",
|
"To report misbehaving players to moderators, please use /report <name> <action>",
|
||||||
|
@ -72,14 +72,13 @@ function random_messages.read_messages()
|
||||||
"Use /r <number> or /rn <number> to check the rankings of the player in the given rank.",
|
"Use /r <number> or /rn <number> 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 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 /m to add a team marker at pointed location, that's visible only to team-mates.",
|
||||||
"Use /mr to remove your marker.",
|
"Use /summary to check scores of the current match and the previous match.",
|
||||||
"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.",
|
"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.",
|
"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.",
|
"Medics cause troops within 10 metres to regenerate health faster.",
|
||||||
"Hitting your enemy does more damage than not hitting them.",
|
"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.",
|
"Press right mouse button or double-tap the screen to activate scope while wielding a sniper rifle or a rocket gun.",
|
||||||
"Medics can dig pillars by right clicking the base of one with their paxel.",
|
"The 'Updates' tab in your inventory will show some of the latest updates to CTF",
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue