From a468d34621b02aa024592a095b20c8840097f545 Mon Sep 17 00:00:00 2001 From: thunderdog1138 Date: Tue, 5 May 2020 20:46:09 +0000 Subject: [PATCH] Update 'mods/ethereal/mapgen.lua' --- mods/ethereal/mapgen.lua | 271 +++++++++++++-------------------------- 1 file changed, 86 insertions(+), 185 deletions(-) diff --git a/mods/ethereal/mapgen.lua b/mods/ethereal/mapgen.lua index 393268c4..81f6d832 100644 --- a/mods/ethereal/mapgen.lua +++ b/mods/ethereal/mapgen.lua @@ -13,25 +13,18 @@ path = path .. "/schematics/" local dpath = minetest.get_modpath("default") .. "/schematics/" -- tree schematics -dofile(path .. "orange_tree.lua") -dofile(path .. "banana_tree.lua") dofile(path .. "bamboo_tree.lua") -dofile(path .. "birch_tree.lua") dofile(path .. "bush.lua") dofile(path .. "waterlily.lua") dofile(path .. "volcanom.lua") dofile(path .. "volcanol.lua") -dofile(path .. "frosttrees.lua") -dofile(path .. "palmtree.lua") -dofile(path .. "pinetree.lua") -dofile(path .. "yellowtree.lua") +dofile(path .. "palm_tree.lua") +dofile(path .. "pine_tree.lua") dofile(path .. "mushroomone.lua") -dofile(path .. "willow.lua") -dofile(path .. "bigtree.lua") -dofile(path .. "redwood_tree.lua") -dofile(path .. "vinetree.lua") -dofile(path .. "sakura.lua") -dofile(path .. "igloo.lua") +dofile(path .. "brylark_tree.lua") +dofile(path .. "jogan_tree.lua") +dofile(path .. "uneti_tree.lua") +dofile(path .. "wroshyr_tree.lua") --= Biomes @@ -111,7 +104,7 @@ if ethereal.glacier == 1 then }) end -add_biome("clearing", nil, "default:dirt_with_grass", 1, "default:dirt", 3, +add_biome("clearing", nil, "ethereal:grove_dirt", 1, "default:dirt", 3, nil, nil, nil, nil, nil, 3, 71, 45, 65, 1) -- ADDED add_biome("bamboo", nil, "ethereal:bamboo_dirt", 1, "default:dirt", 3, @@ -120,12 +113,6 @@ add_biome("bamboo", nil, "ethereal:bamboo_dirt", 1, "default:dirt", 3, --add_biome("bamboo_ocean", nil, "default:sand", 1, "default:sand", 2, --nil, nil, nil, nil, nil, -192, 2, 45, 75, ethereal.bamboo) -add_biome("sakura", nil, "ethereal:bamboo_dirt", 1, "default:dirt", 3, - nil, nil, nil, nil, nil, 3, 25, 45, 75, ethereal.sakura) - -add_biome("sakura_ocean", nil, "default:sand", 1, "default:sand", 2, - nil, nil, nil, nil, nil, -192, 2, 45, 75, ethereal.sakura) - add_biome("mesa", nil, "default:dirt_with_dry_grass", 1, "bakedclay:orange", 15, nil, nil, nil, nil, nil, 1, 71, 25, 28, ethereal.mesa) @@ -143,13 +130,7 @@ add_biome("snowy", nil, "ethereal:cold_dirt", 1, "default:dirt", 2, nil, nil, nil, nil, nil, 4, 40, 10, 40, ethereal.snowy) end -add_biome("frost", nil, "ethereal:crystal_dirt", 1, "default:dirt", 3, - nil, nil, nil, nil, nil, 1, 71, 10, 40, ethereal.frost) - -add_biome("frost_ocean", nil, "default:sand", 1, "default:sand", 2, - nil, nil, nil, nil, nil, -192, 1, 10, 40, ethereal.frost) - -add_biome("grassy", nil, "default:dirt_with_grass", 1, "default:dirt", 3, +add_biome("grassy", nil, "ethereal:grove_dirt", 1, "default:dirt", 3, nil, nil, nil, nil, nil, 3, 91, 13, 40, ethereal.grassy) add_biome("grassy_ocean", nil, "defaut:sand", 2, "default:gravel", 1, @@ -158,30 +139,13 @@ add_biome("grassy_ocean", nil, "defaut:sand", 2, "default:gravel", 1, add_biome("caves", nil, "default:desert_stone", 3, "air", 8, nil, nil, nil, nil, nil, 4, 41, 15, 25, ethereal.caves) -add_biome("grayness", nil, "ethereal:gray_dirt", 1, "default:dirt", 3, - nil, nil, nil, nil, nil, 2, 41, 15, 30, ethereal.grayness) - -if minetest.registered_nodes["default:silver_sand"] then - add_biome("grayness_ocean", nil, "default:silver_sand", 2, "default:sand", 2, - nil, nil, nil, nil, nil, -192, 1, 15, 30, ethereal.grayness) -else - add_biome("grayness_ocean", nil, "default:sand", 1, "default:sand", 2, - nil, nil, nil, nil, nil, -192, 1, 15, 30, ethereal.grayness) -end - -add_biome("grassytwo", nil, "default:dirt_with_grass", 1, "default:dirt", 3, - nil, nil, nil, nil, nil, 1, 91, 15, 40, ethereal.grassytwo) - -add_biome("grassytwo_ocean", nil, "default:sand", 1, "default:sand", 2, - nil, nil, nil, nil, nil, -192, 1, 15, 40, ethereal.grassytwo) - add_biome("prairie", nil, "ethereal:prairie_dirt", 1, "default:dirt", 3, nil, nil, nil, nil, nil, 3, 26, 20, 40, ethereal.prairie) add_biome("prairie_ocean", nil, "default:sand", 1, "default:sand", 2, nil, nil, nil, nil, nil, -192, 1, 20, 40, ethereal.prairie) -add_biome("jumble", nil, "default:dirt_with_grass", 1, "default:dirt", 3, +add_biome("jumble", nil, "ethereal:grove_dirt", 1, "default:dirt", 3, nil, nil, nil, nil, nil, 1, 71, 25, 50, ethereal.jumble) add_biome("jumble_ocean", nil, "default:sand", 1, "default:sand", 2, @@ -204,7 +168,7 @@ add_biome("grove", nil, "ethereal:grove_dirt", 1, "default:dirt", 3, add_biome("grove_ocean", nil, "default:sand", 1, "default:sand", 2, nil, nil, nil, nil, nil, -192, 2, 45, 35, ethereal.grove) -add_biome("mushroom", nil, "ethereal:mushroom_dirt", 1, "default:dirt", 3, +add_biome("mushroom", nil, "ethereal:fungus_dirt", 1, "default:dirt", 3, nil, nil, nil, nil, nil, 3, 50, 45, 55, ethereal.mushroom) add_biome("mushroom_ocean", nil, "default:sand", 1, "default:sand", 2, @@ -216,7 +180,7 @@ add_biome("sandstone", nil, "default:sandstone", 1, "default:sandstone", 1, add_biome("sandstone_ocean", nil, "default:sand", 1, "default:sand", 2, nil, nil, nil, nil, nil, -192, 2, 50, 20, ethereal.sandstone) -add_biome("quicksand", nil, "ethereal:quicksand2", 3, "default:gravel", 1, +add_biome("quicksand", nil, "ethereal:quicksand", 3, "default:gravel", 1, nil, nil, nil, nil, nil, 1, 1, 50, 38, ethereal.quicksand) add_biome("plains", nil, "ethereal:dry_dirt", 1, "default:dirt", 3, @@ -237,16 +201,16 @@ end add_biome("savanna_ocean", nil, "default:sand", 1, "default:sand", 2, nil, nil, nil, nil, nil, -192, 1, 55, 25, ethereal.savanna) -add_biome("fiery", nil, "ethereal:fiery_dirt", 1, "default:dirt", 3, - nil, nil, nil, nil, nil, 5, 20, 75, 10, ethereal.fiery) +add_biome("volcanic", nil, "ethereal:charred_dirt", 1, "default:dirt", 3, + nil, nil, nil, nil, nil, 5, 20, 75, 10, ethereal.volcanic) -add_biome("fiery_ocean", nil, "default:sand", 1, "default:sand", 2, - nil, nil, nil, nil, nil, -192, 4, 75, 10, ethereal.fiery) +add_biome("volcanic_ocean", nil, "default:sand", 1, "default:sand", 2, + nil, nil, nil, nil, nil, -192, 4, 75, 10, ethereal.volcanic) add_biome("sandclay", nil, "default:sand", 3, "default:clay", 2, nil, nil, nil, nil, nil, 1, 11, 65, 2, ethereal.sandclay) -add_biome("swamp", nil, "default:dirt_with_grass", 1, "default:dirt", 3, +add_biome("swamp", nil, "ethereal:grove_dirt", 1, "default:dirt", 3, nil, nil, nil, nil, nil, 1, 7, 80, 90, ethereal.swamp) add_biome("swamp_ocean", nil, "default:sand", 2, "default:clay", 2, @@ -272,46 +236,21 @@ local add_schem = function(a, b, c, d, e, f, g, h) }) end -if ethereal.glacier then +-- wroshyr tree +add_schem({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.0025, {"junglee"}, 1, 100, ethereal.wroshyr_tree, ethereal.junglee) - -- igloo - minetest.register_decoration({ - deco_type = "schematic", - place_on = {"default:snowblock"}, - sidelen = 80, - fill_ratio = 0.001, - biomes = {"glacier"}, - y_min = 3, - y_max = 50, - schematic = ethereal.igloo, - flags = "place_center_x, place_center_z", - spawn_by = "default:snowblock", - num_spawn_by = 8, - rotation = "random", - }) -end +-- brylark tree +add_schem({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.01, {"junglee"}, 1, 100, ethereal.brylark_tree, ethereal.junglee) ---sakura tree -add_schem({"ethereal:bamboo_dirt"}, 0.01, {"sakura"}, 7, 100, ethereal.sakura_tree, ethereal.sakura) - --- redwood tree -add_schem({"default:dirt_with_dry_grass"}, 0.0025, {"mesa"}, 1, 100, ethereal.redwood_tree, ethereal.mesa) - --- banana tree -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, ethereal.yellowtree, ethereal.alpine) - --- crystal frost tree -add_schem({"ethereal:crystal_dirt"}, 0.01, {"frost"}, 1, 100, ethereal.frosttrees, ethereal.frost) +-- uneti tree +add_schem({"default:dirt_with_snow"}, 0.001, {"alpine"}, 120, 140, ethereal.uneti_tree, ethereal.alpine) if ethereal.mushroom then - -- giant shroom +-- giant mushshroom minetest.register_decoration({ deco_type = "schematic", - place_on = {"ethereal:mushroom_dirt"}, + place_on = {"ethereal:fungus_dirt"}, sidelen = 80, fill_ratio = 0.02, biomes = {"mushroom"}, @@ -319,7 +258,7 @@ if ethereal.mushroom then y_max = 100, schematic = ethereal.mushroomone, flags = "place_center_x, place_center_z", - spawn_by = "ethereal:mushroom_dirt", + spawn_by = "ethereal:fungus_dirt", num_spawn_by = 6, }) end @@ -329,69 +268,42 @@ if ethereal.fiery then -- small lava crater minetest.register_decoration({ deco_type = "schematic", - place_on = {"ethereal:fiery_dirt"}, + place_on = {"ethereal:charred_dirt"}, sidelen = 80, fill_ratio = 0.01, - biomes = {"fiery"}, + biomes = {"volcanic"}, y_min = 1, y_max = 100, schematic = ethereal.volcanom, flags = "place_center_x, place_center_z", - spawn_by = "ethereal:fiery_dirt", + spawn_by = "ethereal:charred_dirt", num_spawn_by = 8, }) -- large lava crater minetest.register_decoration({ deco_type = "schematic", - place_on = {"ethereal:fiery_dirt"}, + place_on = {"ethereal:charred_dirt"}, sidelen = 80, fill_ratio = 0.003, - biomes = {"fiery"}, + biomes = {"volcanic"}, y_min = 1, y_max = 100, schematic = ethereal.volcanol, flags = "place_center_x, place_center_z", - spawn_by = "ethereal:fiery_dirt", + spawn_by = "ethereal:charred_dirt", num_spawn_by = 8, rotation = "random", }) end --- default jungle tree -add_schem({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.08, {"junglee"}, 1, 100, dpath .. "jungle_tree.mts", ethereal.junglee) - --- willow tree -add_schem({"ethereal:gray_dirt"}, 0.02, {"grayness"}, 1, 100, ethereal.willow, ethereal.grayness) - -- pine tree (default for lower elevation and ethereal for higher) -add_schem({"ethereal:cold_dirt", "default:dirt_with_coniferous_litter"}, 0.025, {"snowy"}, 10, 40, ethereal.pinetree, ethereal.snowy) -add_schem({"default:dirt_with_snow"}, 0.025, {"alpine"}, 40, 140, ethereal.pinetree, ethereal.alpine) +add_schem({"ethereal:cold_dirt", "default:dirt_with_coniferous_litter"}, 0.025, {"snowy"}, 10, 40, ethereal.pine_tree, ethereal.snowy) +add_schem({"default:dirt_with_snow"}, 0.025, {"alpine"}, 40, 140, ethereal.pine_tree, ethereal.alpine) --- default apple tree -add_schem({"default:dirt_with_grass"}, 0.02, {"jumble"}, 1, 100, dpath .. "apple_tree.mts", ethereal.grassy) -add_schem({"default:dirt_with_grass"}, 0.03, {"grassy"}, 1, 100, dpath .. "apple_tree.mts", ethereal.grassy) - --- big old tree -add_schem({"default:dirt_with_grass"}, 0.001, {"jumble"}, 1, 100, ethereal.bigtree, ethereal.jumble) - --- aspen tree -add_schem({"default:dirt_with_grass"}, 0.02, {"grassytwo"}, 1, 50, dpath .. "aspen_tree.mts", ethereal.jumble) - --- birch tree -add_schem({"default:dirt_with_grass"}, 0.02, {"grassytwo"}, 50, 100, ethereal.birchtree, ethereal.grassytwo) - --- orange tree -add_schem({"ethereal:prairie_dirt"}, 0.01, {"prairie"}, 1, 100, ethereal.orangetree, ethereal.prairie) - --- default acacia tree -if minetest.registered_nodes["default:dry_dirt_with_dry_grass"] then - add_schem({"default:dry_dirt_with_dry_grass"}, 0.004, {"savanna"}, 1, 100, - dpath .. "acacia_tree.mts", ethereal.savanna) -else - add_schem({"default:dirt_with_dry_grass"}, 0.004, {"savanna"}, 1, 100, - dpath .. "acacia_tree.mts", ethereal.savanna) -end +-- jogan tree +add_schem({"ethereal:grove_dirt"}, 0.02, {"jumble"}, 1, 100, ethereal.jogan_tree, ethereal.grassy) +add_schem({"ethereal:grove_dirt"}, 0.03, {"grassy"}, 1, 100, ethereal.jogan_tree, ethereal.grassy) -- large cactus (by Paramat) if ethereal.desert == 1 then @@ -417,28 +329,28 @@ minetest.register_decoration({ end -- palm tree -add_schem({"default:sand"}, 0.0025, {"desert_ocean"}, 1, 1, ethereal.palmtree, ethereal.desert) -add_schem({"default:sand"}, 0.0025, {"plains_ocean"}, 1, 1, ethereal.palmtree, ethereal.plains) -add_schem({"default:sand"}, 0.0025, {"sandclay"}, 1, 1, ethereal.palmtree, ethereal.sandclay) -add_schem({"default:sand"}, 0.0025, {"sandstone_ocean"}, 1, 1, ethereal.palmtree, ethereal.sandstone) -add_schem({"default:sand"}, 0.0025, {"mesa_ocean"}, 1, 1, ethereal.palmtree, ethereal.mesa) -add_schem({"default:sand"}, 0.0025, {"grove_ocean"}, 1, 1, ethereal.palmtree, ethereal.grove) -add_schem({"default:sand"}, 0.0025, {"grassy_ocean"}, 1, 1, ethereal.palmtree, ethereal.grassy) +add_schem({"default:sand"}, 0.0025, {"desert_ocean"}, 1, 1, ethereal.palm_tree, ethereal.desert) +add_schem({"default:sand"}, 0.0025, {"plains_ocean"}, 1, 1, ethereal.palm_tree, ethereal.plains) +add_schem({"default:sand"}, 0.0025, {"sandclay"}, 1, 1, ethereal.palm_tree, ethereal.sandclay) +add_schem({"default:sand"}, 0.0025, {"sandstone_ocean"}, 1, 1, ethereal.palm_tree, ethereal.sandstone) +add_schem({"default:sand"}, 0.0025, {"mesa_ocean"}, 1, 1, ethereal.palm_tree, ethereal.mesa) +add_schem({"default:sand"}, 0.0025, {"grove_ocean"}, 1, 1, ethereal.palm_tree, ethereal.grove) +add_schem({"default:sand"}, 0.0025, {"grassy_ocean"}, 1, 1, ethereal.palm_tree, ethereal.grassy) -- bamboo tree -add_schem({"ethereal:bamboo_dirt"}, 0.025, {"bamboo"}, 1, 100, ethereal.bambootree, ethereal.bamboo) +add_schem({"ethereal:bamboo_dirt"}, 0.025, {"bamboo"}, 1, 100, ethereal.bamboo_tree, ethereal.bamboo) -- bush add_schem({"ethereal:bamboo_dirt"}, 0.08, {"bamboo"}, 1, 100, ethereal.bush, ethereal.bamboo) -- vine tree -add_schem({"default:dirt_with_grass"}, 0.02, {"swamp"}, 1, 100, ethereal.vinetree, ethereal.swamp) +add_schem({"ethereal:grove_dirt"}, 0.02, {"swamp"}, 1, 100, ethereal.vine_tree, ethereal.swamp) -- water pools in swamp areas if 5.0 detected if minetest.registered_nodes["default:permafrost"] then minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"ethereal:grove_dirt"}, place_offset_y = -1, sidelen = 16, fill_ratio = 0.01, @@ -447,12 +359,12 @@ minetest.register_decoration({ y_min = 1, flags = "force_placement", decoration = "default:water_source", - spawn_by = "default:dirt_with_grass", + spawn_by = "ethereal:grove_dirt", num_spawn_by = 8, }) minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass"}, + place_on = {"ethereal:grove_dirt"}, place_offset_y = -1, sidelen = 16, fill_ratio = 0.1, @@ -461,7 +373,7 @@ minetest.register_decoration({ y_min = 1, flags = "force_placement", decoration = "default:water_source", - spawn_by = {"default:dirt_with_grass", "default:water_source"}, + spawn_by = {"ethereal:grove_dirt", "default:water_source"}, num_spawn_by = 8, }) end @@ -491,7 +403,7 @@ end -- bush minetest.register_decoration({ deco_type = "schematic", - place_on = {"default:dirt_with_grass", "default:dirt_with_snow"}, + place_on = {"ethereal:grove_dirt", "default:dirt_with_snow"}, sidelen = 16, noise_params = { offset = -0.004, @@ -511,7 +423,7 @@ minetest.register_decoration({ -- Acacia bush minetest.register_decoration({ deco_type = "schematic", - place_on = {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"}, + place_on = {"ethereal:grove_dirt", "default:dry_dirt_with_dry_grass"}, sidelen = 16, noise_params = { offset = -0.004, @@ -572,9 +484,6 @@ local add_node = function(a, b, c, d, e, f, g, h, i, j) }) end ---firethorn shrub -add_node({"default:snowblock"}, 0.001, {"glacier"}, 1, 30, {"ethereal:firethorn"}, nil, nil, nil, ethereal.glacier) - -- scorched tree add_node({"ethereal:dry_dirt"}, 0.006, {"plains"}, 1, 100, {"ethereal:scorched_tree"}, 6, nil, nil, ethereal.plains) @@ -602,10 +511,10 @@ add_node({"default:desert_stone"}, 0.005, {"caves"}, 5, 40, {"default:dry_grass_ "default:dry_grass_3", "default:dry_shrub"}, nil, nil, nil, ethereal.caves) -- flowers & strawberry -add_node({"default:dirt_with_grass"}, 0.025, {"grassy"}, 1, 100, {"flowers:dandelion_white", +add_node({"ethereal:grove_dirt"}, 0.025, {"grassy"}, 1, 100, {"flowers:dandelion_white", "flowers:dandelion_yellow", "flowers:geranium", "flowers:rose", "flowers:tulip", "flowers:viola", "ethereal:strawberry_7"}, nil, nil, nil, ethereal.grassy) -add_node({"default:dirt_with_grass"}, 0.025, {"grassytwo"}, 1, 100, {"flowers:dandelion_white", +add_node({"ethereal:grove_dirt"}, 0.025, {"grassytwo"}, 1, 100, {"flowers:dandelion_white", "flowers:dandelion_yellow", "flowers:geranium", "flowers:rose", "flowers:tulip", "flowers:viola", "ethereal:strawberry_7"}, nil, nil, nil, ethereal.grassytwo) @@ -614,13 +523,6 @@ add_node({"ethereal:prairie_dirt"}, 0.035, {"prairie"}, 1, 100, {"flowers:dandel "flowers:dandelion_yellow", "flowers:geranium", "flowers:rose", "flowers:tulip", "flowers:viola", "ethereal:strawberry_7", "flowers:chrysanthemum_green", "flowers:tulip_black"}, nil, nil, nil, ethereal.prairie) --- crystal spike & crystal grass -add_node({"ethereal:crystal_dirt"}, 0.02, {"frost"}, 1, 100, {"ethereal:crystal_spike", - "ethereal:crystalgrass"}, nil, nil, nil, ethereal.frost) - --- red shrub -add_node({"ethereal:fiery_dirt"}, 0.10, {"fiery"}, 1, 100, {"ethereal:dry_shrub"}, nil, nil, nil, ethereal.fiery) - -- fire flower --add_node({"ethereal:fiery_dirt"}, 0.02, {"fiery"}, 1, 100, {"ethereal:fire_flower"}, nil, nil, nil, ethereal.fiery) @@ -633,15 +535,15 @@ add_node({"default:sandstone"}, 0.0025, {"sandstone"}, 1, 100, {"default:cactus" add_node({"default:desert_sand"}, 0.005, {"desert"}, 1, 100, {"default:cactus"}, 4, nil, nil, ethereal.desert) -- wild red mushroom -add_node({"ethereal:mushroom_dirt"}, 0.01, {"mushroom"}, 1, 100, {"flowers:mushroom_fertile_red"}, nil, nil, nil, ethereal.mushroom) +add_node({"ethereal:fungus_dirt"}, 0.01, {"mushroom"}, 1, 100, {"flowers:mushroom_fertile_red"}, nil, nil, nil, ethereal.mushroom) local list = { {"junglee", {"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, ethereal.junglee}, - {"grassy", {"default:dirt_with_grass"}, ethereal.grassy}, - {"grassytwo", {"default:dirt_with_grass"}, ethereal.grassytwo}, + {"grassy", {"ethereal:grove_dirt"}, ethereal.grassy}, + {"grassytwo", {"ethereal:grove_dirt"}, ethereal.grassytwo}, {"prairie", {"ethereal:prairie_dirt"}, ethereal.prairie}, - {"mushroom", {"ethereal:mushroom_dirt"}, ethereal.mushroom}, - {"swamp", {"default:dirt_with_grass"}, ethereal.swamp}, + {"mushroom", {"ethereal:fungus_dirt"}, ethereal.mushroom}, + {"swamp", {"ethereal:grove_dirt"}, ethereal.swamp}, } -- wild red and brown mushrooms @@ -671,15 +573,15 @@ end -- jungle grass add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.10, {"junglee"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.junglee) -add_node({"default:dirt_with_grass"}, 0.15, {"jumble"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.jumble) -add_node({"default:dirt_with_grass"}, 0.25, {"swamp"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.swamp) +add_node({"ethereal:grove_dirt"}, 0.15, {"jumble"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.jumble) +add_node({"ethereal:grove_dirt"}, 0.25, {"swamp"}, 1, 100, {"default:junglegrass"}, nil, nil, nil, ethereal.swamp) -- grass -add_node({"default:dirt_with_grass"}, 0.35, {"grassy"}, 1, 100, {"default:grass_2", "default:grass_3", +add_node({"ethereal:grove_dirt"}, 0.35, {"grassy"}, 1, 100, {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.grassy) -add_node({"default:dirt_with_grass"}, 0.35, {"grassytwo"}, 1, 100, {"default:grass_2", "default:grass_3", +add_node({"ethereal:grove_dirt"}, 0.35, {"grassytwo"}, 1, 100, {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.grassytwo) -add_node({"default:dirt_with_grass"}, 0.35, {"jumble"}, 1, 100, {"default:grass_2", "default:grass_3", +add_node({"ethereal:grove_dirt"}, 0.35, {"jumble"}, 1, 100, {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.jumble) add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.35, {"junglee"}, 1, 100, {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.junglee) @@ -689,9 +591,8 @@ add_node({"ethereal:grove_dirt"}, 0.35, {"grove"}, 1, 100, {"default:grass_2", " "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.grove) 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"}, 1, 100, {"default:grass_3", +add_node({"ethereal:grove_dirt"}, 0.35, {"clearing", "swamp"}, 1, 100, {"default:grass_3", "default:grass_4"}, nil, nil, nil, 1) -add_node({"ethereal:bamboo_dirt"}, 0.35, {"sakura"}, 1, 100, {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}, nil, nil, nil, ethereal.sakura) -- grass on sand (and maybe blueberry bush) if minetest.registered_nodes["default:marram_grass_1"] then @@ -726,22 +627,22 @@ end -- ferns add_node({"ethereal:grove_dirt"}, 0.2, {"grove"}, 1, 100, {"ethereal:fern"}, nil, nil, nil, ethereal.grove) -add_node({"default:dirt_with_grass"}, 0.1, {"swamp"}, 1, 100, {"ethereal:fern"}, nil, nil, nil, ethereal.swamp) +add_node({"ethereal:grove_dirt"}, 0.1, {"swamp"}, 1, 100, {"ethereal:fern"}, nil, nil, nil, ethereal.swamp) -- snow add_node({"ethereal:cold_dirt", "default:dirt_with_coniferous_litter"}, 0.8, {"snowy"}, 4, 40, {"default:snow"}, nil, nil, nil, ethereal.snowy) add_node({"default:dirt_with_snow"}, 0.8, {"alpine"}, 40, 140, {"default:snow"}, nil, nil, nil, ethereal.alpine) -- wild onion -add_node({"default:dirt_with_grass"}, 0.25, {"grassy"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.grassy) -add_node({"default:dirt_with_grass"}, 0.25, {"grassytwo"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.grassytwo) -add_node({"default:dirt_with_grass"}, 0.25, {"jumble"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.jumble) +add_node({"ethereal:grove_dirt"}, 0.25, {"grassy"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.grassy) +add_node({"ethereal:grove_dirt"}, 0.25, {"grassytwo"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.grassytwo) +add_node({"ethereal:grove_dirt"}, 0.25, {"jumble"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.jumble) add_node({"ethereal:prairie_dirt"}, 0.25, {"prairie"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.prairie) -- papyrus -add_node({"default:dirt_with_grass"}, 0.1, {"grassy"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.grassy) +add_node({"ethereal:grove_dirt"}, 0.1, {"grassy"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.grassy) add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.1, {"junglee"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.junglee) -add_node({"default:dirt_with_grass"}, 0.1, {"swamp"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.swamp) +add_node({"ethereal:grove_dirt"}, 0.1, {"swamp"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.swamp) --= Farming Redo plants @@ -753,14 +654,14 @@ print ("[MOD] Ethereal - Farming Redo detected and in use") add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.035, {"junglee"}, 1, 100, {"farming:potato_3"}, nil, nil, nil, ethereal.junglee) -- carrot, cucumber, potato, tomato, corn, coffee, raspberry, rhubarb -add_node({"default:dirt_with_grass"}, 0.05, {"grassytwo"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", +add_node({"ethereal:grove_dirt"}, 0.05, {"grassytwo"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", "farming:potato_3", "farming:tomato_7", "farming:corn_8", "farming:coffee_5", "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4"}, nil, nil, nil, ethereal.grassytwo) -add_node({"default:dirt_with_grass"}, 0.05, {"grassy"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", +add_node({"ethereal:grove_dirt"}, 0.05, {"grassy"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", "farming:potato_3", "farming:tomato_7", "farming:corn_8", "farming:coffee_5", "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4", "farming:beetroot_5"}, nil, nil, nil, ethereal.grassy) -add_node({"default:dirt_with_grass"}, 0.05, {"jumble"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", +add_node({"ethereal:grove_dirt"}, 0.05, {"jumble"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", "farming:potato_3", "farming:tomato_7", "farming:corn_8", "farming:coffee_5", "farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4"}, nil, nil, nil, ethereal.jumble) add_node({"ethereal:prairie_dirt"}, 0.05, {"prairie"}, 1, 100, {"farming:carrot_7", "farming:cucumber_4", @@ -770,22 +671,22 @@ add_node({"ethereal:prairie_dirt"}, 0.05, {"prairie"}, 1, 100, {"farming:carrot_ -- melon and pumpkin 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, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassy) -add_node({"default:dirt_with_grass"}, 0.015, {"grassytwo"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassytwo) -add_node({"default:dirt_with_grass"}, 0.015, {"jumble"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.jumble) +add_node({"ethereal:grove_dirt"}, 0.015, {"grassy"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassy) +add_node({"ethereal:grove_dirt"}, 0.015, {"grassytwo"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassytwo) +add_node({"ethereal:grove_dirt"}, 0.015, {"jumble"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.jumble) -- green beans -add_node({"default:dirt_with_grass"}, 0.035, {"grassytwo"}, 1, 100, {"farming:beanbush"}, nil, nil, nil, ethereal.grassytwo) +add_node({"ethereal:grove_dirt"}, 0.035, {"grassytwo"}, 1, 100, {"farming:beanbush"}, nil, nil, nil, ethereal.grassytwo) -- grape bushel -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, {"farming:grapebush"}, nil, nil, nil, ethereal.grassy) +add_node({"ethereal:grove_dirt"}, 0.025, {"grassytwo"}, 1, 100, {"farming:grapebush"}, nil, nil, nil, ethereal.grassytwo) +add_node({"ethereal:grove_dirt"}, 0.025, {"grassy"}, 1, 100, {"farming:grapebush"}, nil, nil, nil, ethereal.grassy) add_node({"ethereal:prairie_dirt"}, 0.025, {"prairie"}, 1, 100, {"farming:grapebush"}, nil, nil, nil, ethereal.prairie) minetest.register_decoration({ deco_type = "simple", place_on = { - "default:dirt_with_grass", "ethereal:prairie_dirt", + "ethereal:grove_dirt", "ethereal:prairie_dirt", "default:dirt_with_rainforest_litter", }, sidelen = 16, @@ -806,7 +707,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, + place_on = {"ethereal:grove_dirt", "default:dirt_with_rainforest_litter"}, sidelen = 16, noise_params = { offset = 0, @@ -950,7 +851,7 @@ if minetest.get_modpath("bakedclay") then minetest.register_decoration({ deco_type = "simple", place_on = { - "ethereal:prairie_grass", "default:dirt_with_grass", + "ethereal:prairie_grass", "ethereal:grove_dirt" }, sidelen = 16, @@ -970,7 +871,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "simple", place_on = { - "ethereal:prairie_grass", "default:dirt_with_grass", + "ethereal:prairie_grass", "ethereal:grove_dirt", "ethereal:bamboo_dirt" }, sidelen = 16, @@ -1008,7 +909,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "simple", - place_on = {"default:dirt_with_grass", "default:sand"}, + place_on = {"ethereal:grove_dirt", "default:sand"}, sidelen = 16, noise_params = { offset = 0, @@ -1174,7 +1075,7 @@ if minetest.get_modpath("butterflies") then minetest.register_decoration({ name = "butterflies:butterfly", deco_type = "simple", - place_on = {"default:dirt_with_grass", "ethereal:prairie_dirt"}, + place_on = {"ethereal:grove_dirt", "ethereal:prairie_dirt"}, place_offset_y = 2, sidelen = 80, fill_ratio = 0.005, @@ -1196,7 +1097,7 @@ if minetest.get_modpath("fireflies") then name = "fireflies:firefly_low", deco_type = "simple", place_on = { - "default:dirt_with_grass", + "ethereal:grove_dirt", "default:dirt_with_coniferous_litter", "default:dirt_with_rainforest_litter", "default:dirt",