diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index 580b8937..6e37b773 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -1269,6 +1269,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "homedecor:wall_sconce 2", + recipe = { + {"default:iron_lump", "", ""}, + {"default:iron_lump", "homedecor:candle", ""}, + {"default:iron_lump", "", ""}, + } +}) + minetest.register_craft({ output = "homedecor:oil_lamp 4", recipe = { diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index fde70859..3d3d5ea8 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -191,6 +191,26 @@ homedecor.register("candle_thin", { light_source = LIGHT_MAX-4, }) +homedecor.register("wall_sconce", { + description = S("Wall sconce"), + mesh = "homedecor_wall_sconce.obj", + tiles = { + 'homedecor_candle_sides.png', + {name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}, + 'homedecor_wall_sconce_back.png', + 'homedecor_tile_wrought_iron2.png', + }, + inventory_image = "homedecor_wall_sconce_inv.png", + selection_box = { + type = "fixed", + fixed = { -0.1875, -0.25, 0.3125, 0.1875, 0.25, 0.5 } + }, + sunlight_propagates = true, + walkable = false, + groups = { snappy = 3 }, + light_source = LIGHT_MAX-4, +}) + homedecor.register("oil_lamp", { description = S("Oil lamp"), drawtype = "plantlike", diff --git a/homedecor/models/homedecor_wall_sconce.obj b/homedecor/models/homedecor_wall_sconce.obj new file mode 100644 index 00000000..416431e5 --- /dev/null +++ b/homedecor/models/homedecor_wall_sconce.obj @@ -0,0 +1,422 @@ +# Blender v2.73 (sub 0) OBJ File: 'wall-sconce.blend' +# www.blender.org +o Cylinder +v 0.030936 0.157185 0.442848 +v 0.030936 0.025935 0.442848 +v 0.008535 -0.093010 0.369002 +v 0.008535 0.025935 0.369002 +v 0.024306 -0.093010 0.375535 +v 0.024306 0.025935 0.375535 +v 0.036377 -0.093010 0.387606 +v 0.036377 0.025935 0.387606 +v 0.042909 -0.093010 0.403377 +v 0.042909 0.025935 0.403377 +v 0.042909 -0.093010 0.420447 +v 0.042909 0.025935 0.420447 +v 0.036377 -0.093010 0.436218 +v 0.036377 0.025935 0.436218 +v 0.024306 -0.093010 0.448289 +v 0.024306 0.025935 0.448289 +v 0.008535 -0.093010 0.454821 +v 0.008535 0.025935 0.454821 +v -0.008535 -0.093010 0.454821 +v -0.008535 0.025935 0.454821 +v -0.024306 -0.093010 0.448289 +v -0.024306 0.025935 0.448289 +v -0.036377 -0.093010 0.436218 +v -0.036377 0.025935 0.436218 +v -0.042909 -0.093010 0.420447 +v -0.042909 0.025935 0.420447 +v -0.042909 -0.093010 0.403377 +v -0.042909 0.025935 0.403377 +v -0.036377 -0.093010 0.387606 +v -0.036377 0.025935 0.387606 +v -0.024306 -0.093010 0.375535 +v -0.024306 0.025935 0.375535 +v -0.008535 -0.093010 0.369002 +v -0.008535 0.025935 0.369002 +v -0.030936 0.025935 0.380976 +v -0.030936 0.157185 0.380976 +v 0.030936 0.157185 0.380976 +v 0.030936 0.025935 0.380976 +v -0.030936 0.025935 0.442848 +v -0.030936 0.157185 0.442848 +v 0.030936 0.157185 0.442848 +v 0.030936 0.025935 0.442848 +v -0.030936 0.025935 0.380976 +v -0.030936 0.157185 0.380976 +v 0.030936 0.157185 0.380976 +v 0.030936 0.025935 0.380976 +v -0.030936 0.025935 0.442848 +v -0.030936 0.157185 0.442848 +v -0.250000 -0.249999 0.498046 +v 0.250000 -0.249999 0.498046 +v -0.250000 0.250001 0.498045 +v 0.250000 0.250001 0.498045 +v 0.017070 -0.106000 0.326093 +v 0.017070 -0.084125 0.326093 +v 0.048612 -0.106000 0.339158 +v 0.048612 -0.084125 0.339158 +v 0.042909 -0.093011 0.420447 +v 0.042909 -0.093011 0.403376 +v 0.072754 -0.106000 0.363299 +v 0.072754 -0.084125 0.363299 +v 0.036377 -0.093011 0.387605 +v 0.024306 -0.093011 0.375535 +v 0.085819 -0.106000 0.394841 +v 0.085819 -0.084125 0.394841 +v 0.008535 -0.093011 0.369002 +v -0.008535 -0.093011 0.369002 +v 0.085819 -0.106000 0.428982 +v 0.085819 -0.084125 0.428982 +v -0.024306 -0.093011 0.375535 +v -0.036377 -0.093011 0.387605 +v 0.072754 -0.106000 0.460524 +v 0.072754 -0.084125 0.460524 +v -0.042909 -0.093011 0.403376 +v -0.042909 -0.093011 0.420447 +v 0.048612 -0.106000 0.484665 +v 0.048612 -0.084125 0.484665 +v -0.036377 -0.093011 0.436218 +v -0.024306 -0.093011 0.448288 +v 0.017070 -0.106000 0.497730 +v 0.017070 -0.084125 0.497730 +v -0.008535 -0.093011 0.454821 +v 0.008535 -0.093011 0.454821 +v -0.017070 -0.106000 0.497730 +v -0.017070 -0.084125 0.497730 +v 0.024306 -0.093011 0.448288 +v 0.036377 -0.093011 0.436218 +v -0.048612 -0.106000 0.484665 +v -0.048612 -0.084125 0.484665 +v 0.000000 -0.106000 0.411912 +v 0.000000 -0.093695 0.411912 +v -0.072754 -0.106000 0.460524 +v -0.072754 -0.084125 0.460524 +v 0.010938 -0.106000 0.498045 +v 0.010938 -0.106000 0.368162 +v -0.085819 -0.106000 0.428982 +v -0.085819 -0.084125 0.428982 +v -0.010937 -0.106000 0.368162 +v -0.010937 -0.106000 0.498045 +v -0.085819 -0.106000 0.394841 +v -0.085819 -0.084125 0.394841 +v 0.010938 -0.149750 0.498045 +v 0.010938 -0.149750 0.477537 +v -0.072753 -0.106000 0.363299 +v -0.072753 -0.084125 0.363299 +v -0.010937 -0.149750 0.477537 +v -0.010937 -0.149750 0.498045 +v -0.048612 -0.106000 0.339158 +v -0.048612 -0.084125 0.339158 +v 0.250000 0.250001 0.499999 +v -0.250000 0.250001 0.499999 +v -0.017070 -0.106000 0.326093 +v -0.017070 -0.084125 0.326093 +v 0.250000 -0.249999 0.499999 +v -0.250000 -0.249999 0.499999 +vt 0.500000 -0.000000 +vt 0.500000 0.500000 +vt 0.437500 0.500000 +vt 0.437500 -0.000000 +vt 0.375000 0.500000 +vt 0.375000 -0.000000 +vt 0.312500 0.500000 +vt 0.312500 -0.000000 +vt 0.250000 0.500000 +vt 0.250000 -0.000000 +vt 0.187500 0.500000 +vt 0.187500 -0.000000 +vt 0.125000 0.500000 +vt 0.125000 -0.000000 +vt 0.062500 0.500000 +vt 0.062500 -0.000000 +vt -0.000000 0.500000 +vt -0.000000 -0.000000 +vt 1.000000 -0.000000 +vt 1.000000 0.500000 +vt 0.937500 0.500000 +vt 0.937500 -0.000000 +vt 0.875000 0.500000 +vt 0.875000 -0.000000 +vt 0.812500 0.500000 +vt 0.812500 -0.000000 +vt 0.750000 0.500000 +vt 0.750000 -0.000000 +vt 0.687500 0.500000 +vt 0.687500 -0.000000 +vt 0.625000 0.500000 +vt 0.625000 -0.000000 +vt 0.476190 0.785650 +vt 0.488110 0.783278 +vt 0.498216 0.776526 +vt 0.504969 0.766420 +vt 0.507340 0.754500 +vt 0.504969 0.742579 +vt 0.498216 0.732474 +vt 0.488110 0.725721 +vt 0.476190 0.723350 +vt 0.464269 0.725721 +vt 0.454164 0.732474 +vt 0.447411 0.742579 +vt 0.445040 0.754500 +vt 0.447411 0.766420 +vt 0.454164 0.776526 +vt 0.464269 0.783278 +vt 0.562500 -0.000000 +vt 0.562500 0.500000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.625000 0.062500 +vt 0.562500 0.062500 +vt 0.225161 0.490214 +vt 0.282890 0.466302 +vt 0.314132 0.623368 +vt 0.687500 0.062500 +vt 0.180978 0.534397 +vt 0.750000 0.062500 +vt 0.157066 0.592125 +vt 0.812500 0.062500 +vt 0.157066 0.654610 +vt 0.875000 0.062500 +vt 0.180978 0.712339 +vt 0.937500 0.062500 +vt 0.225162 0.756522 +vt 1.000000 0.062500 +vt 0.282890 0.780434 +vt 0.062500 0.062500 +vt 0.000000 0.062500 +vt 0.125000 0.062500 +vt 1.000000 0.187500 +vt 0.875000 0.187500 +vt 0.187500 0.062500 +vt 0.345375 0.780434 +vt 0.250000 0.062500 +vt 0.875000 0.687500 +vt 0.625000 0.687500 +vt 0.625000 0.562500 +vt 0.312500 0.062500 +vt 1.000000 0.687500 +vt 0.375000 0.062500 +vt 0.437500 0.062500 +vt 0.500000 0.062500 +vt 0.376617 0.309236 +vt 0.492073 0.357060 +vt 0.375000 0.687500 +vt 0.492074 0.889676 +vt 0.376617 0.937500 +vt 0.403103 0.756522 +vt 0.345375 0.466302 +vt 0.403103 0.490214 +vt 0.447286 0.534397 +vt 0.471198 0.592125 +vt 0.471198 0.654610 +vt 0.447286 0.712338 +vt 0.580440 0.445427 +vt 0.628264 0.560883 +vt 0.628264 0.685853 +vt 0.580440 0.801309 +vt 0.251647 0.937500 +vt 0.136191 0.889676 +vt 0.047824 0.801309 +vt 0.000000 0.685853 +vt 0.000000 0.560883 +vt 0.047824 0.445426 +vt 0.136191 0.357059 +vt 0.251648 0.309236 +vn 0.195100 0.000000 -0.980800 +vn 0.145600 0.665700 -0.731900 +vn 0.414600 0.665700 -0.620400 +vn 0.555600 0.000000 -0.831500 +vn 0.620400 0.665700 -0.414600 +vn 0.831500 0.000000 -0.555600 +vn 0.731900 0.665700 -0.145600 +vn 0.980800 0.000000 -0.195100 +vn 0.731900 0.665700 0.145600 +vn 0.980800 0.000000 0.195100 +vn 0.620400 0.665700 0.414600 +vn 0.831500 0.000000 0.555600 +vn 0.414600 0.665700 0.620400 +vn 0.555600 0.000000 0.831500 +vn 0.145600 0.665700 0.731900 +vn 0.195100 0.000000 0.980800 +vn -0.145600 0.665700 0.731900 +vn -0.195100 0.000000 0.980800 +vn -0.414600 0.665700 0.620400 +vn -0.555600 0.000000 0.831500 +vn -0.620400 0.665700 0.414600 +vn -0.831500 0.000000 0.555600 +vn -0.731900 0.665700 0.145600 +vn -0.980800 0.000000 0.195100 +vn -0.731900 0.665700 -0.145600 +vn -0.980800 0.000000 -0.195100 +vn -0.620400 0.665700 -0.414600 +vn -0.831500 0.000000 -0.555600 +vn -0.414600 0.665700 -0.620400 +vn -0.555600 0.000000 -0.831500 +vn -0.145600 0.665700 -0.731900 +vn -0.195100 0.000000 -0.980800 +vn 0.707100 0.000000 0.707100 +vn -0.707100 0.000000 0.707100 +vn -0.707100 -0.000000 -0.707100 +vn 0.707100 -0.000000 -0.707100 +vn 0.000000 -0.000000 -1.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.380100 0.729200 -0.568900 +vn 0.568900 0.729200 -0.380100 +vn 0.620400 -0.665700 -0.414600 +vn 0.414600 -0.665700 -0.620400 +vn 0.066200 0.992900 -0.099100 +vn 0.023200 0.992900 -0.116900 +vn 0.671100 0.729200 -0.133500 +vn 0.731900 -0.665700 -0.145600 +vn 0.099100 0.992900 -0.066200 +vn 0.671100 0.729200 0.133500 +vn 0.731900 -0.665700 0.145600 +vn 0.116900 0.992900 -0.023200 +vn 0.568900 0.729200 0.380100 +vn 0.620400 -0.665700 0.414600 +vn 0.116900 0.992900 0.023200 +vn 0.380100 0.729200 0.568900 +vn 0.414600 -0.665700 0.620400 +vn 0.099100 0.992900 0.066200 +vn 0.133500 0.729200 0.671100 +vn 0.145600 -0.665700 0.731900 +vn 0.066200 0.992900 0.099100 +vn -0.133500 0.729200 0.671100 +vn -0.145600 -0.665700 0.731900 +vn 0.023200 0.992900 0.116900 +vn -0.380100 0.729200 0.568900 +vn -0.414600 -0.665700 0.620400 +vn -0.568900 0.729200 0.380100 +vn -0.620400 -0.665700 0.414600 +vn -0.707100 -0.707100 0.000000 +vn -0.666900 -0.731700 -0.140900 +vn 0.666900 -0.731700 -0.140900 +vn 0.707100 -0.707100 0.000000 +vn -0.671100 0.729200 0.133500 +vn -0.731900 -0.665700 0.145600 +vn -0.023200 0.992900 0.116900 +vn -0.671100 0.729200 -0.133500 +vn -0.731900 -0.665700 -0.145600 +vn 0.235400 -0.902400 -0.361000 +vn -0.568900 0.729200 -0.380100 +vn -0.620400 -0.665700 -0.414600 +vn -0.235400 -0.902400 -0.361000 +vn -0.380100 0.729200 -0.568900 +vn -0.414600 -0.665700 -0.620400 +vn -0.133500 0.729200 -0.671100 +vn -0.145600 -0.665700 -0.731900 +vn 0.133500 0.729200 -0.671100 +vn 0.145600 -0.665700 -0.731900 +vn -0.066200 0.992900 0.099100 +vn -0.023200 0.992900 -0.116900 +vn -0.066200 0.992900 -0.099100 +vn -0.099100 0.992900 -0.066200 +vn -0.116900 0.992900 -0.023200 +vn -0.116900 0.992900 0.023200 +vn -0.099100 0.992900 0.066200 +g Cylinder_Cylinder_candle +s 1 +f 3/1/1 4/2/2 6/3/3 5/4/4 +f 5/4/4 6/3/3 8/5/5 7/6/6 +f 7/6/6 8/5/5 10/7/7 9/8/8 +f 9/8/8 10/7/7 12/9/9 11/10/10 +f 11/10/10 12/9/9 14/11/11 13/12/12 +f 13/12/12 14/11/11 16/13/13 15/14/14 +f 15/14/14 16/13/13 18/15/15 17/16/16 +f 17/16/16 18/15/15 20/17/17 19/18/18 +f 19/19/18 20/20/17 22/21/19 21/22/20 +f 21/22/20 22/21/19 24/23/21 23/24/22 +f 23/24/22 24/23/21 26/25/23 25/26/24 +f 25/26/24 26/25/23 28/27/25 27/28/26 +f 27/28/26 28/27/25 30/29/27 29/30/28 +f 29/30/28 30/29/27 32/31/29 31/32/30 +f 6/33/3 4/34/2 34/35/31 32/36/29 30/37/27 28/38/25 26/39/23 24/40/21 22/41/19 20/42/17 18/43/15 16/44/13 14/45/11 12/46/9 10/47/7 8/48/5 +f 33/49/32 34/50/31 4/2/2 3/1/1 +f 31/32/30 32/31/29 34/50/31 33/49/32 +g Cylinder_Cylinder_flame +s off +f 38/19/33 37/51/33 40/52/33 39/18/33 +f 2/19/34 1/51/34 36/52/34 35/18/34 +f 46/19/35 47/18/35 48/52/35 45/51/35 +f 42/19/36 43/18/36 44/52/36 41/51/36 +g Cylinder_Cylinder_back +f 49/19/37 51/51/37 52/52/37 50/18/37 +f 51/19/38 49/51/38 114/52/38 110/18/38 +f 49/19/39 50/51/39 113/52/39 114/18/39 +f 50/19/40 52/51/40 109/52/40 113/18/40 +f 52/19/41 51/51/41 110/52/41 109/18/41 +g Cylinder_Cylinder_dish +s 1 +f 56/49/42 60/32/43 59/53/44 55/54/45 +f 78/55/46 81/56/47 90/57/41 +f 60/32/43 64/30/48 63/58/49 59/53/44 +f 77/59/50 78/55/46 90/57/41 +f 64/30/48 68/28/51 67/60/52 63/58/49 +f 74/61/53 77/59/50 90/57/41 +f 68/28/51 72/26/54 71/62/55 67/60/52 +f 73/63/56 74/61/53 90/57/41 +f 72/26/54 76/24/57 75/64/58 71/62/55 +f 70/65/59 73/63/56 90/57/41 +f 76/24/57 80/22/60 79/66/61 75/64/58 +f 69/67/62 70/65/59 90/57/41 +f 80/22/60 84/19/63 83/68/64 79/66/61 +f 66/69/65 69/67/62 90/57/41 +f 84/18/63 88/16/66 87/70/67 83/71/64 +f 88/16/66 92/14/68 91/72/69 87/70/67 +f 106/68/70 105/73/71 102/74/72 101/64/73 +f 92/14/68 96/12/74 95/75/75 91/72/69 +f 65/76/76 66/69/65 90/57/41 +f 96/12/74 100/10/77 99/77/78 95/75/75 +f 94/64/79 93/78/40 101/79/73 102/80/72 +f 100/10/77 104/8/80 103/81/81 99/77/78 +f 97/82/82 94/78/79 102/74/72 105/73/71 +f 104/8/80 108/6/83 107/83/84 103/81/81 +f 108/6/83 112/4/85 111/84/86 107/83/84 +f 111/84/86 112/4/85 54/1/87 53/85/88 +f 53/86/88 55/87/45 89/57/39 +f 98/88/38 97/83/82 105/80/71 106/79/70 +f 56/89/42 54/90/87 65/76/76 62/91/89 +f 54/1/87 56/49/42 55/54/45 53/85/88 +f 81/56/47 82/92/90 90/57/41 +f 82/92/90 85/93/91 90/57/41 +f 85/93/91 86/94/92 90/57/41 +f 86/94/92 57/95/93 90/57/41 +f 57/95/93 58/96/94 90/57/41 +f 58/96/94 61/97/95 90/57/41 +f 61/97/95 62/91/89 90/57/41 +f 62/91/89 65/76/76 90/57/41 +f 55/87/45 59/98/44 89/57/39 +f 59/98/44 63/99/49 89/57/39 +f 63/99/49 67/100/52 89/57/39 +f 67/100/52 71/101/55 89/57/39 +f 71/101/55 75/89/58 89/57/39 +f 75/89/58 79/90/61 89/57/39 +f 79/90/61 83/102/64 89/57/39 +f 83/102/64 87/103/67 89/57/39 +f 87/103/67 91/104/69 89/57/39 +f 91/104/69 95/105/75 89/57/39 +f 95/105/75 99/106/78 89/57/39 +f 99/106/78 103/107/81 89/57/39 +f 103/107/81 107/108/84 89/57/39 +f 107/108/84 111/109/86 89/57/39 +f 111/109/86 53/86/88 89/57/39 +f 60/101/43 56/89/42 62/91/89 61/97/95 +f 64/100/48 60/101/43 61/97/95 58/96/94 +f 68/99/51 64/100/48 58/96/94 57/95/93 +f 72/98/54 68/99/51 57/95/93 86/94/92 +f 76/87/57 72/98/54 86/94/92 85/93/91 +f 80/86/60 76/87/57 85/93/91 82/92/90 +f 84/109/63 80/86/60 82/92/90 81/56/47 +f 54/90/87 112/102/85 66/69/65 65/76/76 +f 112/102/85 108/103/83 69/67/62 66/69/65 +f 108/103/83 104/104/80 70/65/59 69/67/62 +f 104/104/80 100/105/77 73/63/56 70/65/59 +f 100/105/77 96/106/74 74/61/53 73/63/56 +f 96/106/74 92/107/68 77/59/50 74/61/53 +f 92/107/68 88/108/66 78/55/46 77/59/50 +f 88/108/66 84/109/63 81/56/47 78/55/46 diff --git a/homedecor/textures/homedecor_wall_sconce_back.png b/homedecor/textures/homedecor_wall_sconce_back.png new file mode 100644 index 00000000..09a06140 Binary files /dev/null and b/homedecor/textures/homedecor_wall_sconce_back.png differ diff --git a/homedecor/textures/homedecor_wall_sconce_inv.png b/homedecor/textures/homedecor_wall_sconce_inv.png new file mode 100644 index 00000000..54a586fc Binary files /dev/null and b/homedecor/textures/homedecor_wall_sconce_inv.png differ