From 83815a8bf7463a920d54c92228f1a920e72ecd27 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 24 Jul 2021 22:09:06 +0100 Subject: [PATCH] rename some biomes to be more inline with default for spawning --- README.md | 1 + biomes.lua | 11 ++++++----- decor.lua | 35 ++++++++++++++++++----------------- plantpack.lua | 19 ++++++++++--------- schems.lua | 18 +++++++++--------- 5 files changed, 44 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 7b2c5ef..f6e72c0 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ Ethereal Mapgen mod for Minetest (works on all except v6) ### 1.29 - Use "stratum" to generate mesa biome for stripey goodness - Added coloured candles (thanks wRothbard) + - Rename some biomes to fall inline with default for spawning ### 1.28 diff --git a/biomes.lua b/biomes.lua index 71d6cbb..71d8c64 100644 --- a/biomes.lua +++ b/biomes.lua @@ -69,7 +69,7 @@ end add_biome("mountain", 140, 31000, 50, 50, 1, nil, "default:snow", 1, "default:snowblock", 2) -add_biome("clearing", 3, 71, 45, 65, 1, +add_biome("grassland", 3, 71, 45, 65, 1, nil, "default:dirt_with_grass", 1, "default:dirt", 3) add_biome("underground", -31000, -192, 50, 50, 1, @@ -110,10 +110,11 @@ if not minetest.registered_nodes[tmp] then tmp = "ethereal:cold_dirt" end -add_biome("snowy", 4, 40, 10, 40, ethereal.snowy, +-- was 'snowy' biome +add_biome("coniferous_forest", 4, 40, 10, 40, ethereal.snowy, nil, tmp, 1, "default:dirt", 2) -add_biome("alpine", 40, 140, 10, 40, ethereal.alpine, +add_biome("taiga", 40, 140, 10, 40, ethereal.alpine, nil, "default:dirt_with_snow", 1, "default:dirt", 2) @@ -127,10 +128,10 @@ add_biome("frost_ocean", -192, 1, 10, 40, ethereal.frost, nil, "default:sand", 1, "default:sand", 2) -add_biome("grassy", 3, 91, 13, 40, ethereal.grassy, +add_biome("deciduous_forest", 3, 91, 13, 40, ethereal.grassy, nil, "default:dirt_with_grass", 1, "default:dirt", 3) -add_biome("grassy_ocean", -31000, 3, 13, 40, ethereal.grassy, +add_biome("deciduous_forest_ocean", -31000, 3, 13, 40, ethereal.grassy, nil, "default:sand", 2, "default:gravel", 1) diff --git a/decor.lua b/decor.lua index 3c75ca2..eef6b6a 100644 --- a/decor.lua +++ b/decor.lua @@ -111,7 +111,7 @@ add_node({"ethereal:dry_dirt"}, 0.006, {"plains"}, 1, 100, add_node({"ethereal:dry_dirt"}, 0.015, {"plains"}, 1, 100, {"default:dry_shrub"}, nil, nil, nil, ethereal.plains) -add_node({"default:sand"}, 0.015, {"grassy_ocean"}, 1, 100, +add_node({"default:sand"}, 0.015, {"deciduous_forest_ocean"}, 1, 100, {"default:dry_shrub"}, nil, nil, nil, ethereal.grassy) add_node({"default:desert_sand"}, 0.015, {"desert"}, 1, 100, @@ -138,10 +138,10 @@ add_node({"default:desert_stone"}, 0.005, {"caves"}, 5, 40, nil, nil, nil, ethereal.caves) -- flowers & strawberry -add_node({"default:dirt_with_grass"}, 0.025, {"grassy"}, 1, 100, +add_node({"default:dirt_with_grass"}, 0.025, {"deciduous_forest"}, 1, 100, {"flowers:dandelion_white", "flowers:dandelion_yellow", "flowers:geranium", "flowers:rose", "flowers:tulip", - "flowers:viola", "ethereal:strawberry_7"}, nil, nil, nil, + "flowers:viola", "ethereal:strawberry_7"}, nil, nil, nil, ethereal.grassy) add_node({"default:dirt_with_grass"}, 0.025, {"grassytwo"}, 1, 100, @@ -172,7 +172,7 @@ add_node({"ethereal:gray_dirt"}, 0.05, {"grayness"}, 1, 100, {"ethereal:snowygrass"}, nil, nil, nil, ethereal.grayness) add_node({"ethereal:cold_dirt", "default:dirt_with_coniferous_litter"}, 0.05, - {"snowy"}, 1, 100, {"ethereal:snowygrass"}, nil, nil, nil, ethereal.snowy) + {"coniferous_forest"}, 1, 100, {"ethereal:snowygrass"}, nil, nil, nil, ethereal.snowy) -- cactus add_node({"default:sandstone"}, 0.0025, {"sandstone"}, 1, 100, @@ -187,7 +187,7 @@ add_node({"ethereal:mushroom_dirt"}, 0.01, {"mushroom"}, 1, 100, local list = { {"junglee", {"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, ethereal.junglee}, - {"grassy", {"default:dirt_with_grass"}, ethereal.grassy}, + {"deciduous_forest", {"default:dirt_with_grass"}, ethereal.grassy}, {"grassytwo", {"default:dirt_with_grass"}, ethereal.grassytwo}, {"prairie", {"ethereal:prairie_dirt"}, ethereal.prairie}, {"mushroom", {"ethereal:mushroom_dirt"}, ethereal.mushroom}, @@ -231,7 +231,7 @@ add_node({"default:dirt_with_grass"}, 0.25, {"swamp"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.swamp) -- grass -add_node({"default:dirt_with_grass"}, 0.35, {"grassy"}, 1, 100, +add_node({"default:dirt_with_grass"}, 0.35, {"deciduous_forest"}, 1, 100, {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.grassy) @@ -263,7 +263,7 @@ add_node({"ethereal:bamboo_dirt"}, 0.35, {"bamboo"}, 1, 100, {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.bamboo) -add_node({"default:dirt_with_grass"}, 0.35, {"clearing", "swamp"}, +add_node({"default:dirt_with_grass"}, 0.35, {"grassland", "swamp"}, 1, 100, {"default:grass_3", "default:grass_4"}, nil, nil, nil, 1) add_node({"ethereal:bamboo_dirt"}, 0.35, {"sakura"}, 1, 100, @@ -295,18 +295,18 @@ add_node({"ethereal:crystal_dirt"}, 0.001, {"frost_floatlands"}, 1025, 1750, -- snow add_node({"ethereal:cold_dirt", "default:dirt_with_coniferous_litter"}, - 0.8, {"snowy"}, 4, 40, {"default:snow"}, nil, nil, nil, ethereal.snowy) + 0.8, {"coniferous_forest"}, 4, 40, {"default:snow"}, nil, nil, nil, ethereal.snowy) -add_node({"default:dirt_with_snow"}, 0.8, {"alpine"}, 40, 140, +add_node({"default:dirt_with_snow"}, 0.8, {"taiga"}, 40, 140, {"default:snow"}, nil, nil, nil, ethereal.alpine) -- wild onion add_node({"default:dirt_with_grass", "ethereal:prairie_dirt"}, 0.25, - {"grassy", "grassytwo", "jumble", "prairie"}, 1, 100, + {"deciduous_forest", "grassytwo", "jumble", "prairie"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, 1) -- papyrus -add_node({"default:dirt_with_grass"}, 0.1, {"grassy"}, 1, 1, +add_node({"default:dirt_with_grass"}, 0.1, {"deciduous_forest"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.grassy) add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, @@ -334,7 +334,7 @@ add_node({"default:dirt_with_grass"}, 0.05, {"grassytwo"}, 1, 100, "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4", "farming:cabbage_6", "farming:lettuce_5"}, nil, nil, nil, ethereal.grassytwo) -add_node({"default:dirt_with_grass"}, 0.05, {"grassy"}, 1, 100, +add_node({"default:dirt_with_grass"}, 0.05, {"deciduous_forest"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", "farming:potato_3", "farming:vanilla_7", "farming:tomato_7", "farming:corn_8", "farming:coffee_5", "farming:blackberry_4", "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4", @@ -360,7 +360,7 @@ add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.015, {"junglee"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.junglee) -add_node({"default:dirt_with_grass"}, 0.015, {"grassy"}, 1, 1, +add_node({"default:dirt_with_grass"}, 0.015, {"deciduous_forest"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassy) @@ -385,7 +385,7 @@ add_node({"default:dirt_with_grass"}, 0.035, {"grassytwo"}, 1, 100, add_node({"default:dirt_with_grass"}, 0.025, {"grassytwo"}, 1, 100, {"farming:grapebush"}, nil, nil, nil, ethereal.grassytwo) -add_node({"default:dirt_with_grass"}, 0.025, {"grassy"}, 1, 100, +add_node({"default:dirt_with_grass"}, 0.025, {"deciduous_forest"}, 1, 100, {"farming:grapebush"}, nil, nil, nil, ethereal.grassy) add_node({"ethereal:prairie_dirt"}, 0.025, {"prairie"}, 1, 100, @@ -634,7 +634,7 @@ minetest.register_decoration({ place_offset_y = 2, sidelen = 80, fill_ratio = 0.005, - biomes = {"grassy", "grassytwo", "prairie", "jumble"}, + biomes = {"deciduous_forest", "grassytwo", "prairie", "jumble"}, y_max = 31000, y_min = 1, decoration = { @@ -662,7 +662,8 @@ if minetest.get_modpath("fireflies") then place_offset_y = 2, sidelen = 80, fill_ratio = 0.0005, - biomes = {"grassy", "grassytwo", "snowy", "junglee", "swamp"}, + biomes = { + "deciduous_forest", "grassytwo", "coniferous_forest", "junglee", "swamp"}, y_max = 31000, y_min = -1, decoration = "fireflies:hidden_firefly" @@ -718,7 +719,7 @@ if minetest.registered_nodes["default:coral_green"] then persist = 0.7 }, biomes = { - "frost_ocean", "grassy_ocean", "sandstone_ocean", "swamp_ocean"}, + "frost_ocean", "deciduous_forest_ocean", "sandstone_ocean", "swamp_ocean"}, y_max = -5, y_min = -10, flags = "force_placement", diff --git a/plantpack.lua b/plantpack.lua index 34d07cd..c15c4ca 100644 --- a/plantpack.lua +++ b/plantpack.lua @@ -37,7 +37,7 @@ minetest.register_decoration({ place_on = {"ethereal:prairie_dirt", "default:dirt_with_grass"}, sidelen = 16, fill_ratio = 0.005, - biomes = {"prairie", "grassy", "grassytwo"}, + biomes = {"prairie", "deciduous_forest", "grassytwo"}, decoration = { "xanadu:grass_prairie", "xanadu:grass_cord", "xanadu:grass_wheatgrass", "xanadu:desert_whitesage" @@ -53,7 +53,7 @@ minetest.register_decoration({ }, sidelen = 16, fill_ratio = 0.005, - biomes = {"prairie", "grassy", "grassytwo", "bamboo"}, + biomes = {"prairie", "deciduous_forest", "grassytwo", "bamboo"}, decoration = { "xanadu:flower_jacobsladder", "xanadu:flower_thistle", "xanadu:flower_wildcarrot" @@ -68,7 +68,7 @@ minetest.register_decoration({ }, sidelen = 16, fill_ratio = 0.005, - biomes = {"prairie", "grassy", "grassytwo", "grove"}, + biomes = {"prairie", "deciduous_forest", "grassytwo", "grove"}, decoration = { "xanadu:flower_delphinium", "xanadu:flower_celosia", "xanadu:flower_daisy", "xanadu:flower_bluerose" @@ -86,7 +86,7 @@ minetest.register_decoration({ sidelen = 16, fill_ratio = 0.005, biomes = { - "prairie", "grassy", "grassytwo", "grove", "junglee", + "prairie", "deciduous_forest", "grassytwo", "grove", "junglee", "grayness", "jumble" }, decoration = {"xanadu:shrub_kerria", "xanadu:shrub_spicebush"} @@ -117,7 +117,7 @@ minetest.register_decoration({ }, sidelen = 16, fill_ratio = 0.005, - biomes = {"snowy", "alpine", "grayness"}, + biomes = {"coniferous_forest", "taiga", "grayness"}, decoration = { "xanadu:mountain_edelweiss", "xanadu:mountain_armeria", "xanadu:mountain_bellflower", "xanadu:mountain_willowherb", @@ -146,7 +146,8 @@ minetest.register_decoration({ place_on = {"default:sand", "default:dirt_with_grass"}, sidelen = 16, fill_ratio = 0.015, - biomes = {"sandclay", "grassy_ocean", "grassy", "grassytwo", "jumble", "swamp"}, + biomes = { + "sandclay", "deciduous_forest_ocean", "grassy", "grassytwo", "jumble", "swamp"}, decoration = { "xanadu:wetlands_cattails", "xanadu:wetlands_pickerel", "xanadu:wetlands_mannagrass", "xanadu:wetlands_turtle" @@ -172,8 +173,8 @@ minetest.register_decoration({ fill_ratio = 0.004, biomes = { "mushroom", "prairie", "grayness", "plains", "desert", - "junglee", "grassy", "grassytwo", "jumble", "snowy", "alpine", - "fiery", "mesa", "bamboo" + "junglee", "deciduous_forest", "grassytwo", "jumble", "coniferous_forest", + "taiga", "fiery", "mesa", "bamboo" }, decoration = {"xanadu:spooky_thornbush", "xanadu:spooky_baneberry"} }) @@ -187,6 +188,6 @@ minetest.register_decoration({ }, sidelen = 16, fill_ratio = 0.004, - biomes = {"clearing"}, + biomes = {"grassland"}, decoration = {"xanadu:poppy"} }) diff --git a/schems.lua b/schems.lua index abed404..6092fc2 100644 --- a/schems.lua +++ b/schems.lua @@ -71,7 +71,7 @@ add_schem({"ethereal:grove_dirt"}, 0.015, {"grove"}, 1, 100, ethereal.bananatree, ethereal.grove) -- healing tree -add_schem({"default:dirt_with_snow"}, 0.01, {"alpine"}, 120, 140, +add_schem({"default:dirt_with_snow"}, 0.01, {"taiga"}, 120, 140, ethereal.yellowtree, ethereal.alpine, nil, "default:dirt_with_snow", 8) -- crystal frost tree @@ -103,14 +103,14 @@ add_schem({"ethereal:gray_dirt"}, 0.02, {"grayness"}, 1, 100, -- default large pine tree for lower elevation add_schem({"ethereal:cold_dirt", "default:dirt_with_coniferous_litter"}, - 0.025, {"snowy"}, 10, 40, ethereal.pinetree, ethereal.snowy) + 0.025, {"coniferous_forest"}, 10, 40, ethereal.pinetree, ethereal.snowy) -- small pine for higher elevation -add_schem({"default:dirt_with_snow"}, 0.025, {"alpine"}, 40, 140, +add_schem({"default:dirt_with_snow"}, 0.025, {"taiga"}, 40, 140, ethereal.pinetree, ethereal.alpine) -- default apple tree -add_schem({"default:dirt_with_grass"}, 0.025, {"jumble", "grassy"}, 1, 100, +add_schem({"default:dirt_with_grass"}, 0.025, {"jumble", "deciduous_forest"}, 1, 100, dpath .. "apple_tree.mts", ethereal.grassy) -- big old tree @@ -137,7 +137,7 @@ add_schem({"default:dry_dirt_with_dry_grass", -- palm tree add_schem("default:sand", 0.0025, {"desert_ocean", "plains_ocean", "sandclay", - "sandstone_ocean", "mesa_ocean", "grove_ocean", "grassy_ocean"}, 1, 1, + "sandstone_ocean", "mesa_ocean", "grove_ocean", "deciduous_forest_ocean"}, 1, 1, ethereal.palmtree, 1) -- bamboo tree @@ -198,7 +198,7 @@ minetest.register_decoration({ octaves = 3, persist = 0.7, }, - biomes = {"grassy", "grassytwo", "jumble"}, + biomes = {"deciduous_forest", "grassytwo", "jumble"}, y_min = 1, y_max = 31000, schematic = dpath .. "bush.mts", @@ -243,7 +243,7 @@ if minetest.registered_nodes["default:pine_bush"] then octaves = 3, persist = 0.7, }, - biomes = {"alpine"}, + biomes = {"taiga"}, y_max = 31000, y_min = 4, schematic = dpath .. "pine_bush.mts", @@ -268,7 +268,7 @@ minetest.register_decoration({ octaves = 3, persist = 0.7, }, - biomes = {"snowy", "alpine"}, + biomes = {"coniferous_forest", "taiga"}, y_max = 31000, y_min = 1, place_offset_y = 1, @@ -292,7 +292,7 @@ minetest.register_decoration({ persist = 0.7 }, biomes = {"desert_ocean", "plains_ocean", "sandclay", - "mesa_ocean", "grove_ocean", "grassy_ocean", "swamp_ocean"}, + "mesa_ocean", "grove_ocean", "deciduous_forest_ocean", "swamp_ocean"}, y_min = 0, y_max = 0, schematic = ethereal.waterlily,