From ba3e5711d0686453b2e666ac33ab734a01617f70 Mon Sep 17 00:00:00 2001
From: sys4-fr <sys4@free.fr>
Date: Mon, 14 May 2018 01:14:01 +0200
Subject: [PATCH] Add Solanaceae flower that spawn above 64 blocks of altitude

---
 init.lua                            |  21 ++++++++-----
 mapgen.lua                          |  44 +++++++++++++---------------
 textures/moreflowers_solanaceae.png | Bin 0 -> 258 bytes
 3 files changed, 35 insertions(+), 30 deletions(-)
 create mode 100644 textures/moreflowers_solanaceae.png

diff --git a/init.lua b/init.lua
index 79aba97..f75243e 100644
--- a/init.lua
+++ b/init.lua
@@ -64,7 +64,13 @@ moreflowers.datas_simple = {
 		"wild_carrot",
 		"Wild Carrot",
 		{-2 / 16, -0.5, -2 / 16, 2 / 16, 5 / 16, 2 / 16},
-		{flammable = 1}
+		{flammable = 1},
+	},
+	{
+		"solanaceae",
+		"Solanaceae",
+		{-0.3, -0.5, -0.3, 0.3, 0.5, 0.3},
+		{flammable = 1},
 	},
 }
 moreflowers.datas_tall = {
@@ -144,15 +150,16 @@ if minetest.get_modpath("bonemeal") and bonemeal then
 	local flowers = {
 		"flowers:dandelion_white", "flowers:dandelion_yellow", "flowers:geranium",
 		"flowers:rose", "flowers:tulip", "flowers:viola", "moreflowers:wild_carrot",
-		"moreflowers:teosinte",
+		"moreflowers:teosinte", "moreflowers:solanaceae"
 	}
 
 	if minetest.get_modpath("bakedclay") then
-		flowers[9] = "bakedclay:delphinium"
-		flowers[10] = "bakedclay:thistle"
-		flowers[11] = "bakedclay:lazarus"
-		flowers[12] = "bakedclay:mannagrass"
-		flowers[13] = ""
+		local index = #flowers
+		flowers[index+1] = "bakedclay:delphinium"
+		flowers[index+2] = "bakedclay:thistle"
+		flowers[index+3] = "bakedclay:lazarus"
+		flowers[index+4] = "bakedclay:mannagrass"
+		flowers[index+5] = ""
 	end
 
 	
diff --git a/mapgen.lua b/mapgen.lua
index c74c992..4b6e632 100644
--- a/mapgen.lua
+++ b/mapgen.lua
@@ -18,32 +18,12 @@ local function register_mgv6_flower(name)
 	})
 end
 
---[[local function register_flower(seed, name, biomes_list)
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = -0.015,
-			scale = 0.025,
-			spread = {x = 200, y = 200, z = 200},
-			seed = seed,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"grassland", "deciduous_forest", "coniferous_forest"},
-		y_min = 1,
-		y_max = 31000,
-		decoration = "moreflowers:" .. name,
-	})
-end
---]]
 function moreflowers.register_mgv6_decorations()
 	register_mgv6_flower("wild_carrot")
+	register_mgv6_flower("solanaceae")
 end
 
 function moreflowers.register_decorations()
---	register_flower(368, "wild_carrot")
 	minetest.register_decoration(
 		{
 			deco_type = "simple",
@@ -57,7 +37,7 @@ function moreflowers.register_decorations()
 				octaves = 3,
 				persist = 0.6
 			},
-			biomes = {"grassland", "deciduous_forest", "coniferous_forest"},
+			biomes = {"grassland", "deciduous_forest"},
 			y_min = 1,
 			y_max = 31000,
 			decoration = "moreflowers:wild_carrot",
@@ -73,7 +53,25 @@ function moreflowers.register_decorations()
 			decoration = "moreflowers:teosinte",
 			height = 1,
 		})
-											  
+
+	minetest.register_decoration(
+		{
+			deco_type = "simple",
+			place_on = {"default:dirt_with_grass"},
+			sidelen = 16,
+			noise_params = {
+				offset = -0.015,
+				scale = 0.025,
+				spread = {x = 200, y = 200, z = 200},
+				seed = 369,
+				octaves = 3,
+				persist = 0.6
+			},
+			biomes = {"grassland", "deciduous_forest"},
+			y_min = 64,
+			y_max = 31000,
+			decoration = "moreflowers:solanaceae",
+		})											  
 end
 
 -- detect mapgen
diff --git a/textures/moreflowers_solanaceae.png b/textures/moreflowers_solanaceae.png
new file mode 100644
index 0000000000000000000000000000000000000000..ece695f954658bb591a740dbe29e1ad4c573c8ab
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDUoiT3;Lm-2;I|D-sgMADm
zLlJ{oIs<n-1H%*shNTR%YX!q*Fsz%-wyop!!D*k4ZgKaokX#1T%UBZR7tG-B>_!@p
z)8Ogi7{YNqIf0>(oxg!aUjFdz?e81D?5=)a@jr&4>yCZ(`@32bPOL6n|85`a%AMu!
zuUoHpRP7*Yd_af2?_62itGhfre6mlM@^sFXz9GA8I-8LSd->*yDbn0V8#=wWPqCKf
zGB8-ObjpU7rd*xWAOk&yOK%Q&tvSQyz_yq{*h7Y4(=RQrm_tEEK({b>y85}Sb4q9e
E0IlF#ng9R*

literal 0
HcmV?d00001