From c15250a03a5492b922593dd0cae7cf1b4677b3d0 Mon Sep 17 00:00:00 2001 From: Niklp Date: Mon, 14 Oct 2024 19:12:36 +0200 Subject: [PATCH] Rename some vars to reduce the mess in the mapgen code --- biome_defs.lua | 89 +++++++++++++++++++++++++------------------------- init.lua | 6 ++-- 2 files changed, 47 insertions(+), 48 deletions(-) diff --git a/biome_defs.lua b/biome_defs.lua index 57a9993..43c5765 100644 --- a/biome_defs.lua +++ b/biome_defs.lua @@ -1,80 +1,79 @@ moretrees.beech_biome = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, } moretrees.palm_biome = { - surface = xcompat.materials.sand, + place_on = xcompat.materials.sand, min_elevation = -1, max_elevation = 1, - near_nodes = {xcompat.materials.water_source}, - near_nodes_count = 10, + spawn_by = {xcompat.materials.water_source}, + num_spawn_by = 10, } moretrees.date_palm_biome = { - surface = xcompat.materials.desert_sand, + place_on = xcompat.materials.desert_sand, min_elevation = -1, max_elevation = 10, - near_nodes = {xcompat.materials.water_source}, - near_nodes_count = 100, + spawn_by = {xcompat.materials.water_source}, + num_spawn_by = 100, } moretrees.date_palm_biome_2 = { - surface = xcompat.materials.desert_sand, + place_on = xcompat.materials.desert_sand, min_elevation = 11, max_elevation = 30, - near_nodes = {xcompat.materials.water_source}, - near_nodes_count = 1, + spawn_by = {xcompat.materials.water_source}, + num_spawn_by = 1, } moretrees.apple_tree_biome = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = 1, max_elevation = 10, - place_on = {xcompat.materials.dirt_with_grass}, biomes = {"deciduous_forest"}, fill_ratio = 0.0001, } moretrees.oak_biome = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = 0, max_elevation = 10, fill_ratio = 0.0003 } moretrees.sequoia_biome = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = 0, max_elevation = 10, fill_ratio = 0.0001, } moretrees.birch_biome = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = 10, max_elevation = 15, fill_ratio = 0.001, } moretrees.willow_biome = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = -5, max_elevation = 5, - near_nodes = {xcompat.materials.water_source}, - near_nodes_count = 5, + spawn_by = {xcompat.materials.water_source}, + num_spawn_by = 5, } moretrees.rubber_tree_biome = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = -5, max_elevation = 5, - near_nodes = {xcompat.materials.water_source}, - near_nodes_count = 10, + spawn_by = {xcompat.materials.water_source}, + num_spawn_by = 10, } moretrees.jungletree_biome = { - surface = { + place_on = { xcompat.materials.dirt, xcompat.materials.dirt_with_grass, "woodsoils:dirt_with_leaves_1", @@ -83,74 +82,74 @@ moretrees.jungletree_biome = { "default:dirt_with_rainforest_litter", }, min_elevation = 1, - near_nodes = minetest.get_modpath("default") and {"default:jungletree"} or nil, - near_nodes_count = minetest.get_modpath("default") and 1 or nil, + spawn_by = minetest.get_modpath("default") and {"default:jungletree"} or nil, + num_spawn_by = minetest.get_modpath("default") and 1 or nil, biomes = {"rainforest", "rainforest_swamp"}, } moretrees.spruce_biome = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = 20, } moretrees.cedar_biome = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = 0, --Added to solve an issue where cedar trees would sometimes spawn deep underground - near_nodes = {xcompat.materials.water_source}, - near_nodes_count = 5, + spawn_by = {xcompat.materials.water_source}, + num_spawn_by = 5, } -- Poplar requires a lot of water. moretrees.poplar_biome = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = 0, max_elevation = 50, - near_nodes = {xcompat.materials.water_source}, - near_nodes_count = 1, + spawn_by = {xcompat.materials.water_source}, + num_spawn_by = 1, } -- Spawn an occasional poplar elsewhere. moretrees.poplar_biome_2 = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = 0, max_elevation = 50, - near_nodes = {xcompat.materials.water_source}, - near_nodes_count = 10, + spawn_by = {xcompat.materials.water_source}, + num_spawn_by = 10, } -- Subterranean lakes provide enough water for poplars to grow moretrees.poplar_biome_3 = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = 0, max_elevation = 50, - near_nodes = {xcompat.materials.water_source}, - near_nodes_count = 1, + spawn_by = {xcompat.materials.water_source}, + num_spawn_by = 1, } moretrees.poplar_small_biome = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = 0, max_elevation = 50, - near_nodes = {xcompat.materials.water_source}, - near_nodes_count = 1, + spawn_by = {xcompat.materials.water_source}, + num_spawn_by = 1, } moretrees.poplar_small_biome_2 = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = 0, max_elevation = 50, - near_nodes = {xcompat.materials.water_source}, - near_nodes_count = 5, + spawn_by = {xcompat.materials.water_source}, + num_spawn_by = 5, } moretrees.fir_biome = { - surface = xcompat.materials.dirt_with_grass, + place_on = xcompat.materials.dirt_with_grass, min_elevation = 25, } moretrees.fir_biome_snow = { - surface = {"snow:dirt_with_snow", "snow:snow"}, + place_on = {"snow:dirt_with_snow", "snow:snow"}, below_nodes = {xcompat.materials.dirt, xcompat.materials.dirt_with_grass, "snow:dirt_with_snow"}, } diff --git a/init.lua b/init.lua index 229ee1f..f4947b7 100644 --- a/init.lua +++ b/init.lua @@ -135,14 +135,14 @@ function translate_biome_defs(def, treename, index) local deco_def = { name = treename .. "_" .. index, deco_type = "simple", - place_on = def.place_on or def.surface, + place_on = def.place_on, sidelen = 16, fill_ratio = def.fill_ratio or 0.001, --biomes eventually? y_min = def.min_elevation, y_max = def.max_elevation, - spawn_by = def.near_nodes, - num_spawn_by = def.near_nodes_count, + spawn_by = def.spawn_by, + num_spawn_by = def.num_spawn_by, decoration = "moretrees:"..treename.."_sapling_ongen" }