MT-CTF/ctf_pvp_engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
rubenwardy 2015-07-16 18:23:00 +01:00
parent 56139c13b2
commit 57b7f709c9
6 changed files with 214 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
mods/capturetheflag/ctf/gui.lua
View File

@ -34,11 +34,11 @@ function ctf.gui.show(name, tab, team)
return
end
if not team or not ctf.team(team) then
if not ctf.team(team) then
team = ctf.player(name).team
end
if team and team ~= "" and ctf.team(team) then
if ctf.team(team) then
ctf.action("gui", name .. " views " .. team .. "'s " .. tab .. " page")
ctf.gui.tabs[tab].func(name, team)
else
@ -67,7 +67,7 @@ end
-- Team interface
ctf.gui.register_tab("news", "News", function(name, team)
local result = ""
local data = ctf.teams[team].log
local data = ctf.team(team).log
if not data then
data = {}
@ -85,9 +85,13 @@ ctf.gui.register_tab("news", "News", function(name, team)
if data[i].mode == "diplo" then
result = result .. "image[0.5," .. height .. ";10.5,1;diplo_" .. data[i].msg .. ".png]"
if data[i].msg == "alliance" then
result = result .. "label[1,".. height ..";".. data[i].team .." offers an "..minetest.formspec_escape(data[i].msg).." treaty]"
result = result .. "label[1," .. height .. ";" ..
data[i].team .. " offers an " ..
minetest.formspec_escape(data[i].msg) .. " treaty]"
else
result = result .. "label[1,".. height ..";".. data[i].team .." offers a "..minetest.formspec_escape(data[i].msg).." treaty]"
result = result .. "label[1," .. height .. ";" ..
data[i].team .. " offers a " ..
minetest.formspec_escape(data[i].msg) .. " treaty]"
end
result = result .. "button[6," .. height .. ";1,1;btn_y" .. i .. ";Yes]"
result = result .. "button[7," .. height .. ";1,1;btn_n" .. i .. ";No]"
@ -103,7 +107,8 @@ ctf.gui.register_tab("news", "News", function(name, team)
break
end
result = result .. "label[0.5,".. height ..";".. minetest.formspec_escape(data[i].msg) .."]"
result = result .. "label[0.5," .. height .. ";" ..
minetest.formspec_escape(data[i].msg) .. "]"
end
end
@ -150,25 +155,35 @@ ctf.gui.register_tab("diplo", "Diplomacy", function(name, team)
break
end
result = result .. "image[1,".. height ..";10,1;diplo_"..data[i].state..".png]"
result = result .. "button[1.25,".. height ..";2,1;team_".. data[i].team ..";".. data[i].team .."]"
result = result .. "label[3.75,".. height ..";".. data[i].state .."]"
result = result .. "image[1," .. height .. ";10,1;diplo_" ..
data[i].state .. ".png]"
result = result .. "button[1.25," .. height .. ";2,1;team_" ..
data[i].team .. ";" .. data[i].team .. "]"
result = result .. "label[3.75," .. height .. ";" .. data[i].state
.. "]"
if ctf.can_mod(name,team)==true and ctf.player(name).team == team then
if ctf.can_mod(name,team) and ctf.player(name).team == team then
if not data[i].from and not data[i].to then
if data[i].state == "war" then
result = result .. "button[7.5,".. height ..";1.5,1;peace_".. data[i].team ..";Peace]"
result = result .. "button[7.5," .. height ..
";1.5,1;peace_" .. data[i].team .. ";Peace]"
elseif data[i].state == "peace" then
result = result .. "button[6,".. height ..";1.5,1;war_".. data[i].team ..";War]"
result = result .. "button[7.5,".. height ..";1.5,1;alli_".. data[i].team ..";Alliance]"
result = result .. "button[6," .. height ..
";1.5,1;war_" .. data[i].team .. ";War]"
result = result .. "button[7.5," .. height ..
";1.5,1;alli_" .. data[i].team .. ";Alliance]"
elseif data[i].state == "alliance" then
result = result .. "button[6,".. height ..";1.5,1;peace_".. data[i].team ..";Peace]"
result = result .. "button[6," .. height ..
";1.5,1;peace_" .. data[i].team .. ";Peace]"
end
elseif data[i].from ~= nil then
result = result .. "label[6,".. height ..";request recieved]"
result = result .. "label[6," .. height ..
";request recieved]"
elseif data[i].to ~= nil then
result = result .. "label[5.5,".. height ..";request sent]"
result = result .. "button[7.5,".. height ..";1.5,1;cancel_".. data[i].team ..";Cancel]"
result = result .. "label[5.5," .. height ..
";request sent]"
result = result .. "button[7.5," .. height ..
";1.5,1;cancel_" .. data[i].team .. ";Cancel]"
end
end
end
@ -184,7 +199,7 @@ end)
ctf.gui.register_tab("settings", "Settings", function(name, team)
local color = ""
if ctf.team(team).data and ctf.team(team).data.color then
if ctf.team(team).data.color then
color = ctf.team(team).data.color
end
@ -192,7 +207,7 @@ ctf.gui.register_tab("settings", "Settings", function(name, team)
"button[4,6;2,1;save;Save]"
if ctf.can_mod(name,team) == false then
if not ctf.can_mod(name,team) then
result = "label[0.5,1;You do not own this team!"
end
@ -213,15 +228,23 @@ local function formspec_is_ctf_tab(fsname)
end
minetest.register_on_player_receive_fields(function(player, formname, fields)
local name = player:get_player_name()
if not formspec_is_ctf_tab(formname) then
return false
end
local name = player:get_player_name()
local tplayer = ctf.player(name)
local tname = tplayer.team
local team = ctf.team(tname)
if not team then
return false
end
-- Do navigation
for tname, tab in pairs(ctf.gui.tabs) do
if fields[tname] then
ctf.gui.show(name, tname)
for tabname, tab in pairs(ctf.gui.tabs) do
if fields[tabname] then
ctf.gui.show(name, tabname)
return true
end
end
@ -229,22 +252,18 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
-- Todo: move callbacks
-- News page
if fields.clear then
if ctf and ctf.players and ctf.players[name] and ctf.players[name].team then
ctf.team(ctf.players[name].team).log = {}
team.log = {}
ctf.needs_save = true
ctf.gui.show(name, "news")
end
return true
end
-- Settings page
if fields.save and formname == "ctf:settings" then
if ctf and ctf.players and ctf.players[name] and ctf.players[name].team then
ctf.gui.show(name, "settings")
end
if ctf and ctf.team(ctf.players[name].team) and ctf.team(ctf.players[name].team).data then
if ctf.flag_colors[fields.color] then
ctf.team(ctf.players[name].team).data.color = fields.color
team.data.color = fields.color
ctf.needs_save = true
else
local colors = ""
@ -257,97 +276,116 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
minetest.chat_send_player(name, "Color " .. fields.color ..
" does not exist! Available: " .. colors)
end
end
return true
end
end)
minetest.register_on_player_receive_fields(function(player, formname, fields)
local name = player:get_player_name()
local tplayer = ctf.player(name)
local tname = tplayer.team
local team = ctf.team(tname)
if not team then
return false
end
if formname == "ctf:news" then
for key, field in pairs(fields) do
local ok, id = string.match(key, "btn_([yn])([0123456789]+)")
if ok and id then
if ctf.player(name).team and ctf.team(ctf.player(name).team) then
if ok == "y" then
ctf.diplo.set(ctf.player(name).team, ctf.team(ctf.player(name).team).log[tonumber(id)].team, ctf.team(ctf.player(name).team).log[tonumber(id)].msg)
ctf.post(ctf.player(name).team,{msg="You have accepted the "..ctf.team(ctf.player(name).team).log[tonumber(id)].msg.." request from "..ctf.team(ctf.player(name).team).log[tonumber(id)].team})
ctf.post(ctf.team(ctf.player(name).team).log[tonumber(id)].team,{msg=ctf.player(name).team.." has accepted your "..ctf.team(ctf.player(name).team).log[tonumber(id)].msg.." request"})
ctf.diplo.set(tname, team.log[tonumber(id)].team, team.log[tonumber(id)].msg)
-- Post to acceptor's log
ctf.post(tname, {
msg = "You have accepted the " ..
team.log[tonumber(id)].msg .. " request from " ..
team.log[tonumber(id)].team })
-- Post to request's log
ctf.post(team.log[tonumber(id)].team, {
msg = tname .. " has accepted your " ..
team.log[tonumber(id)].msg .. " request" })
id = id + 1
end
table.remove(ctf.team(ctf.player(name).team).log,id)
table.remove(team.log, id)
ctf.needs_save = true
ctf.gui.show(name, "news")
return true
end
end
end
end
end)
minetest.register_on_player_receive_fields(function(player, formname, fields)
local name = player:get_player_name()
local tplayer = ctf.player(name)
local tname = tplayer.team
local team = ctf.team(tname)
if not team then
return false
end
if formname == "ctf:diplo" then
for key, field in pairs(fields) do
local newteam = string.match(key, "team_(.+)")
if newteam then
local tname2 = string.match(key, "team_(.+)")
if tname2 then
ctf.gui.show(name, "diplo")
return true
end
newteam = string.match(key, "peace_(.+)")
if newteam and ctf.player(name) then
local team = ctf.player(name).team
if team then
if ctf.diplo.get(team,newteam) == "war" then
ctf.post(newteam,{type="request",msg="peace",team=team,mode="diplo"})
tname2 = string.match(key, "peace_(.+)")
if tname2 then
if ctf.diplo.get(tname, tname2) == "war" then
ctf.post(tname2, {
type = "request",
msg = "peace",
team = tname,
mode = "diplo" })
else
ctf.diplo.set(team,newteam,"peace")
ctf.post(team,{msg="You have cancelled the alliance treaty with "..newteam})
ctf.post(newteam,{msg=team.." has cancelled the alliance treaty"})
end
ctf.diplo.set(tname, tname2, "peace")
ctf.post(tname, {
msg = "You have cancelled the alliance treaty with " .. tname2 })
ctf.post(tname2, {
msg = tname .. " has cancelled the alliance treaty" })
end
ctf.gui.show(name, "diplo")
return true
end
newteam = string.match(key, "war_(.+)")
if newteam and ctf.player(name) then
local team = ctf.player(name).team
if team then
ctf.diplo.set(team,newteam,"war")
ctf.post(team,{msg="You have declared war on "..newteam})
ctf.post(newteam,{msg=team.." has declared war on you"})
end
tname2 = string.match(key, "war_(.+)")
if tname2 then
ctf.diplo.set(team, tname2,"war")
ctf.post(tname, {
msg = "You have declared war on " .. tname2 })
ctf.post(tname2, {
msg = tname .. " has declared war on you" })
ctf.gui.show(name, "diplo")
return true
end
newteam = string.match(key, "alli_(.+)")
if newteam and ctf.player(name) then
local team = ctf.player(name).team
if team then
ctf.post(newteam,{type="request",msg="alliance",team=team,mode="diplo"})
end
tname2 = string.match(key, "alli_(.+)")
if tname2 then
ctf.post(tname2, {
type = "request",
msg = "alliance",
team = tname,
mode = "diplo" })
ctf.gui.show(name, "diplo")
return true
end
newteam = string.match(key, "cancel_(.+)")
if newteam and ctf.player(name) then
local team = ctf.player(name).team
if team then
ctf.diplo.cancel_requests(team,newteam)
end
tname2 = string.match(key, "cancel_(.+)")
if tname2 then
ctf.diplo.cancel_requests(tname, tname2)
ctf.gui.show(name, "diplo")
return true
end

13
mods/capturetheflag/ctf/hud.lua
View File

@ -72,14 +72,14 @@ function ctf.hud.update(player)
end
local name = player:get_player_name()
local player_data = ctf.player(name)
local tplayer = ctf.player(name)
if not player_data or not player_data.team or not ctf.team(player_data.team) then
if not tplayer or not tplayer.team or not ctf.team(tplayer.team) then
return
end
-- Team Identifier
local color = ctf.flag_colors[ctf.team(player_data.team).data.color]
local color = ctf.flag_colors[ctf.team(tplayer.team).data.color]
if not color then
color = "0x000000"
end
@ -89,12 +89,12 @@ function ctf.hud.update(player)
hud_elem_type = "text",
position = {x = 1, y = 0},
scale = {x = 100, y = 100},
text = player_data.team,
text = tplayer.team,
number = color,
offset = {x=-100, y = 20}
})
else
ctf.hud:change(player, "ctf:hud_team", "text", player_data.team)
ctf.hud:change(player, "ctf:hud_team", "text", tplayer.team)
ctf.hud:change(player, "ctf:hud_team", "number", color)
end
end
@ -102,17 +102,16 @@ end
local count = 0
function ctf.hud.updateAll()
count = 0
if not ctf.setting("hud") then
return
end
local players = minetest.get_connected_players()
for i = 1, #players do
ctf.hud.update(players[i])
end
end
minetest.register_globalstep(function(delta)
count = count + delta

12
mods/capturetheflag/ctf/teams.lua
View File

@ -22,13 +22,19 @@ function ctf.team(name)
return ctf.teams[name.name]
else
if not ctf.teams[name] then
if name then
local team = ctf.teams[name]
if team then
if not team.data or not team.players then
ctf.warning("team", "Assertion failed, data{} or players{} not " ..
"found in team{}")
end
return team
else
if name and name:trim() ~= "" then
ctf.warning("team", dump(name) .. " does not exist!")
end
return nil
end
return ctf.teams[name]
end
end

25
mods/capturetheflag/ctf_chat/init.lua
View File

@ -11,13 +11,16 @@ local function team_console_help(name)
minetest.chat_send_player(name, "Try:")
minetest.chat_send_player(name, "/team - show team panel")
minetest.chat_send_player(name, "/team all - list all teams")
minetest.chat_send_player(name,"/team name - show details about team 'name'")
minetest.chat_send_player(name,"/team player name - get which team 'player' is in")
minetest.chat_send_player(name, "/team <team> - show details about team 'name'")
minetest.chat_send_player(name, "/team <name> - get which team 'player' is in")
minetest.chat_send_player(name, "/team player <name> - get which team 'player' is in")
local privs = minetest.get_player_privs(name)
if privs and privs.team == true then
minetest.chat_send_player(name,"/team add name - add a team called name (admin only)")
minetest.chat_send_player(name,"/team join player team - add 'player' to team 'team' (admin only)")
minetest.chat_send_player(name, "/team add <team> - add a team called name (admin only)")
minetest.chat_send_player(name, "/team remove <team> - add a team called name (admin only)")
minetest.chat_send_player(name, "/team join <name> <team> - add 'player' to team 'team' (admin only)")
minetest.chat_send_player(name, "/team removeply <name> - add 'player' to team 'team' (admin only)")
end
end
@ -27,8 +30,8 @@ minetest.register_chatcommand("team", {
local test = string.match(param,"^player ([%a%d_]+)")
local create = string.match(param,"^add ([%a%d_]+)")
local remove = string.match(param,"^remove ([%a%d_]+)")
local tplayer, tteam = string.match(param,"^join ([%a%d_]+) ([%a%d_]+)")
local tlplayer = string.match(param,"^removeplr ([%a%d_]+)")
local j_name, j_tname = string.match(param,"^join ([%a%d_]+) ([%a%d_]+)")
local l_name = string.match(param,"^removeplr ([%a%d_]+)")
if create then
local privs = minetest.get_player_privs(name)
if privs and privs.team == true then
@ -85,20 +88,20 @@ minetest.register_chatcommand("team", {
else
minetest.chat_send_player(name, test.." is not in a team")
end
elseif tplayer and tteam then
elseif j_name and j_tname then
local privs = minetest.get_player_privs(name)
if privs and privs.ctf_admin == true then
if not ctf.join(tplayer, tteam, true, name) then
if not ctf.join(j_name, j_tname, true, name) then
minetest.chat_send_player(name, "Failed to add player to team.")
end
else
minetest.chat_send_player(name, "You are not a ctf_admin!")
end
elseif tlplayer then
elseif l_name then
local privs = minetest.get_player_privs(name)
if privs and privs.ctf_admin == true then
if ctf.remove_player(tlplayer) then
minetest.chat_send_player(name, "Removed player " .. tlplayer)
if ctf.remove_player(l_name) then
minetest.chat_send_player(name, "Removed player " .. l_name)
else
minetest.chat_send_player(name, "Failed to remove player.")
end

2
mods/capturetheflag/ctf_endgame/init.lua
View File

@ -30,7 +30,7 @@ ctf_flag.register_on_capture(function(attname, flag)
minetest.chat_send_all("Team " .. winner .. " won!")
minetest.chat_send_all("Resetting the map, this may take a few moments...")
minetest.after(0.5, function()
minetest.delete_area(vector.new(-16*4, -16*4, -16*4), vector.new(16*4, 16*4, 16*4))
--minetest.delete_area(vector.new(-16*4, -16*4, -16*4), vector.new(16*4, 16*4, 16*4))
minetest.after(1, function()
ctf.reset()