From: paramat <paramat@users.noreply.github.com>
Date: Mon, 20 Nov 2017 04:13:41 +0000 (+0000)
Subject: Flowers: Add black tulip, green chrysanthemum
X-Git-Tag: 5.0.0~144
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2c5670563adac0286828fafcf71f66ebf38b7d6f;p=oweals%2Fminetest_game.git

Flowers: Add black tulip, green chrysanthemum

Adds a direct resource of green dye, and a flower resource of black dye.
Completes the colour sequence: red, orange, yellow, green, blue, violet.
Makes all base dyes cultivatable and sustainable, without the presence
of coal.

Add the new flowers to the world with the same density variation as the
others, but obviously with different noise seeds. Results in more flowers
in a world and more variety of flower combinations.
---

diff --git a/mods/flowers/README.txt b/mods/flowers/README.txt
index 6fd30942..4b3149c4 100644
--- a/mods/flowers/README.txt
+++ b/mods/flowers/README.txt
@@ -26,3 +26,5 @@ yyt16384 (CC BY-SA 3.0):
 
 paramat (CC BY-SA 3.0):
   flowers_dandelion_yellow.png -- Derived from RHRhino's texture
+  flowers_tulip_black.png -- Derived from RHRhino's texture
+  flowers_chrysanthemum_green.png
diff --git a/mods/flowers/init.lua b/mods/flowers/init.lua
index 6836baa7..51b0d87f 100644
--- a/mods/flowers/init.lua
+++ b/mods/flowers/init.lua
@@ -75,6 +75,12 @@ flowers.datas = {
 		{-4 / 16, -0.5, -4 / 16, 4 / 16, -2 / 16, 4 / 16},
 		{color_yellow = 1, flammable = 1}
 	},
+	{
+		"chrysanthemum_green",
+		"Green Chrysanthemum",
+		{-4 / 16, -0.5, -4 / 16, 4 / 16, -1 / 16, 4 / 16},
+		{color_green = 1, flammable = 1}
+	},
 	{
 		"geranium",
 		"Blue Geranium",
@@ -93,6 +99,12 @@ flowers.datas = {
 		{-5 / 16, -0.5, -5 / 16, 5 / 16, -2 / 16, 5 / 16},
 		{color_white = 1, flammable = 1}
 	},
+	{
+		"tulip_black",
+		"Black Tulip",
+		{-2 / 16, -0.5, -2 / 16, 2 / 16, 3 / 16, 2 / 16},
+		{color_black = 1, flammable = 1}
+	},
 }
 
 for _,item in pairs(flowers.datas) do
diff --git a/mods/flowers/mapgen.lua b/mods/flowers/mapgen.lua
index 6ea796cd..8e8c4936 100644
--- a/mods/flowers/mapgen.lua
+++ b/mods/flowers/mapgen.lua
@@ -147,9 +147,11 @@ function flowers.register_decorations()
 	register_flower(436,     "rose")
 	register_flower(19822,   "tulip")
 	register_flower(1220999, "dandelion_yellow")
+	register_flower(800081,  "chrysanthemum_green")
 	register_flower(36662,   "geranium")
 	register_flower(1133,    "viola")
 	register_flower(73133,   "dandelion_white")
+	register_flower(42,      "tulip_black")
 
 	register_mushroom("mushroom_brown")
 	register_mushroom("mushroom_red")
diff --git a/mods/flowers/textures/flowers_chrysanthemum_green.png b/mods/flowers/textures/flowers_chrysanthemum_green.png
new file mode 100644
index 00000000..11980463
Binary files /dev/null and b/mods/flowers/textures/flowers_chrysanthemum_green.png differ
diff --git a/mods/flowers/textures/flowers_tulip_black.png b/mods/flowers/textures/flowers_tulip_black.png
new file mode 100644
index 00000000..1dd09f74
Binary files /dev/null and b/mods/flowers/textures/flowers_tulip_black.png differ