Put tournament commands in a separate file
upsilon
parent
1dd736dbb4
commit
a41d62ea3d
200
tournament.lua
200
tournament.lua
|
|
@ -1,8 +1,6 @@
|
|||
local tournament_starting_time = tonumber(minetest.setting_get("pvpplus.tournament_starting_time")) or 60 -- seconds
|
||||
|
||||
local previous_player_transfer_distance
|
||||
|
||||
local tournament = {
|
||||
pvpplus.tournament = {
|
||||
engaging_players = false,
|
||||
engagement_position = nil,
|
||||
running_tournament = false,
|
||||
|
|
@ -17,6 +15,8 @@ local tournament = {
|
|||
starting_infos = {starter = nil, open_time = nil, start_time = nil, initially_engaged_players = nil},
|
||||
}
|
||||
|
||||
local tournament = pvpplus.tournament -- Shortcut reference
|
||||
|
||||
function pvpplus.engage_player(player_name)
|
||||
if not tournament.engaging_players then
|
||||
return false, "There is no open tournament."
|
||||
|
|
@ -340,198 +340,6 @@ function pvpplus.tournament_on_punchplayer(player, hitter, damage)
|
|||
end
|
||||
end
|
||||
|
||||
minetest.register_privilege("tournament_mod", "PvP Tournament Moderator")
|
||||
|
||||
minetest.register_chatcommand("start_global_tournament", {
|
||||
params = "",
|
||||
description = "Start a PvP tournament engaging every connected players and starting immediately",
|
||||
privs = {interact = true, tournament_mod = true},
|
||||
func = function(name, param)
|
||||
-- Fill start infos
|
||||
tournament.starting_infos.starter = name
|
||||
tournament.starting_infos.open_time = nil
|
||||
tournament.starting_infos.start_time = os.time()
|
||||
|
||||
return pvpplus.start_global_tournament()
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("stop_tournament", {
|
||||
params = "",
|
||||
description = "Stops the current PvP tournament",
|
||||
privs = {interact = true, tournament_mod = true},
|
||||
func = function(name, param)
|
||||
pvpplus.stop_tournament()
|
||||
return true
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("remove_from_tournament", {
|
||||
params = "<name>",
|
||||
description = "Removes a player from a PvP tournament",
|
||||
privs = {interact = true, tournament_mod = true},
|
||||
func = function(name, param)
|
||||
if not minetest.get_player_by_name(param) then
|
||||
return false, "Player does not exist. Please refer to usage: /help kick_from_tournament"
|
||||
end
|
||||
minetest.chat_send_player(param, "You have been removed from the tournament by " .. name)
|
||||
pvpplus.remove_from_tournament(param)
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("add_to_tournament", {
|
||||
params = "<name>",
|
||||
description = "Adds a player to the current tournament",
|
||||
privs = {interact = true, tournament_mod = true},
|
||||
func = function(name, param)
|
||||
if not minetest.get_player_by_name(param) then
|
||||
return false, "Player does not exist. Please refer to usage: /help kick_from_tournament"
|
||||
end
|
||||
if pvpplus.is_playing_tournament(player) then
|
||||
return false, "Player is already playing a tournament."
|
||||
end
|
||||
if not pvpplus.is_running_tournament() then
|
||||
return false, "There is no currently running tournament."
|
||||
end
|
||||
minetest.chat_send_player(param, "You have been added to the current tournament by " .. name)
|
||||
pvpplus.add_to_tournament(param)
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("leave_tournament", {
|
||||
params = "",
|
||||
description = "Leaves a PvP tournament",
|
||||
privs = {interact = true},
|
||||
func = function(name, param)
|
||||
if not pvpplus.is_playing_tournament(name) then
|
||||
return false, "You are not playing a tournament."
|
||||
end
|
||||
pvpplus.remove_from_tournament(name)
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("engage", {
|
||||
params = "",
|
||||
description = "Engages for the next PvP tournament",
|
||||
privs = {interact = true},
|
||||
func = function(name, param)
|
||||
if pvpplus.is_playing_tournament(name) then
|
||||
return false, "You are already playing a tournament."
|
||||
end
|
||||
if not tournament.engaging_players then
|
||||
return false, "There is no opened tournament. Type /tournament!"
|
||||
end
|
||||
pvpplus.engage_player(name)
|
||||
minetest.chat_send_all("Player "..name.." engaged himself/herself for the PvP tournament!")
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("tournament", {
|
||||
params = "[noteleport] [seconds]",
|
||||
description = "Creates a new tournament, optionally teleporting players to your current position 10 seconds before the tournament starts.",
|
||||
privs = {interact = true},
|
||||
func = function(name, param)
|
||||
local params = param:split(" ")
|
||||
if #params > 2 then
|
||||
return false, "Invalid usage. See /help tournament."
|
||||
end
|
||||
local starting_time = tournament_starting_time
|
||||
local teleport = true
|
||||
if tonumber(params[1]) then
|
||||
starting_time = tonumber(params[1])
|
||||
elseif params[1] == "noteleport" then
|
||||
teleport = false
|
||||
if tonumber(params[2]) then
|
||||
starting_time = tonumber(params[2])
|
||||
elseif params[2] ~= "" and params[2] ~= nil then
|
||||
return false, "Invalid usage. See /help tournament."
|
||||
end
|
||||
end
|
||||
|
||||
if starting_time < 10 or starting_time > 600 then
|
||||
return false, "Please set a starting time between 10s and 600s."
|
||||
end
|
||||
|
||||
-- Fill start infos
|
||||
tournament.starting_infos.starter = name
|
||||
tournament.starting_infos.open_time = os.time()
|
||||
tournament.starting_infos.start_time = os.time() + starting_time
|
||||
|
||||
-- Allow engaging
|
||||
local e, m = pvpplus.allow_engaging(name, teleport)
|
||||
if e == false then
|
||||
return false, m
|
||||
end
|
||||
|
||||
-- Engage starter
|
||||
pvpplus.engage_player(name)
|
||||
|
||||
-- Chat messages
|
||||
minetest.chat_send_all("The tournament will begin in " .. tostring(starting_time).."s.")
|
||||
minetest.after(starting_time - 10, function()
|
||||
minetest.chat_send_all("The tournament will begin in 10s! Engage yourself by typing /engage!")
|
||||
pvpplus.teleport_engaged_players()
|
||||
end)
|
||||
minetest.after(starting_time - 5, function()
|
||||
minetest.chat_send_all("The tournament will begin in 5s!")
|
||||
end)
|
||||
for i = 1, 4 do
|
||||
minetest.after(starting_time - i, function()
|
||||
minetest.chat_send_all(tostring(i).."!")
|
||||
end)
|
||||
end
|
||||
|
||||
-- Start tournament
|
||||
minetest.after(starting_time, function(name)
|
||||
local ok, e = pvpplus.start_tournament()
|
||||
if ok == false and e then
|
||||
minetest.chat_send_player(name, e)
|
||||
end
|
||||
end, name)
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("tournament_info", {
|
||||
params = "",
|
||||
description = "Prints tournament informations",
|
||||
privs = {},
|
||||
func = function(name, param)
|
||||
if pvpplus.is_engaging_players() then
|
||||
local str = "There is an open tournament which is not yet started (you can engage for this tournament by typing /engage).\n" ..
|
||||
"The tournament was open by: " .. tournament.starting_infos.starter ..
|
||||
"\nThe tournament will start in: " .. os.difftime(tournament.starting_infos.start_time, os.time()) .. " seconds\n" ..
|
||||
"The tournament is open since: " .. os.date("%c", tournament.starting_infos.open_time) ..
|
||||
(tournament.engagement_position and "\nEngaged players will be teleported before the tournament starts.\n" or "\nEngaged players won't be teleported.\n") ..
|
||||
"Currently engaged players are: "
|
||||
for player, _ in pairs(tournament.engaged_players) do
|
||||
str = str .. player .. ", "
|
||||
end
|
||||
str = str:sub(0, -3)
|
||||
|
||||
return true, str
|
||||
elseif pvpplus.is_running_tournament() then
|
||||
local str = "There is a currrently running tournament.\n" ..
|
||||
"The tournament was open by: " .. tournament.starting_infos.starter ..
|
||||
"\nThe tournament is running since: " .. os.date("%c", tournament.starting_infos.start_time) ..
|
||||
"\nInitially engaged players were: "
|
||||
for player, _ in pairs(tournament.starting_infos.initially_engaged_players) do
|
||||
str = str .. player .. ", "
|
||||
end
|
||||
str = str:sub(0, -3)
|
||||
|
||||
str = str .. "\nRemaining players are: "
|
||||
for player, _ in pairs(tournament.players) do
|
||||
str = str .. player .. ", "
|
||||
end
|
||||
str = str:sub(0, -3)
|
||||
|
||||
return true, str
|
||||
else
|
||||
return true, "There is no currently running tournament. You can start a new tournament by using /tournament (see /help tournament)."
|
||||
end
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_on_leaveplayer(function(player)
|
||||
local player_name = player:get_player_name()
|
||||
if pvpplus.is_playing_tournament(player_name) then
|
||||
|
|
@ -562,3 +370,5 @@ minetest.register_on_dieplayer(function(player)
|
|||
minetest.remove_node(pos)
|
||||
end
|
||||
end)
|
||||
|
||||
dofile(minetest.get_modpath(minetest.get_current_modname()).."/tournament_commands.lua")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,194 @@
|
|||
local tournament_starting_time = tonumber(minetest.setting_get("pvpplus.tournament_starting_time")) or 60 -- seconds
|
||||
local tournament = pvpplus.tournament -- Shortcut reference
|
||||
|
||||
minetest.register_privilege("tournament_mod", "PvP Tournament Moderator")
|
||||
|
||||
minetest.register_chatcommand("start_global_tournament", {
|
||||
params = "",
|
||||
description = "Start a PvP tournament engaging every connected players and starting immediately",
|
||||
privs = {interact = true, tournament_mod = true},
|
||||
func = function(name, param)
|
||||
-- Fill start infos
|
||||
tournament.starting_infos.starter = name
|
||||
tournament.starting_infos.open_time = nil
|
||||
tournament.starting_infos.start_time = os.time()
|
||||
|
||||
return pvpplus.start_global_tournament()
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("stop_tournament", {
|
||||
params = "",
|
||||
description = "Stops the current PvP tournament",
|
||||
privs = {interact = true, tournament_mod = true},
|
||||
func = function(name, param)
|
||||
pvpplus.stop_tournament()
|
||||
return true
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("remove_from_tournament", {
|
||||
params = "<name>",
|
||||
description = "Removes a player from a PvP tournament",
|
||||
privs = {interact = true, tournament_mod = true},
|
||||
func = function(name, param)
|
||||
if not minetest.get_player_by_name(param) then
|
||||
return false, "Player does not exist. Please refer to usage: /help kick_from_tournament"
|
||||
end
|
||||
minetest.chat_send_player(param, "You have been removed from the tournament by " .. name)
|
||||
pvpplus.remove_from_tournament(param)
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("add_to_tournament", {
|
||||
params = "<name>",
|
||||
description = "Adds a player to the current tournament",
|
||||
privs = {interact = true, tournament_mod = true},
|
||||
func = function(name, param)
|
||||
if not minetest.get_player_by_name(param) then
|
||||
return false, "Player does not exist. Please refer to usage: /help kick_from_tournament"
|
||||
end
|
||||
if pvpplus.is_playing_tournament(player) then
|
||||
return false, "Player is already playing a tournament."
|
||||
end
|
||||
if not pvpplus.is_running_tournament() then
|
||||
return false, "There is no currently running tournament."
|
||||
end
|
||||
minetest.chat_send_player(param, "You have been added to the current tournament by " .. name)
|
||||
pvpplus.add_to_tournament(param)
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("leave_tournament", {
|
||||
params = "",
|
||||
description = "Leaves a PvP tournament",
|
||||
privs = {interact = true},
|
||||
func = function(name, param)
|
||||
if not pvpplus.is_playing_tournament(name) then
|
||||
return false, "You are not playing a tournament."
|
||||
end
|
||||
pvpplus.remove_from_tournament(name)
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("engage", {
|
||||
params = "",
|
||||
description = "Engages for the next PvP tournament",
|
||||
privs = {interact = true},
|
||||
func = function(name, param)
|
||||
if pvpplus.is_playing_tournament(name) then
|
||||
return false, "You are already playing a tournament."
|
||||
end
|
||||
if not tournament.engaging_players then
|
||||
return false, "There is no opened tournament. Type /tournament!"
|
||||
end
|
||||
pvpplus.engage_player(name)
|
||||
minetest.chat_send_all("Player "..name.." engaged himself/herself for the PvP tournament!")
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("tournament", {
|
||||
params = "[noteleport] [seconds]",
|
||||
description = "Creates a new tournament, optionally teleporting players to your current position 10 seconds before the tournament starts.",
|
||||
privs = {interact = true},
|
||||
func = function(name, param)
|
||||
local params = param:split(" ")
|
||||
if #params > 2 then
|
||||
return false, "Invalid usage. See /help tournament."
|
||||
end
|
||||
local starting_time = tournament_starting_time
|
||||
local teleport = true
|
||||
if tonumber(params[1]) then
|
||||
starting_time = tonumber(params[1])
|
||||
elseif params[1] == "noteleport" then
|
||||
teleport = false
|
||||
if tonumber(params[2]) then
|
||||
starting_time = tonumber(params[2])
|
||||
elseif params[2] ~= "" and params[2] ~= nil then
|
||||
return false, "Invalid usage. See /help tournament."
|
||||
end
|
||||
end
|
||||
|
||||
if starting_time < 10 or starting_time > 600 then
|
||||
return false, "Please set a starting time between 10s and 600s."
|
||||
end
|
||||
|
||||
-- Fill start infos
|
||||
tournament.starting_infos.starter = name
|
||||
tournament.starting_infos.open_time = os.time()
|
||||
tournament.starting_infos.start_time = os.time() + starting_time
|
||||
|
||||
-- Allow engaging
|
||||
local e, m = pvpplus.allow_engaging(name, teleport)
|
||||
if e == false then
|
||||
return false, m
|
||||
end
|
||||
|
||||
-- Engage starter
|
||||
pvpplus.engage_player(name)
|
||||
|
||||
-- Chat messages
|
||||
minetest.chat_send_all("The tournament will begin in " .. tostring(starting_time).."s.")
|
||||
minetest.after(starting_time - 10, function()
|
||||
minetest.chat_send_all("The tournament will begin in 10s! Engage yourself by typing /engage!")
|
||||
pvpplus.teleport_engaged_players()
|
||||
end)
|
||||
minetest.after(starting_time - 5, function()
|
||||
minetest.chat_send_all("The tournament will begin in 5s!")
|
||||
end)
|
||||
for i = 1, 4 do
|
||||
minetest.after(starting_time - i, function()
|
||||
minetest.chat_send_all(tostring(i).."!")
|
||||
end)
|
||||
end
|
||||
|
||||
-- Start tournament
|
||||
minetest.after(starting_time, function(name)
|
||||
local ok, e = pvpplus.start_tournament()
|
||||
if ok == false and e then
|
||||
minetest.chat_send_player(name, e)
|
||||
end
|
||||
end, name)
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_chatcommand("tournament_info", {
|
||||
params = "",
|
||||
description = "Prints tournament informations",
|
||||
privs = {},
|
||||
func = function(name, param)
|
||||
if pvpplus.is_engaging_players() then
|
||||
local str = "There is an open tournament which is not yet started (you can engage for this tournament by typing /engage).\n" ..
|
||||
"The tournament was open by: " .. tournament.starting_infos.starter ..
|
||||
"\nThe tournament will start in: " .. os.difftime(tournament.starting_infos.start_time, os.time()) .. " seconds\n" ..
|
||||
"The tournament is open since: " .. os.date("%c", tournament.starting_infos.open_time) ..
|
||||
(tournament.engagement_position and "\nEngaged players will be teleported before the tournament starts.\n" or "\nEngaged players won't be teleported.\n") ..
|
||||
"Currently engaged players are: "
|
||||
for player, _ in pairs(tournament.engaged_players) do
|
||||
str = str .. player .. ", "
|
||||
end
|
||||
str = str:sub(0, -3)
|
||||
|
||||
return true, str
|
||||
elseif pvpplus.is_running_tournament() then
|
||||
local str = "There is a currrently running tournament.\n" ..
|
||||
"The tournament was open by: " .. tournament.starting_infos.starter ..
|
||||
"\nThe tournament is running since: " .. os.date("%c", tournament.starting_infos.start_time) ..
|
||||
"\nInitially engaged players were: "
|
||||
for player, _ in pairs(tournament.starting_infos.initially_engaged_players) do
|
||||
str = str .. player .. ", "
|
||||
end
|
||||
str = str:sub(0, -3)
|
||||
|
||||
str = str .. "\nRemaining players are: "
|
||||
for player, _ in pairs(tournament.players) do
|
||||
str = str .. player .. ", "
|
||||
end
|
||||
str = str:sub(0, -3)
|
||||
|
||||
return true, str
|
||||
else
|
||||
return true, "There is no currently running tournament. You can start a new tournament by using /tournament (see /help tournament)."
|
||||
end
|
||||
end
|
||||
})
|
||||
Loading…
Reference in New Issue