updated biomes

2 files changed, 61 insertions, 59 deletions

diff --git a/init.lua b/init.lua
index aed8393..f859388 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,6 @@
 --[[

 

-	Minetest Ethereal Mod 1.14 (24th March 2015)

+	Minetest Ethereal Mod 1.14 (9th April 2015)

 

 	Created by ChinChow

 

diff --git a/mapgen_v7n.lua b/mapgen_v7n.lua
index 017ec34..840145e 100644
--- a/mapgen_v7n.lua
+++ b/mapgen_v7n.lua
@@ -1,12 +1,14 @@
--- Clear default mapgen definitions

+-- Clear default mapgen biomes and decorations

 minetest.clear_registered_biomes()

 minetest.clear_registered_decorations()

 --minetest.clear_registered_ores()

 

+local e = "ethereal:"

+

 -- Biomes (for 0.4.12 with new changes from Paramat)

 if ethereal.bamboo == 1 then

 minetest.register_biome({

-	name			= "bamboo",

+	name			= e.."bamboo",

 	node_top		= "ethereal:bamboo_dirt",	depth_top			= 1,

 	node_filler		= "default:dirt",			depth_filler		= 5,

 	y_min			= 1,						y_max				= 71,

@@ -16,7 +18,7 @@ end
 

 if ethereal.mesa == 1 then

 minetest.register_biome({

-	name           = "mesa",

+	name           = e.."mesa",

 	node_top       = "bakedclay:red",			depth_top      = 1,

 	node_filler    = "bakedclay:orange",		depth_filler   = 5,

 	y_min     = 2,							y_max     = 71,

@@ -26,7 +28,7 @@ end
 

 if ethereal.alpine == 1 then

 minetest.register_biome({

-	name           = "alpine",

+	name           = e.."alpine",

 	node_top       = "default:dirt_with_snow",	depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 2,

 	y_min     = 40,						y_max     = 90,

@@ -36,7 +38,7 @@ end
 

 if ethereal.healing == 1 then

 minetest.register_biome({

-	name           = "healing",

+	name           = e.."healing",

 	node_top       = "default:dirt_with_snow",	depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 2,

 	y_min     = 75,						y_max     = 140,

@@ -46,7 +48,7 @@ end
 

 if ethereal.snowy == 1 then

 minetest.register_biome({

-	name           = "snowy",

+	name           = e.."snowy",

 	node_top       = "ethereal:cold_dirt",		depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 2,

 	y_min     = 5,							y_max     = 40,

@@ -56,7 +58,7 @@ end
 

 if ethereal.frost == 1 then

 minetest.register_biome({

-	name           = "frost",

+	name           = e.."frost",

 	node_top       = "ethereal:crystal_dirt",	depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 5,

 	y_min     = 1,							y_max     = 71,

@@ -66,7 +68,7 @@ end
 

 if ethereal.grassy == 1 then

 minetest.register_biome({

-	name           = "grassy",

+	name           = e.."grassy",

 	node_top       = "ethereal:green_dirt", 	depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 5,

 	y_min     = 1,							y_max     = 91,

@@ -76,7 +78,7 @@ end
 

 if ethereal.caves == 1 then

 minetest.register_biome({

-	name           = "caves",

+	name           = e.."caves",

 	node_top       = "default:desert_stone",	depth_top      = 3,

 	node_filler    = "air",						depth_filler   = 8,

 	y_min     = 4,							y_max     = 41,

@@ -86,7 +88,7 @@ end
 

 if ethereal.grayness == 1 then

 minetest.register_biome({

-	name           = "grayness",

+	name           = e.."grayness",

 	node_top       = "ethereal:gray_dirt",		depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 5,

 	y_min     = 1,							y_max     = 41,

@@ -96,7 +98,7 @@ end
 

 if ethereal.grassytwo == 1 then

 minetest.register_biome({

-	name           = "grassytwo",

+	name           = e.."grassytwo",

 	node_top       = "ethereal:green_dirt",		depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 5,

 	y_min     = 1,							y_max     = 91,

@@ -106,7 +108,7 @@ end
 

 if ethereal.prairie == 1 then

 minetest.register_biome({

-	name           = "prairie",

+	name           = e.."prairie",

 	node_top       = "ethereal:prairie_dirt",	depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 5,

 	y_min     = 3,							y_max     = 26,

@@ -116,7 +118,7 @@ end
 

 if ethereal.jumble == 1 then

 minetest.register_biome({

-	name           = "jumble",

+	name           = e.."jumble",

 	node_top       = "ethereal:green_dirt",		depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 5,

 	y_min     = 1,							y_max     = 71,

@@ -126,7 +128,7 @@ end
 

 if ethereal.junglee == 1 then

 minetest.register_biome({

-	name           = "junglee",

+	name           = e.."junglee",

 	node_top       = "ethereal:jungle_dirt",	depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 5,

 	y_min     = 1,							y_max     = 71,

@@ -136,7 +138,7 @@ end
 

 if ethereal.desert ==1 then

 minetest.register_biome({

-	name           = "desert",

+	name           = e.."desert",

 	node_top       = "default:desert_sand",		depth_top      = 5,

 	node_filler    = "default:desert_stone",	depth_filler   = 70,

 	y_min     = 3,							y_max     = 23,

@@ -146,7 +148,7 @@ end
 

 if ethereal.grove == 1 then

 minetest.register_biome({

-	name           = "grove",

+	name           = e.."grove",

 	node_top       = "ethereal:grove_dirt",		depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 5,

 	y_min     = 3,							y_max     = 23,

@@ -156,7 +158,7 @@ end
 

 if ethereal.mushroom == 1 then

 minetest.register_biome({

-	name           = "mushroom",

+	name           = e.."mushroom",

 	node_top       = "ethereal:mushroom_dirt",	depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 5,

 	y_min     = 1,							y_max     = 50,

@@ -166,7 +168,7 @@ end
 

 if ethereal.desertstone == 1 then

 minetest.register_biome({

-	name           = "desertstone",

+	name           = e.."desertstone",

 	node_top       = "default:sandstone",		depth_top      = 7,

 	node_filler    = "default:desert_stone",	depth_filler   = 70,

 	y_min     = 3,							y_max     = 23,

@@ -176,7 +178,7 @@ end
 

 if ethereal.quicksand == 1 then

 minetest.register_biome({

-	name			= "quicksand",

+	name			= e.."quicksand",

 	node_top		= "ethereal:quicksand2",	depth_top = 3,

 	node_filler		= "default:gravel",			depth_filler = 1,

 	y_min		= 1,						y_max = 1,

@@ -186,7 +188,7 @@ end
 

 if ethereal.lake == 1 then

 minetest.register_biome({

-	name			= "lake",

+	name			= e.."lake",

 	node_top		= "default:sand",			depth_top = 2,

 	node_filler		= "default:gravel",			depth_filler = 1,

 	node_water		= "default:water_source",	node_dust_water= "default:water_source",

@@ -197,7 +199,7 @@ end
 

 if ethereal.plains == 1 then

 minetest.register_biome({

-	name           = "plains",

+	name           = e.."plains",

 	node_top       = "ethereal:dry_dirt",		depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 5,

 	y_min     = 3,							y_max     = 61,

@@ -207,7 +209,7 @@ end
 

 if ethereal.fiery == 1 then

 minetest.register_biome({

-	name           = "fiery",

+	name           = e.."fiery",

 	node_top       = "ethereal:fiery_dirt",		depth_top      = 1,

 	node_filler    = "default:dirt",			depth_filler   = 5,

 	y_min     = 5,							y_max     = 65,

@@ -217,7 +219,7 @@ end
 

 if ethereal.sandclay == 1 then

 minetest.register_biome({

-	name           = "sandclay",

+	name           = e.."sandclay",

 	node_top       = "default:sand",			depth_top      = 3,

 	node_filler    = "default:clay",			depth_filler   = 2,

 	y_min     = 1,							y_max     = 11,

@@ -233,7 +235,7 @@ minetest.register_decoration({							-- Redwood Tree
 	place_on = {"bakedclay:red","bakedclay:orange"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.01, -- was 0.025

-	biomes = {"mesa"},

+	biomes = {e.."mesa"},

 	schematic = path.."redwood.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -243,7 +245,7 @@ minetest.register_decoration({							-- Banana Tree
 	place_on = "ethereal:grove_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.015,

-	biomes = {"grove"},

+	biomes = {e.."grove"},

 	schematic = path.."bananatree.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -253,7 +255,7 @@ minetest.register_decoration({							-- Healing Tree
 	place_on = "default:dirt_with_snow",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.04,

-	biomes = {"healing"},

+	biomes = {e.."healing"},

 	schematic = path.."yellowtree.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -263,7 +265,7 @@ minetest.register_decoration({							-- Frost Tree
 	place_on = "ethereal:crystal_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.010,

-	biomes = {"frost"},

+	biomes = {e.."frost"},

 	schematic = path.."frosttrees.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -273,7 +275,7 @@ minetest.register_decoration({							-- Giant Mushroom
 	place_on = "ethereal:mushroom_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.070,

-	biomes = {"mushroom"},

+	biomes = {e.."mushroom"},

 	schematic = path.."mushroomone.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -283,7 +285,7 @@ minetest.register_decoration({							-- Small Lava Crater
 	place_on = "ethereal:fiery_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.012,

-	biomes = {"fiery"},

+	biomes = {e.."fiery"},

 	schematic = path.."volcanom.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -293,7 +295,7 @@ minetest.register_decoration({							-- Large Lava Crater
 	place_on = "ethereal:fiery_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.010,

-	biomes = {"fiery"},

+	biomes = {e.."fiery"},

 	schematic = path.."volcanol.mts",

 	flags = "place_center_x, place_center_z",

 --	replacements = {{"default:stone", "default:desert_stone"}},

@@ -304,7 +306,7 @@ minetest.register_decoration({							-- Jungle Tree
 	place_on = "ethereal:jungle_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.3, -- was 0.250

-	biomes = {"junglee"},

+	biomes = {e.."junglee"},

 	schematic = path.."jungletree.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -314,7 +316,7 @@ minetest.register_decoration({							-- Willow Tree
 	place_on = "ethereal:gray_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.025,

-	biomes = {"grayness"},

+	biomes = {e.."grayness"},

 	schematic = path.."willow.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -324,7 +326,7 @@ minetest.register_decoration({							-- Pine Tree
 	place_on = {"ethereal:cold_dirt", "default:dirt_with_snow"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.025,

-	biomes = {"snowy", "alpine"},

+	biomes = {e.."snowy", e.."alpine"},

 	schematic = path.."pinetree.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -334,7 +336,7 @@ minetest.register_decoration({							-- Apple Tree
 	place_on = "ethereal:green_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.030,

-	biomes = {"grassy", "jumble"},

+	biomes = {e.."grassy", e.."jumble"},

 	schematic = path.."tree.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -344,7 +346,7 @@ minetest.register_decoration({
 	place_on = {"ethereal:green_dirt"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.005,

-	biomes = {"grassytwo"},

+	biomes = {e.."grassytwo"},

 	schematic = path.."tree.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -354,7 +356,7 @@ minetest.register_decoration({							-- Orange Tree
 	place_on = {"ethereal:prairie_dirt"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.005,

-	biomes = {"prairie"},

+	biomes = {e.."prairie"},

 	schematic = path.."orangetree.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -364,7 +366,7 @@ minetest.register_decoration({							-- Acacia Tree
 	place_on = {"default:desert_sand"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.004,

-	biomes = {"desert"},

+	biomes = {e.."desert"},

 	schematic = path.."acaciatree.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -374,7 +376,7 @@ minetest.register_decoration({							-- Big Old Tree
 	place_on = "ethereal:green_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.010,

-	biomes = {"grassytwo"},

+	biomes = {e.."grassytwo"},

 	schematic = path.."bigtree.mts",

 	flags = "place_center_x, place_center_z",

 })

@@ -385,7 +387,7 @@ minetest.register_decoration({							-- Scorched Tree
 	place_on = "ethereal:dry_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.006,

-	biomes = {"plains"},

+	biomes = {e.."plains"},

 	decoration = "ethereal:scorched_tree",

 	height_max = 6,

 })

@@ -395,7 +397,7 @@ minetest.register_decoration({							-- Bamboo Stalks
 	place_on = "ethereal:bamboo_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.055,

-	biomes = {"bamboo"},

+	biomes = {e.."bamboo"},

 	decoration = "ethereal:bamboo",

 	height_max = 5,

 })

@@ -405,7 +407,7 @@ minetest.register_decoration({							-- Bamboo Sprouts & Grass
 	place_on = "ethereal:bamboo_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.25,

-	biomes = {"bamboo"},

+	biomes = {e.."bamboo"},

 	decoration = {"ethereal:bamboo_sprout", "default:grass_2", "default:grass_3"},

 })

 

@@ -414,7 +416,7 @@ minetest.register_decoration({							-- Dry Shrub
 	place_on = {"ethereal:dry_dirt", "default:sand", "default:desert_sand", "sandstone", "bakedclay:red"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.015,

-	biomes = {"plains", "lake", "desert", "desertstone", "mesa"},

+	biomes = {e.."plains", e.."lake", e.."desert", e.."desertstone", e.."mesa"},

 	decoration = "default:dry_shrub",

 })

 

@@ -432,7 +434,7 @@ minetest.register_decoration({							-- Prairie Flowers & Strawberry
 	place_on = "ethereal:prairie_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.050,

-	biomes = {"prairie"},

+	biomes = {e.."prairie"},

 	decoration = {"flowers:dandelion_white", "flowers:dandelion_yellow", "flowers:geranium", "flowers:rose", "flowers:tulip", "flowers:viola", "ethereal:strawberry_7"},

 })

 

@@ -441,7 +443,7 @@ minetest.register_decoration({							-- Crystal Spike & Crystal Grass
 	place_on = "ethereal:crystal_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.02,

-	biomes = {"frost"},

+	biomes = {e.."frost"},

 	decoration = {"ethereal:crystal_spike", "ethereal:crystalgrass"},

 })

 

@@ -450,7 +452,7 @@ minetest.register_decoration({							-- Red Shrub
 	place_on = "ethereal:fiery_dirt", 

 	sidelen = 80, -- was 16

 	fill_ratio = 0.20,

-	biomes = {"fiery"},

+	biomes = {e.."fiery"},

 	decoration = "ethereal:dry_shrub",

 })

 

@@ -459,7 +461,7 @@ minetest.register_decoration({							-- Snowy Grass
 	place_on = {"ethereal:gray_dirt", "ethereal:cold_dirt"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.05,

-	biomes = {"grayness", "snowy"},

+	biomes = {e.."grayness", e.."snowy"},

 	decoration = "ethereal:snowygrass",

 })

 

@@ -468,7 +470,7 @@ minetest.register_decoration({							-- Cactus
 	place_on = "default:sandstone",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.010,

-	biomes = {"desertstone"},

+	biomes = {e.."desertstone"},

 	decoration = "default:cactus",

 	height_max = 3,

 })

@@ -478,7 +480,7 @@ minetest.register_decoration({							-- Cactus
 	place_on = "default:desert_sand",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.010,

-	biomes = {"desert"},

+	biomes = {e.."desert"},

 	decoration = "default:cactus",

 	height_max = 4,

 })

@@ -488,7 +490,7 @@ minetest.register_decoration({							-- Wild Mushroom
 	place_on = "ethereal:mushroom_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.015,

-	biomes = {"mushroom"},

+	biomes = {e.."mushroom"},

 	decoration = "ethereal:mushroom_plant",

 })

 

@@ -497,7 +499,7 @@ minetest.register_decoration({							-- Jungle Grass
 	place_on = {"ethereal:jungle_dirt", "ethereal:green_dirt"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.18,

-	biomes = {"junglee", "jumble"},

+	biomes = {e.."junglee", e.."jumble"},

 	decoration = "default:junglegrass",

 })

 

@@ -506,7 +508,7 @@ minetest.register_decoration({							-- Grass
 	place_on = {"ethereal:green_dirt_top", "ethereal:jungle_dirt", "ethereal:prairie_dirt", "ethereal:grove_dirt"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.40, -- was 0.50

-	biomes = {"grassy", "grassytwo", "jumble", "junglee", "prairie", "grove"},

+	biomes = {e.."grassy", e.."grassytwo", e.."jumble", e.."junglee", e.."prairie", e.."grove"},

 	decoration = "default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5",

 })

 

@@ -515,7 +517,7 @@ minetest.register_decoration({							-- Ferns
 	place_on = "ethereal:grove_dirt",

 	sidelen = 80, -- was 16

 	fill_ratio = 0.20,

-	biomes = {"grove"},

+	biomes = {e.."grove"},

 	decoration = "ethereal:fern",

 })

 

@@ -524,7 +526,7 @@ minetest.register_decoration({							-- Snow
 	place_on = {"ethereal:cold_dirt", "default:dirt_with_snow"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.80,

-	biomes = {"snowy", "alpine"},

+	biomes = {e.."snowy", e.."alpine"},

 	decoration = "default:snow",

 })

 

@@ -533,7 +535,7 @@ minetest.register_decoration({							-- Wild Onion
 	place_on = {"ethereal:green_dirt", "ethereal:prairie_dirt"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.25, -- was 0.35

-	biomes = {"grassy", "grassytwo", "jumble", "prairie"},

+	biomes = {e.."grassy", e.."grassytwo", e.."jumble", e.."prairie"},

 	decoration = "ethereal:onion_4",

 })

 

@@ -542,7 +544,7 @@ minetest.register_decoration({							-- Papyrus
 	place_on = {"ethereal:green_dirt", "ethereal:jungle_dirt"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.1,

-	biomes = {"grassy", "junglee"},

+	biomes = {e.."grassy", e.."junglee"},

 	decoration = "default:papyrus",

 	height_max = 4,

 	spawn_by = "default:water_source",

@@ -585,7 +587,7 @@ minetest.register_decoration({						-- Potato
 	place_on = {"ethereal:jungle_dirt"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.035,

-	biomes = {"junglee"},

+	biomes = {e.."junglee"},

 	decoration = "farming:potato_3",

 })

 

@@ -594,7 +596,7 @@ minetest.register_decoration({						-- Carrot, Cucumber, Potato, Tomato, Corn, C
 	place_on = {"ethereal:green_dirt", "ethereal:prairie_dirt"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.05,

-	biomes = {"grassy", "grassytwo", "prairie", "jumble"},

+	biomes = {e.."grassy", e.."grassytwo", e.."prairie", e.."jumble"},

 	decoration = {"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"},

 })

 

@@ -603,7 +605,7 @@ minetest.register_decoration({						-- Melon, Pumpkin
 	place_on = {"ethereal:green_dirt", "ethereal:jungle_dirt"},

 	sidelen = 80, -- was 16

 	fill_ratio = 0.015,

-	biomes = {"grassy", "grassytwo", "junglee", "jumble"},

+	biomes = {e.."grassy", e.."grassytwo", e.."junglee", e.."jumble"},

 	decoration = {"farming:melon_8", "farming:pumpkin_8"},

 	spawn_by = "default:water_source",

 	num_spawn_by = 1,