From 6aea90215958a6552f1bb8dd17deef9f2fb51dc7 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Tue, 28 Jul 2015 07:37:57 -0400 Subject: [PATCH] move shrubbery from gloopblocks to homedecor --- homedecor/crafts.lua | 26 ++++++++++ homedecor/exterior.lua | 46 ++++++++++++++++++ .../textures/homedecor_shrubbery_bottom.png | Bin 0 -> 404 bytes .../textures/homedecor_shrubbery_sides.png | Bin 0 -> 317 bytes .../textures/homedecor_shrubbery_top.png | Bin 0 -> 198 bytes 5 files changed, 72 insertions(+) create mode 100644 homedecor/textures/homedecor_shrubbery_bottom.png create mode 100644 homedecor/textures/homedecor_shrubbery_sides.png create mode 100644 homedecor/textures/homedecor_shrubbery_top.png diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index 1d56528a..a1d5079d 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -3344,6 +3344,32 @@ minetest.register_craft( { recipe = { { "homedecor:flower_pot_terracotta" } } }) +minetest.register_craft({ + output = "homedecor:shrubbery 3", + recipe = { + { "group:leaves", "group:leaves", "group:leaves" }, + { "group:leaves", "group:leaves", "group:leaves" }, + { "group:stick", "group:stick", "group:stick" } + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:shrubbery_large", + recipe = { + "homedecor:shrubbery" + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:shrubbery", + recipe = { + "homedecor:shrubbery_large" + } +}) + + for i in ipairs(homedecor.banister_materials) do local name = homedecor.banister_materials[i][1] diff --git a/homedecor/exterior.lua b/homedecor/exterior.lua index 9201d0c6..1745c9f5 100644 --- a/homedecor/exterior.lua +++ b/homedecor/exterior.lua @@ -349,5 +349,51 @@ if minetest.get_modpath("bucket") then }) end +minetest.register_node("homedecor:shrubbery_large", { + description = S("Shrubbery"), + drawtype = "allfaces_optional", + tiles = {"homedecor_shrubbery_top.png"}, + paramtype = "light", + is_ground_content = false, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), +}) + +minetest.register_node("homedecor:shrubbery", { + description = S("Shrubbery"), + drawtype = "nodebox", + tiles = { + "homedecor_shrubbery_top.png", + "homedecor_shrubbery_bottom.png", + "homedecor_shrubbery_sides.png" + }, + paramtype = "light", + is_ground_content = false, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), + node_box = { + type = "fixed", + fixed = { + {-0.312500,-0.500000,0.250000,-0.187500,-0.437500,0.375000}, --NodeBox 1 + {0.187500,-0.500000,-0.125000,0.312500,-0.437500,0.000000}, --NodeBox 2 + {0.000000,-0.500000,-0.312500,0.125000,-0.437500,-0.187500}, --NodeBox 3 + {-0.375000,-0.500000,-0.062500,-0.250000,-0.437500,0.062500}, --NodeBox 4 + {0.000000,-0.500000,-0.250000,0.125000,-0.437500,-0.125000}, --NodeBox 5 + {0.187500,-0.437500,-0.187500,0.375000,-0.375000,0.062500}, --NodeBox 6 + {-0.062500,-0.437500,0.125000,0.187500,-0.375000,0.375000}, --NodeBox 7 + {-0.062500,-0.437500,-0.375000,0.187500,-0.375000,-0.062500}, --NodeBox 8 + {-0.375000,-0.437500,0.187500,-0.125000,-0.375000,0.431179}, --NodeBox 9 + {-0.437500,-0.437500,-0.125000,-0.187500,-0.375000,0.125000}, --NodeBox 10 + {-0.437500,-0.375000,-0.437500,0.439966,-0.312500,0.420887}, --NodeBox 11 + {-0.500000,-0.312500,-0.500000,0.500000,0.500000,0.500000}, --NodeBox 12 + {0.000000,-0.500000,0.187500,0.125000,-0.437500,0.312500}, --NodeBox 13 + } + } +}) + + minetest.register_alias("homedecor:well_top", "air") minetest.register_alias("homedecor:well_base", "homedecor:well") + +minetest.register_alias("gloopblocks:shrubbery", "homedecor:shrubbery") +minetest.register_alias("gloopblocks:shrubbery_large", "homedecor:shrubbery_large") diff --git a/homedecor/textures/homedecor_shrubbery_bottom.png b/homedecor/textures/homedecor_shrubbery_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..15b0b6d8c7268a5f7de5abeb104967532e811611 GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf(g2?jS9S&l1%3uy2?jkW2198E zLuCddWd>sz22(i(GkFFxJqAl91}h~7J1Z`GOD;!sMkgTBV06}CcJ|_O)nazjVs_VN zao1(>)MfF}XZ6)*^)qA*Fk%lhW)CuE4>9EkHRFh~;)=22j-|*T>Jfj4qoNy z;useuT3alaBq#dmfzWdo zbyd%a77LraBXfW7h%a0FurYX*XWCYQxaLFG`X)aAV%_<~aOpR_*l<5y_I=ye37P-Q u{#rOqq*~DW;)}YxHuihR`X=7_$p6SnF#E{QGY5dKX7F_Nb6Mw<&;$S!oPg8- literal 0 HcmV?d00001 diff --git a/homedecor/textures/homedecor_shrubbery_sides.png b/homedecor/textures/homedecor_shrubbery_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..6c9661a55597014047c3745567a02f70a7c430d3 GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}LV!<*E0E?_;ghluk`-f6kYiAm zVo+0NP*-EskYvy_Vbzjj&<&N>(_qlkVKcO1GgV?XHRdog;;>X^aMEOP(q?nhV|TC8 z^U!7YGT;a@;S4t8Ot9lgvFFWn<}30MD)AAz_2Xa@&<@6uAirP+hi5m^fShhm7sn6@ zN!EkhPFEQO4jf2X7!s$`b>Pwb-}fg;wsZ(^E-aOqexg;T>x}A=n3INcSkJJ`?#NIx z=`?IKoi=e=V@||mgO)oo*9~J-96QvMj-;k|9yE1w@^Dj|-XZ(wPtm?w>-hKY&&~h- z|J?ELzV^p2e-z7JFWeh{y!7Mi$G`jkZ@;g9UVr=Z+t>GR_rHFE?NHT~rxStBV(@hJ Kb6Mw<&;$THQE7Vs literal 0 HcmV?d00001 diff --git a/homedecor/textures/homedecor_shrubbery_top.png b/homedecor/textures/homedecor_shrubbery_top.png new file mode 100644 index 0000000000000000000000000000000000000000..7434857e7b0d1a21727f40dcbbdcaf0eb9c42640 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1<@*eQWiqGq4MrkdRu?4 z-v$(7ED7=pW^j0RBMrz&^>lFz;gDrL$SBz2z{7mt%O@tQFDw@hIxw+u{d4`RHz|dM zxn{S!+>e@w*^ReeUNhv7E}ghz{fZFj3e&Te4}XWR