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

Fix same map being played twice in a row

Browse source
This commit is contained in:
rubenwardy 2018-01-06 03:21:54 +00:00
parent 61b909142e
commit aa9605574e
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mods/ctf_map/schem_map.lua
View file

@ -49,6 +49,7 @@ function ctf_match.load_map_meta(idx, name)
local meta = Settings(mapdir .. name .. ".conf") local meta = Settings(mapdir .. name .. ".conf")
local map = { local map = {
idx = idx,
name = meta:get("name"), name = meta:get("name"),
author = meta:get("author"), author = meta:get("author"),
rotation = meta:get("rotation"), rotation = meta:get("rotation"),
@ -105,11 +106,25 @@ function ctf_match.load_map_meta(idx, name)
end end
ctf_match.register_on_new_match(function() ctf_match.register_on_new_match(function()
local idx = math.random(#ctf_map.available_maps) -- Choose next map index, but don't select the same one again
local idx
if ctf_map.map then
idx = math.random(#ctf_map.available_maps - 1)
if idx == ctf_map.map.idx then
idx = idx + 1
end
else
idx = math.random(#ctf_map.available_maps)
end
-- Load meta data
local name = ctf_map.available_maps[idx] local name = ctf_map.available_maps[idx]
ctf_map.map = ctf_match.load_map_meta(idx, name) ctf_map.map = ctf_match.load_map_meta(idx, name)
-- Place map
ctf_map.place_map(ctf_map.map) ctf_map.place_map(ctf_map.map)
-- Fixes
minetest.after(10, function() minetest.after(10, function()
minetest.fix_light(ctf_map.map.pos1, ctf_map.map.pos2) minetest.fix_light(ctf_map.map.pos1, ctf_map.map.pos2)
end) end)