diff options
author | Paramat <paramat@users.noreply.github.com> | 2019-06-01 20:50:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-01 20:50:43 +0100 |
commit | 7379aa74cf98c7e4c7aa5325ef1531d412a0abac (patch) | |
tree | 45a3c608dce1fd03182f4f84f1968439dbfa4dbc /src/mapgen/mapgen_fractal.cpp | |
parent | a1459a9eac4eeb35a6c578a8b8f96393f87ed53d (diff) | |
download | hax-minetest-server-7379aa74cf98c7e4c7aa5325ef1531d412a0abac.tar.gz hax-minetest-server-7379aa74cf98c7e4c7aa5325ef1531d412a0abac.zip |
Dungeons: Settable density noise, move number calculation to mapgens (#8473)
Add user-settable noise parameters for dungeon density to each mapgen,
except V6 which hardcodes this noise parameter.
Move the calculation of number of dungeons generated in a mapchunk out
of dungeongen.cpp and into mapgen code, to allow mapgens to generate
any desired number of dungeons in a mapchunk, instead of being forced
to have number of dungeons determined by a density noise.
This is more flexible and allows mapgens to use dungeon generation to
create custom structures, such as occasional mega-dungeons.
Diffstat (limited to 'src/mapgen/mapgen_fractal.cpp')
-rw-r--r-- | src/mapgen/mapgen_fractal.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mapgen/mapgen_fractal.cpp b/src/mapgen/mapgen_fractal.cpp index 47699b8a2..8dcff726f 100644 --- a/src/mapgen/mapgen_fractal.cpp +++ b/src/mapgen/mapgen_fractal.cpp @@ -70,8 +70,9 @@ MapgenFractal::MapgenFractal(MapgenFractalParams *params, EmergeManager *emerge) noise_seabed = new Noise(¶ms->np_seabed, seed, csize.X, csize.Z); noise_filler_depth = new Noise(¶ms->np_filler_depth, seed, csize.X, csize.Z); - MapgenBasic::np_cave1 = params->np_cave1; - MapgenBasic::np_cave2 = params->np_cave2; + MapgenBasic::np_cave1 = params->np_cave1; + MapgenBasic::np_cave2 = params->np_cave2; + MapgenBasic::np_dungeons = params->np_dungeons; formula = fractal / 2 + fractal % 2; julia = fractal % 2 == 0; @@ -89,7 +90,8 @@ MapgenFractalParams::MapgenFractalParams(): np_seabed (-14, 9, v3f(600, 600, 600), 41900, 5, 0.6, 2.0), np_filler_depth (0, 1.2, v3f(150, 150, 150), 261, 3, 0.7, 2.0), np_cave1 (0, 12, v3f(61, 61, 61), 52534, 3, 0.5, 2.0), - np_cave2 (0, 12, v3f(67, 67, 67), 10325, 3, 0.5, 2.0) + np_cave2 (0, 12, v3f(67, 67, 67), 10325, 3, 0.5, 2.0), + np_dungeons (0.9, 0.5, v3f(500, 500, 500), 0, 2, 0.8, 2.0) { } @@ -116,6 +118,7 @@ void MapgenFractalParams::readParams(const Settings *settings) settings->getNoiseParams("mgfractal_np_filler_depth", np_filler_depth); settings->getNoiseParams("mgfractal_np_cave1", np_cave1); settings->getNoiseParams("mgfractal_np_cave2", np_cave2); + settings->getNoiseParams("mgfractal_np_dungeons", np_dungeons); } @@ -141,6 +144,7 @@ void MapgenFractalParams::writeParams(Settings *settings) const settings->setNoiseParams("mgfractal_np_filler_depth", np_filler_depth); settings->setNoiseParams("mgfractal_np_cave1", np_cave1); settings->setNoiseParams("mgfractal_np_cave2", np_cave2); + settings->setNoiseParams("mgfractal_np_dungeons", np_dungeons); } |