minetest/capturetheflag
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Maps catalog: Use textareas for hint and license, add others (#413)

Browse source
This commit is contained in:
Thomas--S 2019-05-15 17:04:25 +02:00 committed by ANAND ︻气デ═一
parent 0d04bfd081
commit 74c8531de4
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
mods/ctf/ctf_map/maps_catalog.lua
View file

@ -8,7 +8,7 @@ local function show_catalog(name, idx)
-- Select map to be displayed -- Select map to be displayed
local map = ctf_map.available_maps[idx] local map = ctf_map.available_maps[idx]
local fs = "size[10,8]" local fs = "size[10,9]"
fs = fs .. "container[0,0]" fs = fs .. "container[0,0]"
fs = fs .. "box[0,0;9.8,1;#111]" fs = fs .. "box[0,0;9.8,1;#111]"
@ -20,12 +20,14 @@ local function show_catalog(name, idx)
end end
-- Map name and author -- Map name and author
fs = fs .. "label[3,0;" .. minetest.formspec_escape(map.name) .. "]" fs = fs .. "label[1.75,0;" ..
fs = fs .. "label[5,0.5;" .. "(by " .. minetest.formspec_escape(map.author) .. ")]" 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[]" fs = fs .. "container_end[]"
-- List of maps -- 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 for i, v in pairs(ctf_map.available_maps) do
local mname = v.name local mname = v.name
@ -45,15 +47,32 @@ local function show_catalog(name, idx)
local y = 1 local y = 1
if map.screenshot then if map.screenshot then
fs = fs .. "image[4,1.5;6.5,3.5;" .. map.screenshot .. "]" fs = fs .. "image[4,1.5;6.5,3.5;" .. map.screenshot .. "]"
y = y + 4 y = y + 3.5
end end
-- Other fields -- Other fields
fs = fs .. "container[3.5," .. y + 0.5 .. "]" fs = fs .. "container[3.5," .. y + 0.5 .. "]"
fs = fs .. "label[0.5,0;HINT: " .. y = 0
minetest.formspec_escape(map.hint or "---") .. "]" if map.hint then
fs = fs .. "label[0.5,0.5;LICENSE: " .. fs = fs .. "label[0.5," .. y .. ";" ..
minetest.formspec_escape(map.license or "---") .. "]" 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[]" fs = fs .. "container_end[]"
minetest.show_formspec(name, "ctf_map:maps_catalog", fs) minetest.show_formspec(name, "ctf_map:maps_catalog", fs)

2
mods/ctf/ctf_map/schem_map.lua
View file

@ -98,6 +98,8 @@ local function load_map_meta(idx, path)
hint = meta:get("hint"), hint = meta:get("hint"),
rotation = meta:get("rotation"), rotation = meta:get("rotation"),
screenshot = meta:get("screenshot"), screenshot = meta:get("screenshot"),
license = meta:get("license"),
others = meta:get("others"),
schematic = path .. ".mts", schematic = path .. ".mts",
initial_stuff = initial_stuff and initial_stuff:split(","), initial_stuff = initial_stuff and initial_stuff:split(","),
treasures = treasures, treasures = treasures,