Randomwalk caves: Add parameters for number, proportion flooded. Allow small caves (#8928)

Add mapgen parameters to set the range of the random number of
randomwalk caves per mapchunk, and to set the proportion that are
flooded with liquids.
Default values are, for now, unchanged from the previous hardcoded
values.

Add parameters to allow small randomwalk caves
Disabled by default for now as they have never been present in the
non-mgv6 mapgens.

1 files changed, 39 insertions, 24 deletions

diff --git a/src/mapgen/mapgen_valleys.cpp b/src/mapgen/mapgen_valleys.cpp
index d0b36f29b..413967cbd 100644
--- a/src/mapgen/mapgen_valleys.cpp
+++ b/src/mapgen/mapgen_valleys.cpp
@@ -68,6 +68,11 @@ MapgenValleys::MapgenValleys(MapgenValleysParams *params, EmergeManager *emerge)
 	cave_width         = params->cave_width;
 	large_cave_depth   = params->large_cave_depth;
 	lava_depth         = params->lava_depth;
+	small_cave_num_min = params->small_cave_num_min;
+	small_cave_num_max = params->small_cave_num_max;
+	large_cave_num_min = params->large_cave_num_min;
+	large_cave_num_max = params->large_cave_num_max;
+	large_cave_flooded = params->large_cave_flooded;
 	cavern_limit       = params->cavern_limit;
 	cavern_taper       = params->cavern_taper;
 	cavern_threshold   = params->cavern_threshold;
@@ -124,18 +129,23 @@ MapgenValleysParams::MapgenValleysParams():
 
 void MapgenValleysParams::readParams(const Settings *settings)
 {
-	settings->getFlagStrNoEx("mgvalleys_spflags",        spflags, flagdesc_mapgen_valleys);
-	settings->getU16NoEx("mgvalleys_altitude_chill",     altitude_chill);
-	settings->getS16NoEx("mgvalleys_large_cave_depth",   large_cave_depth);
-	settings->getS16NoEx("mgvalleys_lava_depth",         lava_depth);
-	settings->getU16NoEx("mgvalleys_river_depth",        river_depth);
-	settings->getU16NoEx("mgvalleys_river_size",         river_size);
-	settings->getFloatNoEx("mgvalleys_cave_width",       cave_width);
-	settings->getS16NoEx("mgvalleys_cavern_limit",       cavern_limit);
-	settings->getS16NoEx("mgvalleys_cavern_taper",       cavern_taper);
-	settings->getFloatNoEx("mgvalleys_cavern_threshold", cavern_threshold);
-	settings->getS16NoEx("mgvalleys_dungeon_ymin",       dungeon_ymin);
-	settings->getS16NoEx("mgvalleys_dungeon_ymax",       dungeon_ymax);
+	settings->getFlagStrNoEx("mgvalleys_spflags", spflags, flagdesc_mapgen_valleys);
+	settings->getU16NoEx("mgvalleys_altitude_chill",       altitude_chill);
+	settings->getS16NoEx("mgvalleys_large_cave_depth",     large_cave_depth);
+	settings->getS16NoEx("mgvalleys_lava_depth",           lava_depth);
+	settings->getU16NoEx("mgvalleys_small_cave_num_min",   small_cave_num_min);
+	settings->getU16NoEx("mgvalleys_small_cave_num_max",   small_cave_num_max);
+	settings->getU16NoEx("mgvalleys_large_cave_num_min",   large_cave_num_min);
+	settings->getU16NoEx("mgvalleys_large_cave_num_max",   large_cave_num_max);
+	settings->getFloatNoEx("mgvalleys_large_cave_flooded", large_cave_flooded);
+	settings->getU16NoEx("mgvalleys_river_depth",          river_depth);
+	settings->getU16NoEx("mgvalleys_river_size",           river_size);
+	settings->getFloatNoEx("mgvalleys_cave_width",         cave_width);
+	settings->getS16NoEx("mgvalleys_cavern_limit",         cavern_limit);
+	settings->getS16NoEx("mgvalleys_cavern_taper",         cavern_taper);
+	settings->getFloatNoEx("mgvalleys_cavern_threshold",   cavern_threshold);
+	settings->getS16NoEx("mgvalleys_dungeon_ymin",         dungeon_ymin);
+	settings->getS16NoEx("mgvalleys_dungeon_ymax",         dungeon_ymax);
 
 	settings->getNoiseParams("mgvalleys_np_filler_depth",       np_filler_depth);
 	settings->getNoiseParams("mgvalleys_np_inter_valley_fill",  np_inter_valley_fill);
@@ -154,18 +164,23 @@ void MapgenValleysParams::readParams(const Settings *settings)
 
 void MapgenValleysParams::writeParams(Settings *settings) const
 {
-	settings->setFlagStr("mgvalleys_spflags",        spflags, flagdesc_mapgen_valleys, U32_MAX);
-	settings->setU16("mgvalleys_altitude_chill",     altitude_chill);
-	settings->setS16("mgvalleys_large_cave_depth",   large_cave_depth);
-	settings->setS16("mgvalleys_lava_depth",         lava_depth);
-	settings->setU16("mgvalleys_river_depth",        river_depth);
-	settings->setU16("mgvalleys_river_size",         river_size);
-	settings->setFloat("mgvalleys_cave_width",       cave_width);
-	settings->setS16("mgvalleys_cavern_limit",       cavern_limit);
-	settings->setS16("mgvalleys_cavern_taper",       cavern_taper);
-	settings->setFloat("mgvalleys_cavern_threshold", cavern_threshold);
-	settings->setS16("mgvalleys_dungeon_ymin",       dungeon_ymin);
-	settings->setS16("mgvalleys_dungeon_ymax",       dungeon_ymax);
+	settings->setFlagStr("mgvalleys_spflags", spflags, flagdesc_mapgen_valleys, U32_MAX);
+	settings->setU16("mgvalleys_altitude_chill",       altitude_chill);
+	settings->setS16("mgvalleys_large_cave_depth",     large_cave_depth);
+	settings->setS16("mgvalleys_lava_depth",           lava_depth);
+	settings->setU16("mgvalleys_small_cave_num_min",   small_cave_num_min);
+	settings->setU16("mgvalleys_small_cave_num_max",   small_cave_num_max);
+	settings->setU16("mgvalleys_large_cave_num_min",   large_cave_num_min);
+	settings->setU16("mgvalleys_large_cave_num_max",   large_cave_num_max);
+	settings->setFloat("mgvalleys_large_cave_flooded", large_cave_flooded);
+	settings->setU16("mgvalleys_river_depth",          river_depth);
+	settings->setU16("mgvalleys_river_size",           river_size);
+	settings->setFloat("mgvalleys_cave_width",         cave_width);
+	settings->setS16("mgvalleys_cavern_limit",         cavern_limit);
+	settings->setS16("mgvalleys_cavern_taper",         cavern_taper);
+	settings->setFloat("mgvalleys_cavern_threshold",   cavern_threshold);
+	settings->setS16("mgvalleys_dungeon_ymin",         dungeon_ymin);
+	settings->setS16("mgvalleys_dungeon_ymax",         dungeon_ymax);
 
 	settings->setNoiseParams("mgvalleys_np_filler_depth",       np_filler_depth);
 	settings->setNoiseParams("mgvalleys_np_inter_valley_fill",  np_inter_valley_fill);