From 57e02f7bb8afc75368dc0f4b7b0359f666ade162 Mon Sep 17 00:00:00 2001 From: philipmi Date: Wed, 26 May 2021 22:16:37 +0200 Subject: [PATCH 1/2] Make match summary formspec wider --- mods/ctf/ctf_stats/gui.lua | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/mods/ctf/ctf_stats/gui.lua b/mods/ctf/ctf_stats/gui.lua index e3a628d..df2358e 100644 --- a/mods/ctf/ctf_stats/gui.lua +++ b/mods/ctf/ctf_stats/gui.lua @@ -98,18 +98,18 @@ function ctf_stats.get_formspec_match_summary(stats, winner_team, winner_player, -- Map name ret = ret .. "label[1,7.6;Map: " .. minetest.colorize("#EEEE00", stats.map) .. "]" - ret = ret .. "label[6.5,0;Kills]" - ret = ret .. "label[8,0;" .. render_team_stats(red, blue, "kills") .. "]" - ret = ret .. "label[3.5,0;Team K/D]" - ret = ret .. "label[5,0;" .. minetest.colorize(red.color, tostring(red_kd)) .. + ret = ret .. "label[7.5,0;Kills]" + ret = ret .. "label[9,0;" .. render_team_stats(red, blue, "kills") .. "]" + ret = ret .. "label[4,0;Team K/D]" + ret = ret .. "label[5.5,0;" .. minetest.colorize(red.color, tostring(red_kd)) .. " - " .. " " .. minetest.colorize(blue.color, tostring(blue_kd)) .. "]" - ret = ret .. "label[6.5,0.5;Attempts]" - ret = ret .. "label[8,0.5;" .. render_team_stats(red, blue, "attempts") .. "]" - ret = ret .. "label[9.5,0;Duration]" - ret = ret .. "label[11,0;" .. match_length .. "]" - ret = ret .. "label[9.5,0.5;Total score]" - ret = ret .. "label[11,0.5;" .. render_team_stats(red, blue, "score", true) .. "]" - ret = ret .. "label[8,7.2;Tip: type /rankings for league tables]" + ret = ret .. "label[7.5,0.5;Attempts]" + ret = ret .. "label[9,0.5;" .. render_team_stats(red, blue, "attempts") .. "]" + ret = ret .. "label[11.5,0;Duration]" + ret = ret .. "label[13,0;" .. match_length .. "]" + ret = ret .. "label[11.5,0.5;Total score]" + ret = ret .. "label[13,0.5;" .. render_team_stats(red, blue, "score", true) .. "]" + ret = ret .. "label[10,7.2;Tip: type /rankings for league tables]" return ret end @@ -119,13 +119,13 @@ function ctf_stats.get_formspec(title, players, header, target) return one.score > two.score end) - local ret = "size[14," .. 7 + header .. "]" + local ret = "size[15.5," .. 7 + header .. "]" ret = ret .. "container[0," .. header .. "]" ret = ret .. "vertlabel[0,1;" .. title .. "]" ret = ret .. tablecolumns ret = ret .. "tableoptions[highlight=#00000000]" - ret = ret .. "table[0.5,0;13.25,6.1;scores;" + ret = ret .. "table[0.5,0;14.75,6.1;scores;" ret = ret .. "#ffffff,,Player,Kills,Deaths,K/D,Bounty Kills,Captures,Attempts,Capture Rate,Score" local hstat, hplace From 282128382d22f861b2ef021e40b883006843c53d Mon Sep 17 00:00:00 2001 From: philipmi Date: Wed, 26 May 2021 22:26:07 +0200 Subject: [PATCH 2/2] Update random_messages --- mods/other/random_messages/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/other/random_messages/init.lua b/mods/other/random_messages/init.lua index 5d3c6cc..fa28205 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, killing 4 people for every 3 deaths, capturing the flag on every 3rd attempt and at least 10 times.", + "Access the pro section of the chest by achieving a 10k+ score and either killing 3 people for every 2 deaths and capture the flag 10 times or killing as many people as you die, capturing the flag on every 3rd attempt and at least 30 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.",