From 23a0af58ee5126d34a6ab0a27d6bd039b1cb6676 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Tue, 28 Jul 2015 08:04:25 -0400 Subject: [PATCH] add yellow and red shrubbery, crafted from green shrub + dye --- homedecor/crafts.lua | 53 +++++++--- homedecor/exterior.lua | 93 ++++++++++-------- ...ng => homedecor_shrubbery_green_sides.png} | Bin ....png => homedecor_shrubbery_green_top.png} | Bin .../homedecor_shrubbery_red_sides.png | Bin 0 -> 448 bytes .../textures/homedecor_shrubbery_red_top.png | Bin 0 -> 318 bytes .../homedecor_shrubbery_yellow_sides.png | Bin 0 -> 447 bytes .../homedecor_shrubbery_yellow_top.png | Bin 0 -> 313 bytes 8 files changed, 89 insertions(+), 57 deletions(-) rename homedecor/textures/{homedecor_shrubbery_sides.png => homedecor_shrubbery_green_sides.png} (100%) rename homedecor/textures/{homedecor_shrubbery_top.png => homedecor_shrubbery_green_top.png} (100%) create mode 100644 homedecor/textures/homedecor_shrubbery_red_sides.png create mode 100644 homedecor/textures/homedecor_shrubbery_red_top.png create mode 100644 homedecor/textures/homedecor_shrubbery_yellow_sides.png create mode 100644 homedecor/textures/homedecor_shrubbery_yellow_top.png diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index a1d5079d..fc5c178d 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -3345,7 +3345,7 @@ minetest.register_craft( { }) minetest.register_craft({ - output = "homedecor:shrubbery 3", + output = "homedecor:shrubbery_green 3", recipe = { { "group:leaves", "group:leaves", "group:leaves" }, { "group:leaves", "group:leaves", "group:leaves" }, @@ -3353,22 +3353,45 @@ minetest.register_craft({ } }) -minetest.register_craft({ - type = "shapeless", - output = "homedecor:shrubbery_large", - recipe = { - "homedecor:shrubbery" - } -}) +for _, color in ipairs(homedecor.shrub_colors) do -minetest.register_craft({ - type = "shapeless", - output = "homedecor:shrubbery", - recipe = { - "homedecor:shrubbery_large" - } -}) + minetest.register_craft({ + type = "shapeless", + output = "homedecor:shrubbery_large_"..color, + recipe = { + "homedecor:shrubbery_"..color + } + }) + minetest.register_craft({ + type = "shapeless", + output = "homedecor:shrubbery_"..color, + recipe = { + "homedecor:shrubbery_large_"..color + } + }) + + if color ~= "green" then + minetest.register_craft({ + type = "shapeless", + output = "homedecor:shrubbery_large_"..color, + recipe = { + "homedecor:shrubbery_large_green", + "dye:"..color + } + }) + + minetest.register_craft({ + type = "shapeless", + output = "homedecor:shrubbery_"..color, + recipe = { + "homedecor:shrubbery_green", + "dye:"..color + } + }) + + end +end for i in ipairs(homedecor.banister_materials) do diff --git a/homedecor/exterior.lua b/homedecor/exterior.lua index 1745c9f5..bcea22bf 100644 --- a/homedecor/exterior.lua +++ b/homedecor/exterior.lua @@ -349,51 +349,60 @@ 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 - } +local shrub_model = { + 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 } -}) +} +homedecor.shrub_colors = { + "green", + "red", + "yellow" +} + +for _, color in ipairs(homedecor.shrub_colors) do + minetest.register_node("homedecor:shrubbery_large_"..color, { + description = S("Shrubbery ("..color..")"), + drawtype = "allfaces_optional", + tiles = {"homedecor_shrubbery_"..color.."_top.png"}, + paramtype = "light", + is_ground_content = false, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), + }) + + minetest.register_node("homedecor:shrubbery_"..color, { + description = S("Shrubbery ("..color..")"), + drawtype = "nodebox", + tiles = { + "homedecor_shrubbery_"..color.."_top.png", + "homedecor_shrubbery_bottom.png", + "homedecor_shrubbery_"..color.."_sides.png" + }, + paramtype = "light", + is_ground_content = false, + groups = {snappy=3, flammable=2}, + sounds = default.node_sound_leaves_defaults(), + node_box = shrub_model + }) +end 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") +minetest.register_alias("gloopblocks:shrubbery", "homedecor:shrubbery_green") +minetest.register_alias("gloopblocks:shrubbery_large", "homedecor:shrubbery_large_green") diff --git a/homedecor/textures/homedecor_shrubbery_sides.png b/homedecor/textures/homedecor_shrubbery_green_sides.png similarity index 100% rename from homedecor/textures/homedecor_shrubbery_sides.png rename to homedecor/textures/homedecor_shrubbery_green_sides.png diff --git a/homedecor/textures/homedecor_shrubbery_top.png b/homedecor/textures/homedecor_shrubbery_green_top.png similarity index 100% rename from homedecor/textures/homedecor_shrubbery_top.png rename to homedecor/textures/homedecor_shrubbery_green_top.png diff --git a/homedecor/textures/homedecor_shrubbery_red_sides.png b/homedecor/textures/homedecor_shrubbery_red_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..b961ed1304a50899aac5150e04c33eefb5f0b0ab GIT binary patch literal 448 zcmV;x0YCnUP)#}M%rn)#6{k9$tPIS}_bv%@7bv!uP zSZd=dARfvU!6myxYYJR~Ez?$F55+_IUx5ML)7)M>l)BU-)3gauH{4iedbT3_AdGxN zG!o5#ZMMO2jWVFUtnAm>@4_@E>YkD8@H_d(MBUTa_j#NtMzX_~`JdJInZL)^UsodP zhI%AB>)~+CD+}0$nPq7!yT6?QV>0%DeK&XMMs#h(_9;f*YY{d|?9_@6?*lC!3iM7u ztLE`HRV2R0yFhUHkh933z8lb~SNJ*4IPZmgyLrM3q4^~6R9djCgGvkT-e~68g44q) zGXWI^Zx6OmX~C^p(vPZqpJu4EAjkwW0p4-E&8H)YY}Tkvb3T8R{J2i()ho0jpW2p3 qEAmlE&O8vPB&QL=V6Tcwa-IRkoETP)c@IqKou2TsXgtn@|4l-{<=i zADzngY!-7ZMPLwZUN(!lZdXh7(P`6#ByLyBY$)f)MAL;4V8OO2VPFAFlbLW+(}f=c zB<*ds)^tIO8llJlA6+&KHD<&Y3Frd|ifCZ5kryizl02-mI{vOuJPbGKLo27(Lk`1D zCbL@J*FpNw%I}#ZsY- z7?RgM7hipSjahDT?z#7!cXIHnp5pg8JPB1+)f`=IoWqk)ot@T{U-eX24@TDw& zi4TFW9t;UK*&Z5EU=vK4rV?`~tOtJzG-#h@_riLhGCk5wli*jqv1PhvDl!j3%hyCL zQ4g4AYaH7s4Vufcex3O)bo1suqS+|(@btyaeZ(s=?r&y5n~XVN-pyV*7F|=Zd5V_zUxc+1GqqxU%~hh8qGntw zMTgHw(#<=pxPs?iLO+JmtjlUC$73hvpyqM?`i_d(PlufT%_1aINlDpdx@x(a#Z|0#R-Rs ppGS5RI<7!=6Q(@aoi8A}2|tAeBIq=j%98*9002ovPDHLkV1f{{&H4ZU literal 0 HcmV?d00001 diff --git a/homedecor/textures/homedecor_shrubbery_yellow_top.png b/homedecor/textures/homedecor_shrubbery_yellow_top.png new file mode 100644 index 0000000000000000000000000000000000000000..1a8a496c017936f99e2d5a5eb91e2269acd12626 GIT binary patch literal 313 zcmV-90mlA`P)Ao)aJQTm8(9g_!i?o#L!C|wHfQl%H!$)edq-DJ_o zx~Letu)H-3vl4V|L|EH7t`65p^2d=w#VB!Xx=@hX02X5<+NtmbI}#5^(kEU`00000 LNkvXXu0mjfWhjHs literal 0 HcmV?d00001