diff --git a/biome_info.json b/biome_info.json index 79f9744..4493a4e 100644 --- a/biome_info.json +++ b/biome_info.json @@ -21,7 +21,8 @@ {"name": "taiga_under", "heat_point": 25, "humidity_point": 70, "y_min": -31000, "y_max": -256}, {"name": "frost_floatland", "heat_point": 5, "humidity_point": 60, "y_min": 1025, "y_max": 1750}, {"name": "frost", "heat_point": 5, "humidity_point": 60, "y_min": 1, "y_max": 71}, -{"name": "cold_grass", "heat_point": 15, "humidity_point": 58, "y_min": 2, "y_max": 30}, +{"name": "snowy_grassland", "heat_point": 15, "humidity_point": 58, "y_min": 3, "y_max": 30}, +{"name": "snowy_grassland_ocean", "heat_point": 15, "humidity_point": 58, "y_min": 2, "y_max": -192}, {"name": "deciduous_forest", "heat_point": 60, "humidity_point": 68, "y_min": 3, "y_max": 91}, {"name": "deciduous_forest_ocean", "heat_point": 60, "humidity_point": 68, "y_min": -31000, "y_max": 3}, {"name": "deciduous_forest_under", "heat_point": 60, "humidity_point": 68, "y_min": -31000, "y_max": -256}, diff --git a/biomes.lua b/biomes.lua index 4da3a1d..4fac480 100644 --- a/biomes.lua +++ b/biomes.lua @@ -188,14 +188,22 @@ register_biome(ethereal.frost, { node_top = "ethereal:crystal_dirt", depth_top = 1, node_filler = "default:dirt", depth_filler = 3}) --- cold (inbetween frost and taiga/jumble) +-- snowy grassland (inbetween frost and taiga/jumble) register_biome(1, { - name = "cold_grass", - heat_point = 15, humidity_point = 58, y_min = 2, y_max = 30, + name = "snowy_grassland", + heat_point = 15, humidity_point = 58, y_min = 3, y_max = 30, node_top = "ethereal:cold_dirt", depth_top = 1, node_filler = "default:dirt", depth_filler = 3}) +register_biome(1, { + name = "snowy_grassland_ocean", + node_dust = "default:snow", + heat_point = 15, humidity_point = 58, y_min = -192, y_max = 2, + node_top = "default:sand", depth_top = 1, + node_filler = "default:sand", depth_filler = 3, + vertical_blend = 1}) + -- deciduous forest register_biome(ethereal.grassy, { diff --git a/biomes_init.lua b/biomes_init.lua index 3420d05..0a3d9e2 100644 --- a/biomes_init.lua +++ b/biomes_init.lua @@ -1,8 +1,7 @@ -- storage tables -local old_biomes = {} -local old_decor = {} +local old_biomes, old_decor = {}, {} -- backup registered biomes @@ -25,49 +24,49 @@ minetest.clear_registered_decorations() -- create list of default biomes to remove local def_biomes = { + ["rainforest"] = 1, ["rainforest_swamp"] = 1, + ["rainforest_ocean"] = 1, + ["rainforest_under"] = 1, + ["grassland"] = 1, ["grassland_dunes"] = 1, - ["cold_desert"] = 1, + ["grassland_ocean"] = 1, + ["grassland_under"] = 1, ["taiga"] = 1, + ["taiga_ocean"] = 1, + ["taiga_under"] = 1, + ["icesheet"] = 1, ["icesheet_ocean"] = 1, + ["icesheet_under"] = 1, + ["snowy_grassland"] = 1, + ["snowy_grassland_ocean"] = 1, ["snowy_grassland_under"] = 1, ["desert"] = 1, - ["deciduous_forest"] = 1, - ["taiga_ocean"] = 1, ["desert_ocean"] = 1, - ["tundra_ocean"] = 1, - ["snowy_grassland_ocean"] = 1, - ["sandstone_desert"] = 1, - ["tundra_under"] = 1, - ["coniferous_forest_ocean"] = 1, - ["tundra"] = 1, - ["sandstone_desert_under"] = 1, - ["grassland"] = 1, - ["rainforest"] = 1, - ["grassland_ocean"] = 1, - ["tundra_beach"] = 1, - ["rainforest_under"] = 1, - ["savanna_under"] = 1, - ["icesheet"] = 1, - ["savanna_ocean"] = 1, - ["tundra_highland"] = 1, - ["savanna"] = 1, - ["cold_desert_under"] = 1, - ["cold_desert_ocean"] = 1, ["desert_under"] = 1, - ["taiga_under"] = 1, - ["savanna_shore"] = 1, + ["tundra"] = 1, + ["tundra_highland"] = 1, + ["tundra_beach"] = 1, + ["tundra_ocean"] = 1, + ["tundra_under"] = 1, + ["sandstone_desert"] = 1, ["sandstone_desert_ocean"] = 1, - ["snowy_grassland"] = 1, - ["coniferous_forest_under"] = 1, - ["deciduous_forest_ocean"] = 1, - ["grassland_under"] = 1, - ["icesheet_under"] = 1, - ["rainforest_ocean"] = 1, - ["deciduous_forest_shore"] = 1, - ["deciduous_forest_under"] = 1, + ["sandstone_desert_under"] = 1, + ["savanna"] = 1, + ["savanna_shore"] = 1, + ["savanna_ocean"] = 1, + ["savanna_under"] = 1, + ["cold_desert"] = 1, + ["cold_desert_ocean"] = 1, + ["cold_desert_under"] = 1, + ["coniferous_forest"] = 1, ["coniferous_forest_dunes"] = 1, - ["coniferous_forest"] = 1 + ["coniferous_forest_ocean"] = 1, + ["coniferous_forest_under"] = 1, + ["deciduous_forest"] = 1, + ["deciduous_forest_shore"] = 1, + ["deciduous_forest_ocean"] = 1, + ["deciduous_forest_under"] = 1 } -- only re-register biomes that aren't on the list diff --git a/decor.lua b/decor.lua index 3d54c7c..76f9edc 100644 --- a/decor.lua +++ b/decor.lua @@ -168,8 +168,7 @@ register_decoration(ethereal.fiery, { -- snowy grass register_decoration(ethereal.snowy, { - place_on = {"ethereal:gray_dirt", "ethereal:cold_dirt", - "default:dirt_with_coniferous_litter"}, + place_on = {"ethereal:gray_dirt", "default:dirt_with_coniferous_litter"}, fill_ratio = 0.05, biomes = {"grayness", "coniferous_forest"}, decoration = "ethereal:snowygrass"}) @@ -315,9 +314,9 @@ register_decoration(ethereal.alpine, { register_decoration(1, { place_on = {"ethereal:cold_dirt"}, - fill_ratio = 0.4, + fill_ratio = 0.8, y_min = 2, y_max = 40, - biomes = {"cold_grass"}, + biomes = {"snowy_grassland"}, decoration = "default:snow"}) -- wild onion and setting @@ -488,7 +487,7 @@ if minetest.get_modpath("fireflies") then name = "fireflies:firefly_low", place_on = {"default:dirt_with_grass", "default:dirt_with_coniferous_litter", "default:dirt_with_rainforest_litter", "default:dirt", - "ethereal:cold_dirt", "prairie"}, + "ethereal:prairie_dirt"}, place_offset_y = 2, fill_ratio = 0.0005, biomes = {"deciduous_forest", "grassytwo", "coniferous_forest", "rainforest", diff --git a/dirt.lua b/dirt.lua index 7ebc1ac..78646d4 100644 --- a/dirt.lua +++ b/dirt.lua @@ -23,7 +23,7 @@ minetest.register_craft({ type = "cooking", output = "ethereal:dry_dirt", recipe = "default:dirt", - cooktime = 3, + cooktime = 3 }) -- ethereal dirt types diff --git a/leaves.lua b/leaves.lua index cb11261..99b98db 100644 --- a/leaves.lua +++ b/leaves.lua @@ -1,7 +1,7 @@ local S = minetest.get_translator("ethereal") --- set leaftype (0 for block, 1 for plantlike) +-- set leaftype (0 for plantlike, 1 for block) local leaftype = "plantlike" local leafscale = 1.4 diff --git a/plantlife.lua b/plantlife.lua index d0aeb73..cf20606 100644 --- a/plantlife.lua +++ b/plantlife.lua @@ -21,7 +21,7 @@ minetest.register_node("ethereal:spore_grass", { } }) --- Firethorn (poisonous when eaten raw, must be crushed and washed water 1st) +-- Firethorn (poisonous when eaten raw, must be crushed and washed with water 1st) minetest.register_node("ethereal:firethorn", { description = S("Firethorn Shrub"), diff --git a/schems.lua b/schems.lua index 61a888a..5c46611 100644 --- a/schems.lua +++ b/schems.lua @@ -374,12 +374,13 @@ register_decoration((minetest.registered_nodes["default:pine_bush"] and 1), { register_decoration((minetest.registered_nodes["default:blueberry_bush_leaves"] and 1), { name = "default:blueberry_bush", - place_on = {"default:dirt_with_coniferous_litter", "default:dirt_with_snow"}, + place_on = {"default:dirt_with_coniferous_litter", "default:dirt_with_snow", + "ethereal:cold_dirt"}, sidelen = 16, noise_params = { offset = -0.004, scale = 0.01, spread = {x = 100, y = 100, z = 100}, seed = 697, octaves = 3, persist = 0.7}, - biomes = {"coniferous_forest", "taiga"}, + biomes = {"coniferous_forest", "taiga", "snowy_grassland"}, place_offset_y = 1, schematic = dpath .. "blueberry_bush.mts"})