diff --git a/homedecor/climate-control.lua b/homedecor/climate-control.lua index 03e4d31a..4afeb192 100644 --- a/homedecor/climate-control.lua +++ b/homedecor/climate-control.lua @@ -27,35 +27,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:space_heater', { - drawtype = "nodebox", - description = S("Space heater"), - tiles = { 'homedecor_heater_tb.png', - 'homedecor_heater_tb.png', - 'homedecor_heater_sides.png', - 'homedecor_heater_sides.png', - 'homedecor_heater_back.png', - 'homedecor_heater_front.png' - }, - inventory_image = "homedecor_heater_inv.png", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = { snappy = 3 }, - sounds = default.node_sound_leaves_defaults(), - node_box = { - type = "fixed", - fixed = { - {-0.1875, -0.5, 0.0625, 0.1875, 0, 0.3125}, - } - }, - selection_box = { - type = "fixed", - fixed = {-0.1875, -0.5, 0.0625, 0.1875, 0, 0.3125} - } -}) - -- fans minetest.register_entity("homedecor:mesh_desk_fan", { @@ -144,4 +115,86 @@ minetest.register_node("homedecor:desk_fan", { end, }) +-- heating devices + +minetest.register_node('homedecor:space_heater', { + drawtype = "nodebox", + description = S("Space heater"), + tiles = { 'homedecor_heater_tb.png', + 'homedecor_heater_tb.png', + 'homedecor_heater_sides.png', + 'homedecor_heater_sides.png', + 'homedecor_heater_back.png', + 'homedecor_heater_front.png' + }, + inventory_image = "homedecor_heater_inv.png", + sunlight_propagates = true, + paramtype = "light", + paramtype2 = "facedir", + walkable = true, + groups = { snappy = 3 }, + sounds = default.node_sound_leaves_defaults(), + node_box = { + type = "fixed", + fixed = { + {-0.1875, -0.5, 0.0625, 0.1875, 0, 0.3125}, + } + }, + selection_box = { + type = "fixed", + fixed = {-0.1875, -0.5, 0.0625, 0.1875, 0, 0.3125} + } +}) + +minetest.register_node("homedecor:radiator", { + tiles = { "homedecor_white_metal.png" }, + inventory_image = "homedecor_radiator_inv.png", + description = "Radiator heater", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + node_box = { + type = "fixed", + fixed = { + {-0.4375, 0.3125, 0.3125, 0.5, 0.4375, 0.4375}, -- NodeBox1 + {0.375, 0.25, 0.25, 0.4375, 0.5, 0.5}, -- NodeBox2 + {0.25, 0.25, 0.25, 0.3125, 0.5, 0.5}, -- NodeBox3 + {0.125, 0.25, 0.25, 0.1875, 0.5, 0.5}, -- NodeBox4 + {0, 0.25, 0.25, 0.0625, 0.5, 0.5}, -- NodeBox5 + {-0.125, 0.25, 0.25, -0.0625, 0.5, 0.5}, -- NodeBox6 + {-0.25, 0.25, 0.25, -0.1875, 0.5, 0.5}, -- NodeBox7 + {-0.375, 0.25, 0.25, -0.3125, 0.5, 0.5}, -- NodeBox8 + {0.375, -0.375, 0.4375, 0.4375, 0.5, 0.5}, -- NodeBox10 + {0.375, -0.375, 0.25, 0.4375, 0.5, 0.3125}, -- NodeBox11 + {0.25, -0.375, 0.4375, 0.3125, 0.5, 0.5}, -- NodeBox12 + {0.25, -0.375, 0.25, 0.3125, 0.5, 0.3125}, -- NodeBox13 + {0.125, -0.375, 0.4375, 0.1875, 0.5, 0.5}, -- NodeBox14 + {0.125, -0.375, 0.25, 0.1875, 0.5, 0.3125}, -- NodeBox15 + {0, -0.375, 0.4375, 0.0625, 0.5, 0.5}, -- NodeBox16 + {0, -0.375, 0.25, 0.0625, 0.5, 0.3125}, -- NodeBox17 + {0, -0.375, 0.4375, 0.0625, 0.5, 0.5}, -- NodeBox18 + {0, -0.375, 0.25, 0.0625, 0.5, 0.3125}, -- NodeBox19 + {-0.125, -0.375, 0.4375, -0.0625, 0.5, 0.5}, -- NodeBox20 + {-0.125, -0.375, 0.25, -0.0625, 0.5, 0.3125}, -- NodeBox21 + {-0.25, -0.375, 0.4375, -0.1875, 0.5, 0.5}, -- NodeBox22 + {-0.25, -0.375, 0.25, -0.1875, 0.5, 0.3125}, -- NodeBox23 + {-0.375, -0.375, 0.4375, -0.3125, 0.5, 0.5}, -- NodeBox24 + {-0.375, -0.375, 0.25, -0.3125, 0.5, 0.3125}, -- NodeBox25 + {-0.4375, -0.3125, 0.3125, 0.5, -0.1875, 0.4375}, -- NodeBox26 + {0.375, -0.375, 0.3125, 0.4375, -0.125, 0.4375}, -- NodeBox27 + {0.25, -0.375, 0.3125, 0.3125, -0.125, 0.4375}, -- NodeBox28 + {0.125, -0.375, 0.3125, 0.1875, -0.125, 0.4375}, -- NodeBox29 + {0, -0.375, 0.3125, 0.0625, -0.125, 0.4375}, -- NodeBox30 + {-0.125, -0.375, 0.3125, -0.0625, -0.125, 0.4375}, -- NodeBox31 + {-0.125, -0.375, 0.3125, -0.0625, -0.125, 0.4375}, -- NodeBox32 + {-0.25, -0.375, 0.3125, -0.1875, -0.125, 0.4375}, -- NodeBox33 + {-0.375, -0.375, 0.3125, -0.3125, -0.125, 0.4375}, -- NodeBox34 + } + }, + selection_box = { + type = "fixed", + fixed = { -0.4375, -0.375, 0.25, 0.5, 0.5, 0.5 } + } +}) diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index 1ff63127..8b42527f 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -2193,6 +2193,15 @@ minetest.register_craft( { }, }) +minetest.register_craft( { + output = "homedecor:radiator", + recipe = { + { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" }, + { "homedecor:ic", "homedecor:heating_element", "" }, + { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" } + }, +}) + -- bathroom/kitchen tiles local color_pairings = { @@ -2325,3 +2334,22 @@ minetest.register_craft( { { "group:stick", "", "group:stick" } }, }) + +minetest.register_craft( { + output = "homedecor:trash_can 2", + recipe = { + { "homedecor:steel_wire", "", "homedecor:steel_wire" }, + { "homedecor:steel_wire", "", "homedecor:steel_wire" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } + }, +}) + +minetest.register_craft( { + output = "homedecor:telephone", + recipe = { + { "homedecor:speaker_driver", "homedecor:copper_wire", "homedecor:speaker_driver" }, + { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } + }, +}) + diff --git a/homedecor/electronics.lua b/homedecor/electronics.lua index bd6d41fa..c40c96ab 100644 --- a/homedecor/electronics.lua +++ b/homedecor/electronics.lua @@ -130,3 +130,45 @@ minetest.register_node("homedecor:dvd_vcr", { sounds = default.node_sound_wood_defaults(), }) +minetest.register_node("homedecor:telephone", { + tiles = { + "homedecor_telephone_top.png", + "homedecor_telephone_bottom.png", + "homedecor_telephone_sides.png", + "homedecor_telephone_sides.png", + "homedecor_telephone_sides.png", + "homedecor_telephone_sides.png" + }, + inventory_image = "homedecor_telephone_inv.png", + description = "Telephone", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + node_box = { + type = "fixed", + fixed = { + {-0.1875, -0.5, -0.1875, 0.1875, -0.4375, 0.1875}, -- NodeBox1 + {-0.125, -0.5, -0.130, 0.125, -0.375, 0.1875}, -- NodeBox2 + {-0.0625, -0.5, -0.0625, 0.0625, -0.3125, 0.1875}, -- NodeBox3 + {0.0331951, -0.375, 0, 0.0625, -0.223757, 0.125}, -- NodeBox4 + {-0.0625, -0.375, 0, -0.033195, -0.223757, 0.125}, -- NodeBox5 + {-0.207469, -0.25, 0.0374656, 0.207469, -0.1875, 0.0873276}, -- NodeBox6 + {0.125, -0.3125, 0, 0.25, -0.25, 0.125}, -- NodeBox7 + {-0.25, -0.3125, 0, -0.125, -0.25, 0.125}, -- NodeBox8 + {-0.0912863, -0.5, -0.0955001, 0.0995851, -0.339779, 0.1875}, -- NodeBox9 + {-0.157676, -0.5, -0.161983, 0.157676, -0.406077, 0.1875}, -- NodeBox10 + {0.124481, -0.290055, 0.0208449, 0.232365, -0.21547, 0.103948}, -- NodeBox11 + {-0.232365, -0.290055, 0.0208449, -0.124481, -0.21547, 0.103948}, -- NodeBox12 + {-0.174274, -0.472376, -0.174604, 0.174274, -0.422652, 0.187541}, -- NodeBox13 + {-0.141079, -0.430939, -0.145079, 0.141079, -0.389503, 0.187521}, -- NodeBox14 + {-0.107884, -0.389503, -0.114121, 0.112183, -0.356354, 0.187552}, -- NodeBox15 + {-0.0756888, -0.344917, 0.187571, 0.085884, -0.321492, -0.0793901}, -- NodeBox16 + } + }, + selection_box = { + type = "fixed", + fixed = { -0.25, -0.5, -0.1875, 0.25, -0.1875, 0.1875 } + } +}) + diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 4c81f3a4..714699f4 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -892,3 +892,71 @@ minetest.register_node("homedecor:pool_table2", { fixed = { 0, 0, 0, 0, 0, 0 } }, }) + +minetest.register_node("homedecor:trash_can", { + tiles = { + "homedecor_trashcan_tb.png", + "homedecor_trashcan_tb.png", + "homedecor_trashcan_sides.png", + "homedecor_trashcan_sides.png", + "homedecor_trashcan_sides.png", + "homedecor_trashcan_sides.png" + }, + inventory_image = "homedecor_trashcan_inv.png", + description = "Trash Can", + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + node_box = { + type = "fixed", + fixed = { + {-0.1875, -0.5, -0.1875, 0.1875, -0.4375, 0.1875}, -- NodeBox8 + {-0.125, -0.5, 0.1875, 0.125, -0.375, 0.25}, -- NodeBox9 + {-0.125, -0.5, -0.25, 0.125, -0.375, -0.1875}, -- NodeBox10 + {0.1875, -0.5, -0.125, 0.25, -0.375, 0.125}, -- NodeBox11 + {-0.25, -0.5, -0.125, -0.1875, -0.375, 0.125}, -- NodeBox12 + {-0.1875, -0.4375, 0.125, -0.125, -0.375, 0.1875}, -- NodeBox13 + {0.125, -0.4375, -0.1875, 0.1875, -0.375, -0.125}, -- NodeBox15 + {-0.125, -0.375, 0.1875, -0.0625, 0.125, 0.25}, -- NodeBox17 + {0, -0.375, 0.1875, 0.0625, 0.125, 0.25}, -- NodeBox18 + {0.125, -0.5, 0.125, 0.1875, 0.125, 0.1875}, -- NodeBox19 + {0.1875, -0.375, 0, 0.25, 0.125, 0.0625}, -- NodeBox20 + {0.1875, -0.375, -0.125, 0.25, 0.125, -0.0625}, -- NodeBox21 + {0.0625, -0.375, -0.25, 0.125, 0.125, -0.1875}, -- NodeBox22 + {-0.0625, -0.375, -0.25, 0, 0.125, -0.1875}, -- NodeBox23 + {-0.125, -0.4375, -0.1875, -0.1875, 0.125, -0.125}, -- NodeBox24 + {-0.25, -0.375, -0.0625, -0.1875, 0.125, 0}, -- NodeBox25 + {-0.25, -0.375, 0.0625, -0.1875, 0.125, 0.125}, -- NodeBox26 + {-0.125, -0.3125, -0.25, 0.125, -0.25, -0.1875}, -- NodeBox27 + {0.1875, -0.3125, -0.125, 0.25, -0.25, 0.125}, -- NodeBox28 + {-0.125, -0.3125, 0.1875, 0.125, -0.25, 0.25}, -- NodeBox29 + {-0.25, -0.3125, -0.125, -0.1875, -0.25, 0.125}, -- NodeBox30 + {0.125, -0.3125, -0.1875, 0.1875, -0.25, -0.125}, -- NodeBox31 + {-0.1875, -0.3125, 0.125, -0.125, -0.25, 0.1875}, -- NodeBox33 + {-0.125, -0.1875, -0.25, 0.125, -0.125, -0.1875}, -- NodeBox35 + {0.1875, -0.1875, -0.125, 0.25, -0.125, 0.125}, -- NodeBox36 + {-0.125, -0.1875, 0.1875, 0.125, -0.125, 0.25}, -- NodeBox37 + {-0.25, -0.1875, -0.125, -0.1875, -0.125, 0.125}, -- NodeBox38 + {-0.125, -0.0625, -0.25, 0.125, 0, -0.1875}, -- NodeBox39 + {0.1875, 0.0625, -0.125, 0.25, 0.125, 0.125}, -- NodeBox44 + {-0.125, 0.0625, 0.1875, 0.125, 0.125, 0.25}, -- NodeBox45 + {0.125, -0.1875, -0.1875, 0.1875, -0.125, -0.125}, -- NodeBox44 + {0.125, 0.0625, -0.1875, 0.1875, 0.125, -0.125}, -- NodeBox45 + {-0.1875, -0.1875, 0.125, -0.125, -0.125, 0.1875}, -- NodeBox47 + {-0.1875, -0.0625, 0.125, -0.125, 0, 0.1875}, -- NodeBox48 + {-0.1875, 0.0625, 0.125, -0.125, 0.125, 0.1875}, -- NodeBox49 + {0.125, -0.0625, -0.1875, 0.1875, 0, -0.125}, -- NodeBox51 + {-0.25, 0.0625, -0.125, -0.1875, 0.125, 0.125}, -- NodeBox48 + {-0.25, -0.0625, -0.125, -0.1875, 0, 0.125}, -- NodeBox49 + {-0.125, 0.0625, -0.25, 0.125, 0.125, -0.1875}, -- NodeBox50 + {0.1875, -0.0625, -0.125, 0.25, 0, 0.125}, -- NodeBox51 + {-0.125, -0.0625, 0.1875, 0.125, 0, 0.25}, -- NodeBox52 + } + }, + selection_box = { + type = "fixed", + fixed = { -0.25, -0.5, -0.25, 0.25, 0.125, 0.25 } + } +}) + diff --git a/homedecor/textures/homedecor_radiator_inv.png b/homedecor/textures/homedecor_radiator_inv.png new file mode 100644 index 00000000..2ca084ea Binary files /dev/null and b/homedecor/textures/homedecor_radiator_inv.png differ diff --git a/homedecor/textures/homedecor_telephone_bottom.png b/homedecor/textures/homedecor_telephone_bottom.png new file mode 100644 index 00000000..37f503c9 Binary files /dev/null and b/homedecor/textures/homedecor_telephone_bottom.png differ diff --git a/homedecor/textures/homedecor_telephone_inv.png b/homedecor/textures/homedecor_telephone_inv.png new file mode 100644 index 00000000..bde3b3df Binary files /dev/null and b/homedecor/textures/homedecor_telephone_inv.png differ diff --git a/homedecor/textures/homedecor_telephone_sides.png b/homedecor/textures/homedecor_telephone_sides.png new file mode 100644 index 00000000..37f503c9 Binary files /dev/null and b/homedecor/textures/homedecor_telephone_sides.png differ diff --git a/homedecor/textures/homedecor_telephone_top.png b/homedecor/textures/homedecor_telephone_top.png new file mode 100644 index 00000000..643000c8 Binary files /dev/null and b/homedecor/textures/homedecor_telephone_top.png differ diff --git a/homedecor/textures/homedecor_trashcan_inv.png b/homedecor/textures/homedecor_trashcan_inv.png new file mode 100644 index 00000000..54bdbc97 Binary files /dev/null and b/homedecor/textures/homedecor_trashcan_inv.png differ diff --git a/homedecor/textures/homedecor_trashcan_sides.png b/homedecor/textures/homedecor_trashcan_sides.png new file mode 100644 index 00000000..112b6d6f Binary files /dev/null and b/homedecor/textures/homedecor_trashcan_sides.png differ diff --git a/homedecor/textures/homedecor_trashcan_tb.png b/homedecor/textures/homedecor_trashcan_tb.png new file mode 100644 index 00000000..e4970731 Binary files /dev/null and b/homedecor/textures/homedecor_trashcan_tb.png differ diff --git a/homedecor/textures/homedecor_white_metal.png b/homedecor/textures/homedecor_white_metal.png new file mode 100644 index 00000000..faae38cc Binary files /dev/null and b/homedecor/textures/homedecor_white_metal.png differ