]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/mapgen.cpp
Various server.cpp cleanups
[dragonfireclient.git] / src / mapgen.cpp
index 09671d845d717ac48730c67a41f96d1523424940..cec59389dbc1bd256b2c7bce9995d1229b3449a7 100644 (file)
@@ -1,7 +1,8 @@
 /*
 Minetest
-Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
 Copyright (C) 2010-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2015-2017 paramat
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -39,13 +40,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include "filesys.h"
 #include "log.h"
+#include "mapgen_carpathian.h"
+#include "mapgen_flat.h"
+#include "mapgen_fractal.h"
+#include "mapgen_v5.h"
+#include "mapgen_v6.h"
+#include "mapgen_v7.h"
+#include "mapgen_valleys.h"
+#include "mapgen_singlenode.h"
 #include "cavegen.h"
+#include "dungeongen.h"
 
 FlagDesc flagdesc_mapgen[] = {
-       {"trees",       MG_TREES},
        {"caves",       MG_CAVES},
        {"dungeons",    MG_DUNGEONS},
-       {"flat",        MG_FLAT},
        {"light",       MG_LIGHT},
        {"decorations", MG_DECORATIONS},
        {NULL,       0}
@@ -62,6 +70,29 @@ FlagDesc flagdesc_gennotify[] = {
        {NULL,               0}
 };
 
+struct MapgenDesc {
+       const char *name;
+       bool is_user_visible;
+};
+
+////
+//// Built-in mapgens
+////
+
+static MapgenDesc g_reg_mapgens[] = {
+       {"v5",         true},
+       {"v6",         true},
+       {"v7",         true},
+       {"flat",       true},
+       {"fractal",    true},
+       {"valleys",    true},
+       {"singlenode", true},
+       {"carpathian", true},
+};
+
+STATIC_ASSERT(
+       ARRLEN(g_reg_mapgens) == MAPGEN_INVALID,
+       registered_mapgens_is_wrong_size);
 
 ////
 //// Mapgen
@@ -69,35 +100,34 @@ FlagDesc flagdesc_gennotify[] = {
 
 Mapgen::Mapgen()
 {
-       generating  = false;
-       id          = -1;
-       seed        = 0;
-       water_level = 0;
-       flags       = 0;
-
-       vm        = NULL;
-       ndef      = NULL;
-       biomegen  = NULL;
-       biomemap  = NULL;
-       heightmap = NULL;
 }
 
 
 Mapgen::Mapgen(int mapgenid, MapgenParams *params, EmergeManager *emerge) :
        gennotify(emerge->gen_notify_on, &emerge->gen_notify_on_deco_ids)
 {
-       generating  = false;
-       id          = mapgenid;
-       seed        = (int)params->seed;
-       water_level = params->water_level;
-       flags       = params->flags;
-       csize       = v3s16(1, 1, 1) * (params->chunksize * MAP_BLOCKSIZE);
+       id           = mapgenid;
+       water_level  = params->water_level;
+       mapgen_limit = params->mapgen_limit;
+       flags        = params->flags;
+       csize        = v3s16(1, 1, 1) * (params->chunksize * MAP_BLOCKSIZE);
+
+       /*
+               We are losing half our entropy by doing this, but it is necessary to
+               preserve reverse compatibility.  If the top half of our current 64 bit
+               seeds ever starts getting used, existing worlds will break due to a
+               different hash outcome and no way to differentiate between versions.
+
+               A solution could be to add a new bit to designate that the top half of
+               the seed value should be used, essentially a 1-bit version code, but
+               this would require increasing the total size of a seed to 9 bytes (yuck)
+
+               It's probably okay if this never gets fixed.  4.2 billion possibilities
+               ought to be enough for anyone.
+       */
+       seed = (s32)params->seed;
 
-       vm        = NULL;
        ndef      = emerge->ndef;
-       biomegen  = NULL;
-       biomemap  = NULL;
-       heightmap = NULL;
 }
 
 
@@ -106,7 +136,88 @@ Mapgen::~Mapgen()
 }
 
 
-u32 Mapgen::getBlockSeed(v3s16 p, int seed)
+MapgenType Mapgen::getMapgenType(const std::string &mgname)
+{
+       for (size_t i = 0; i != ARRLEN(g_reg_mapgens); i++) {
+               if (mgname == g_reg_mapgens[i].name)
+                       return (MapgenType)i;
+       }
+
+       return MAPGEN_INVALID;
+}
+
+
+const char *Mapgen::getMapgenName(MapgenType mgtype)
+{
+       size_t index = (size_t)mgtype;
+       if (index == MAPGEN_INVALID || index >= ARRLEN(g_reg_mapgens))
+               return "invalid";
+
+       return g_reg_mapgens[index].name;
+}
+
+
+Mapgen *Mapgen::createMapgen(MapgenType mgtype, int mgid,
+       MapgenParams *params, EmergeManager *emerge)
+{
+       switch (mgtype) {
+       case MAPGEN_CARPATHIAN:
+               return new MapgenCarpathian(mgid, (MapgenCarpathianParams *)params, emerge);
+       case MAPGEN_FLAT:
+               return new MapgenFlat(mgid, (MapgenFlatParams *)params, emerge);
+       case MAPGEN_FRACTAL:
+               return new MapgenFractal(mgid, (MapgenFractalParams *)params, emerge);
+       case MAPGEN_SINGLENODE:
+               return new MapgenSinglenode(mgid, (MapgenSinglenodeParams *)params, emerge);
+       case MAPGEN_V5:
+               return new MapgenV5(mgid, (MapgenV5Params *)params, emerge);
+       case MAPGEN_V6:
+               return new MapgenV6(mgid, (MapgenV6Params *)params, emerge);
+       case MAPGEN_V7:
+               return new MapgenV7(mgid, (MapgenV7Params *)params, emerge);
+       case MAPGEN_VALLEYS:
+               return new MapgenValleys(mgid, (MapgenValleysParams *)params, emerge);
+       default:
+               return NULL;
+       }
+}
+
+
+MapgenParams *Mapgen::createMapgenParams(MapgenType mgtype)
+{
+       switch (mgtype) {
+       case MAPGEN_CARPATHIAN:
+               return new MapgenCarpathianParams;
+       case MAPGEN_FLAT:
+               return new MapgenFlatParams;
+       case MAPGEN_FRACTAL:
+               return new MapgenFractalParams;
+       case MAPGEN_SINGLENODE:
+               return new MapgenSinglenodeParams;
+       case MAPGEN_V5:
+               return new MapgenV5Params;
+       case MAPGEN_V6:
+               return new MapgenV6Params;
+       case MAPGEN_V7:
+               return new MapgenV7Params;
+       case MAPGEN_VALLEYS:
+               return new MapgenValleysParams;
+       default:
+               return NULL;
+       }
+}
+
+
+void Mapgen::getMapgenNames(std::vector<const char *> *mgnames, bool include_hidden)
+{
+       for (u32 i = 0; i != ARRLEN(g_reg_mapgens); i++) {
+               if (include_hidden || g_reg_mapgens[i].is_user_visible)
+                       mgnames->push_back(g_reg_mapgens[i].name);
+       }
+}
+
+
+u32 Mapgen::getBlockSeed(v3s16 p, s32 seed)
 {
        return (u32)seed   +
                p.Z * 38134234 +
@@ -115,7 +226,7 @@ u32 Mapgen::getBlockSeed(v3s16 p, int seed)
 }
 
 
-u32 Mapgen::getBlockSeed2(v3s16 p, int seed)
+u32 Mapgen::getBlockSeed2(v3s16 p, s32 seed)
 {
        u32 n = 1619 * p.X + 31337 * p.Y + 52591 * p.Z + 1013 * seed;
        n = (n >> 13) ^ n;
@@ -126,7 +237,7 @@ u32 Mapgen::getBlockSeed2(v3s16 p, int seed)
 // Returns Y one under area minimum if not found
 s16 Mapgen::findGroundLevelFull(v2s16 p2d)
 {
-       v3s16 em = vm->m_area.getExtent();
+       const v3s16 &em = vm->m_area.getExtent();
        s16 y_nodes_max = vm->m_area.MaxEdge.Y;
        s16 y_nodes_min = vm->m_area.MinEdge.Y;
        u32 i = vm->m_area.index(p2d.X, y_nodes_max, p2d.Y);
@@ -146,7 +257,7 @@ s16 Mapgen::findGroundLevelFull(v2s16 p2d)
 // Returns -MAX_MAP_GENERATION_LIMIT if not found
 s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax)
 {
-       v3s16 em = vm->m_area.getExtent();
+       const v3s16 &em = vm->m_area.getExtent();
        u32 i = vm->m_area.index(p2d.X, ymax, p2d.Y);
        s16 y;
 
@@ -164,7 +275,7 @@ s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax)
 // Returns -MAX_MAP_GENERATION_LIMIT if not found or if ground is found first
 s16 Mapgen::findLiquidSurface(v2s16 p2d, s16 ymin, s16 ymax)
 {
-       v3s16 em = vm->m_area.getExtent();
+       const v3s16 &em = vm->m_area.getExtent();
        u32 i = vm->m_area.index(p2d.X, ymax, p2d.Y);
        s16 y;
 
@@ -195,30 +306,88 @@ void Mapgen::updateHeightmap(v3s16 nmin, v3s16 nmax)
                        heightmap[index] = y;
                }
        }
-       //printf("updateHeightmap: %dus\n", t.stop());
 }
 
+inline bool Mapgen::isLiquidHorizontallyFlowable(u32 vi, v3s16 em)
+{
+       u32 vi_neg_x = vi;
+       vm->m_area.add_x(em, vi_neg_x, -1);
+       if (vm->m_data[vi_neg_x].getContent() != CONTENT_IGNORE) {
+               const ContentFeatures &c_nx = ndef->get(vm->m_data[vi_neg_x]);
+               if (c_nx.floodable && !c_nx.isLiquid())
+                       return true;
+       }
+       u32 vi_pos_x = vi;
+       vm->m_area.add_x(em, vi_pos_x, +1);
+       if (vm->m_data[vi_pos_x].getContent() != CONTENT_IGNORE) {
+               const ContentFeatures &c_px = ndef->get(vm->m_data[vi_pos_x]);
+               if (c_px.floodable && !c_px.isLiquid())
+                       return true;
+       }
+       u32 vi_neg_z = vi;
+       vm->m_area.add_z(em, vi_neg_z, -1);
+       if (vm->m_data[vi_neg_z].getContent() != CONTENT_IGNORE) {
+               const ContentFeatures &c_nz = ndef->get(vm->m_data[vi_neg_z]);
+               if (c_nz.floodable && !c_nz.isLiquid())
+                       return true;
+       }
+       u32 vi_pos_z = vi;
+       vm->m_area.add_z(em, vi_pos_z, +1);
+       if (vm->m_data[vi_pos_z].getContent() != CONTENT_IGNORE) {
+               const ContentFeatures &c_pz = ndef->get(vm->m_data[vi_pos_z]);
+               if (c_pz.floodable && !c_pz.isLiquid())
+                       return true;
+       }
+       return false;
+}
 
 void Mapgen::updateLiquid(UniqueQueue<v3s16> *trans_liquid, v3s16 nmin, v3s16 nmax)
 {
-       bool isliquid, wasliquid;
-       v3s16 em  = vm->m_area.getExtent();
-
-       for (s16 z = nmin.Z; z <= nmax.Z; z++) {
-               for (s16 x = nmin.X; x <= nmax.X; x++) {
-                       wasliquid = true;
-
-                       u32 i = vm->m_area.index(x, nmax.Y, z);
-                       for (s16 y = nmax.Y; y >= nmin.Y; y--) {
-                               isliquid = ndef->get(vm->m_data[i]).isLiquid();
-
-                               // there was a change between liquid and nonliquid, add to queue.
-                               if (isliquid != wasliquid)
+       bool isignored, isliquid, wasignored, wasliquid, waschecked, waspushed;
+       const v3s16 &em  = vm->m_area.getExtent();
+
+       for (s16 z = nmin.Z + 1; z <= nmax.Z - 1; z++)
+       for (s16 x = nmin.X + 1; x <= nmax.X - 1; x++) {
+               wasignored = true;
+               wasliquid = false;
+               waschecked = false;
+               waspushed = false;
+
+               u32 vi = vm->m_area.index(x, nmax.Y, z);
+               for (s16 y = nmax.Y; y >= nmin.Y; y--) {
+                       isignored = vm->m_data[vi].getContent() == CONTENT_IGNORE;
+                       isliquid = ndef->get(vm->m_data[vi]).isLiquid();
+
+                       if (isignored || wasignored || isliquid == wasliquid) {
+                               // Neither topmost node of liquid column nor topmost node below column
+                               waschecked = false;
+                               waspushed = false;
+                       } else if (isliquid) {
+                               // This is the topmost node in the column
+                               bool ispushed = false;
+                               if (isLiquidHorizontallyFlowable(vi, em)) {
                                        trans_liquid->push_back(v3s16(x, y, z));
-
-                               wasliquid = isliquid;
-                               vm->m_area.add_y(em, i, -1);
+                                       ispushed = true;
+                               }
+                               // Remember waschecked and waspushed to avoid repeated
+                               // checks/pushes in case the column consists of only this node
+                               waschecked = true;
+                               waspushed = ispushed;
+                       } else {
+                               // This is the topmost node below a liquid column
+                               u32 vi_above = vi;
+                               vm->m_area.add_y(em, vi_above, 1);
+                               if (!waspushed && (ndef->get(vm->m_data[vi]).floodable ||
+                                               (!waschecked && isLiquidHorizontallyFlowable(vi_above, em)))) {
+                                       // Push back the lowest node in the column which is one
+                                       // node above this one
+                                       trans_liquid->push_back(v3s16(x, y + 1, z));
+                               }
                        }
+
+                       wasliquid = isliquid;
+                       wasignored = isignored;
+                       vm->m_area.add_y(em, vi, -1);
                }
        }
 }
@@ -298,7 +467,7 @@ void Mapgen::propagateSunlight(v3s16 nmin, v3s16 nmax, bool propagate_shadow)
        //TimeTaker t("propagateSunlight");
        VoxelArea a(nmin, nmax);
        bool block_is_underground = (water_level >= nmax.Y);
-       v3s16 em = vm->m_area.getExtent();
+       const v3s16 &em = vm->m_area.getExtent();
 
        // NOTE: Direct access to the low 4 bits of param1 is okay here because,
        // by definition, sunlight will never be in the night lightbank.
@@ -377,14 +546,94 @@ void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax)
 MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emerge)
        : Mapgen(mapgenid, params, emerge)
 {
+       this->m_emerge = emerge;
+       this->m_bmgr   = emerge->biomemgr;
+
+       //// Here, 'stride' refers to the number of elements needed to skip to index
+       //// an adjacent element for that coordinate in noise/height/biome maps
+       //// (*not* vmanip content map!)
+
+       // Note there is no X stride explicitly defined.  Items adjacent in the X
+       // coordinate are assumed to be adjacent in memory as well (i.e. stride of 1).
+
+       // Number of elements to skip to get to the next Y coordinate
+       this->ystride = csize.X;
+
+       // Number of elements to skip to get to the next Z coordinate
+       this->zstride = csize.X * csize.Y;
+
+       // Z-stride value for maps oversized for 1-down overgeneration
+       this->zstride_1d = csize.X * (csize.Y + 1);
+
+       // Z-stride value for maps oversized for 1-up 1-down overgeneration
+       this->zstride_1u1d = csize.X * (csize.Y + 2);
+
+       //// Allocate heightmap
+       this->heightmap = new s16[csize.X * csize.Z];
+
+       //// Initialize biome generator
+       // TODO(hmmmm): should we have a way to disable biomemanager biomes?
+       biomegen = m_bmgr->createBiomeGen(BIOMEGEN_ORIGINAL, params->bparams, csize);
+       biomemap = biomegen->biomemap;
+
+       //// Look up some commonly used content
+       c_stone              = ndef->getId("mapgen_stone");
+       c_desert_stone       = ndef->getId("mapgen_desert_stone");
+       c_sandstone          = ndef->getId("mapgen_sandstone");
+       c_water_source       = ndef->getId("mapgen_water_source");
+       c_river_water_source = ndef->getId("mapgen_river_water_source");
+       c_lava_source        = ndef->getId("mapgen_lava_source");
+
+       // Fall back to more basic content if not defined
+       // river_water_source cannot fallback to water_source because river water
+       // needs to be non-renewable and have a short flow range.
+       if (c_desert_stone == CONTENT_IGNORE)
+               c_desert_stone = c_stone;
+       if (c_sandstone == CONTENT_IGNORE)
+               c_sandstone = c_stone;
+
+       //// Content used for dungeon generation
+       c_cobble                = ndef->getId("mapgen_cobble");
+       c_mossycobble           = ndef->getId("mapgen_mossycobble");
+       c_stair_cobble          = ndef->getId("mapgen_stair_cobble");
+       c_stair_desert_stone    = ndef->getId("mapgen_stair_desert_stone");
+       c_sandstonebrick        = ndef->getId("mapgen_sandstonebrick");
+       c_stair_sandstone_block = ndef->getId("mapgen_stair_sandstone_block");
+
+       // Fall back to more basic content if not defined
+       if (c_mossycobble == CONTENT_IGNORE)
+               c_mossycobble = c_cobble;
+       if (c_stair_cobble == CONTENT_IGNORE)
+               c_stair_cobble = c_cobble;
+       if (c_stair_desert_stone == CONTENT_IGNORE)
+               c_stair_desert_stone = c_desert_stone;
+       if (c_sandstonebrick == CONTENT_IGNORE)
+               c_sandstonebrick = c_sandstone;
+       if (c_stair_sandstone_block == CONTENT_IGNORE)
+               c_stair_sandstone_block = c_sandstonebrick;
+}
 
+
+MapgenBasic::~MapgenBasic()
+{
+       delete biomegen;
+       delete []heightmap;
 }
 
-MgStoneType MapgenBasic::generateBiomes()
+
+void MapgenBasic::generateBiomes(MgStoneType *mgstone_type,
+       content_t *biome_stone, s16 biome_zero_level)
 {
-       v3s16 em = vm->m_area.getExtent();
+       // can't generate biomes without a biome generator!
+       assert(biomegen);
+       assert(biomemap);
+
+       const v3s16 &em = vm->m_area.getExtent();
        u32 index = 0;
-       MgStoneType stone_type = MGSTONE_STONE;
+       MgStoneType stone_type = MGSTONE_OTHER;
+       content_t c_biome_stone = c_stone;
+
+       noise_filler_depth->perlinMap2D(node_min.X, node_min.Z);
 
        for (s16 z = node_min.Z; z <= node_max.Z; z++)
        for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
@@ -392,13 +641,17 @@ MgStoneType MapgenBasic::generateBiomes()
                u16 depth_top = 0;
                u16 base_filler = 0;
                u16 depth_water_top = 0;
+               u16 depth_riverbed = 0;
                u32 vi = vm->m_area.index(x, node_max.Y, z);
 
                // Check node at base of mapchunk above, either a node of a previously
                // generated mapchunk or if not, a node of overgenerated base terrain.
                content_t c_above = vm->m_data[vi + em.X].getContent();
                bool air_above = c_above == CONTENT_AIR;
-               bool water_above = (c_above == c_water_source || c_above == c_river_water_source);
+               bool river_water_above = c_above == c_river_water_source;
+               bool water_above = c_above == c_water_source || river_water_above;
+
+               biomemap[index] = BIOME_NONE;
 
                // If there is air or water above enable top/filler placement, otherwise force
                // nplaced to stone level by setting a number exceeding any possible filler depth.
@@ -414,24 +667,39 @@ MgStoneType MapgenBasic::generateBiomes()
                        // 1. At the surface of stone below air or water.
                        // 2. At the surface of water below air.
                        // 3. When stone or water is detected but biome has not yet been calculated.
-                       if ((c == c_stone && (air_above || water_above || !biome))
-                                       || ((c == c_water_source || c == c_river_water_source)
-                                               && (air_above || !biome))) {
-                               biome = biomegen->getBiomeAtIndex(index, y);
+                       bool is_stone_surface = (c == c_stone) &&
+                               (air_above || water_above || !biome);
+
+                       bool is_water_surface =
+                               (c == c_water_source || c == c_river_water_source) &&
+                               (air_above || !biome);
+
+                       if (is_stone_surface || is_water_surface) {
+                               // Limit to +-MAX MAP GENERATION LIMIT to work with biome y_min / y_max.
+                               s32 relative_y = rangelim(y - biome_zero_level,
+                                       -MAX_MAP_GENERATION_LIMIT, MAX_MAP_GENERATION_LIMIT);
+                               biome = biomegen->getBiomeAtIndex(index, relative_y);
+
+                               if (biomemap[index] == BIOME_NONE && is_stone_surface)
+                                       biomemap[index] = biome->index;
 
                                depth_top = biome->depth_top;
-                               base_filler = MYMAX(depth_top
-                                               + biome->depth_filler
-                                               + noise_filler_depth->result[index], 0.f);
+                               base_filler = MYMAX(depth_top +
+                                       biome->depth_filler +
+                                       noise_filler_depth->result[index], 0.f);
                                depth_water_top = biome->depth_water_top;
+                               depth_riverbed = biome->depth_riverbed;
 
                                // Detect stone type for dungeons during every biome calculation.
-                               // This is more efficient than detecting per-node and will not
-                               // miss any desert stone or sandstone biomes.
-                               if (biome->c_stone == c_desert_stone)
+                               // If none detected the last selected biome stone is chosen.
+                               if (biome->c_stone == c_stone)
+                                       stone_type = MGSTONE_STONE;
+                               else if (biome->c_stone == c_desert_stone)
                                        stone_type = MGSTONE_DESERT_STONE;
                                else if (biome->c_stone == c_sandstone)
                                        stone_type = MGSTONE_SANDSTONE;
+
+                               c_biome_stone = biome->c_stone;
                        }
 
                        if (c == c_stone) {
@@ -446,7 +714,15 @@ MgStoneType MapgenBasic::generateBiomes()
                                                || c_below == c_river_water_source)
                                        nplaced = U16_MAX;
 
-                               if (nplaced < depth_top) {
+                               if (river_water_above) {
+                                       if (nplaced < depth_riverbed) {
+                                               vm->m_data[vi] = MapNode(biome->c_riverbed);
+                                               nplaced++;
+                                       } else {
+                                               nplaced = U16_MAX;  // Disable top/filler placement
+                                               river_water_above = false;
+                                       }
+                               } else if (nplaced < depth_top) {
                                        vm->m_data[vi] = MapNode(biome->c_top);
                                        nplaced++;
                                } else if (nplaced < base_filler) {
@@ -466,9 +742,10 @@ MgStoneType MapgenBasic::generateBiomes()
                                water_above = true;
                        } else if (c == c_river_water_source) {
                                vm->m_data[vi] = MapNode(biome->c_river_water);
-                               nplaced = depth_top;  // Enable filler placement for next surface
+                               nplaced = 0;  // Enable riverbed placement for next surface
                                air_above = false;
                                water_above = true;
+                               river_water_above = true;
                        } else if (c == CONTENT_AIR) {
                                nplaced = 0;  // Enable top/filler placement for next surface
                                air_above = true;
@@ -483,7 +760,8 @@ MgStoneType MapgenBasic::generateBiomes()
                }
        }
 
-       return stone_type;
+       *mgstone_type = stone_type;
+       *biome_stone = c_biome_stone;
 }
 
 
@@ -492,12 +770,12 @@ void MapgenBasic::dustTopNodes()
        if (node_max.Y < water_level)
                return;
 
-       v3s16 em = vm->m_area.getExtent();
+       const v3s16 &em = vm->m_area.getExtent();
        u32 index = 0;
 
        for (s16 z = node_min.Z; z <= node_max.Z; z++)
        for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
-               Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]);
+               Biome *biome = (Biome *)m_bmgr->getRaw(biomemap[index]);
 
                if (biome->c_dust == CONTENT_IGNORE)
                        continue;
@@ -542,56 +820,10 @@ void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
        if (max_stone_y < node_min.Y)
                return;
 
-       noise_cave1->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
-       noise_cave2->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
+       CavesNoiseIntersection caves_noise(ndef, m_bmgr, csize,
+               &np_cave1, &np_cave2, seed, cave_width);
 
-       v3s16 em = vm->m_area.getExtent();
-       u32 index2d = 0;
-
-       for (s16 z = node_min.Z; z <= node_max.Z; z++)
-       for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
-               bool column_is_open = false;  // Is column open to overground
-               bool is_tunnel = false;  // Is tunnel or tunnel floor
-               u32 vi = vm->m_area.index(x, node_max.Y, z);
-               u32 index3d = (z - node_min.Z) * zstride_1d + csize.Y * ystride +
-                       (x - node_min.X);
-               // Biome of column
-               Biome *biome = (Biome *)bmgr->getRaw(biomemap[index2d]);
-
-               // Don't excavate the overgenerated stone at node_max.Y + 1,
-               // this creates a 'roof' over the tunnel, preventing light in
-               // tunnels at mapchunk borders when generating mapchunks upwards.
-               // This 'roof' is removed when the mapchunk above is generated.
-               for (s16 y = node_max.Y; y >= node_min.Y - 1; y--,
-                               index3d -= ystride,
-                               vm->m_area.add_y(em, vi, -1)) {
-
-                       content_t c = vm->m_data[vi].getContent();
-                       if (c == CONTENT_AIR || c == biome->c_water_top ||
-                                       c == biome->c_water) {
-                               column_is_open = true;
-                               continue;
-                       }
-                       // Ground
-                       float d1 = contour(noise_cave1->result[index3d]);
-                       float d2 = contour(noise_cave2->result[index3d]);
-
-                       if (d1 * d2 > cave_width && ndef->get(c).is_ground_content) {
-                               // In tunnel and ground content, excavate
-                               vm->m_data[vi] = MapNode(CONTENT_AIR);
-                               is_tunnel = true;
-                       } else {
-                               // Not in tunnel or not ground content
-                               if (is_tunnel && column_is_open &&
-                                               (c == biome->c_filler || c == biome->c_stone))
-                                       // Tunnel entrance floor
-                                       vm->m_data[vi] = MapNode(biome->c_top);
-
-                               column_is_open = false;
-                               is_tunnel = false;
-                       }
-               }
-       }
+       caves_noise.generateCaves(vm, node_min, node_max, biomemap);
 
        if (node_max.Y > large_cave_depth)
                return;
@@ -600,20 +832,115 @@ void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
        u32 bruises_count = ps.range(0, 2);
        for (u32 i = 0; i < bruises_count; i++) {
                CavesRandomWalk cave(ndef, &gennotify, seed, water_level,
-                       c_water_source, CONTENT_IGNORE);
+                       c_water_source, CONTENT_IGNORE, lava_depth);
 
                cave.makeCave(vm, node_min, node_max, &ps, true, max_stone_y, heightmap);
        }
 }
 
 
+bool MapgenBasic::generateCaverns(s16 max_stone_y)
+{
+       if (node_min.Y > max_stone_y || node_min.Y > cavern_limit)
+               return false;
+
+       CavernsNoise caverns_noise(ndef, csize, &np_cavern,
+               seed, cavern_limit, cavern_taper, cavern_threshold);
+
+       return caverns_noise.generateCaverns(vm, node_min, node_max);
+}
+
+
+void MapgenBasic::generateDungeons(s16 max_stone_y,
+       MgStoneType stone_type, content_t biome_stone)
+{
+       if (max_stone_y < node_min.Y)
+               return;
+
+       DungeonParams dp;
+
+       dp.seed             = seed;
+       dp.c_water          = c_water_source;
+       dp.c_river_water    = c_river_water_source;
+
+       dp.only_in_ground   = true;
+       dp.corridor_len_min = 1;
+       dp.corridor_len_max = 13;
+       dp.rooms_min        = 2;
+       dp.rooms_max        = 16;
+       dp.y_min            = -MAX_MAP_GENERATION_LIMIT;
+       dp.y_max            = MAX_MAP_GENERATION_LIMIT;
+
+       dp.np_density       = nparams_dungeon_density;
+       dp.np_alt_wall      = nparams_dungeon_alt_wall;
+
+       switch (stone_type) {
+       default:
+       case MGSTONE_STONE:
+               dp.c_wall              = c_cobble;
+               dp.c_alt_wall          = c_mossycobble;
+               dp.c_stair             = c_stair_cobble;
+
+               dp.diagonal_dirs       = false;
+               dp.holesize            = v3s16(1, 2, 1);
+               dp.room_size_min       = v3s16(4, 4, 4);
+               dp.room_size_max       = v3s16(8, 6, 8);
+               dp.room_size_large_min = v3s16(8, 8, 8);
+               dp.room_size_large_max = v3s16(16, 16, 16);
+               dp.notifytype          = GENNOTIFY_DUNGEON;
+               break;
+       case MGSTONE_DESERT_STONE:
+               dp.c_wall              = c_desert_stone;
+               dp.c_alt_wall          = CONTENT_IGNORE;
+               dp.c_stair             = c_stair_desert_stone;
+
+               dp.diagonal_dirs       = true;
+               dp.holesize            = v3s16(2, 3, 2);
+               dp.room_size_min       = v3s16(6, 9, 6);
+               dp.room_size_max       = v3s16(10, 11, 10);
+               dp.room_size_large_min = v3s16(10, 13, 10);
+               dp.room_size_large_max = v3s16(18, 21, 18);
+               dp.notifytype          = GENNOTIFY_TEMPLE;
+               break;
+       case MGSTONE_SANDSTONE:
+               dp.c_wall              = c_sandstonebrick;
+               dp.c_alt_wall          = CONTENT_IGNORE;
+               dp.c_stair             = c_stair_sandstone_block;
+
+               dp.diagonal_dirs       = false;
+               dp.holesize            = v3s16(2, 2, 2);
+               dp.room_size_min       = v3s16(6, 4, 6);
+               dp.room_size_max       = v3s16(10, 6, 10);
+               dp.room_size_large_min = v3s16(10, 8, 10);
+               dp.room_size_large_max = v3s16(18, 16, 18);
+               dp.notifytype          = GENNOTIFY_DUNGEON;
+               break;
+       case MGSTONE_OTHER:
+               dp.c_wall              = biome_stone;
+               dp.c_alt_wall          = biome_stone;
+               dp.c_stair             = biome_stone;
+
+               dp.diagonal_dirs       = false;
+               dp.holesize            = v3s16(1, 2, 1);
+               dp.room_size_min       = v3s16(4, 4, 4);
+               dp.room_size_max       = v3s16(8, 6, 8);
+               dp.room_size_large_min = v3s16(8, 8, 8);
+               dp.room_size_large_max = v3s16(16, 16, 16);
+               dp.notifytype          = GENNOTIFY_DUNGEON;
+               break;
+       }
+
+       DungeonGen dgen(ndef, &gennotify, &dp);
+       dgen.generate(vm, blockseed, full_node_min, full_node_max);
+}
+
+
 ////
 //// GenerateNotifier
 ////
 
 GenerateNotifier::GenerateNotifier()
 {
-       m_notify_on = 0;
 }
 
 
@@ -684,52 +1011,111 @@ void GenerateNotifier::getEvents(
 MapgenParams::~MapgenParams()
 {
        delete bparams;
-       delete sparams;
 }
 
 
-void MapgenParams::load(const Settings &settings)
+void MapgenParams::readParams(const Settings *settings)
 {
        std::string seed_str;
-       const char *seed_name = (&settings == g_settings) ? "fixed_map_seed" : "seed";
+       const char *seed_name = (settings == g_settings) ? "fixed_map_seed" : "seed";
 
-       if (settings.getNoEx(seed_name, seed_str) && !seed_str.empty())
-               seed = read_seed(seed_str.c_str());
-       else
-               myrand_bytes(&seed, sizeof(seed));
+       if (settings->getNoEx(seed_name, seed_str)) {
+               if (!seed_str.empty())
+                       seed = read_seed(seed_str.c_str());
+               else
+                       myrand_bytes(&seed, sizeof(seed));
+       }
 
-       settings.getNoEx("mg_name", mg_name);
-       settings.getS16NoEx("water_level", water_level);
-       settings.getS16NoEx("chunksize", chunksize);
-       settings.getFlagStrNoEx("mg_flags", flags, flagdesc_mapgen);
+       std::string mg_name;
+       if (settings->getNoEx("mg_name", mg_name)) {
+               mgtype = Mapgen::getMapgenType(mg_name);
+               if (mgtype == MAPGEN_INVALID)
+                       mgtype = MAPGEN_DEFAULT;
+       }
+
+       settings->getS16NoEx("water_level", water_level);
+       settings->getS16NoEx("mapgen_limit", mapgen_limit);
+       settings->getS16NoEx("chunksize", chunksize);
+       settings->getFlagStrNoEx("mg_flags", flags, flagdesc_mapgen);
 
        delete bparams;
        bparams = BiomeManager::createBiomeParams(BIOMEGEN_ORIGINAL);
        if (bparams) {
-               bparams->readParams(&settings);
+               bparams->readParams(settings);
                bparams->seed = seed;
        }
-
-       delete sparams;
-       MapgenFactory *mgfactory = EmergeManager::getMapgenFactory(mg_name);
-       if (mgfactory) {
-               sparams = mgfactory->createMapgenParams();
-               sparams->readParams(&settings);
-       }
 }
 
 
-void MapgenParams::save(Settings &settings) const
+void MapgenParams::writeParams(Settings *settings) const
 {
-       settings.set("mg_name", mg_name);
-       settings.setU64("seed", seed);
-       settings.setS16("water_level", water_level);
-       settings.setS16("chunksize", chunksize);
-       settings.setFlagStr("mg_flags", flags, flagdesc_mapgen, U32_MAX);
+       settings->set("mg_name", Mapgen::getMapgenName(mgtype));
+       settings->setU64("seed", seed);
+       settings->setS16("water_level", water_level);
+       settings->setS16("mapgen_limit", mapgen_limit);
+       settings->setS16("chunksize", chunksize);
+       settings->setFlagStr("mg_flags", flags, flagdesc_mapgen, U32_MAX);
 
        if (bparams)
-               bparams->writeParams(&settings);
+               bparams->writeParams(settings);
+}
+
+// Calculate edges of outermost generated mapchunks (less than
+// 'mapgen_limit'), and corresponding exact limits for SAO entities.
+void MapgenParams::calcMapgenEdges()
+{
+       if (m_mapgen_edges_calculated)
+               return;
+
+       // Central chunk offset, in blocks
+       s16 ccoff_b = -chunksize / 2;
+       // Chunksize, in nodes
+       s32 csize_n = chunksize * MAP_BLOCKSIZE;
+       // Minp/maxp of central chunk, in nodes
+       s16 ccmin = ccoff_b * MAP_BLOCKSIZE;
+       s16 ccmax = ccmin + csize_n - 1;
+       // Fullminp/fullmaxp of central chunk, in nodes
+       s16 ccfmin = ccmin - MAP_BLOCKSIZE;
+       s16 ccfmax = ccmax + MAP_BLOCKSIZE;
+       // Effective mapgen limit, in blocks
+       // Uses same calculation as ServerMap::blockpos_over_mapgen_limit(v3s16 p)
+       s16 mapgen_limit_b = rangelim(mapgen_limit,
+               0, MAX_MAP_GENERATION_LIMIT) / MAP_BLOCKSIZE;
+       // Effective mapgen limits, in nodes
+       s16 mapgen_limit_min = -mapgen_limit_b * MAP_BLOCKSIZE;
+       s16 mapgen_limit_max = (mapgen_limit_b + 1) * MAP_BLOCKSIZE - 1;
+       // Number of complete chunks from central chunk fullminp/fullmaxp
+       // to effective mapgen limits.
+       s16 numcmin = MYMAX((ccfmin - mapgen_limit_min) / csize_n, 0);
+       s16 numcmax = MYMAX((mapgen_limit_max - ccfmax) / csize_n, 0);
+       // Mapgen edges, in nodes
+       mapgen_edge_min = ccmin - numcmin * csize_n;
+       mapgen_edge_max = ccmax + numcmax * csize_n;
+       // SAO position limits, in Irrlicht units
+       m_sao_limit_min = mapgen_edge_min * BS - 3.0f;
+       m_sao_limit_max = mapgen_edge_max * BS + 3.0f;
+
+       m_mapgen_edges_calculated = true;
+}
+
+
+bool MapgenParams::saoPosOverLimit(const v3f &p)
+{
+       if (!m_mapgen_edges_calculated)
+               calcMapgenEdges();
+
+       return p.X < m_sao_limit_min ||
+               p.X > m_sao_limit_max ||
+               p.Y < m_sao_limit_min ||
+               p.Y > m_sao_limit_max ||
+               p.Z < m_sao_limit_min ||
+               p.Z > m_sao_limit_max;
+}
+
+
+s32 MapgenParams::getSpawnRangeMax()
+{
+       calcMapgenEdges();
 
-       if (sparams)
-               sparams->writeParams(&settings);
+       return MYMIN(-mapgen_edge_min, mapgen_edge_max);
 }