diff --git a/biome_info.json b/biome_info.json index a32ac43..04841eb 100644 --- a/biome_info.json +++ b/biome_info.json @@ -2,7 +2,7 @@ {"name": "mountain", "heat_point": 50, "humidity_point": 50, "y_min": 140, "y_max": 31000}, {"name": "grassland", "heat_point": 50, "humidity_point": 35, "y_min": 3, "y_max": 71}, {"name": "grassland_ocean", "heat_point": 50, "humidity_point": 35, "y_min": -192, "y_max": 2}, -{"name": "grassland_under", "heat_point": 50, "humidity_point": 55, "y_min": -31000, "y_max": -256}, +{"name": "grassland_under", "heat_point": 50, "humidity_point": 35, "y_min": -31000, "y_max": -256}, {"name": "desert", "heat_point": 92, "humidity_point": 16, "y_min": 3, "y_max": 23}, {"name": "desert_ocean", "heat_point": 92, "humidity_point": 16, "y_min": -192, "y_max": 3}, {"name": "desert_under", "heat_point": 92, "humidity_point": 16, "y_min": -31000, "y_max": -256}, @@ -25,17 +25,17 @@ {"name": "deciduous_forest_under", "heat_point": 60, "humidity_point": 68, "y_min": -31000, "y_max": -256}, {"name": "caves", "heat_point": 70, "humidity_point": 5, "y_min": 4, "y_max": 41}, {"name": "grayness", "heat_point": 15, "humidity_point": 30, "y_min": 2, "y_max": 41}, -{"name": "grayness_ocean", "heat_point": 10, "humidity_point": 10, "y_min": -18, "y_max": 2}, -{"name": "grayness_under", "heat_point": 10, "humidity_point": 10, "y_min": -31000, "y_max": -256}, +{"name": "grayness_ocean", "heat_point": 15, "humidity_point": 30, "y_min": -18, "y_max": 2}, +{"name": "grayness_under", "heat_point": 15, "humidity_point": 30, "y_min": -31000, "y_max": -256}, {"name": "grassytwo", "heat_point": 15, "humidity_point": 25, "y_min": 1, "y_max": 91}, {"name": "grassytwo_ocean", "heat_point": 15, "humidity_point": 25, "y_min": -192, "y_max": 2}, {"name": "prairie", "heat_point": 30, "humidity_point": 35, "y_min": 3, "y_max": 26}, {"name": "prairie_ocean", "heat_point": 30, "humidity_point": 35, "y_min": -192, "y_max": 2}, {"name": "jumble", "heat_point": 25, "humidity_point": 55, "y_min": 1, "y_max": 71}, {"name": "jumble_ocean", "heat_point": 25, "humidity_point": 55, "y_min": -192, "y_max": 1}, -{"name": "junglee", "heat_point": 86, "humidity_point": 65, "y_min": 1, "y_max": 71}, -{"name": "junglee_ocean", "heat_point": 86, "humidity_point": 65, "y_min": -192, "y_max": 2}, -{"name": "junglee_under", "heat_point": 86, "humidity_point": 65, "y_min": -31000, "y_max": -256}, +{"name": "rainforest", "heat_point": 86, "humidity_point": 65, "y_min": 1, "y_max": 71}, +{"name": "rainforest_ocean", "heat_point": 86, "humidity_point": 65, "y_min": -192, "y_max": 2}, +{"name": "rainforest_under", "heat_point": 86, "humidity_point": 65, "y_min": -31000, "y_max": -256}, {"name": "swamp", "heat_point": 80, "humidity_point": 90, "y_min": 1, "y_max": 7}, {"name": "swamp_beach", "heat_point": 80, "humidity_point": 90, "y_min": -1, "y_max": 0}, {"name": "swamp_ocean", "heat_point": 80, "humidity_point": 90, "y_min": -192, "y_max": -1}, diff --git a/biomes.lua b/biomes.lua index a3e6f4d..3eff3fc 100644 --- a/biomes.lua +++ b/biomes.lua @@ -45,7 +45,7 @@ register_biome(1, { register_biome(1, { name = "grassland_under", node_cave_liquid = {"default:water_source", "default:lava_source"}, - heat_point = 50, humidity_point = 55, y_min = -31000, y_max = -256}) + heat_point = 50, humidity_point = 35, y_min = -31000, y_max = -256}) -- desert @@ -209,14 +209,14 @@ register_biome(ethereal.grayness, { register_biome(ethereal.grayness, { name = "grayness_ocean", - heat_point = 10, humidity_point = 10, y_min = -18, y_max = 2, + heat_point = 15, humidity_point = 30, y_min = -18, y_max = 2, node_top = "default:silver_sand", depth_top = 2, node_filler = "default:sand", depth_filler = 2, node_stone = "ethereal:blue_marble"}) register_biome(ethereal.grayness, { name = "grayness_under", - heat_point = 10, humidity_point = 10, y_min = -31000, y_max = -256, + heat_point = 15, humidity_point = 30, y_min = -31000, y_max = -256, node_cave_liquid = {"default:water_source", "default:lava_source"}}) -- grassy two @@ -261,22 +261,22 @@ register_biome(ethereal.jumble, { node_top = "default:sand", depth_top = 1, node_filler = "default:sand", depth_filler = 2}) --- jungle +-- rainforest register_biome(ethereal.junglee, { - name = "junglee", + name = "rainforest", heat_point = 86, humidity_point = 65, y_min = 1, y_max = 71, node_top = "default:dirt_with_rainforest_litter", depth_top = 1, node_filler = "default:dirt", depth_filler = 3}) register_biome(ethereal.junglee, { - name = "junglee_ocean", + name = "rainforest_ocean", heat_point = 86, humidity_point = 65, y_min = -192, y_max = 2, node_top = "default:sand", depth_top = 1, node_filler = "default:sand", depth_filler = 2}) register_biome(ethereal.junglee, { - name = "junglee_under", + name = "rainforest_under", heat_point = 86, humidity_point = 65, y_min = -31000, y_max = -256, node_cave_liquid = {"default:water_source", "default:lava_source"}}) diff --git a/decor.lua b/decor.lua index 4bc062f..1391230 100644 --- a/decor.lua +++ b/decor.lua @@ -52,6 +52,27 @@ register_decoration(1, { flags = "force_placement" }) +-- farming redo check, salt crystal if found, strawberry if not + +if minetest.get_modpath("farming") and farming.mod and farming.mod == "redo" then + + register_decoration(ethereal.glacier, { + place_on = "default:silver_sand", + fill_ratio = 0.001, + y_min = 4, y_max = 100, + decoration = "farming:salt_crystal"}) +else + register_decoration(1, { + place_on = {"default:dirt_with_grass", "ethereal:prairie_dirt"}, + sidelen = 16, + noise_params = { + offset = 0, scale = 0.002, spread = {x = 100, y = 100, z = 100}, + seed = 143, octaves = 3, persist = 0.6 + }, + y_min = 15, y_max = 55, + decoration = "ethereal:strawberry_7"}) +end + -- firethorn shrub register_decoration(ethereal.glacier, { @@ -185,7 +206,7 @@ register_decoration(1, { "ethereal:prairie_dirt", "ethereal:mushroom_dirt"}, sidelen = 16, fill_ratio = 0.01, - biomes = {"junglee", "deciduous_forest", "grassytwo", "prairie", "swamp", "mushroom"}, + biomes = {"rainforest", "deciduous_forest", "grassytwo", "prairie", "swamp", "mushroom"}, decoration = {"flowers:mushroom_brown", "flowers:mushroom_red"}}) -- jungle grass @@ -193,7 +214,7 @@ register_decoration(1, { register_decoration(ethereal.junglee, { place_on = {"default:dirt_with_rainforest_litter"}, fill_ratio = 0.1, - biomes = {"junglee"}, + biomes = {"rainforest"}, decoration = "default:junglegrass"}) register_decoration(ethereal.jumble, { @@ -214,7 +235,7 @@ register_decoration(1, { place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter", "ethereal:prairie_dirt", "ethereal:grove_dirt", "ethereal:bamboo_dirt"}, fill_ratio = 0.35, - biomes = {"deciduous_forest", "grassytwo", "jumble", "junglee", "grove", "prairie", + biomes = {"deciduous_forest", "grassytwo", "jumble", "rainforest", "grove", "prairie", "mediterranean", "bamboo", "grassland", "swamp"}, decoration = {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}}) @@ -299,11 +320,11 @@ register_decoration(1, { -- papyrus -register_decoration((ethereal.grassy or ethereal.junglee or ethereal.swamp), { +register_decoration(1, { place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, fill_ratio = 0.1, y_min = 1, y_max = 1, - biomes = {"deciduous_forest", "junglee", "swamp"}, + biomes = {"deciduous_forest", "rainforest", "swamp"}, decoration = "default:papyrus", height_max = 4, spawn_by = "default:water_source", num_spawn_by = 1}) @@ -458,7 +479,7 @@ if minetest.get_modpath("fireflies") then "ethereal:cold_dirt", "prairie"}, place_offset_y = 2, fill_ratio = 0.0005, - biomes = {"deciduous_forest", "grassytwo", "coniferous_forest", "junglee", + biomes = {"deciduous_forest", "grassytwo", "coniferous_forest", "rainforest", "swamp"}, y_min = -1, y_max = 200, decoration = "fireflies:hidden_firefly"}) @@ -484,7 +505,7 @@ register_decoration(1, { offset = -4, scale = 4, spread = {x = 50, y = 50, z = 50}, seed = 7013, octaves = 3, persist = 0.7, }, - biomes = {"desert_ocean", "savanna_ocean", "junglee_ocean"}, + biomes = {"desert_ocean", "savanna_ocean", "rainforest_ocean"}, y_min = -8, y_max = -2, flags = "force_placement", decoration = {"default:coral_green", "default:coral_pink", "default:coral_cyan", @@ -579,7 +600,7 @@ if minetest.get_modpath("xanadu") then "ethereal:grove_dirt", "ethereal:jungle_grass", "ethereal:gray_dirt", "default:dirt_with_rainforest_litter"}, sidelen = 16, fill_ratio = 0.005, - biomes = {"prairie", "deciduous_forest", "grassytwo", "grove", "junglee", + biomes = {"prairie", "deciduous_forest", "grassytwo", "grove", "rainforest", "grayness", "jumble"}, decoration = {"xanadu:shrub_kerria", "xanadu:shrub_spicebush"}}) @@ -588,7 +609,7 @@ if minetest.get_modpath("xanadu") then register_decoration(1, { place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, sidelen = 16, fill_ratio = 0.007, - biomes = {"junglee", "jumble"}, + biomes = {"rainforest", "jumble"}, decoration = {"xanadu:rainforest_guzmania", "xanadu:rainforest_devil", "xanadu:rainforest_lazarus", "xanadu:rainforest_lollipop", "xanadu:mushroom_woolly"}}) @@ -632,7 +653,7 @@ if minetest.get_modpath("xanadu") then "default:sand", "default:desert_sand", "ethereal:bamboo_dirt", "default:dirt_with_rainforest_litter"}, sidelen = 16, fill_ratio = 0.004, - biomes = {"mushroom", "prairie", "grayness", "plains", "desert", "junglee", + biomes = {"mushroom", "prairie", "grayness", "plains", "desert", "rainforest", "deciduous_forest", "grassytwo", "jumble", "coniferous_forest", "taiga", "fiery", "mesa", "bamboo"}, decoration = {"xanadu:spooky_thornbush", "xanadu:spooky_baneberry"}}) diff --git a/fishing.lua b/fishing.lua index dbe48b3..acbfd48 100644 --- a/fishing.lua +++ b/fishing.lua @@ -14,22 +14,22 @@ local fish_items = { "ethereal:fish_salmon", {"ethereal:fish_clownfish", "savanna"}, {"ethereal:fish_pike", "grassland_ocean"}, - {"ethereal:fish_flathead", "jungle"}, + {"ethereal:fish_flathead", "rainforest"}, {"ethereal:fish_pufferfish", "desert_ocean"}, - {"ethereal:fish_cichlid", "junglee_ocean"}, + {"ethereal:fish_cichlid", "rainforest_ocean"}, {"ethereal:fish_coy", "bamboo"}, {"ethereal:fish_tilapia", "bamboo"}, {"ethereal:fish_trevally", "bamboo"}, {"ethereal:fish_angler", "ocean"}, {"ethereal:fish_jellyfish", "ocean"}, {"ethereal:fish_seahorse", "ocean"}, - {"ethereal:fish_seahorse_green", "junglee_ocean"}, + {"ethereal:fish_seahorse_green", "rainforest_ocean"}, {"ethereal:fish_seahorse_pink", "mushroom_ocean"}, {"ethereal:fish_seahorse_blue", "coniferous_forest_ocean"}, {"ethereal:fish_seahorse_yellow", "desert_ocean"}, {"ethereal:fish_parrot", "desert"}, - {"ethereal:fish_piranha", "jungle"}, - {"ethereal:fish_tuna", "jungle"}, + {"ethereal:fish_piranha", "rainforest"}, + {"ethereal:fish_tuna", "rainforest"}, {"ethereal:fish_trout", "ocean"}, {"ethereal:fish_cod", "ocean"}, {"ethereal:fish_flounder", "ocean"}, @@ -42,7 +42,7 @@ local fish_items = { } -- grassland_ocean, desert_ocean, bamboo_ocean, mesa_ocean, coniferous_forest_ocean, -- taiga_ocean, frost_ocean, deciduous_forest_ocean, grayness_ocean, grassytwo_ocean, --- prairie_ocean, jumble_ocean, junglee_ocean, grove_ocean, mushroom_ocean, +-- prairie_ocean, jumble_ocean, rainforest_ocean, grove_ocean, mushroom_ocean, -- sandstone_desert_ocean, plains_ocean, savanna_ocean, fiery_ocean, swamp_ocean, -- glacier_ocean, tundra_ocean diff --git a/schematics/igloo.lua b/schematics/igloo.lua index 3a1c3a4..cdccb78 100644 --- a/schematics/igloo.lua +++ b/schematics/igloo.lua @@ -1,5 +1,5 @@ -local _ = {name = "air", prob = 0} +local _ = {name = "air", prob = 255, force_place = true} local S = {name = "default:snowblock", prob = 255} local P = {name = "default:pine_bush_stem", prob = 50} local C = {name = "ethereal:coconut", prob = 50} diff --git a/schems.lua b/schems.lua index 61b202e..74db055 100644 --- a/schems.lua +++ b/schems.lua @@ -52,9 +52,10 @@ register_decoration(ethereal.glacier, { place_on = "default:snowblock", fill_ratio = 0.0005, biomes = {"glacier"}, - y_min = 3, y_max = 50, + y_min = 3, y_max = 30, place_offset_y = -1, schematic = ethereal.igloo, spawn_by = "default:snowblock", num_spawn_by = 8, + flags = "place_center_x, place_center_z, force_placement", rotation = "random"}) -- sakura tree @@ -159,7 +160,7 @@ register_decoration(ethereal.fiery, { register_decoration(ethereal.junglee, { place_on = "default:dirt_with_rainforest_litter", fill_ratio = 0.08, - biomes = {"junglee"}, + biomes = {"rainforest"}, schematic = dpath .. "jungle_tree.mts"}) -- willow tree @@ -411,7 +412,7 @@ if ethereal.logs == 1 then place_on = {"default:dirt_with_rainforest_litter"}, place_offset_y = 1, fill_ratio = 0.005, - biomes = {"junglee"}, + biomes = {"rainforest"}, schematic = dpath .. "jungle_log.mts", flags = "place_center_x", rotation = "random", diff --git a/water.lua b/water.lua index 0bf6b32..f72c27f 100644 --- a/water.lua +++ b/water.lua @@ -80,7 +80,7 @@ minetest.register_abm({ "default:furnace_active", "default:torch", "default:torch_wall", "default:torch_ceiling" }, - interval = 5, + interval = 7, chance = 4, catch_up = false, @@ -119,13 +119,12 @@ minetest.register_abm({ }, neighbors = {"group:water"}, interval = 15, - chance = 2, + chance = 3, catch_up = false, action = function(pos, node) - if node.name == "ethereal:dry_dirt" - or node.name == "default:dry_dirt" then + if node.name == "ethereal:dry_dirt" or node.name == "default:dry_dirt" then minetest.swap_node(pos, {name = "default:dirt"}) elseif node.name == "default:dirt_with_dry_grass" then minetest.swap_node(pos, {name = "default:dirt_with_grass"})