From 66dcae6e45f56ed07c4bcf5aa7ceddbb3937a9c1 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 14 Mar 2017 18:53:31 +0100 Subject: [PATCH] Add rose bush and lilac --- mods/ITEMS/mcl_flowers/init.lua | 10 +++++++--- .../mcl_flowers_double_plant_rose_bottom.png | Bin 0 -> 900 bytes .../mcl_flowers_double_plant_rose_top.png | Bin 0 -> 655 bytes .../mcl_flowers_double_plant_syringa_bottom.png | Bin 0 -> 638 bytes .../mcl_flowers_double_plant_syringa_top.png | Bin 0 -> 626 bytes 5 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_rose_bottom.png create mode 100644 mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_rose_top.png create mode 100644 mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_syringa_bottom.png create mode 100644 mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_syringa_top.png diff --git a/mods/ITEMS/mcl_flowers/init.lua b/mods/ITEMS/mcl_flowers/init.lua index f7af8aa800..14b08ffe14 100644 --- a/mods/ITEMS/mcl_flowers/init.lua +++ b/mods/ITEMS/mcl_flowers/init.lua @@ -71,7 +71,10 @@ minetest.register_node("mcl_flowers:fern", { }, }) -local function add_large_flower(name, desc, longdesc, inv_img, bottom_img, top_img) +local function add_large_flower(name, desc, longdesc, bottom_img, top_img, inv_img) + if not inv_img then + inv_img = top_img + end minetest.register_node("mcl_flowers:"..name, { description = desc, _doc_items_longdesc = longdesc, @@ -146,8 +149,9 @@ local function add_large_flower(name, desc, longdesc, inv_img, bottom_img, top_i }) end -add_large_flower("peony", "Peony", nil, "mcl_flowers_double_plant_paeonia_top.png", "mcl_flowers_double_plant_paeonia_bottom.png", "mcl_flowers_double_plant_paeonia_top.png") - +add_large_flower("peony", "Peony", nil, "mcl_flowers_double_plant_paeonia_bottom.png", "mcl_flowers_double_plant_paeonia_top.png") +add_large_flower("rose_bush", "Rose Bush", nil, "mcl_flowers_double_plant_rose_bottom.png", "mcl_flowers_double_plant_rose_top.png") +add_large_flower("lilac", "Lilac", nil, "mcl_flowers_double_plant_syringa_bottom.png", "mcl_flowers_double_plant_syringa_top.png") -- Lily Pad minetest.register_node("mcl_flowers:waterlily", { diff --git a/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_rose_bottom.png b/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_rose_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..1802fd1eb7686f2579c7bd333346b1bc67a44450 GIT binary patch literal 900 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50 z7^+km7#f-x7=Hc-(k~epN(~qoUL`OvSj}Ky5YL|!f7A`AHb1~8#P$FG{}Y*51(F$9 z>=;xgFtFG#h_y2qnlmt)GYAzi@Dwqy`7^LuGZ@TauybJ$sABl;>hPVNe-|tFMK(@D zGX}0u2CZofg82-hl?);+48jcz3Th1IwhTh`4DwwJoY@SlaSUvM4E&W0Ea415yR5wP zw*#$aED7=pW^j0RBMrn!@^*J&=wOxg0CG4BJR*x37`TN&n2}-D90{Nxdx@v7EBixc zJ|SIWv)9T%k1>Amba4!^IGr2(uzPd9gM zuCdaNZRe1?7`{?n>XF5!{Ia{oY7ZtqHWFa=*NW%7yYKwXk9DUkSE&TPYuj;<{kZi@ zs$i$wjw{!q zG~Nau5($2^SN5Qg=(gGwyy073Wt_X2t^NLFVUXBA!KUde5^eeKEby!DP@m)8%G|S3 z)JRUKc$>zqFAb$fi|2)v&lfV5l`~UD zqbhH*?>8Dw6>Bn1`x3n|EP3X8&l(RW-nCbPte!}PG2Yr?A%2(rP1fN}2RLWkIu)bc z>A7=vGgD0y|JF5r3a>o{AGcdS?5VIU6_?a-I&ydJ=7mfWUoXC#=^E z3V*YylQ(q5H@_`gb^m_uLyyjdjwf$?oL@NiiMsNnhwYIOJwDf&qVI(M*%bKHob8x_ zg>rr9gT}+B?4sCe?zsM%F2F9d^Vn(DmfPp{J&gUH9`J9+CD%uKPAAHpw(~51&93&l zP3r&QgFCnic2BhZxPM2tB1_4Q$De`8LAAs+q9i4;B-JXpC>2OC7#SFv>lzsA8k&R{ vT3DHwTA3PZ8yH#{7-($k=t9wuo1c=IR*73fNSwWJ?9znhg z3{|QO3=Pc;3_t$^>6Z))r3MTPuM!v-tY$DUi04m=Kk5clYY^ZQ;`;yp|L?92yI8p= zGO=D{rzzH2ZM=;tSh*P3tawwDxc|7JP#zzUPxo|>h(+0imda3P=lU52o8$1(GGF|*C}XuZq(l0uH$4nEA*v+Ilcdj`X_Q)Z<~ zNoNjdHqH!M8?Yk(PeQe#`~m%&`|K9mdS8eF2CQm{YeY#(Vo9o1a#1RfVlXl=G}kpS z)-^Nzopr07W73 AvH$=8 literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_syringa_bottom.png b/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_syringa_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..2031aaf00dfbb8a68dfb7fd819049b984f516d22 GIT binary patch literal 638 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{|QO3=Pc;3_t$^>6Z))r3MTPuM!v-tY$DUi04m=Kk5cls~g}G;`;yp|6OzUt!iIC zzha4Jw}xq%Nca*Xzv)``jdJ%6JSv(Tli3{RGf^wAJqD=K*1<~zsFATG$S;_|;n|He z5GTpo-GwiIuYo_1!&%@FSPkAGoD4K9s zw$kiNyX0!KfW*@}UzC?yF}8l3+iFnh_FLkt{a}OuLpPW%f0%+ z&i~&gH2%Z;)xe-sEpd$~Nl7e8wMs5Z1yT$~28QOk2FALECLx9vRwkxariR)EhE@g! i8rwR$P&DM`r(~v8;?@xP+Q1B`fx*+&&t;ucLK6U4jO^|J literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_syringa_top.png b/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_syringa_top.png new file mode 100644 index 0000000000000000000000000000000000000000..f89a8eae9ce1beabe2f8fd2c547585e1a8b35c80 GIT binary patch literal 626 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{|QO3=Pc;3_t$^>6Z))r3MTPuM!v-tY$DUi04m=Kk5cls}t!iJt zYwo`J6-$aH$7D8#g)cD*oM`CTtzq9NXIduWH(d*;EOf)eT%az-k|4ie28U-i(mn;4ZnT^vI+ z&i78(=y%vapl!XU3YX4_M~stxB>4G>6+bmup}cB}jRWJxv_)J={0612I+23j<`W_+ zOlrz}F8A_mdvE>w|9|cS_4_9OH9GOs&Ot@=w(!%LcUN3!;!kYcW;pS)*T>+-)@tP! zMVZ@}of51n@yHaW`LnwoDl0xS%9OepE2yT&J$+rt?YS!S z*}=l=%|StLd+f{uu2pVh&gK8Q^>fFY3va(YNPn?(mj1qji`UjMDmIwTT(&;_G%y5J zOI#yLQW8s2t&)pUffR$0fuXssfw8WkNr<6^m5Hg9siC%kp_PGw#