Mgv6: Enable snowbiomes by default. Double biome noise spread. 3 octaves, 0.5 persist...

diff --git a/minetest.conf.example b/minetest.conf.example
index 90a5ba48c5d9b04b145b8650ba42b8236d7d17c2..76f01bcfcb89f8d0c3a2023723edff3df766a271 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -496,7 +496,7 @@
 #    Map generation attributes specific to Mapgen V6.
 #    Currently supported: jungles, biomeblend, mudflow, snowbiomes.
 #    When snowbiomes are enabled jungles are enabled and the jungles flag is ignored.
-#mgv6_spflags = jungles, biomeblend, mudflow
+#mgv6_spflags = jungles, biomeblend, mudflow, snowbiomes
 #    Controls size of deserts and beaches in Mapgen V6
 #    When snowbiomes are enabled 'mgv6_freq_desert' is ignored.
 #mgv6_freq_desert = 0.45
@@ -551,9 +551,9 @@
 #mgv6_np_height_select = 0.5, 1, (250, 250, 250), 4213, 5, 0.69, 2.0
 #mgv6_np_mud = 4, 2, (200, 200, 200), 91013, 3, 0.55, 2.0
 #mgv6_np_beach = 0, 1, (250, 250, 250), 59420, 3, 0.50, 2.0
-#mgv6_np_biome = 0, 1, (250, 250, 250), 9130, 3, 0.50, 2.0
+#mgv6_np_biome = 0, 1, (500, 500, 500), 9130, 3, 0.50, 2.0
 #mgv6_np_cave = 6, 6, (250, 250, 250), 34329, 3, 0.50, 2.0
-#mgv6_np_humidity = 0.5, 0.5, (500, 500, 500), 72384, 4, 0.66, 2.0
+#mgv6_np_humidity = 0.5, 0.5, (500, 500, 500), 72384, 3, 0.50, 2.0
 #mgv6_np_trees = 0, 1, (125, 125, 125), 2, 4, 0.66, 2.0
 #mgv6_np_apple_trees = 0, 1, (100, 100, 100), 342902, 3, 0.45, 2.0
 

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index af1aa4140c4346ea2629022bb94ad5163627ff43..0cf1dd7706b590c11d923decb01eaa9326dcc97e 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -299,7 +299,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("water_level", "1");
        settings->setDefault("chunksize", "5");
        settings->setDefault("mg_flags", "dungeons");
-       settings->setDefault("mgv6_spflags", "jungles");
+       settings->setDefault("mgv6_spflags", "jungles, snowbiomes");
        settings->setDefault("enable_floating_dungeons", "true");
 
        // IPv6

diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index a6beb710b6ca5d9f991e5b168484367389ec5966..50126ecf0d2ba5888a30fc7f59df7fd0e6c88ec3 100644 (file)
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -138,9 +138,9 @@ MapgenV6Params::MapgenV6Params()
        np_height_select  = NoiseParams(0,    1.0,  v3f(250.0, 250.0, 250.0), 4213,   5, 0.69, 2.0);
        np_mud            = NoiseParams(4,    2.0,  v3f(200.0, 200.0, 200.0), 91013,  3, 0.55, 2.0);
        np_beach          = NoiseParams(0,    1.0,  v3f(250.0, 250.0, 250.0), 59420,  3, 0.50, 2.0);
-       np_biome          = NoiseParams(0,    1.0,  v3f(250.0, 250.0, 250.0), 9130,   3, 0.50, 2.0);
+       np_biome          = NoiseParams(0,    1.0,  v3f(500.0, 500.0, 500.0), 9130,   3, 0.50, 2.0);
        np_cave           = NoiseParams(6,    6.0,  v3f(250.0, 250.0, 250.0), 34329,  3, 0.50, 2.0);
-       np_humidity       = NoiseParams(0.5,  0.5,  v3f(500.0, 500.0, 500.0), 72384,  4, 0.66, 2.0);
+       np_humidity       = NoiseParams(0.5,  0.5,  v3f(500.0, 500.0, 500.0), 72384,  3, 0.50, 2.0);
        np_trees          = NoiseParams(0,    1.0,  v3f(125.0, 125.0, 125.0), 2,      4, 0.66, 2.0);
        np_apple_trees    = NoiseParams(0,    1.0,  v3f(100.0, 100.0, 100.0), 342902, 3, 0.45, 2.0);
 }

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index a540c4b0216eed8d86c37be8b1ce91d5b7205672..c71cf3c535fb0e1fbc83800fc861002340e94427 100644 (file)
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define FREQ_HOT 0.4
 #define FREQ_SNOW -0.4
 #define FREQ_TAIGA 0.5
-#define FREQ_JUNGLE 0.7
+#define FREQ_JUNGLE 0.5
 
 //////////// Mapgen V6 flags
 #define MGV6_JUNGLES    0x01