diff --git a/minetest.conf b/minetest.conf index 9ecfad9..5989eb9 100644 --- a/minetest.conf +++ b/minetest.conf @@ -46,13 +46,13 @@ mgv6_np_trees = 0.3, 2, (125, 125, 125), 2, 4, 0.70, 2.0 mgv7_np_terrain_base = { - offset = 4 + offset = 3 scale = 60 spread = (200,200,200) seed = 82341 octaves = 5 persistence = 0.5 - lacunarity = 2 + lacunarity = 2.11 flags = eased } @@ -63,18 +63,18 @@ mgv7_np_terrain_persist = { seed = 539 octaves = 3 persistence = 0.6 - lacunarity = 2 + lacunarity = 2.11 flags = defaults } mgv7_np_terrain_alt = { - offset = -2, - scale = 50, - spread = (400, 400, 400), - seed = 5934, - octaves = 6, - persistence = 0.8, - lacunarity = 2.0, + offset = -2 + scale = 50 + spread = (400, 400, 400) + seed = 5934 + octaves = 6 + persistence = 0.8 + lacunarity = 2.11 flags = eased } @@ -85,40 +85,40 @@ mgv7_np_height_select = { seed = 4213 octaves = 6 persistence = 0.4 - lacunarity = 2 + lacunarity = 2.11 flags = eased } mgv7_np_ridge = { - offset = -1, - scale = 0.5, - spread = (200, 200, 200), - seed = 6467, - octaves = 4, - persistence = 0.75, - lacunarity = 2.0, + offset = -0.8 + scale = 0.4 + spread = (200, 200, 200) + seed = 6467 + octaves = 4 + persistence = 0.75 + lacunarity = 2.11 flags = } mgv7_np_mountain = { - offset = -0.27, - scale = 1.8, - spread = (2000, 1500, 2000), - seed = 5333, - octaves = 7, - persistence = 0.6, - lacunarity = 2.0, + offset = -0.2 + scale = 1.8 + spread = (2000, 1500, 2000) + seed = 5333 + octaves = 7 + persistence = 0.6 + lacunarity = 2.11 flags = } mgv7_np_dungeons = { - offset = 2, - scale = 2, - spread = (500, 500, 500), - seed = 0, - octaves = 2, - persistence = 0.9, - lacunarity = 2.0, + offset = 2 + scale = 2 + spread = (500, 500, 500) + seed = 0 + octaves = 2 + persistence = 0.9 + lacunarity = 2.11 flags = } diff --git a/mods/default/biomes.lua b/mods/default/biomes.lua index 3f9ee6d..9e3f842 100644 --- a/mods/default/biomes.lua +++ b/mods/default/biomes.lua @@ -125,6 +125,23 @@ minetest.register_biome({ humidity_point = 50, }) +minetest.register_biome({ + name = "tc-blend", + node_top = "default:dirt_with_grass", + depth_top = 1, + node_filler = "default:dirt", + depth_filler = 2, + node_riverbed = "default:dirt", + depth_riverbed = 2, + node_dungeon = "default:cobble", + node_dungeon_alt = "default:mossycobble", + node_dungeon_stair = "stairsplus:stair_cobble", + y_max = 31000, + y_min = 1, + heat_point = 10, + humidity_point = 50, +}) + minetest.register_biome({ name = "conifer", node_top = "default:dirt_with_grass", @@ -246,6 +263,23 @@ minetest.register_biome({ humidity_point = 20, }) +minetest.register_biome({ + name = "gs-blend", + node_top = "default:dirt_with_grass", + depth_top = 1, + node_filler = "default:dirt", + depth_filler = 5, + node_riverbed = "default:dirt", + depth_riverbed = 2, + node_dungeon = "default:cobble", + node_dungeon_alt = "default:mossycobble", + node_dungeon_stair = "stairsplus:stair_cobble", + y_max = 31000, + y_min = 1, + heat_point = 70, + humidity_point = 20, +}) + minetest.register_biome({ name = "savanna", node_top = "default:dry_dirt_with_dry_grass", @@ -280,7 +314,7 @@ minetest.register_biome({ y_max = 31000, y_min = 1, heat_point = 5, - humidity_point = -20, + humidity_point = -10, }) minetest.register_biome({ @@ -312,7 +346,7 @@ minetest.register_biome({ y_max = 31000, y_min = 1, heat_point = 50, - humidity_point = -20, + humidity_point = -10, }) minetest.register_biome({ @@ -327,7 +361,7 @@ minetest.register_biome({ y_max = 31000, y_min = 1, heat_point = 75, - humidity_point = -20, + humidity_point = -10, }) minetest.register_biome({ @@ -342,5 +376,5 @@ minetest.register_biome({ y_max = 31000, y_min = 1, heat_point = 95, - humidity_point = -20, + humidity_point = -10, }) diff --git a/mods/default/decorations.lua b/mods/default/decorations.lua index 482fb95..aeb5b71 100644 --- a/mods/default/decorations.lua +++ b/mods/default/decorations.lua @@ -22,6 +22,46 @@ minetest.register_decoration({ flags = "force_placement", }) +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 4, + noise_params = { + offset = -1, + scale = 1.5, + spread = {x = 200, y = 200, z = 200}, + seed = 329, + octaves = 4, + persist = 0.8 + }, + biomes = {"gs-blend"}, + y_max = 31000, + y_min = 1, + decoration = "default:dry_dirt_with_dry_grass", + place_offset_y = -1, + flags = "force_placement", +}) + +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 4, + noise_params = { + offset = -1, + scale = 1.5, + spread = {x = 200, y = 200, z = 200}, + seed = 329, + octaves = 4, + persist = 0.8 + }, + biomes = {"tc-blend"}, + y_max = 31000, + y_min = 1, + decoration = "default:dirt_with_snow", + place_offset_y = -1, + flags = "force_placement", +}) + minetest.register_decoration({ deco_type = "simple", place_on = {"default:dirt_with_grass", "default:dirt_with_snow"}, @@ -34,7 +74,7 @@ minetest.register_decoration({ octaves = 2, persist = 2.00 }, - biomes = {"conifer", "taiga"}, + biomes = {"conifer", "taiga", "tc-blend"}, y_max = 31000, y_min = 1, decoration = "default:dirt_with_coniferous_litter", @@ -96,7 +136,7 @@ for i = 1, 5 do octaves = 3, persist = 0.6 }, - biomes = {"savanna"}, + biomes = {"savanna", "gs-blend"}, y_max = 31000, y_min = 1, decoration = "default:dry_grass_" .. i, @@ -115,7 +155,7 @@ minetest.register_decoration({ octaves = 2, persist = 0.66 }, - biomes = {"conifer"}, + biomes = {"conifer", "tc-blend"}, flags = "place_center_x, place_center_z", schematic = minetest.get_modpath("default").."/schematics/conifer_conifertree_1.mts", y_min = 1, @@ -134,7 +174,7 @@ minetest.register_decoration({ octaves = 2, persist = 0.66 }, - biomes = {"conifer"}, + biomes = {"conifer", "tc-blend"}, flags = "place_center_x, place_center_z", schematic = minetest.get_modpath("default").."/schematics/conifer_conifertree_2.mts", y_min = 1, @@ -153,7 +193,7 @@ minetest.register_decoration({ octaves = 2, persist = 0.66 }, - biomes = {"taiga"}, + biomes = {"taiga", "tc-blend"}, flags = "place_center_x, place_center_z", schematic = minetest.get_modpath("default").."/schematics/pine_tree.mts", y_min = 1, @@ -172,7 +212,7 @@ minetest.register_decoration({ octaves = 2, persist = 0.66 }, - biomes = {"forest", "grassland"}, + biomes = {"forest", "grassland", "gs-blend"}, flags = "place_center_x, place_center_z", schematic = minetest.get_modpath("default").."/schematics/default_tree.mts", rotation = "random", @@ -192,7 +232,7 @@ minetest.register_decoration({ octaves = 2, persist = 0.66 }, - biomes = {"forest", "grassland"}, + biomes = {"forest", "grassland", "gs-blend"}, flags = "place_center_x, place_center_z", schematic = minetest.get_modpath("default").."/schematics/default_apple_tree.mts", rotation = "random", @@ -232,7 +272,7 @@ minetest.register_decoration({ octaves = 2, persist = 0.7 }, - biomes = {"savanna"}, + biomes = {"savanna", "gs-blend"}, flags = "place_center_x, place_center_z", schematic = minetest.get_modpath("default").."/schematics/acacia_tree.mts", rotation = "random", @@ -332,7 +372,7 @@ minetest.register_decoration({ }, y_min = 1, y_max = 30000, - biomes = {"forest", "rainforest", "deep_rainforest", "grassland", "savanna"}, + biomes = {"forest", "rainforest", "deep_rainforest", "grassland", "savanna", "gs-blend"}, decoration = "default:papyrus", height = 3, height_max = 5, @@ -355,7 +395,7 @@ minetest.register_decoration({ }, y_min = 1, y_max = 300, - biomes = {"sandstone_desert", "desert", "rocky_desert", "savanna", "sea_sand"}, + biomes = {"sandstone_desert", "desert", "rocky_desert", "savanna", "sea_sand", "gs-blend"}, decoration = "default:cactus", height = 3, height_max = 5, diff --git a/mods/flowers/mapgen.lua b/mods/flowers/mapgen.lua index 399b913..302845f 100644 --- a/mods/flowers/mapgen.lua +++ b/mods/flowers/mapgen.lua @@ -63,6 +63,30 @@ local function register_mgv6_waterlily() }) end +local function register_waterlily() + minetest.register_decoration({ + name = "flowers:waterlily", + deco_type = "simple", + place_on = {"default:dirt"}, + sidelen = 16, + noise_params = { + offset = -0.12, + scale = 0.3, + spread = {x = 100, y = 100, z = 100}, + seed = 33, + octaves = 3, + persist = 0.7 + }, + y_max = 0, + y_min = 0, + biomes = {"sea_dirt"}, + decoration = "flowers:waterlily_waving", + param2 = 0, + param2_max = 3, + place_offset_y = 1, + }) +end + function flowers.register_mgv6_decorations() register_mgv6_flower("rose", 1) register_mgv6_flower("tulip", 2) @@ -77,15 +101,28 @@ function flowers.register_mgv6_decorations() register_mgv6_waterlily() end +function flowers.register_decorations() + register_mgv6_flower("rose", 1) + register_mgv6_flower("tulip", 2) + register_mgv6_flower("dandelion_yellow", 3) + register_mgv6_flower("geranium", 4) + register_mgv6_flower("viola", 5) + register_mgv6_flower("dandelion_white", 6) + + register_mgv6_mushroom("mushroom_brown", 1) + register_mgv6_mushroom("mushroom_red", 2) + + register_waterlily() +end + -- -- Detect mapgen to select functions -- --- TODO: Other mapgens --- local mg_name = minetest.get_mapgen_setting("mg_name") --- if mg_name == "v6" then +local mg_name = minetest.get_mapgen_setting("mg_name") +if mg_name == "v6" then flowers.register_mgv6_decorations() --- else --- flowers.register_decorations() --- end +else + flowers.register_decorations() +end