From 949a2a94d80207fc80a4805c23295f80ee7363d2 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Thu, 26 Jun 2014 21:33:27 -0400 Subject: [PATCH] Add towel rod with towel moved bathroom/kitchen tiles into misc-bathroom.lua also, rename misc_nodes.lua -> misc-nodes.lua --- homedecor/init.lua | 4 +- homedecor/misc-bathroom.lua | 91 ++++++++++++++++++ homedecor/{misc_nodes.lua => misc-nodes.lua} | 60 ------------ .../textures/homedecor_towel_rod_bottom.png | Bin 0 -> 212 bytes homedecor/textures/homedecor_towel_rod_fb.png | Bin 0 -> 435 bytes .../textures/homedecor_towel_rod_sides.png | Bin 0 -> 176 bytes .../textures/homedecor_towel_rod_top.png | Bin 0 -> 217 bytes 7 files changed, 94 insertions(+), 61 deletions(-) create mode 100644 homedecor/misc-bathroom.lua rename homedecor/{misc_nodes.lua => misc-nodes.lua} (92%) create mode 100644 homedecor/textures/homedecor_towel_rod_bottom.png create mode 100644 homedecor/textures/homedecor_towel_rod_fb.png create mode 100644 homedecor/textures/homedecor_towel_rod_sides.png create mode 100644 homedecor/textures/homedecor_towel_rod_top.png diff --git a/homedecor/init.lua b/homedecor/init.lua index 9c5e904f..fc5c4117 100644 --- a/homedecor/init.lua +++ b/homedecor/init.lua @@ -57,7 +57,7 @@ end -- load various other components -dofile(homedecor.modpath.."/misc_nodes.lua") -- the catch-all for all misc nodes +dofile(homedecor.modpath.."/misc-nodes.lua") -- the catch-all for all misc nodes dofile(homedecor.modpath.."/tables.lua") dofile(homedecor.modpath.."/electronics.lua") dofile(homedecor.modpath.."/shutters.lua") @@ -73,6 +73,8 @@ dofile(homedecor.modpath.."/lighting.lua") dofile(homedecor.modpath.."/kitchen_cabinet.lua") dofile(homedecor.modpath.."/refrigerator.lua") +dofile(homedecor.modpath.."/misc-bathroom.lua") + dofile(homedecor.modpath.."/laundry.lua") dofile(homedecor.modpath.."/furnaces.lua") diff --git a/homedecor/misc-bathroom.lua b/homedecor/misc-bathroom.lua new file mode 100644 index 00000000..9add37b4 --- /dev/null +++ b/homedecor/misc-bathroom.lua @@ -0,0 +1,91 @@ +minetest.register_node("homedecor:tiles_1", { + description = "Bathroom/kitchen tiles (shade #1)", + tiles = { + "homedecor_tiles1.png", + "homedecor_tiles1.png", + "homedecor_tiles1.png", + "homedecor_tiles1.png", + "homedecor_tiles1.png^[transformR90", + "homedecor_tiles1.png^[transformR90" + }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("homedecor:tiles_2", { + description = "Bathroom/kitchen tiles (shade #2)", + tiles = { + "homedecor_tiles2.png", + "homedecor_tiles2.png", + "homedecor_tiles2.png", + "homedecor_tiles2.png", + "homedecor_tiles2.png^[transformR90", + "homedecor_tiles2.png^[transformR90" + }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("homedecor:tiles_3", { + description = "Bathroom/kitchen tiles (shade #3)", + tiles = { + "homedecor_tiles3.png", + "homedecor_tiles3.png", + "homedecor_tiles3.png", + "homedecor_tiles3.png", + "homedecor_tiles3.png^[transformR90", + "homedecor_tiles3.png^[transformR90" + }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("homedecor:tiles_4", { + description = "Bathroom/kitchen tiles (shade #4)", + tiles = { + "homedecor_tiles4.png", + "homedecor_tiles4.png", + "homedecor_tiles4.png", + "homedecor_tiles4.png", + "homedecor_tiles4.png^[transformR90", + "homedecor_tiles4.png^[transformR90" + }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("homedecor:towel_rod", { + description = "Towel rod with towel", + drawtype = "nodebox", + tiles = { + "homedecor_towel_rod_top.png", + "homedecor_towel_rod_bottom.png", + "homedecor_towel_rod_sides.png", + "homedecor_towel_rod_sides.png^[transformFX", + "homedecor_towel_rod_fb.png", + "homedecor_towel_rod_fb.png" + }, + paramtype = "light", + paramtype2 = "facedir", + node_box = { + type = "fixed", + fixed = { + {-0.375, 0.1875, 0.25, -0.3125, 0.375, 0.5}, + { 0.3125, 0.1875, 0.25, 0.375, 0.375, 0.5}, + {-0.3125, 0.25, 0.3125, 0.3125, 0.375, 0.375}, + {-0.3125, 0, 0.375, 0.3125, 0.34375, 0.4375}, + {-0.3125, -0.3125, 0.25, 0.3125, 0.34375, 0.3125}, + } + }, + selection_box = { + type = "fixed", + fixed = { -0.375, -0.3125, 0.25, 0.375, 0.375, 0.5 } + }, + groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3}, + sounds = default.node_sound_defaults(), +}) + diff --git a/homedecor/misc_nodes.lua b/homedecor/misc-nodes.lua similarity index 92% rename from homedecor/misc_nodes.lua rename to homedecor/misc-nodes.lua index ffeefd9f..bbf24d52 100644 --- a/homedecor/misc_nodes.lua +++ b/homedecor/misc-nodes.lua @@ -278,66 +278,6 @@ minetest.register_node('homedecor:air_conditioner', { selection_box = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } }) -minetest.register_node("homedecor:tiles_1", { - description = "Bathroom/kitchen tiles (shade #1)", - tiles = { - "homedecor_tiles1.png", - "homedecor_tiles1.png", - "homedecor_tiles1.png", - "homedecor_tiles1.png", - "homedecor_tiles1.png^[transformR90", - "homedecor_tiles1.png^[transformR90" - }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_node("homedecor:tiles_2", { - description = "Bathroom/kitchen tiles (shade #2)", - tiles = { - "homedecor_tiles2.png", - "homedecor_tiles2.png", - "homedecor_tiles2.png", - "homedecor_tiles2.png", - "homedecor_tiles2.png^[transformR90", - "homedecor_tiles2.png^[transformR90" - }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_node("homedecor:tiles_3", { - description = "Bathroom/kitchen tiles (shade #3)", - tiles = { - "homedecor_tiles3.png", - "homedecor_tiles3.png", - "homedecor_tiles3.png", - "homedecor_tiles3.png", - "homedecor_tiles3.png^[transformR90", - "homedecor_tiles3.png^[transformR90" - }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_node("homedecor:tiles_4", { - description = "Bathroom/kitchen tiles (shade #4)", - tiles = { - "homedecor_tiles4.png", - "homedecor_tiles4.png", - "homedecor_tiles4.png", - "homedecor_tiles4.png", - "homedecor_tiles4.png^[transformR90", - "homedecor_tiles4.png^[transformR90" - }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - local welcome_mat_colors = { "green", "brown", "grey" } for _, color in ipairs(welcome_mat_colors) do diff --git a/homedecor/textures/homedecor_towel_rod_bottom.png b/homedecor/textures/homedecor_towel_rod_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..05d45f61b1ceea2be0a7fbde47ecb240f2fc35d8 GIT binary patch literal 212 zcmV;_04x8AP)Y@ zJ$p6-DS(NAL@=shq-bD)P~UE>w2SE$5D@tP|G$us(4|Y4czJobxVR)FB<|d~BP=Yu zadHZmMmR#l_ivwjDxz3fm~j~#Hv*#<2oX`k%5U%q_N*4BRh{5dl-^M?-~)YR18 zzkkoj$oS&Li@o!5gpH6i+<)=u5mv=0DyA23;@{g_k@rFpkA*t#!S=nJkKzU$z(z)^*qnE z?H~vW03pO~w?haiilXZ}gfK~xEXzuz66d@CSg+TbrVWQfO6hDiYc`v{@7uN=hGC=8 zI6d4!gploan`Ie7NRlK~RS`m*b0I{51EqAaSadp_D2m$cb{K}WT5UR=>bkyKt$x$s dzdzsEz&AI8uK2P~6#@VN002ovPDHLkV1it4wzvQQ literal 0 HcmV?d00001 diff --git a/homedecor/textures/homedecor_towel_rod_sides.png b/homedecor/textures/homedecor_towel_rod_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..d0f1c2ee1798d809870e92379827b2accae75cc4 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|<(@8%AsXlBUQ*<1H4tFAuu#W5 zqv>s6mCvNO1lE7IvqD%madxp>XNx{8TK4Zn?aenS%cls~51*g4jL|@D+tZ@v z?>4QTx2}KOv@UyTNYBLLd!@3;IxP#f=G~qabnEwBPKF7~6SmG^-eFsCj!~nF$)RVW zz^3=Sam^1arUh9&U$tt}H7>;-!yd!zwLzznp1IV1{^Up1{|~~Otj)hUWXd$Q Rumj!7;OXk;vd$@?2>=87SE>L2 literal 0 HcmV?d00001