nalc/nalc_game
1
0
Fork 1
forked from minetest/minetest_game
Code Issues Pull Requests Releases Wiki Activity

Biome registration: Update due to revert of mgv7 'biomerepeat' option

Browse Source
This commit is contained in:
paramat 2017-09-17 06:03:42 +01:00 committed by paramat
parent bf8404fcf7
commit 4ccafd1518
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mods/default/mapgen.lua
View File

@ -1445,7 +1445,6 @@ end
-- Biomes for floatlands -- Biomes for floatlands
-- Used when mgv7 'biomerepeat' flag is false
-- TODO Temporary simple biomes to be replaced by special floatland biomes later. -- TODO Temporary simple biomes to be replaced by special floatland biomes later.
@ -2018,10 +2017,9 @@ end
-- Get setting or default -- Get setting or default
local mgv7_spflags = minetest.get_mapgen_setting("mgv7_spflags") or local mgv7_spflags = minetest.get_mapgen_setting("mgv7_spflags") or
"mountains, ridges, nofloatlands, caverns, biomerepeat" "mountains, ridges, nofloatlands, caverns"
local captures_float = string.match(mgv7_spflags, "floatlands") local captures_float = string.match(mgv7_spflags, "floatlands")
local captures_nofloat = string.match(mgv7_spflags, "nofloatlands") local captures_nofloat = string.match(mgv7_spflags, "nofloatlands")
local captures_nobiorep = string.match(mgv7_spflags, "nobiomerepeat")
-- Get setting or default -- Get setting or default
-- Make global for mods to use to register floatland biomes -- Make global for mods to use to register floatland biomes
@ -2039,12 +2037,11 @@ local mg_name = minetest.get_mapgen_setting("mg_name")
if mg_name == "v6" then if mg_name == "v6" then
default.register_mgv6_ores() default.register_mgv6_ores()
default.register_mgv6_decorations() default.register_mgv6_decorations()
-- Need to check for 'nofloatlands' because that contains
-- 'floatlands' which makes the second condition true.
elseif mg_name == "v7" and elseif mg_name == "v7" and
captures_float == "floatlands" and captures_float == "floatlands" and
-- Need to check for 'nofloatlands' because that contains captures_nofloat ~= "nofloatlands" then
-- 'floatlands' which makes the second condition true.
captures_nofloat ~= "nofloatlands" and
captures_nobiorep == "nobiomerepeat" then
-- Mgv7 with floatlands and floatland biomes -- Mgv7 with floatlands and floatland biomes
default.register_biomes(default.mgv7_shadow_limit - 1) default.register_biomes(default.mgv7_shadow_limit - 1)
default.register_floatland_biomes( default.register_floatland_biomes(