diff --git a/homedecor/bathroom_furniture.lua b/homedecor/bathroom_furniture.lua index 842d1395..586ab648 100644 --- a/homedecor/bathroom_furniture.lua +++ b/homedecor/bathroom_furniture.lua @@ -60,23 +60,16 @@ homedecor.register("towel_rod", { homedecor.register("medicine_cabinet", { description = S("Medicine Cabinet"), + mesh = "homedecor_medicine_cabinet.obj", tiles = { - 'homedecor_medicine_cabinet_tb.png', - 'homedecor_medicine_cabinet_tb.png', - 'homedecor_medicine_cabinet_sides.png', - 'homedecor_medicine_cabinet_sides.png', - 'homedecor_medicine_cabinet_back.png', - 'homedecor_medicine_cabinet_front.png' + 'default_wood.png', + 'homedecor_medicine_cabinet_mirror.png' }, inventory_image = "homedecor_medicine_cabinet_inv.png", selection_box = { type = "fixed", fixed = {-0.3125, -0.1875, 0.3125, 0.3125, 0.5, 0.5} }, - node_box = { - type = "fixed", - fixed = {-0.3125, -0.1875, 0.3125, 0.3125, 0.5, 0.5} - }, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), on_punch = function(pos, node, puncher, pointed_thing) @@ -90,22 +83,17 @@ homedecor.register("medicine_cabinet", { }) homedecor.register("medicine_cabinet_open", { + mesh = "homedecor_medicine_cabinet_open.obj", tiles = { - 'homedecor_medicine_cabinet_tb.png', - 'homedecor_medicine_cabinet_tb.png', - "homedecor_medicine_cabinet_open_right.png", - 'homedecor_medicine_cabinet_sides.png', - 'homedecor_medicine_cabinet_back.png', - "homedecor_medicine_cabinet_open_front.png" + 'default_wood.png', + 'homedecor_medicine_cabinet_mirror.png', + 'homedecor_medicine_cabinet_inside.png' + }, + selection_box = { + type = "fixed", + fixed = {-0.3125, -0.1875, -0.25, 0.3125, 0.5, 0.5} }, groups = { snappy = 3, not_in_creative_inventory=1 }, - node_box = { - type = "fixed", - fixed = { - {-0.3125, -0.1875, 0.375, 0.3125, 0.5, 0.5}, -- NodeBox1 - {0.28, -0.1875, -0.1875, 0.3125, 0.5, 0.375}, -- NodeBox2 - } - }, drop = "homedecor:medicine_cabinet", on_punch = function(pos, node, puncher, pointed_thing) node.name = "homedecor:medicine_cabinet" diff --git a/homedecor/models/homedecor_medicine_cabinet.obj b/homedecor/models/homedecor_medicine_cabinet.obj new file mode 100644 index 00000000..5dc068dd --- /dev/null +++ b/homedecor/models/homedecor_medicine_cabinet.obj @@ -0,0 +1,62 @@ +# Blender v2.73 (sub 0) OBJ File: 'medicine-cabinet.blend' +# www.blender.org +o Cylinder +v -0.312500 -0.187500 0.500000 +v -0.312500 -0.187500 0.312500 +v 0.312500 -0.187500 0.312500 +v 0.312500 -0.187500 0.500000 +v -0.312500 0.500000 0.500000 +v -0.312500 0.500000 0.312500 +v 0.312500 0.500000 0.312500 +v 0.312500 0.500000 0.500000 +v -0.312500 0.437500 0.312500 +v 0.312500 0.437500 0.312500 +v -0.312500 -0.125000 0.312500 +v 0.312500 -0.125000 0.312500 +v -0.250000 0.437500 0.312500 +v -0.250000 -0.125000 0.312500 +v 0.250000 0.437500 0.312500 +v 0.250000 -0.125000 0.312500 +vt 0.875000 0.562500 +vt 0.875000 0.750000 +vt 0.187500 0.750000 +vt 0.187500 0.562500 +vt 0.812500 1.000000 +vt 0.187500 1.000000 +vt 0.187500 0.937500 +vt 0.812500 0.937500 +vt 0.875000 0.812500 +vt 0.875000 1.000000 +vt 0.187500 0.812500 +vt 0.187500 0.312500 +vt 0.812500 0.312500 +vt 0.250000 0.250000 +vt 0.250000 0.062500 +vt 0.875000 0.062500 +vt 0.875000 0.250000 +vt 0.812500 0.812500 +vt 0.812500 0.375000 +vt 0.187500 0.375000 +vt 0.750000 0.937500 +vt 0.750000 0.375000 +vt 0.250000 0.937500 +vt 0.250000 0.375000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +g Cylinder_Cylinder_wood +s off +f 5/1/1 6/2/1 2/3/1 1/4/1 +f 6/5/2 7/6/2 10/7/2 9/8/2 +f 7/9/3 8/10/3 4/6/3 3/11/3 +f 8/5/4 5/6/4 1/12/4 4/13/4 +f 1/14/5 2/15/5 3/16/5 4/17/5 +f 8/18/6 7/5/6 6/6/6 5/11/6 +f 3/12/2 2/13/2 11/19/2 12/20/2 +f 13/21/2 14/22/2 11/19/2 9/8/2 +f 15/23/2 10/7/2 12/20/2 16/24/2 +g Cylinder_Cylinder_mirror +f 14/22/2 13/21/2 15/23/2 16/24/2 diff --git a/homedecor/models/homedecor_medicine_cabinet_open.obj b/homedecor/models/homedecor_medicine_cabinet_open.obj new file mode 100644 index 00000000..92da0723 --- /dev/null +++ b/homedecor/models/homedecor_medicine_cabinet_open.obj @@ -0,0 +1,96 @@ +# Blender v2.73 (sub 0) OBJ File: 'medicine-cabinet-open.blend' +# www.blender.org +o Cylinder +v -0.312500 -0.187500 0.500000 +v 0.312500 -0.187500 0.500000 +v -0.312500 0.500000 0.500000 +v 0.312500 0.500000 0.500000 +v -0.312500 0.500000 0.375000 +v -0.312500 -0.187500 0.375000 +v 0.312500 0.500000 0.375000 +v 0.312500 -0.187500 0.375000 +v -0.312500 -0.187500 -0.250000 +v -0.312500 0.500000 -0.250000 +v -0.312500 0.437500 0.375000 +v -0.312500 0.437500 -0.250000 +v -0.312500 -0.125000 0.375000 +v -0.312500 -0.125000 -0.250000 +v -0.312500 0.437500 0.312500 +v -0.312500 -0.125000 0.312500 +v -0.312500 0.437500 -0.187500 +v -0.312500 -0.125000 -0.187500 +v -0.250000 0.500000 0.375000 +v -0.250000 -0.187500 0.375000 +v -0.250000 0.500000 -0.250000 +v -0.250000 -0.187500 -0.250000 +v -0.312500 0.500000 0.375000 +v -0.312500 -0.187500 0.375000 +v 0.312500 -0.187500 0.375000 +v 0.312500 0.500000 0.375000 +v -0.312500 0.437500 0.375000 +v 0.312500 0.437500 0.375000 +v -0.312500 -0.125000 0.375000 +v 0.312500 -0.125000 0.375000 +v 0.250000 0.437500 0.375000 +v 0.250000 -0.125000 0.375000 +v 0.250000 0.437500 0.375000 +v 0.250000 -0.125000 0.375000 +v -0.250000 0.437500 0.375000 +v -0.250000 -0.125000 0.375000 +vt 0.875000 0.875000 +vt 0.875000 1.000000 +vt 0.187500 1.000000 +vt 0.187500 0.875000 +vt 0.812500 1.000000 +vt 0.187500 0.312500 +vt 0.812500 0.312500 +vt 0.812500 0.375000 +vt 0.187500 0.375000 +vt 0.187500 0.937500 +vt 0.812500 0.937500 +vt 0.250000 0.125000 +vt 0.250000 0.062500 +vt 0.875000 0.062500 +vt 0.875000 0.125000 +vt 0.812500 0.812500 +vt 0.187500 0.812500 +vt 0.250000 0.250000 +vt 0.875000 0.250000 +vt 0.875000 0.562500 +vt 0.875000 0.687500 +vt 0.187500 0.687500 +vt 0.187500 0.562500 +vt 0.750000 0.937500 +vt 0.750000 0.375000 +vt 0.250000 0.937500 +vt 0.250000 0.375000 +vt 0.875000 0.750000 +vt 0.187500 0.750000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 -0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +g Cylinder_Cylinder_wood +s off +f 7/1/1 4/2/1 2/3/1 8/4/1 +f 4/5/2 3/3/2 1/6/2 2/7/2 +f 9/6/3 6/7/3 13/8/3 14/9/3 +f 21/3/4 10/10/4 5/11/4 19/5/4 +f 20/12/5 6/13/5 9/14/5 22/15/5 +f 5/5/3 10/3/3 12/10/3 11/11/3 +f 4/16/4 7/11/4 5/10/4 3/17/4 +f 1/18/5 6/12/5 8/15/5 2/19/5 +f 3/20/3 5/21/3 6/22/3 1/23/3 +f 22/7/1 21/5/1 19/3/1 20/6/1 +f 15/24/3 16/25/3 13/8/3 11/11/3 +f 17/26/3 12/10/3 14/9/3 18/27/3 +f 10/21/6 21/28/6 22/29/6 9/22/6 +f 25/6/6 24/7/6 29/8/6 30/9/6 +f 23/5/6 26/3/6 28/10/6 27/11/6 +f 31/26/6 28/10/6 30/9/6 32/27/6 +g Cylinder_Cylinder_mirror +f 16/25/3 15/24/3 17/26/3 18/27/3 +g Cylinder_Cylinder_inside +f 34/27/6 36/25/6 35/24/6 33/26/6 diff --git a/homedecor/textures/homedecor_medicine_cabinet_back.png b/homedecor/textures/homedecor_medicine_cabinet_back.png deleted file mode 100644 index e6b41cca..00000000 Binary files a/homedecor/textures/homedecor_medicine_cabinet_back.png and /dev/null differ diff --git a/homedecor/textures/homedecor_medicine_cabinet_front.png b/homedecor/textures/homedecor_medicine_cabinet_front.png deleted file mode 100644 index c76f5c11..00000000 Binary files a/homedecor/textures/homedecor_medicine_cabinet_front.png and /dev/null differ diff --git a/homedecor/textures/homedecor_medicine_cabinet_inside.png b/homedecor/textures/homedecor_medicine_cabinet_inside.png new file mode 100644 index 00000000..64d6c156 Binary files /dev/null and b/homedecor/textures/homedecor_medicine_cabinet_inside.png differ diff --git a/homedecor/textures/homedecor_medicine_cabinet_inv.png b/homedecor/textures/homedecor_medicine_cabinet_inv.png index 6aa39d00..c91c6b49 100644 Binary files a/homedecor/textures/homedecor_medicine_cabinet_inv.png and b/homedecor/textures/homedecor_medicine_cabinet_inv.png differ diff --git a/homedecor/textures/homedecor_medicine_cabinet_mirror.png b/homedecor/textures/homedecor_medicine_cabinet_mirror.png new file mode 100644 index 00000000..dd9be546 Binary files /dev/null and b/homedecor/textures/homedecor_medicine_cabinet_mirror.png differ diff --git a/homedecor/textures/homedecor_medicine_cabinet_open_front.png b/homedecor/textures/homedecor_medicine_cabinet_open_front.png deleted file mode 100644 index 8e0e0866..00000000 Binary files a/homedecor/textures/homedecor_medicine_cabinet_open_front.png and /dev/null differ diff --git a/homedecor/textures/homedecor_medicine_cabinet_open_right.png b/homedecor/textures/homedecor_medicine_cabinet_open_right.png deleted file mode 100644 index 51641223..00000000 Binary files a/homedecor/textures/homedecor_medicine_cabinet_open_right.png and /dev/null differ diff --git a/homedecor/textures/homedecor_medicine_cabinet_sides.png b/homedecor/textures/homedecor_medicine_cabinet_sides.png deleted file mode 100644 index 4092b2f8..00000000 Binary files a/homedecor/textures/homedecor_medicine_cabinet_sides.png and /dev/null differ diff --git a/homedecor/textures/homedecor_medicine_cabinet_tb.png b/homedecor/textures/homedecor_medicine_cabinet_tb.png deleted file mode 100644 index dd1f8504..00000000 Binary files a/homedecor/textures/homedecor_medicine_cabinet_tb.png and /dev/null differ