From 2c5670563adac0286828fafcf71f66ebf38b7d6f Mon Sep 17 00:00:00 2001
From: paramat <paramat@users.noreply.github.com>
Date: Mon, 20 Nov 2017 04:13:41 +0000
Subject: [PATCH] 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.
---
 mods/flowers/README.txt                           |   2 ++
 mods/flowers/init.lua                             |  12 ++++++++++++
 mods/flowers/mapgen.lua                           |   2 ++
 .../textures/flowers_chrysanthemum_green.png      | Bin 0 -> 236 bytes
 mods/flowers/textures/flowers_tulip_black.png     | Bin 0 -> 172 bytes
 5 files changed, 16 insertions(+)
 create mode 100644 mods/flowers/textures/flowers_chrysanthemum_green.png
 create mode 100644 mods/flowers/textures/flowers_tulip_black.png

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 0000000000000000000000000000000000000000..11980463d28c1c7dbc49f6e83f600077ab983ce2
GIT binary patch
literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}RDe&2D}y3~oIRJUi>9ipu8NnS
zqK}BIAFol6pk|=Caiok{gspjmuVtLJb+mItpFz|tw%FMsnX6<bY;x?~X*6NGL;nGd
zRi`=Do)uVm$z%Iv`Q4W^_Fiz>eBJ!eEuBp~r}==kFqQ=Q1v5B2yO9RuIC#1^hDcma
zPLMd`5W_T8|CqYM$pZ?y-2#F_i3t-PiBECt_`tAng~6QDXOA8@cHlr~4wo@Ev$Zh0
g{w4us?J0~5jeU$;bge#h0nK9YboFyt=akR{099E@-v9sr

literal 0
HcmV?d00001

diff --git a/mods/flowers/textures/flowers_tulip_black.png b/mods/flowers/textures/flowers_tulip_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dd09f746caaf3baf52b57c6d262cb2bfe5fbaf6
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHF3h)VWWl&_W7F5-fQq_&JG)s0e
z&bIQX2@UDdjhShfu+SuVnOVwmv!Yei?FXj&JW_oJ)Wuj5<QL4~@a#q!kYnKK;uykl
zJvl)^P(#B(vdf@NsOKPG@L|TKm6nM-dTlHmuT8W=UTo2xa_|j9asvm$#1+hKx>{Oq
QfqEG{UHx3vIVCg!00H$fAOHXW

literal 0
HcmV?d00001