From cf81d194f97c414fc8d23a082d62dfdac5c44351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20C?= Date: Wed, 18 Apr 2018 22:49:47 +0200 Subject: [PATCH] Add more info to end of match score board * Added name of winner team * Number of kills, attempts, and score - total and per team * Match duration --- mods/ctf_stats/gui.lua | 68 +++++++++++++++++++++++++++++++++++++---- mods/ctf_stats/init.lua | 12 +++++++- 2 files changed, 73 insertions(+), 7 deletions(-) diff --git a/mods/ctf_stats/gui.lua b/mods/ctf_stats/gui.lua index 079070f..6c6f014 100644 --- a/mods/ctf_stats/gui.lua +++ b/mods/ctf_stats/gui.lua @@ -1,26 +1,81 @@ -function ctf_stats.get_formspec_match_summary(stats) +local function render_per_team_stats(red, blue, stat, round) + local red_stat, blue_stat = red[stat], blue[stat] + if round then + red_stat = math.floor(red_stat*10)/10 + blue_stat = math.floor(blue_stat*10)/10 + end + return red_stat+blue_stat .. " (" .. minetest.colorize(red.color, tostring(red_stat)) .. " - " .. minetest.colorize(blue.color, tostring(blue_stat)) .. ")" +end + +function ctf_stats.get_formspec_match_summary(stats, winner_team, winner_player, time) local players = {} + local red = { + color = ctf.flag_colors.red:gsub("0x", "#"), + kills = 0, + attempts = 0, + score = 0, + } + local blue = { + color = ctf.flag_colors.blue:gsub("0x", "#"), + kills = 0, + attempts = 0, + score = 0, + } for name, pstat in pairs(stats.red) do pstat.name = name pstat.color = ctf.flag_colors.red table.insert(players, pstat) + red.kills = red.kills + pstat.kills + red.attempts = red.attempts + pstat.attempts + red.score = red.score + pstat.score end for name, pstat in pairs(stats.blue) do pstat.name = name pstat.color = ctf.flag_colors.blue table.insert(players, pstat) + blue.kills = blue.kills + pstat.kills + blue.attempts = blue.attempts + pstat.attempts + blue.score = blue.score + pstat.score end - local ret = ctf_stats.get_formspec("Match Summary", players) - ret = ret .. "label[3.5,6.2;Tip: type /rankings for league tables]" + + local ret = ctf_stats.get_formspec("Match Summary", players, 1) + + if stats[winner_team] then + local winner_color = ctf.flag_colors[winner_team]:gsub("0x", "#") + ret = ret .. "item_image[0,0;1,1;ctf_flag:flag_top_"..winner_team.."]" + ret = ret .. "label[1,0;" .. minetest.colorize(winner_color, "TEAM " .. winner_team:upper() .. " WON!") .. "]" + ret = ret .. "label[1,0.5;Flag captured by " .. winner_player .. "]" + else + ret = ret .. "label[1,0;NO WINNER]" + end + + ret = ret .. "label[4,0;Kills]" + ret = ret .. "label[6,0;" .. render_per_team_stats(red, blue, "kills") .. "]" + ret = ret .. "label[4,0.5;Attempts]" + ret = ret .. "label[6,0.5;" .. render_per_team_stats(red, blue, "attempts") .. "]" + + local time_display = "" + if time >= 3600 then + time_display = math.floor(time/3600) .. "h" + end + time_display = time_display .. math.floor((time % 3600) / 60) .. "m" .. math.floor(time % 60) .. "s" + ret = ret .. "label[8,0;Duration]" + ret = ret .. "label[10,0;" .. time_display .. "]" + ret = ret .. "label[8,0.5;Total score]" + ret = ret .. "label[10,0.5;" .. render_per_team_stats(red, blue, "score", true) .. "]" + + ret = ret .. "label[3.5,7.2;Tip: type /rankings for league tables]" return ret end -function ctf_stats.get_formspec(title, players) +function ctf_stats.get_formspec(title, players, header) table.sort(players, function(one, two) return one.score > two.score end) - local ret = "size[12,6.5]" + local ret = "size[12,"..6.5+header.."]" + ret = ret .. "container[0,"..header.."]" + ret = ret .. "vertlabel[0,0;" .. title .. "]" ret = ret .. "tablecolumns[color;text;text;text;text;text;text;text;text]" ret = ret .. "tableoptions[highlight=#00000000]" @@ -51,6 +106,7 @@ function ctf_stats.get_formspec(title, players) ret = ret .. ";-1]" ret = ret .. "button_exit[0.5,6;3,1;close;Close]" + ret = ret .. "container_end[]" return ret end @@ -173,7 +229,7 @@ minetest.register_chatcommand("rankings", { pstat.color = nil table.insert(players, pstat) end - local fs = ctf_stats.get_formspec("Player Rankings", players) + local fs = ctf_stats.get_formspec("Player Rankings", players, 0) fs = fs .. "label[3.5,6.2;Tip: to see where you are, type /rankings me]" minetest.show_formspec(name, "ctf_stats:rankings", fs) end diff --git a/mods/ctf_stats/init.lua b/mods/ctf_stats/init.lua index 151a1cb..1177608 100644 --- a/mods/ctf_stats/init.lua +++ b/mods/ctf_stats/init.lua @@ -76,6 +76,8 @@ function ctf_stats.load() blue = {} } + ctf_stats.start = os.time() + -- Strip players which have no score for name, player_stats in pairs(ctf_stats.players) do if not player_stats.score or player_stats.score <= 0 then @@ -138,6 +140,9 @@ ctf_match.register_on_skip_map(function() ctf_stats.matches.skipped = ctf_stats.matches.skipped + 1 end) +local winner_team = "-" +local winner_player = "-" + ctf_flag.register_on_capture(function(name, flag) local main, match = ctf_stats.player(name) if main and match then @@ -147,15 +152,17 @@ ctf_flag.register_on_capture(function(name, flag) match.score = match.score + 25 ctf.needs_save = true end + winner_player = name end) ctf_match.register_on_winner(function(winner) ctf.needs_save = true ctf_stats.matches.wins[winner] = ctf_stats.matches.wins[winner] + 1 + winner_team = winner end) ctf_match.register_on_new_match(function() - local fs = ctf_stats.get_formspec_match_summary(ctf_stats.current) + local fs = ctf_stats.get_formspec_match_summary(ctf_stats.current, winner_team, winner_player, os.time()-ctf_stats.start) local players = minetest.get_connected_players() for _, player in pairs(players) do minetest.show_formspec(player:get_player_name(), "ctf_stats:eom", fs) @@ -165,6 +172,9 @@ ctf_match.register_on_new_match(function() red = {}, blue = {} } + winner_team = "-" + winner_player = "-" + ctf_stats.start = os.time() ctf.needs_save = true end)