diff options
| -rw-r--r-- | builtin/settingtypes.txt | 3 | ||||
| -rw-r--r-- | minetest.conf.example | 4 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 1 | ||||
| -rw-r--r-- | src/dungeongen.cpp | 8 |
4 files changed, 14 insertions, 2 deletions
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 192ce5b66..10e3969e7 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -984,6 +984,9 @@ mapgen_limit (Map generation limit) int 31000 0 31000 # Flags starting with 'no' are used to explicitly disable them. mg_flags (Mapgen flags) flags caves,dungeons,light,decorations caves,dungeons,light,decorations,nocaves,nodungeons,nolight,nodecorations +# Whether dungeons occasionally project from the terrain. +projecting_dungeons (Projecting dungeons) bool true + [**Advanced] # Size of chunks to be generated at once by mapgen, stated in mapblocks (16 nodes). diff --git a/minetest.conf.example b/minetest.conf.example index f5f3f5e8c..77cc3ed53 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1201,6 +1201,10 @@ # type: flags possible values: caves, dungeons, light, decorations, nocaves, nodungeons, nolight, nodecorations # mg_flags = caves,dungeons,light,decorations +# Whether dungeons occasionally project from the terrain. +# type: bool +# projecting_dungeons = true + ### Advanced # Size of chunks to be generated at once by mapgen, stated in mapblocks (16 nodes). diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 42e369f60..fe3a4d275 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -349,6 +349,7 @@ void set_default_settings(Settings *settings) settings->setDefault("mg_flags", "dungeons"); settings->setDefault("fixed_map_seed", ""); settings->setDefault("max_block_generate_distance", "7"); + settings->setDefault("projecting_dungeons", "true"); settings->setDefault("enable_mapgen_debug_info", "false"); // Server list announcing diff --git a/src/dungeongen.cpp b/src/dungeongen.cpp index 6cef3f88d..883492bab 100644 --- a/src/dungeongen.cpp +++ b/src/dungeongen.cpp @@ -97,6 +97,8 @@ void DungeonGen::generate(MMVManip *vm, u32 bseed, v3s16 nmin, v3s16 nmax) if (nval_density < 1.0f) return; + static const bool preserve_ignore = !g_settings->getBool("projecting_dungeons"); + this->vm = vm; this->blockseed = bseed; random.seed(bseed + 2); @@ -105,14 +107,16 @@ void DungeonGen::generate(MMVManip *vm, u32 bseed, v3s16 nmin, v3s16 nmax) vm->clearFlag(VMANIP_FLAG_DUNGEON_INSIDE | VMANIP_FLAG_DUNGEON_PRESERVE); if (dp.only_in_ground) { - // Set all air and water to be untouchable - // to make dungeons open to caves and open air + // Set all air and water to be untouchable to make dungeons open to + // caves and open air. Optionally set ignore to be untouchable to + // prevent protruding dungeons. for (s16 z = nmin.Z; z <= nmax.Z; z++) { for (s16 y = nmin.Y; y <= nmax.Y; y++) { u32 i = vm->m_area.index(nmin.X, y, z); for (s16 x = nmin.X; x <= nmax.X; x++) { content_t c = vm->m_data[i].getContent(); if (c == CONTENT_AIR || c == dp.c_water || + (preserve_ignore && c == CONTENT_IGNORE) || c == dp.c_river_water) vm->m_flags[i] |= VMANIP_FLAG_DUNGEON_PRESERVE; i++; |