diff --git a/homedecor/blends/toilet_paper.blend b/homedecor/blends/toilet_paper.blend new file mode 100644 index 00000000..12759794 Binary files /dev/null and b/homedecor/blends/toilet_paper.blend differ diff --git a/homedecor/misc-bathroom.lua b/homedecor/misc-bathroom.lua index 78b0d862..e0986cda 100644 --- a/homedecor/misc-bathroom.lua +++ b/homedecor/misc-bathroom.lua @@ -156,28 +156,19 @@ minetest.register_node("homedecor:medicine_cabinet_open", { minetest.register_node("homedecor:toilet_paper", { description = S("Toilet paper"), - tiles = { - "homedecor_toilet_paper_sides.png", - "homedecor_toilet_paper_sides.png", - "homedecor_toilet_paper_ends.png", - "homedecor_toilet_paper_ends.png", - "homedecor_toilet_paper_sides.png", - "homedecor_toilet_paper_sides.png" - }, + drawtype = "mesh", + mesh = "homedecor_toilet_paper.obj", + tiles = { "homedecor_toilet_paper.png" }, inventory_image = "homedecor_toilet_paper_inv.png", - drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", - node_box = { + selection_box = { type = "fixed", - fixed = { - {-0.25, 0.1875, 0.4375, -0.1875, 0.375, 0.5}, -- NodeBox1 - {0.125, 0.1875, 0.4375, 0.1875, 0.375, 0.5}, -- NodeBox2 - {-0.25, 0.25, 0.1875, -0.1875, 0.3125, 0.5}, -- NodeBox3 - {0.125, 0.25, 0.1875, 0.1875, 0.3125, 0.5}, -- NodeBox4 - {-0.1875, 0.125, 0.125, 0.125, 0.4375, 0.3125}, -- NodeBox5 - {-0.1875, 0.1875, 0.0625, 0.125, 0.375, 0.375}, -- NodeBox6 - } + fixed = { -0.1875, 0.125, 0.0625, 0.25, 0.4375, 0.5 } + }, + collision_box = { + type = "fixed", + fixed = { -0.1875, 0.125, 0.0625, 0.25, 0.4375, 0.5 } }, groups = {snappy=2,oddly_breakable_by_hand=3,flammable=3}, sounds = default.node_sound_defaults(), diff --git a/homedecor/models/homedecor_toilet_paper.obj b/homedecor/models/homedecor_toilet_paper.obj new file mode 100644 index 00000000..e59592fc --- /dev/null +++ b/homedecor/models/homedecor_toilet_paper.obj @@ -0,0 +1,222 @@ +# Blender v2.69 (sub 0) OBJ File: 'toilet_paper.blend' +# www.blender.org +o nodebox-3 +v 0.127489 0.216954 0.063069 +v -0.189989 0.216954 0.063069 +v 0.127489 0.345883 0.063069 +v -0.189989 0.345883 0.063069 +v 0.127489 0.437050 0.154235 +v -0.189989 0.437050 0.154235 +v 0.127489 0.437050 0.283165 +v -0.189989 0.437050 0.283165 +v 0.127489 0.345883 0.374331 +v -0.189989 0.345883 0.374331 +v 0.127489 0.216954 0.374331 +v -0.189989 0.216954 0.374331 +v 0.127489 0.125787 0.283165 +v -0.189989 0.125787 0.283165 +v 0.127489 0.125787 0.154235 +v -0.189989 0.125787 0.154235 +v -0.250001 0.249999 0.187499 +v -0.187500 0.249999 0.187499 +v -0.250001 0.187500 0.437499 +v -0.250001 0.249999 0.437499 +v -0.187500 0.187500 0.437499 +v -0.187500 0.249999 0.437499 +v -0.250001 0.187500 0.500000 +v -0.187500 0.187500 0.500000 +v -0.250001 0.312500 0.187499 +v -0.187500 0.312500 0.187499 +v -0.250001 0.312500 0.437499 +v -0.250001 0.374999 0.437499 +v -0.187500 0.312500 0.437499 +v -0.187500 0.374999 0.437499 +v -0.250001 0.374999 0.500000 +v -0.187500 0.374999 0.500000 +v 0.124999 0.249999 0.187499 +v 0.187500 0.249999 0.187499 +v 0.124999 0.187500 0.437499 +v 0.124999 0.249999 0.437499 +v 0.187500 0.187500 0.437499 +v 0.187500 0.249999 0.437499 +v 0.124999 0.187500 0.500000 +v 0.187500 0.187500 0.500000 +v 0.124999 0.312500 0.187499 +v 0.187500 0.312500 0.187499 +v 0.124999 0.312500 0.437499 +v 0.124999 0.374999 0.437499 +v 0.187500 0.312500 0.437499 +v 0.187500 0.374999 0.437499 +v 0.124999 0.374999 0.500000 +v 0.187500 0.374999 0.500000 +v -0.189989 0.281418 0.218700 +v 0.127489 0.281418 0.218700 +vt 0.037037 0.888889 +vt 0.222222 0.888889 +vt 0.222222 0.962963 +vt 0.037037 0.962963 +vt 0.037037 0.370370 +vt 0.222222 0.370370 +vt 0.222222 0.444444 +vt 0.037037 0.444444 +vt 0.222222 0.518519 +vt 0.037037 0.518519 +vt 0.222222 0.592593 +vt 0.037037 0.592593 +vt 0.222222 0.666667 +vt 0.037037 0.666667 +vt 0.222222 0.740741 +vt 0.037037 0.740741 +vt 0.695246 0.835853 +vt 0.695246 0.904888 +vt 0.611111 0.870370 +vt 0.037037 0.814815 +vt 0.222222 0.814815 +vt 0.925926 0.444444 +vt 0.962963 0.481481 +vt 0.925926 0.481481 +vt 0.962963 0.370370 +vt 0.925926 0.407407 +vt 0.925926 0.370370 +vt 0.296296 0.925926 +vt 0.333333 0.925926 +vt 0.333333 0.962963 +vt 0.296296 0.962963 +vt 0.555556 0.629630 +vt 0.555556 0.666667 +vt 0.518519 0.666667 +vt 0.333333 0.555556 +vt 0.333333 0.592593 +vt 0.296296 0.592593 +vt 0.296296 0.555556 +vt 0.444444 0.777778 +vt 0.444444 0.925926 +vt 0.407407 0.925926 +vt 0.407407 0.777778 +vt 0.407407 0.703704 +vt 0.444444 0.703704 +vt 0.444444 0.740741 +vt 0.407407 0.740741 +vt 0.444444 0.370370 +vt 0.444444 0.518519 +vt 0.407407 0.518519 +vt 0.407407 0.370370 +vt 0.444444 0.555556 +vt 0.407407 0.555556 +vt 0.444444 0.592593 +vt 0.407407 0.592593 +vt 0.296296 0.777778 +vt 0.333333 0.777778 +vt 0.296296 0.740741 +vt 0.333333 0.740741 +vt 0.296296 0.703704 +vt 0.333333 0.703704 +vt 0.518519 0.481481 +vt 0.555556 0.444444 +vt 0.555556 0.481481 +vt 0.444444 0.962963 +vt 0.407407 0.962963 +vt 0.333333 0.518519 +vt 0.296296 0.518519 +vt 0.962963 0.666667 +vt 0.925926 0.666667 +vt 0.925926 0.629630 +vt 0.296296 0.370370 +vt 0.333333 0.370370 +vt 0.786236 0.904888 +vt 0.786236 0.835853 +vt 0.870370 0.870370 +vt 0.835521 0.787037 +vt 0.905220 0.787037 +vt 0.954505 0.835853 +vt 0.954505 0.904888 +vt 0.905220 0.953704 +vt 0.835521 0.953704 +vt 0.645961 0.953704 +vt 0.576261 0.953704 +vt 0.526976 0.904888 +vt 0.526976 0.835853 +vt 0.576261 0.787037 +vt 0.645961 0.787037 +vt 0.777778 0.444444 +vt 0.777778 0.407407 +vt 0.555556 0.592593 +vt 0.518519 0.555556 +vt 0.555556 0.555556 +vt 0.703704 0.629630 +vt 0.703704 0.592593 +vt 0.555556 0.370370 +vt 0.555556 0.407407 +vt 0.518519 0.370370 +vt 0.703704 0.407407 +vt 0.703704 0.444444 +vt 0.925926 0.555556 +vt 0.962963 0.555556 +vt 0.925926 0.592593 +vt 0.777778 0.629630 +vt 0.777778 0.592593 +s off +f 1/1 2/2 4/3 3/4 +f 3/5 4/6 6/7 5/8 +f 5/8 6/7 8/9 7/10 +f 7/10 8/9 10/11 9/12 +f 9/12 10/11 12/13 11/14 +f 11/14 12/13 14/15 13/16 +f 1/17 3/18 50/19 +f 15/20 16/21 2/2 1/1 +f 13/16 14/15 16/21 15/20 +f 27/22 31/23 28/24 +f 23/25 20/26 19/27 +f 34/28 33/29 41/30 42/31 +f 45/32 46/33 48/34 +f 44/35 47/36 48/37 46/38 +f 20/39 17/40 18/41 22/42 +f 24/43 23/44 19/45 21/46 +f 25/47 27/48 29/49 26/50 +f 27/48 28/51 30/52 29/49 +f 31/53 23/44 24/43 32/54 +f 30/52 28/51 31/53 32/54 +f 38/55 36/56 33/29 34/28 +f 19/45 20/39 22/42 21/46 +f 36/56 38/55 37/57 35/58 +f 35/58 37/57 40/59 39/60 +f 32/61 29/62 30/63 +f 25/64 26/65 18/41 17/40 +f 43/66 44/35 46/38 45/67 +f 48/37 47/36 39/60 40/59 +f 47/68 44/69 43/70 +f 42/71 41/72 43/66 45/67 +f 4/73 2/74 49/75 +f 2/74 16/76 49/75 +f 16/76 14/77 49/75 +f 14/77 12/78 49/75 +f 12/78 10/79 49/75 +f 10/79 8/80 49/75 +f 8/80 6/81 49/75 +f 6/81 4/73 49/75 +f 3/18 5/82 50/19 +f 5/82 7/83 50/19 +f 7/83 9/84 50/19 +f 9/84 11/85 50/19 +f 11/85 13/86 50/19 +f 13/86 15/87 50/19 +f 15/87 1/17 50/19 +f 31/23 20/26 23/25 +f 27/22 20/26 31/23 +f 25/88 17/89 20/26 +f 27/22 25/88 20/26 +f 38/90 40/91 37/92 +f 45/32 48/34 40/91 +f 45/32 40/91 38/90 +f 42/93 45/32 38/90 +f 34/94 42/93 38/90 +f 21/95 22/96 24/97 +f 24/97 29/62 32/61 +f 24/97 22/96 29/62 +f 22/96 18/98 26/99 +f 29/62 22/96 26/99 +f 35/100 39/101 36/102 +f 39/101 47/68 36/102 +f 47/68 43/70 36/102 +f 43/70 41/103 33/104 +f 36/102 43/70 33/104 diff --git a/homedecor/textures/homedecor_toilet_paper.png b/homedecor/textures/homedecor_toilet_paper.png new file mode 100644 index 00000000..88b35132 Binary files /dev/null and b/homedecor/textures/homedecor_toilet_paper.png differ diff --git a/homedecor/textures/homedecor_toilet_paper_ends.png b/homedecor/textures/homedecor_toilet_paper_ends.png deleted file mode 100644 index b1491478..00000000 Binary files a/homedecor/textures/homedecor_toilet_paper_ends.png and /dev/null differ diff --git a/homedecor/textures/homedecor_toilet_paper_inv.png b/homedecor/textures/homedecor_toilet_paper_inv.png index a543948f..b3ac19bb 100644 Binary files a/homedecor/textures/homedecor_toilet_paper_inv.png and b/homedecor/textures/homedecor_toilet_paper_inv.png differ diff --git a/homedecor/textures/homedecor_toilet_paper_sides.png b/homedecor/textures/homedecor_toilet_paper_sides.png deleted file mode 100644 index 7f4dd558..00000000 Binary files a/homedecor/textures/homedecor_toilet_paper_sides.png and /dev/null differ