From 74c8531de40a1ae1b631c614a24d373bccfde231 Mon Sep 17 00:00:00 2001
From: Thomas--S <Thomas--S@users.noreply.github.com>
Date: Wed, 15 May 2019 17:04:25 +0200
Subject: [PATCH] Maps catalog: Use textareas for hint and license, add
 `others` (#413)

---
 mods/ctf/ctf_map/maps_catalog.lua | 37 +++++++++++++++++++++++--------
 mods/ctf/ctf_map/schem_map.lua    |  2 ++
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/mods/ctf/ctf_map/maps_catalog.lua b/mods/ctf/ctf_map/maps_catalog.lua
index 6bba7bb..00583f5 100644
--- a/mods/ctf/ctf_map/maps_catalog.lua
+++ b/mods/ctf/ctf_map/maps_catalog.lua
@@ -8,7 +8,7 @@ local function show_catalog(name, idx)
 	-- Select map to be displayed
 	local map = ctf_map.available_maps[idx]
 
-	local fs = "size[10,8]"
+	local fs = "size[10,9]"
 
 	fs = fs .. "container[0,0]"
 	fs = fs .. "box[0,0;9.8,1;#111]"
@@ -20,12 +20,14 @@ local function show_catalog(name, idx)
 	end
 
 	-- Map name and author
-	fs = fs .. "label[3,0;" .. minetest.formspec_escape(map.name) .. "]"
-	fs = fs .. "label[5,0.5;" .. "(by " .. minetest.formspec_escape(map.author) .. ")]"
+	fs = fs .. "label[1.75,0;" ..
+			minetest.colorize("#ffff00", minetest.formspec_escape(map.name)) .. "]"
+	fs = fs .. "label[1.75,0.5;" .. minetest.colorize("#cccccc",
+					"by " .. minetest.formspec_escape(map.author)) .. "]"
 	fs = fs .. "container_end[]"
 
 	-- List of maps
-	fs = fs .. "textlist[0,1.2;3.5,6.8;maps_list;"
+	fs = fs .. "textlist[0,1.2;3.5,7.8;maps_list;"
 	for i, v in pairs(ctf_map.available_maps) do
 		local mname = v.name
 
@@ -45,15 +47,32 @@ local function show_catalog(name, idx)
 	local y = 1
 	if map.screenshot then
 		fs = fs .. "image[4,1.5;6.5,3.5;" .. map.screenshot .. "]"
-		y = y + 4
+		y = y + 3.5
 	end
 
 	-- Other fields
 	fs = fs .. "container[3.5," .. y + 0.5 .. "]"
-	fs = fs .. "label[0.5,0;HINT: " ..
-			minetest.formspec_escape(map.hint or "---") .. "]"
-	fs = fs .. "label[0.5,0.5;LICENSE: " ..
-			minetest.formspec_escape(map.license or "---") .. "]"
+	y = 0
+	if map.hint then
+		fs = fs .. "label[0.5," .. y .. ";" ..
+				minetest.colorize("#FFFF00", "HINT:") .. "]"
+		fs = fs .. "textarea[0.8," .. y + 0.5 .. ";5.5,1;;;" ..
+				minetest.formspec_escape(map.hint) .. "]"
+		y = y + 1.375
+	end
+	if map.license then
+		fs = fs .. "label[0.5," .. y .. ";" ..
+				minetest.colorize("#FFFF00", "LICENSE:") .. "]"
+		fs = fs .. "textarea[0.8," .. y + 0.5 .. ";5.5,1;;;" ..
+				minetest.formspec_escape(map.license) .. "]"
+		y = y + 1.375
+	end
+	if map.others then
+		fs = fs .. "label[0.5," .. y .. ";" ..
+				minetest.colorize("#FFFF00", "MORE INFORMATION:") .. "]"
+		fs = fs .. "textarea[0.8," .. y + 0.5 .. ";5.5,1;;;" ..
+				minetest.formspec_escape(map.others) .. "]"
+	end
 	fs = fs .. "container_end[]"
 
 	minetest.show_formspec(name, "ctf_map:maps_catalog", fs)
diff --git a/mods/ctf/ctf_map/schem_map.lua b/mods/ctf/ctf_map/schem_map.lua
index b3d2e68..364b769 100644
--- a/mods/ctf/ctf_map/schem_map.lua
+++ b/mods/ctf/ctf_map/schem_map.lua
@@ -98,6 +98,8 @@ local function load_map_meta(idx, path)
 		hint          = meta:get("hint"),
 		rotation      = meta:get("rotation"),
 		screenshot    = meta:get("screenshot"),
+		license       = meta:get("license"),
+		others        = meta:get("others"),
 		schematic     = path .. ".mts",
 		initial_stuff = initial_stuff and initial_stuff:split(","),
 		treasures     = treasures,