From a0c3b2bd422c72727370f07ae14c2530d756083f Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Wed, 20 Aug 2014 14:01:20 -0400
Subject: [PATCH] add potted bonzai and cactus

---
 flowers_plus/init.lua                         |  24 ++++++++++--------
 .../textures/flowers_potted_bonzai.png        | Bin 0 -> 565 bytes
 .../textures/flowers_potted_cactus.png        | Bin 0 -> 509 bytes
 3 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 flowers_plus/textures/flowers_potted_bonzai.png
 create mode 100644 flowers_plus/textures/flowers_potted_cactus.png

diff --git a/flowers_plus/init.lua b/flowers_plus/init.lua
index de6b3fc..8b7cf9c 100644
--- a/flowers_plus/init.lua
+++ b/flowers_plus/init.lua
@@ -226,19 +226,23 @@ for i in ipairs(algae_list) do
 end
 
 -- register all potted plant nodes, crafts, and most backward-compat aliases
+-- Description, base node name, item to craft flowerpot with
 
 local flowers_list = {
-	{ "Rose",		"rose"},
-	{ "Tulip",		"tulip"},
-	{ "Yellow Dandelion",	"dandelion_yellow"},
-	{ "White Dandelion",	"dandelion_white"},
-	{ "Blue Geranium",	"geranium"},
-	{ "Viola",		"viola"},
+	{ "Rose",				"rose", 			"flowers:rose" },
+	{ "Tulip",				"tulip", 			"flowers:tulip" },
+	{ "Yellow Dandelion",	"dandelion_yellow",	"flowers:dandelion_yellow" },
+	{ "White Dandelion",	"dandelion_white",	"flowers:dandelion_white" },
+	{ "Blue Geranium",		"geranium",			"flowers:geranium" },
+	{ "Viola",				"viola",			"flowers:viola" },
+	{ "Cactus",				"cactus",			"default:cactus" },
+	{ "Bonzai",				"bonzai",			"default:sapling" }
 }
 
 for i in ipairs(flowers_list) do
-	local flowerdesc = flowers_list[i][1]
-	local flower     = flowers_list[i][2]
+	local flowerdesc	= flowers_list[i][1]
+	local flower		= flowers_list[i][2]
+	local craftwith		= flowers_list[i][3]
 	
 	minetest.register_node(":flowers:potted_"..flower, {
 		description = S("Potted "..flowerdesc),
@@ -261,8 +265,8 @@ for i in ipairs(flowers_list) do
 		type = "shapeless",
 		output = "flowers:potted_"..flower,
 		recipe = {
-			"flowers:flower_pot",
-			"flowers:"..flower
+			craftwith,
+			"flowers:flower_pot"
 		}
 	})
 
diff --git a/flowers_plus/textures/flowers_potted_bonzai.png b/flowers_plus/textures/flowers_potted_bonzai.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a04dac6ddf46ed6cca2b748307609348dbd0d72
GIT binary patch
literal 565
zcmV-50?Pe~P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-Ut*3DK?G-2Rr}(0m4Z{
zK~y-)jgmcRQ&AX(pYu~=ZGH^RPz-|7rF4*Xs-Sdnur39qPCB{jC^|TZ;?m7Qgo3y@
z)JdTZf>Hzt2vUUziWS;Al!`XiRFj)D_uTWj7)jH6t?%@4&U>Ek?<l%-_8IE+Wi>H4
z%1nKegPRqhF9XVQOVUignWfh0SHx)OII``)0Txmz?w04d*m-5!!RQ2%>t|+dnF`Kc
zz`FYYy=m^`iyT}3Og59}L3gsh00TFx-?*j?=H#IxL3uS$#q545WLuXOg15KRc}8B%
z@xB|dt%b2un4%kYz>f%XWrf9i8>^ud55ra{G#fnmSYmS58JwFuD%I-G`8_@6M1NlM
z^i%m^kC4g@aHjnH9~H!bYV{i8jhcH=j`irI$EU}K0hSugkWls}CP@T5e))l38?H6C
z+(J;VBm#D{@MUU5at1^q@PY^^tx!r+b;5y1?^Ns>+nOq^5P9(p7ikee5R}sFv)U_^
z-n9aNt3w63KA1togMd<s8%w{KUi_{SKT@Z{$g>_aA&UM?O4Dk`{O20Kju)gJIz)s%
zYZxeP#CmNKKwJwSI>dXtB-)Yz=a+>j0uhZhk_h+>Je0Lx<v~&O00000NkvXXu0mjf
DR6+Ia

literal 0
HcmV?d00001

diff --git a/flowers_plus/textures/flowers_potted_cactus.png b/flowers_plus/textures/flowers_potted_cactus.png
new file mode 100644
index 0000000000000000000000000000000000000000..42dd70d5307f90065a58640a370f82553c3c4f3b
GIT binary patch
literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-Ut*24iJrycbNbH0g6dP
zK~y-)jgviV6j2yP&z(=#VF)3Ms02}LQib$F{(}&^uol`$3N;`$2G>HZ1VNI<LafsG
zE0RBu&IC1B_`OTQFk^Oh?tN^uFq7HLtuB}Ip5ky{m~gWGwzB@VCNXBx@X_ZT0M1;R
zCw+9yv=-cYdReXvcxm1MaJ#s{bT?sRb+5*I#~<#znA7Wr`^X=$;(DyO9v5b3*jU};
z=95{SDmWMv+<i4qUgUIApHAvC91iKNU13zzbJPS;7%}*f(Fv!JM4sm)NzxdxCa}(8
zjA7<nN|9B>am@PtT>#=ZZWr<Ty{@7t0-!8Q;y5M@L*DlHPmc(oalq!YFN|_WS%||y
z!LM(J?f${nr3Fp-AX#ui0^=Es@i?f&#dkaZ%>>5<OIx3?PVRSQJxK^*jK|r)a|YwJ
zYVcsLtF@~sk^_M;hQ}W=p1&W|_~0bL*gAd|M_}#WQXb{Md)r<3zSvbhu8>3$_?+Jw
zp2!AG0#zk$Tp{OhYQ&la%O8ccAbA9S^G5#x;2@}`TW@n~00000NkvXXu0mjfT!Y|<

literal 0
HcmV?d00001