Add Valleys mapgen.

build/android/jni/Android.mk

@@ -179,6 +179,7 @@ LOCAL_SRC_FILES :=                                \
 		jni/src/mapgen_v5.cpp                     \
 		jni/src/mapgen_v6.cpp                     \
 		jni/src/mapgen_v7.cpp                     \
+		jni/src/mapgen_valleys.cpp                \
 		jni/src/mapnode.cpp                       \
 		jni/src/mapsector.cpp                     \
 		jni/src/mesh.cpp                          \

builtin/settingtypes.txt

@@ -1033,6 +1033,84 @@ mgfractal_np_filler_depth (Mapgen fractal filler depth noise parameters) noise_p
 mgfractal_np_cave1 (Mapgen fractal cave1 noise parameters) noise_params 0, 12, (128, 128, 128), 52534, 4, 0.5, 2.0
 mgfractal_np_cave2 (Mapgen fractal cave2 noise parameters) noise_params 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0
 
+# Mapgen Valleys parameters
+[***Mapgen Valleys]
+
+# General parameters
+[****General]
+
+#    Map generation attributes specific to Mapgen Valleys.
+#    Flags that are not specified in the flag string are not modified from the default.
+#    Flags starting with "no" are used to explicitly disable them.
+#    "altitude_chill" makes higher elevations colder, which may cause biome issues.
+#    "fast" produces softer terrain, more quickly
+#    "humid_rivers" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes.
+#    "rugged" and "cliffs" do nothing unless "fast" is enabled
+mg_valleys_spflags (Valleys C Flags) flags altitude_chill,cliffs,humid_rivers,nofast,rugged altitude_chill,noaltitude_chill,cliffs,nocliffs,fast,nofast,humid_rivers,nohumid_rivers,rugged,norugged
+
+# The altitude at which temperature drops by 20C
+mg_valleys_altitude_chill (Altitude Chill) int 90
+
+# Average humidity
+mg_valleys_humidity (Humidity) int 50
+
+# The highest humidity around rivers in otherwise dry areas
+mg_valleys_humidity_break_point (Humidity Break) int 65
+
+# Maximum altitude where lava can emerge
+mg_valleys_lava_max_height (Lava Height) int 0
+
+# Maximum altitude where water occurs in caves (and tends to fall out)
+mg_valleys_cave_water_max_height (Cave Water Height) int 31000
+
+# How deep to make rivers
+mg_valleys_river_depth (River Depth) int 4
+
+# How wide to make rivers
+mg_valleys_river_size (River Size) int 5
+
+# Average temperature
+mg_valleys_temperature (Temperature) int 50
+
+# How often water occurs in caves (0-10)
+mg_valleys_water_features (Water Features) int 3
+
+# Noise parameters
+[****Noises]
+
+# Cliff noise
+mg_valleys_np_cliffs (Cliffs) noise_params 0, 1, (750, 750, 750), 8445, 5, 1.0, 2.0
+
+# Mountain corrugation
+mg_valleys_np_corr (Corrugation) noise_params 0, 1, (40, 40, 40), -3536, 4, 1.0, 2.0
+
+# The depth of dirt or other filler
+mg_valleys_np_filler_depth (Filler Depth) noise_params 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0
+
+# River noise -- rivers occur close to zero
+mg_valleys_np_rivers (River Noise) noise_params 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0
+
+# Caves and tunnels form at the intersection of the two noises
+mg_valleys_np_simple_caves_1 (Simple Caves #1) noise_params 0, 1, v3f(64, 64, 64), -8402, 3, 0.5, 2.0
+
+# Caves and tunnels form at the intersection of the two noises
+mg_valleys_np_simple_caves_2 (Simple Caves #2) noise_params 0, 1, v3f(64, 64, 64), 3944, 3, 0.5, 2.0
+
+# Base terrain height
+mg_valleys_np_terrain_height (Terrain Height) noise_params -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0
+
+# Raises terrain to make valleys around the rivers
+mg_valleys_np_valley_depth (Valley Depth) noise_params 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0
+
+# Slope and fill work together to modify the heights
+mg_valleys_np_inter_valley_fill (Valley Fill) noise_params 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0
+
+# Amplifies the valleys
+mg_valleys_np_valley_profile (Valley Profile) noise_params 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0
+
+# Slope and fill work together to modify the heights
+mg_valleys_np_inter_valley_slope (Valley Slope) noise_params 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0
+
 [*Security]
 
 #    Prevent mods from doing insecure things like running shell commands.

minetest.conf.example

@@ -1313,6 +1313,47 @@
 #    type: noise_params
 # mgfractal_np_cave2 = 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0
 
+#### Mapgen Valleys
+
+#mg_valleys_spflags = altitude_chill,cliffs,humid_rivers,nofast,rugged
+#    "altitude_chill" makes higher elevations colder, which may cause biome issues.
+#    "fast" produces softer terrain, more quickly
+#    "humid_rivers" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes.
+#    "rugged" and "cliffs" do nothing unless "fast" is enabled
+#
+#mg_valleys_altitude_chill = 90  # the altitude at which temperature drops by 20C
+#mg_valleys_cave_water_max_height = 31000   # max altitude of water in caves
+#mg_valleys_humidity = 50        # the average humidity
+#mg_valleys_humidity_break_point = 65        # The highest humidity around rivers in otherwise dry areas
+#mg_valleys_lava_max_height = 0  # maximum altitude of lava
+#mg_valleys_river_depth = 4      # how deep to make rivers
+#mg_valleys_river_size = 5       # how wide to make rivers
+#mg_valleys_temperature = 50     # the average temperature
+#mg_valleys_water_features = 3   # how often water occurs in caves (0-10)
+#
+#mg_valleys_np_cliffs = 0, 1, (750, 750, 750), 8445, 5, 1.0, 2.0
+#mg_valleys_np_corr = 0, 1, (40, 40, 40), -3536, 4, 1.0, 2.0
+#mg_valleys_np_filler_depth = 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0
+#
+# River noise -- rivers occur close to zero
+#mg_valleys_np_rivers = 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0
+#
+#mg_valleys_np_simple_caves_1 = 0, 1, v3f(64, 64, 64), -8402, 3, 0.5, 2.0
+#mg_valleys_np_simple_caves_2 = 0, 1, v3f(64, 64, 64), 3944, 3, 0.5, 2.0
+#
+# Base terrain height
+#mg_valleys_np_terrain_height = -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0
+#
+# Raises terrain to make valleys around the rivers
+#mg_valleys_np_valley_depth = 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0
+#
+# Slope and fill work together to modify the heights
+#mg_valleys_np_inter_valley_fill = 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0
+#mg_valleys_np_inter_valley_slope = 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0
+#
+# Amplifies the valleys
+#mg_valleys_np_valley_profile = 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0
+
 ## Security
 
 #    Prevent mods from doing insecure things like running shell commands.

src/CMakeLists.txt

@@ -388,6 +388,7 @@ set(common_SRCS
 	mapgen_v5.cpp
 	mapgen_v6.cpp
 	mapgen_v7.cpp
+	mapgen_valleys.cpp
 	mapnode.cpp
 	mapsector.cpp
 	mg_biome.cpp

src/emerge.cpp

@@ -39,6 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen_v5.h"
 #include "mapgen_v6.h"
 #include "mapgen_v7.h"
+#include "mapgen_valleys.h"
 #include "mapgen_singlenode.h"
 #include "mg_biome.h"
 #include "mg_ore.h"
@@ -108,6 +109,7 @@ MapgenDesc g_reg_mapgens[] = {
 	{"v7",         new MapgenFactoryV7,         true},
 	{"flat",       new MapgenFactoryFlat,       true},
 	{"fractal",    new MapgenFactoryFractal,    true},
+	{"valleys",    new MapgenFactoryValleys,    true},
 	{"singlenode", new MapgenFactorySinglenode, false},
 };