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 6fd309423ae0c9efde08dea6bebac16b700d5ff0..4b3149c4a058d73b7e8c3b659d8d0223c3ba252f 100644 (file)
--- 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 6836baa72892d5406793edec29cbf0e402e1cb7d..51b0d87fd60927a4396b29bdaa26b94d7fbe540a 100644 (file)
--- 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 6ea796cd02776a9476079695e40b2f359d26f955..8e8c493680730b2371314ddf9ef24c14b225c759 100644 (file)
--- 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 (file)
index 0000000..1198046
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 (file)
index 0000000..1dd09f7
Binary files /dev/null and b/mods/flowers/textures/flowers_tulip_black.png differ