diff --git a/building_blocks/init.lua b/building_blocks/init.lua index ea14a658..e06b8372 100644 --- a/building_blocks/init.lua +++ b/building_blocks/init.lua @@ -151,7 +151,6 @@ minetest.register_node("building_blocks:grate", { sunlight_propagates = true, is_ground_content = true, groups = {cracky=1}, - sounds = default.node_sound_stone_defaults(), }) minetest.register_node("building_blocks:Fireplace", { @@ -212,6 +211,7 @@ minetest.register_node("building_blocks:Tarmac_spread", { sunlight_propagates = true, is_ground_content = true, groups = {cracky=3}, + sounds = default.node_sound_dirt_defaults(), }) minetest.register_node("building_blocks:BWtile", { drawtype = "raillike", @@ -260,6 +260,10 @@ minetest.register_node("building_blocks:gravel_spread", { sunlight_propagates = true, is_ground_content = true, groups = {crumbly=2}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name="default_gravel_footstep", gain=0.5}, + dug = {name="default_gravel_footstep", gain=1.0}, + }), }) minetest.register_node("building_blocks:hardwood", { tiles = {"building_blocks_hardwood.png"}, @@ -593,4 +597,3 @@ if not minetest.get_modpath("technic") then }) end end - diff --git a/chains/init.lua b/chains/init.lua index 102d0d2b..2facad04 100644 --- a/chains/init.lua +++ b/chains/init.lua @@ -1,5 +1,3 @@ -print("[Chains] v1.3") - local chains_sbox = { type = "fixed", fixed = { -0.1, -0.625, -0.1, 0.1, 0.5, 0.1 } diff --git a/computer/init.lua b/computer/init.lua index a0c7a0fe..58b2589c 100644 --- a/computer/init.lua +++ b/computer/init.lua @@ -1,4 +1,3 @@ - computer = { }; computer.register = function ( name, def ) @@ -99,5 +98,3 @@ local MODPATH = minetest.get_modpath("computer"); dofile(MODPATH.."/computers.lua"); dofile(MODPATH.."/miscitems.lua"); dofile(MODPATH.."/recipes.lua"); - - diff --git a/fake_fire/modfiles/abms.lua b/fake_fire/modfiles/abms.lua index 4a7cc6f4..6067e7e3 100644 --- a/fake_fire/modfiles/abms.lua +++ b/fake_fire/modfiles/abms.lua @@ -1,32 +1,26 @@ minetest.register_abm({ nodenames = { - "fake_fire:fake_fire", - "fake_fire:ice_fire", - "fake_fire:chimney_top_stone", - "fake_fire:chimney_top_sandstone" - }, + "fake_fire:fake_fire", + "fake_fire:ice_fire", + "fake_fire:chimney_top_stone", + "fake_fire:chimney_top_sandstone" + }, interval = 1, chance = 2, action = function(pos, node) if minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z}).name == "air" - and minetest.get_node({x=pos.x, y=pos.y+2.0, z=pos.z}).name == "air" then - local image_number = math.random(4) - minetest.add_particlespawner({ - amount = 6, - time = 1, - minpos = {x=pos.x-0.25, y=pos.y+0.4, z=pos.z-0.25}, - maxpos = {x=pos.x+0.25, y=pos.y+8, z=pos.z+0.25}, - minvel = {x=-0.2, y=0.3, z=-0.2}, - maxvel = {x=0.2, y=1, z=0.2}, - minacc = {x=0,y=0,z=0}, - maxacc = {x=0,y=0,z=0}, - minexptime = 0.5, - maxexptime = 3, - minsize = 2, - maxsize = 10, - collisiondetection = false, - texture = "smoke_particle_"..image_number..".png", - }) + and minetest.get_node({x=pos.x, y=pos.y+2.0, z=pos.z}).name == "air" then + local image_number = math.random(4) + minetest.add_particlespawner({ + amount = 6, time = 1, collisiondetection = false, + minpos = {x=pos.x-0.25, y=pos.y+0.4, z=pos.z-0.25}, + maxpos = {x=pos.x+0.25, y=pos.y+8, z=pos.z+0.25}, + minvel = {x=-0.2, y=0.3, z=-0.2}, maxvel = {x=0.2, y=1, z=0.2}, + minacc = {x=0,y=0,z=0}, maxacc = {x=0,y=0,z=0}, + minexptime = 0.5, maxexptime = 3, + minsize = 2, maxsize = 10, + texture = "smoke_particle_"..image_number..".png", + }) end end }) diff --git a/fake_fire/textures/chimney_top_sandstone.xcf b/fake_fire/textures/chimney_top_sandstone.xcf deleted file mode 100644 index 2edfc473..00000000 Binary files a/fake_fire/textures/chimney_top_sandstone.xcf and /dev/null differ diff --git a/fake_fire/textures/chimney_top_stone.xcf b/fake_fire/textures/chimney_top_stone.xcf deleted file mode 100644 index aab3449c..00000000 Binary files a/fake_fire/textures/chimney_top_stone.xcf and /dev/null differ diff --git a/fake_fire/textures/embers_animated.xcf b/fake_fire/textures/embers_animated.xcf deleted file mode 100644 index 23e7da2a..00000000 Binary files a/fake_fire/textures/embers_animated.xcf and /dev/null differ diff --git a/fake_fire/textures/fake_fire_animated_old.png b/fake_fire/textures/fake_fire_animated_old.png deleted file mode 100644 index 328e2855..00000000 Binary files a/fake_fire/textures/fake_fire_animated_old.png and /dev/null differ diff --git a/fake_fire/textures/fake_fire_embers.xcf b/fake_fire/textures/fake_fire_embers.xcf deleted file mode 100644 index e3ca9545..00000000 Binary files a/fake_fire/textures/fake_fire_embers.xcf and /dev/null differ diff --git a/fake_fire/textures/ice_fire.xcf b/fake_fire/textures/ice_fire.xcf deleted file mode 100644 index 62ce3f5e..00000000 Binary files a/fake_fire/textures/ice_fire.xcf and /dev/null differ diff --git a/fake_fire/textures/ice_fire_animated.xcf b/fake_fire/textures/ice_fire_animated.xcf deleted file mode 100644 index b663b8ff..00000000 Binary files a/fake_fire/textures/ice_fire_animated.xcf and /dev/null differ diff --git a/homedecor/bathroom_furniture.lua b/homedecor/bathroom_furniture.lua index dd33d569..4676685b 100644 --- a/homedecor/bathroom_furniture.lua +++ b/homedecor/bathroom_furniture.lua @@ -44,7 +44,7 @@ homedecor.register("towel_rod", { }, inventory_image = "homedecor_towel_rod_inv.png", selection_box = tr_cbox, - collision_box = tr_cbox, + walkable = false, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3}, sounds = default.node_sound_defaults(), }) diff --git a/homedecor/bathroom_sanitation.lua b/homedecor/bathroom_sanitation.lua index 3b634d13..04096084 100644 --- a/homedecor/bathroom_sanitation.lua +++ b/homedecor/bathroom_sanitation.lua @@ -66,7 +66,7 @@ homedecor.register("toilet_paper", { }, inventory_image = "homedecor_toilet_paper_inv.png", selection_box = tp_cbox, - collision_box = tp_cbox, + walkable = false, groups = {snappy=2,oddly_breakable_by_hand=3,flammable=3}, sounds = default.node_sound_defaults(), }) @@ -112,7 +112,7 @@ homedecor.register("taps", { fixed = { -4/16, -7/16, 4/16, 4/16, -4/16, 8/16 }, }, walkable = false, - groups = {cracky=2,}, + groups = {cracky=2}, sounds = default.node_sound_stone_defaults(), }) @@ -127,13 +127,12 @@ homedecor.register("taps_brass", { }, inventory_image = "3dforniture_taps_brass_inv.png", wield_image = "3dforniture_taps_brass_inv.png", - sunlight_propagates = true, selection_box = { type = "fixed", fixed = { -4/16, -7/16, 4/16, 4/16, -4/16, 8/16 }, }, walkable = false, - groups = {cracky=2,}, + groups = {cracky=2}, sounds = default.node_sound_stone_defaults(), }) @@ -145,8 +144,6 @@ homedecor.register("shower_tray", { "forniture_marble_base_ducha_top.png", "forniture_marble.png" }, - sunlight_propagates = true, - legacy_facedir_simple = true, node_box = { type = "fixed", fixed = { @@ -209,7 +206,7 @@ homedecor.register("shower_head", { description = "Shower Head", groups = {snappy=3}, selection_box = sh_cbox, - collision_box = sh_cbox, + walkable = false, on_rightclick = function (pos, node, clicker) local below = minetest.get_node({x=pos.x, y=pos.y-2.0, z=pos.z}) local is_tray = string.find(below.name, "homedecor:shower_tray") @@ -296,7 +293,8 @@ homedecor.register("bathroom_set", { description = "Bathroom sundries set", groups = {snappy=3}, selection_box = bs_cbox, - collision_box = bs_cbox, + walkable = false, + sounds = default.node_sound_glass_defaults(), }) minetest.register_alias("3dforniture:toilet", "homedecor:toilet") diff --git a/homedecor/beds.lua b/homedecor/beds.lua new file mode 100644 index 00000000..2f1ca9de --- /dev/null +++ b/homedecor/beds.lua @@ -0,0 +1,139 @@ +local S = homedecor.gettext + +local bedcolors = { + "red", + "green", + "blue", + "violet", + "brown", + "darkgrey", + "orange", + "yellow", + "pink", +} + +local bed_sbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 1.5 } +} + +local bed_cbox = { + type = "fixed", + fixed = { + { -0.5, -0.5, -0.5, 0.5, -0.05, 1.5 }, + { -0.5, -0.5, 1.44, 0.5, 0.5, 1.5 }, + { -0.5, -0.5, -0.5, 0.5, 0.18, -0.44 }, + } +} + +local kbed_sbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.5, 1.5, 0.5, 1.5 } +} + +local kbed_cbox = { + type = "fixed", + fixed = { + { -0.5, -0.5, -0.5, 1.5, -0.05, 1.5 }, + { -0.5, -0.5, 1.44, 1.5, 0.5, 1.5 }, + { -0.5, -0.5, -0.5, 1.5, 0.18, -0.44 }, + } +} + +for _, color in ipairs(bedcolors) do + local color2=color + if color == "darkgrey" then + color2 = "dark_grey" + end + homedecor.register("bed_"..color.."_regular", { + mesh = "homedecor_bed_regular.obj", + tiles = { + "homedecor_bed_frame.png", + "default_wood.png", + "wool_white.png", + "wool_"..color2..".png", + "homedecor_bed_bottom.png", + "wool_"..color2..".png^[brighten", -- pillow + }, + inventory_image = "homedecor_bed_"..color.."_inv.png", + description = S("Bed (%s)"):format(color), + groups = {snappy=3}, + selection_box = bed_sbox, + collision_box = bed_cbox, + sounds = default.node_sound_wood_defaults(), + after_place_node = function(pos, placer, itemstack, pointed_thing) + if not placer:get_player_control().sneak then + return homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, color) + end + end, + after_dig_node = function(pos) + homedecor.unextend_bed(pos, color) + end, + on_rightclick = function(pos, node, clicker) + if minetest.get_modpath("beds") then + beds.on_rightclick(pos, clicker) + else return end + end + }) + + homedecor.register("bed_"..color.."_extended", { + mesh = "homedecor_bed_extended.obj", + tiles = { + "homedecor_bed_frame.png", + "default_wood.png", + "wool_white.png", + "wool_"..color2..".png", + "homedecor_bed_bottom.png", + "wool_"..color2..".png^[brighten", + }, + groups = {snappy=3, not_in_creative_inventory=1}, + selection_box = bed_sbox, + collision_box = bed_cbox, + sounds = default.node_sound_wood_defaults(), + expand = { forward = "air" }, + after_dig_node = function(pos) + homedecor.unextend_bed(pos, color) + end, + on_rightclick = function(pos, node, clicker) + if minetest.get_modpath("beds") then + beds.on_rightclick(pos, clicker) + else return end + end, + drop = "homedecor:bed_"..color.."_regular" + }) + + homedecor.register("bed_"..color.."_kingsize", { + mesh = "homedecor_bed_kingsize.obj", + tiles = { + "homedecor_bed_frame.png", + "default_wood.png", + "wool_white.png", + "wool_"..color2..".png", + "homedecor_bed_bottom.png", + "wool_"..color2..".png^[brighten", + }, + inventory_image = "homedecor_bed_kingsize_"..color.."_inv.png", + description = S("Bed (%s, king sized)"):format(color), + groups = {snappy=3, not_in_creative_inventory=1}, + selection_box = kbed_sbox, + collision_box = kbed_cbox, + sounds = default.node_sound_wood_defaults(), + after_dig_node = function(pos, oldnode, oldmetadata, digger) + local inv = digger:get_inventory() + if digger:get_player_control().sneak and inv:room_for_item("main", "bed_"..color.."_regular 1") then + inv:remove_item("main", "homedecor:bed_"..color.."_kingsize 1") + inv:add_item("main", "homedecor:bed_"..color.."_regular 2") + end + end, + on_rightclick = function(pos, node, clicker) + if minetest.get_modpath("beds") then + beds.on_rightclick(pos, clicker) + else return end + end + }) + + minetest.register_alias("homedecor:bed_"..color.."_foot", "homedecor:bed_"..color.."_regular") + minetest.register_alias("homedecor:bed_"..color.."_footext", "homedecor:bed_"..color.."_extended") + minetest.register_alias("homedecor:bed_"..color.."_head", "air") + +end diff --git a/homedecor/books.lua b/homedecor/books.lua index 48e90a06..6b52d27e 100644 --- a/homedecor/books.lua +++ b/homedecor/books.lua @@ -36,6 +36,7 @@ homedecor.register("book_"..color, { inventory_image = "homedecor_book_"..color.."_inv.png", wield_image = "homedecor_book_"..color.."_inv.png", groups = { snappy=3, oddly_breakable_by_hand=3, book=1 }, + walkable = false, stack_max = 1, on_rightclick = function(pos, node, clicker) local fdir = node.param2 @@ -99,11 +100,7 @@ homedecor.register("book_"..color, { selection_box = { type = "fixed", fixed = {-0.2, -0.5, -0.25, 0.2, -0.35, 0.25} - }, - collision_box = { - type = "fixed", - fixed = {-0.15, -0.5, -0.25, 0.15, -0.35, 0.25} - }, + } }) homedecor.register("book_open_"..color, { @@ -111,6 +108,7 @@ homedecor.register("book_open_"..color, { tiles = { "homedecor_book_open_"..color..".png" }, groups = { snappy=3, oddly_breakable_by_hand=3, not_in_creative_inventory=1 }, drop = "homedecor:book_"..color, + walkable = false, on_dig = book_dig, on_rightclick = function(pos, node, clicker) local fdir = node.param2 @@ -124,11 +122,7 @@ homedecor.register("book_open_"..color, { selection_box = { type = "fixed", fixed = {-0.35, -0.5, -0.25, 0.35, -0.4, 0.25} - }, - collision_box = { - type = "fixed", - fixed = {-0.35, -0.5, -0.25, 0.35, -0.4, 0.25} - }, + } }) end diff --git a/homedecor/climate-control.lua b/homedecor/climate-control.lua index 6f480052..111960a4 100644 --- a/homedecor/climate-control.lua +++ b/homedecor/climate-control.lua @@ -34,7 +34,6 @@ minetest.register_entity("homedecor:mesh_desk_fan", { homedecor.register("desk_fan", { description = "Desk Fan", - legacy_facedir_simple = true, groups = {oddly_breakable_by_hand=2}, node_box = { type = "fixed", @@ -123,7 +122,7 @@ homedecor.register("ceiling_fan", { }, groups = { snappy = 3 }, light_source = LIGHT_MAX-1, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_glass_defaults(), }) -- heating devices @@ -138,9 +137,9 @@ homedecor.register("space_heater", { 'homedecor_heater_front.png' }, inventory_image = "homedecor_heater_inv.png", - sunlight_propagates = true, + walkable = false, groups = { snappy = 3 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_wood_defaults(), node_box = { type = "fixed", fixed = { @@ -169,5 +168,5 @@ homedecor.register("radiator", { groups = {snappy=3}, selection_box = r_cbox, collision_box = r_cbox, + sounds = default.node_sound_wood_defaults(), }) - diff --git a/homedecor/clocks.lua b/homedecor/clocks.lua index 59406370..b8cfd26e 100644 --- a/homedecor/clocks.lua +++ b/homedecor/clocks.lua @@ -1,14 +1,3 @@ -local clock_cbox = { - type = "fixed", - fixed = { - { -8/32, -3/32, 14/32, 8/32, 3/32, 16/32 }, - { -7/32, -5/32, 14/32, 7/32, 5/32, 16/32 }, - { -6/32, -6/32, 14/32, 6/32, 6/32, 16/32 }, - { -5/32, -7/32, 14/32, 5/32, 7/32, 16/32 }, - { -3/32, -8/32, 14/32, 3/32, 8/32, 16/32 } - } -} - local clock_sbox = { type = "fixed", fixed = { -8/32, -8/32, 14/32, 8/32, 8/32, 16/32 } @@ -31,9 +20,10 @@ for i in ipairs(clock_materials) do "homedecor_analog_clock_back.png" }, inventory_image = "homedecor_analog_clock_"..m1.."_inv.png", - collision_box = clock_cbox, + walkable = false, selection_box = clock_sbox, groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), }) end @@ -54,6 +44,8 @@ homedecor.register("digital_clock", { {-0.28125, -0.25, 0.4375, 0.3125, 0.25, 0.5}, } }, + walkable = false, + sounds = default.node_sound_wood_defaults(), groups = {snappy=3}, }) @@ -74,6 +66,8 @@ homedecor.register("alarm_clock", { { -9/32, -16/32, 7/32, 10/32, -5/32, 16/32 }, } }, + walkable = false, + sounds = default.node_sound_wood_defaults(), groups = {snappy=3}, }) @@ -102,5 +96,3 @@ homedecor.register("grandfather_clock", { minetest.register_alias("homedecor:grandfather_clock_bottom", "homedecor:grandfather_clock") minetest.register_alias("homedecor:grandfather_clock_top", "air") - - diff --git a/homedecor/doors_and_gates.lua b/homedecor/doors_and_gates.lua index c7102b3e..eb9083cf 100644 --- a/homedecor/doors_and_gates.lua +++ b/homedecor/doors_and_gates.lua @@ -505,6 +505,7 @@ minetest.register_node("homedecor:japanese_wall_top", { groups = {snappy=3}, selection_box = jp_cbox, collision_box = jp_cbox, + sounds = default.node_sound_wood_defaults(), }) minetest.register_node("homedecor:japanese_wall_middle", { @@ -520,6 +521,7 @@ minetest.register_node("homedecor:japanese_wall_middle", { groups = {snappy=3}, selection_box = jp_cbox, collision_box = jp_cbox, + sounds = default.node_sound_wood_defaults(), }) minetest.register_node("homedecor:japanese_wall_bottom", { @@ -535,6 +537,7 @@ minetest.register_node("homedecor:japanese_wall_bottom", { groups = {snappy=3}, selection_box = jp_cbox, collision_box = jp_cbox, + sounds = default.node_sound_wood_defaults(), }) minetest.register_node("homedecor:tatami_mat", { @@ -549,7 +552,7 @@ minetest.register_node("homedecor:tatami_mat", { description = "Japanese tatami", drawtype = "nodebox", paramtype = "light", - groups = {snappy=3}, + groups = {snappy=3}, node_box = { type = "fixed", fixed = { @@ -567,6 +570,7 @@ homedecor.register("door_japanese_closed", { }, mesh = "homedecor_door_japanese_closed.obj", groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), selection_box = { type = "fixed", fixed = {-0.5, -0.5, 0, 0.5, 1.5, 0.0625}, @@ -591,6 +595,7 @@ minetest.register_node("homedecor:door_japanese_open", { paramtype = "light", paramtype2 = "facedir", groups = { snappy = 3, not_in_creative_inventory = 1 }, + sounds = default.node_sound_wood_defaults(), selection_box = { type = "fixed", fixed = {-1.5, -0.5, -0.0625, 0.5, 1.5, 0}, @@ -610,4 +615,3 @@ minetest.register_alias("homedecor:jpn_door_bottom", "homedecor:door_japanese_cl minetest.register_alias("homedecor:jpn_door_top_open", "air") minetest.register_alias("homedecor:jpn_door_bottom_open", "homedecor:door_japanese_open") - diff --git a/homedecor/electronics.lua b/homedecor/electronics.lua index d98ed53e..d7b35b47 100644 --- a/homedecor/electronics.lua +++ b/homedecor/electronics.lua @@ -10,7 +10,7 @@ homedecor.register("speaker", { "homedecor_speaker_front.png" }, groups = { snappy = 3 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_wood_defaults(), on_punch = function(pos, node, puncher, pointed_thing) minetest.set_node(pos, {name = "homedecor:speaker_open", param2 = node.param2}) end @@ -26,7 +26,7 @@ homedecor.register("speaker_open", { "homedecor_generic_metal_black.png" }, groups = { snappy = 3 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_wood_defaults(), on_punch = function(pos, node, puncher, pointed_thing) minetest.set_node(pos, {name = "homedecor:speaker", param2 = node.param2}) end @@ -45,9 +45,9 @@ homedecor.register("speaker_small", { "homedecor_speaker_front.png" }, selection_box = spk_cbox, - collision_box = spk_cbox, + walkable = false, groups = { snappy = 3 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_wood_defaults(), }) homedecor.register("stereo", { @@ -59,7 +59,7 @@ homedecor.register("stereo", { 'homedecor_stereo_back.png', 'homedecor_stereo_front.png'}, groups = { snappy = 3 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_wood_defaults(), }) homedecor.register("projection_screen", { @@ -138,7 +138,8 @@ homedecor.register("telephone", { description = "Telephone", groups = {snappy=3}, selection_box = tel_cbox, - collision_box = tel_cbox, + walkable = false, + sounds = default.node_sound_wood_defaults(), }) minetest.register_abm({ diff --git a/homedecor/exterior.lua b/homedecor/exterior.lua index 4d7e6040..0b08b853 100644 --- a/homedecor/exterior.lua +++ b/homedecor/exterior.lua @@ -1,5 +1,4 @@ local S = homedecor.gettext -dofile(homedecor.modpath.."/furniture.lua") local bbq_cbox = { type = "fixed", @@ -25,6 +24,7 @@ homedecor.register("barbecue", { light_source = 9, selection_box = bbq_cbox, collision_box = bbq_cbox, + sounds = default.node_sound_stone_defaults(), expand = { top="air" }, }) @@ -67,12 +67,7 @@ homedecor.register("bench_large_2", { selection_box = bl2_cbox, collision_box = bl2_cbox, expand = { right="air" }, - --[[ - on_rightclick = function(pos, node, clicker) - pos.y = pos.y-0 -- player's sit position. - homedecor.sit_exec(pos, node, clicker) - end, - --]] + sounds = default.node_sound_wood_defaults(), }) minetest.register_alias("homedecor:bench_large_2_left", "homedecor:bench_large_2") @@ -121,6 +116,7 @@ homedecor.register("doghouse", { collision_box = homedecor.nodebox.slab_y(1.5), groups = {snappy=3}, expand = { top="air" }, + sounds = default.node_sound_wood_defaults(), }) minetest.register_alias("homedecor:doghouse_roof", "air") @@ -138,12 +134,7 @@ homedecor.register("simple_bench", { { 0.3, -0.5, 0.1, 0.4, -0.15, 0.3}, } }, - --[[ - on_rightclick = function(pos, node, clicker) - pos.y = pos.y-0 -- player's sit position. - homedecor.sit_exec(pos, node, clicker) - end, - --]] + sounds = default.node_sound_wood_defaults(), }) homedecor.register("stonepath", { @@ -169,7 +160,8 @@ homedecor.register("stonepath", { selection_box = { type = "fixed", fixed = { -0.4375, -0.5, -0.4375, 0.4375, -0.4, 0.4375 } - } + }, + sounds = default.node_sound_stone_defaults(), }) homedecor.register("swing", { @@ -181,6 +173,8 @@ homedecor.register("swing", { }, inventory_image = "homedecor_swing_inv.png", groups = { snappy=3, oddly_breakable_by_hand=3 }, + sounds = default.node_sound_wood_defaults(), + walkable = false, node_box = { type = "fixed", fixed = { @@ -249,6 +243,7 @@ homedecor.register("swing_rope", { "homedecor_swingrope_sides.png" }, groups = { not_in_creative_inventory=1 }, + walkable = false, node_box = { type = "fixed", fixed = { @@ -275,8 +270,8 @@ homedecor.register("well", { selection_box = homedecor.nodebox.slab_y(2), collision_box = homedecor.nodebox.slab_y(2), expand = { top="air" }, + sounds = default.node_sound_stone_defaults(), }) minetest.register_alias("homedecor:well_top", "air") minetest.register_alias("homedecor:well_base", "homedecor:well") - diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua index 0a07cbac..fe06ba67 100644 --- a/homedecor/furniture.lua +++ b/homedecor/furniture.lua @@ -1,5 +1,209 @@ local S = homedecor.gettext +local table_colors = { "", "mahogany", "white" } + +for _, i in ipairs(table_colors) do + local color = "_"..i + local color2 = "_"..i + local desc = S("Table ("..i..")") + + if i == "" then + color = "" + color2 = "_beech" + desc = S("Table") + end + + homedecor.register("table"..color, { + description = desc, + tiles = { "homedecor_generic_wood"..color2..".png" }, + node_box = { + type = "fixed", + fixed = { + { -0.4, -0.5, -0.4, -0.3, 0.4, -0.3 }, + { 0.3, -0.5, -0.4, 0.4, 0.4, -0.3 }, + { -0.4, -0.5, 0.3, -0.3, 0.4, 0.4 }, + { 0.3, -0.5, 0.3, 0.4, 0.4, 0.4 }, + { -0.5, 0.4, -0.5, 0.5, 0.5, 0.5 }, + { -0.4, -0.2, -0.3, -0.3, -0.1, 0.3 }, + { 0.3, -0.2, -0.4, 0.4, -0.1, 0.3 }, + { -0.3, -0.2, -0.4, 0.4, -0.1, -0.3 }, + { -0.3, -0.2, 0.3, 0.3, -0.1, 0.4 }, + }, + }, + groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, + sounds = default.node_sound_wood_defaults(), + }) +end + +local chaircolors = { + { "", "plain" }, + { "black", "Black" }, + { "red", "Red" }, + { "pink", "Pink" }, + { "violet", "Violet" }, + { "blue", "Blue" }, + { "dark_green", "Dark Green" }, +} + +local kc_cbox = { + type = "fixed", + fixed = { -0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125 }, +} + +for i in ipairs(chaircolors) do + + local color = "_"..chaircolors[i][1] + local color2 = chaircolors[i][1] + local name = S(chaircolors[i][2]) + local chairtiles = { + "homedecor_generic_wood_beech.png", + "wool"..color..".png", + } + + if chaircolors[i][1] == "" then + color = "" + chairtiles = { + "homedecor_generic_wood_beech.png", + "homedecor_generic_wood_beech.png" + } + end + + homedecor.register("chair"..color, { + description = S("Kitchen chair (%s)"):format(name), + mesh = "homedecor_kitchen_chair.obj", + tiles = chairtiles, + selection_box = kc_cbox, + collision_box = kc_cbox, + groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, + sounds = default.node_sound_wood_defaults(), + --[[ + on_rightclick = function(pos, node, clicker) + pos.y = pos.y-0 -- player's sit position. + homedecor.sit_exec(pos, node, clicker) + end, + --]] + }) + + if color ~= "" then + homedecor.register("armchair"..color, { + description = S("Armchair (%s)"):format(name), + mesh = "forniture_armchair.obj", + tiles = { + "wool"..color..".png", + "wool_dark_grey.png", + "default_wood.png" + }, + groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, + sounds = default.node_sound_wood_defaults(), + }) + + minetest.register_craft({ + output = "homedecor:armchair"..color.." 2", + recipe = { + { "wool:"..color2,""}, + { "group:wood","group:wood" }, + { "wool:"..color2,"wool:"..color2 }, + }, + }) + end +end + +local ob_cbox = { + type = "fixed", + fixed = { -0.5, -0.5, 0, 0.5, 0.5, 0.5 } +} + +minetest.register_node(":homedecor:openframe_bookshelf", { + description = "Bookshelf (open-frame)", + drawtype = "mesh", + mesh = "homedecor_openframe_bookshelf.obj", + tiles = { + "homedecor_openframe_bookshelf_books.png", + "default_wood.png" + }, + groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3}, + sounds = default.node_sound_wood_defaults(), + selection_box = ob_cbox, + collision_box = ob_cbox, +}) + +local wd_cbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 } +} + +homedecor.register("wardrobe_bottom", { + mesh = "homedecor_bedroom_wardrobe.obj", + tiles = { + "homedecor_generic_wood_beech.png", + "homedecor_wardrobe_drawers.png", + "homedecor_wardrobe_doors.png" + }, + inventory_image = "homedecor_wardrobe_inv.png", + description = "Wardrobe", + groups = {snappy=3}, + selection_box = wd_cbox, + collision_box = wd_cbox, + sounds = default.node_sound_wood_defaults(), + expand = { top="air" }, + infotext = S("Wardrobe cabinet"), + inventory = { + size=24, + }, +}) + +minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe") +minetest.register_alias("homedecor:wardrobe_top", "air") + +homedecor.register("wall_shelf", { + description = "Wall Shelf", + tiles = { + "homedecor_wood_table_large_edges.png", + }, + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), + node_box = { + type = "fixed", + fixed = { + {-0.5, 0.4, 0.47, 0.5, 0.47, 0.5}, + {-0.5, 0.47, -0.1875, 0.5, 0.5, 0.5} + } + } +}) + +local ofchairs_sbox = { + type = "fixed", + fixed = { -8/16, -8/16, -8/16, 8/16, 29/32, 8/16 } + } + +local ofchairs_cbox = { + type = "fixed", + fixed = { + { -5/16, 1/16, -7/16, 5/16, 4/16, 7/16 }, -- seat + { -5/16, 4/16, 4/16, 5/16, 29/32, 15/32 }, -- seatback + { -1/16, -11/32, -1/16, 1/16, 1/16, 1/16 }, -- cylinder + { -8/16, -8/16, -8/16, 8/16, -11/32, 8/16 } -- legs/wheels + } + } + +local ofchairs = {"basic", "upscale"} + +for _, c in ipairs(ofchairs) do + +homedecor.register("office_chair_"..c, { + description = "Office chair ("..c..")", + drawtype = "mesh", + tiles = { "homedecor_office_chair_"..c..".png" }, + mesh = "homedecor_office_chair_"..c..".obj", + groups = { snappy = 3 }, + sounds = default.node_sound_wood_defaults(), + selection_box = ofchairs_sbox, + collision_box = ofchairs_cbox, + expand = { top = "air" }, +}) + +end + -- Sitting functions disabled for now because of buggyness. --[[ @@ -44,357 +248,6 @@ function homedecor.sit_exec(pos, node, clicker) -- don't move these functions in end --]] -local table_colors = { "", "mahogany", "white" } - -for _, i in ipairs(table_colors) do - local color = "_"..i - local color2 = "_"..i - local desc = S("Table ("..i..")") - - if i == "" then - color = "" - color2 = "_beech" - desc = S("Table") - end - - homedecor.register("table"..color, { - description = desc, - tiles = { "homedecor_generic_wood"..color2..".png" }, - node_box = { - type = "fixed", - fixed = { - { -0.4, -0.5, -0.4, -0.3, 0.4, -0.3 }, - { 0.3, -0.5, -0.4, 0.4, 0.4, -0.3 }, - { -0.4, -0.5, 0.3, -0.3, 0.4, 0.4 }, - { 0.3, -0.5, 0.3, 0.4, 0.4, 0.4 }, - { -0.5, 0.4, -0.5, 0.5, 0.5, 0.5 }, - { -0.4, -0.2, -0.3, -0.3, -0.1, 0.3 }, - { 0.3, -0.2, -0.4, 0.4, -0.1, 0.3 }, - { -0.3, -0.2, -0.4, 0.4, -0.1, -0.3 }, - { -0.3, -0.2, 0.3, 0.3, -0.1, 0.4 }, - }, - }, - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, - }) -end - -local chaircolors = { - { "", "plain" }, - { "black", "Black" }, - { "red", "Red" }, - { "pink", "Pink" }, - { "violet", "Violet" }, - { "blue", "Blue" }, - { "dark_green", "Dark Green" }, -} - -local kc_cbox = { - type = "fixed", - fixed = { -0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125 }, -} - -for i in ipairs(chaircolors) do - - local color = "_"..chaircolors[i][1] - local color2 = chaircolors[i][1] - local name = S(chaircolors[i][2]) - local chairtiles = { - "homedecor_generic_wood_beech.png", - "wool"..color..".png", - } - - if chaircolors[i][1] == "" then - color = "" - chairtiles = { - "homedecor_generic_wood_beech.png", - "homedecor_generic_wood_beech.png" - } - end - - homedecor.register("chair"..color, { - description = S("Kitchen chair (%s)"):format(name), - mesh = "homedecor_kitchen_chair.obj", - tiles = chairtiles, - selection_box = kc_cbox, - collision_box = kc_cbox, - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, - --[[ - on_rightclick = function(pos, node, clicker) - pos.y = pos.y-0 -- player's sit position. - homedecor.sit_exec(pos, node, clicker) - end, - --]] - }) - - if color ~= "" then - homedecor.register("armchair"..color, { - description = S("Armchair (%s)"):format(name), - mesh = "forniture_armchair.obj", - tiles = { - "wool"..color..".png", - "wool_dark_grey.png", - "default_wood.png" - }, - sunlight_propagates = true, - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, - --[[ - on_rightclick = function(pos, node, clicker) - pos.y = pos.y-0.1 -- player's sit position. - homedecor.sit_exec(pos, node, clicker) - clicker:set_hp(20) - end, - --]] - }) - - minetest.register_craft({ - output = "homedecor:armchair"..color.." 2", - recipe = { - { "wool:"..color2,""}, - { "group:wood","group:wood" }, - { "wool:"..color2,"wool:"..color2 }, - }, - }) - end -end - -local ob_cbox = { - type = "fixed", - fixed = { -0.5, -0.5, 0, 0.5, 0.5, 0.5 } -} - -minetest.register_node(":homedecor:openframe_bookshelf", { - description = "Bookshelf (open-frame)", - drawtype = "mesh", - mesh = "homedecor_openframe_bookshelf.obj", - tiles = { - "homedecor_openframe_bookshelf_books.png", - "default_wood.png" - }, - paramtype = "light", - paramtype2 = "facedir", - is_ground_content = false, - groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3}, - sounds = default.node_sound_wood_defaults(), - selection_box = ob_cbox, - collision_box = ob_cbox, -}) - -local bedcolors = { - "red", - "green", - "blue", - "violet", - "brown", - "darkgrey", - "orange", - "yellow", - "pink", -} - -local bed_sbox = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 1.5 } -} - -local bed_cbox = { - type = "fixed", - fixed = { - { -0.5, -0.5, -0.5, 0.5, -0.05, 1.5 }, - { -0.5, -0.5, 1.44, 0.5, 0.5, 1.5 }, - { -0.5, -0.5, -0.5, 0.5, 0.18, -0.44 }, - } -} - -local kbed_sbox = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 1.5, 0.5, 1.5 } -} - -local kbed_cbox = { - type = "fixed", - fixed = { - { -0.5, -0.5, -0.5, 1.5, -0.05, 1.5 }, - { -0.5, -0.5, 1.44, 1.5, 0.5, 1.5 }, - { -0.5, -0.5, -0.5, 1.5, 0.18, -0.44 }, - } -} - -for _, color in ipairs(bedcolors) do - local color2=color - if color == "darkgrey" then - color2 = "dark_grey" - end - homedecor.register("bed_"..color.."_regular", { - mesh = "homedecor_bed_regular.obj", - tiles = { - "homedecor_bed_frame.png", - "default_wood.png", - "wool_white.png", - "wool_"..color2..".png", - "homedecor_bed_bottom.png", - "wool_"..color2..".png^[brighten", -- pillow - }, - inventory_image = "homedecor_bed_"..color.."_inv.png", - description = S("Bed (%s)"):format(color), - groups = {snappy=3}, - selection_box = bed_sbox, - collision_box = bed_cbox, - after_place_node = function(pos, placer, itemstack, pointed_thing) - if not placer:get_player_control().sneak then - return homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, color) - end - end, - after_dig_node = function(pos) - homedecor.unextend_bed(pos, color) - end, - on_rightclick = function(pos, node, clicker) - if minetest.get_modpath("beds") then - beds.on_rightclick(pos, clicker) - else return end - end - }) - - homedecor.register("bed_"..color.."_extended", { - mesh = "homedecor_bed_extended.obj", - tiles = { - "homedecor_bed_frame.png", - "default_wood.png", - "wool_white.png", - "wool_"..color2..".png", - "homedecor_bed_bottom.png", - "wool_"..color2..".png^[brighten", - }, - groups = {snappy=3, not_in_creative_inventory=1}, - selection_box = bed_sbox, - collision_box = bed_cbox, - expand = { forward = "air" }, - after_dig_node = function(pos) - homedecor.unextend_bed(pos, color) - end, - on_rightclick = function(pos, node, clicker) - if minetest.get_modpath("beds") then - beds.on_rightclick(pos, clicker) - else return end - end, - drop = "homedecor:bed_"..color.."_regular" - }) - - homedecor.register("bed_"..color.."_kingsize", { - mesh = "homedecor_bed_kingsize.obj", - tiles = { - "homedecor_bed_frame.png", - "default_wood.png", - "wool_white.png", - "wool_"..color2..".png", - "homedecor_bed_bottom.png", - "wool_"..color2..".png^[brighten", - }, - inventory_image = "homedecor_bed_kingsize_"..color.."_inv.png", - description = S("Bed (%s, king sized)"):format(color), - groups = {snappy=3, not_in_creative_inventory=1}, - selection_box = kbed_sbox, - collision_box = kbed_cbox, - after_dig_node = function(pos, oldnode, oldmetadata, digger) - local inv = digger:get_inventory() - if digger:get_player_control().sneak and inv:room_for_item("main", "bed_"..color.."_regular 1") then - inv:remove_item("main", "homedecor:bed_"..color.."_kingsize 1") - inv:add_item("main", "homedecor:bed_"..color.."_regular 2") - end - end, - on_rightclick = function(pos, node, clicker) - if minetest.get_modpath("beds") then - beds.on_rightclick(pos, clicker) - else return end - end - }) - - minetest.register_alias("homedecor:bed_"..color.."_foot", "homedecor:bed_"..color.."_regular") - minetest.register_alias("homedecor:bed_"..color.."_footext", "homedecor:bed_"..color.."_extended") - minetest.register_alias("homedecor:bed_"..color.."_head", "air") - -end - -local wd_cbox = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 } -} - -homedecor.register("wardrobe_bottom", { - mesh = "homedecor_bedroom_wardrobe.obj", - tiles = { - "homedecor_generic_wood_beech.png", - "homedecor_wardrobe_drawers.png", - "homedecor_wardrobe_doors.png" - }, - inventory_image = "homedecor_wardrobe_inv.png", - description = "Wardrobe", - groups = {snappy=3}, - selection_box = wd_cbox, - collision_box = wd_cbox, - expand = { top="air" }, - infotext = S("Wardrobe cabinet"), - inventory = { - size=24, - }, -}) - -minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe") -minetest.register_alias("homedecor:wardrobe_top", "air") - -homedecor.register("wall_shelf", { - description = "Wall Shelf", - tiles = { - "homedecor_wood_table_large_edges.png", - }, - groups = { snappy = 3 }, - node_box = { - type = "fixed", - fixed = { - {-0.5, 0.4, 0.47, 0.5, 0.47, 0.5}, - {-0.5, 0.47, -0.1875, 0.5, 0.5, 0.5} - } - } -}) - -local ofchairs_sbox = { - type = "fixed", - fixed = { -8/16, -8/16, -8/16, 8/16, 29/32, 8/16 } - } - -local ofchairs_cbox = { - type = "fixed", - fixed = { - { -5/16, 1/16, -7/16, 5/16, 4/16, 7/16 }, -- seat - { -5/16, 4/16, 4/16, 5/16, 29/32, 15/32 }, -- seatback - { -1/16, -11/32, -1/16, 1/16, 1/16, 1/16 }, -- cylinder - { -8/16, -8/16, -8/16, 8/16, -11/32, 8/16 } -- legs/wheels - } - } - -local ofchairs = {"basic", "upscale"} - -for _, c in ipairs(ofchairs) do - -homedecor.register("office_chair_"..c, { - description = "Office chair ("..c..")", - drawtype = "mesh", - tiles = { "homedecor_office_chair_"..c..".png" }, - mesh = "homedecor_office_chair_"..c..".obj", - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), - selection_box = ofchairs_sbox, - collision_box = ofchairs_cbox, - expand = { top = "air" }, - --[[ - on_rightclick = function(pos, node, clicker) - pos.y = pos.y+0.14 -- player's sit position. - homedecor.sit_exec(pos, node, clicker) - end, - --]] -}) - -end - -- Aliases for 3dforniture mod. minetest.register_alias("3dforniture:table", "homedecor:table") diff --git a/homedecor/furniture_medieval.lua b/homedecor/furniture_medieval.lua index a080baa2..e7c1b8af 100644 --- a/homedecor/furniture_medieval.lua +++ b/homedecor/furniture_medieval.lua @@ -4,7 +4,6 @@ local S = homedecor.gettext homedecor.register("bars", { description = S("Bars"), tiles = { "homedecor_generic_metal_black.png" }, - sunlight_propagates = true, node_box = { type = "fixed", fixed = { @@ -19,14 +18,14 @@ homedecor.register("bars", { type = "fixed", fixed = { -0.5, -0.5, -0.1, 0.5, 0.5, 0.1 }, }, - groups = {cracky=1}, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), }) --L Binding Bars homedecor.register("L_binding_bars", { description = S("Binding Bars"), tiles = { "homedecor_generic_metal_black.png" }, - sunlight_propagates = true, node_box = { type = "fixed", fixed = { @@ -39,7 +38,8 @@ homedecor.register("L_binding_bars", { { -0.05, 0.45, -0.50, 0.05, 0.50, 0.00 }, }, }, - groups = {cracky=1,} + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), }) local chain_cbox = { @@ -52,10 +52,10 @@ homedecor.register("chains", { mesh = "forniture_chains.obj", tiles = { "homedecor_generic_metal_black.png" }, inventory_image="forniture_chains_inv.png", - sunlight_propagates = true, selection_box = chain_cbox, - collision_box = chain_cbox, - groups = {cracky=1}, + walkable = false, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), }) homedecor.register("torch_wall", { @@ -76,14 +76,13 @@ homedecor.register("torch_wall", { "forniture_coal.png", }, inventory_image="forniture_torch_inv.png", - sunlight_propagates = true, walkable = false, light_source = 14, selection_box = { type = "fixed", fixed = { -0.15, -0.45, 0.15, 0.15,0.35, 0.5 }, }, - groups = {cracky=2}, + groups = {cracky=3}, }) local wl_cbox = { @@ -99,7 +98,7 @@ homedecor.register("wall_lamp", { groups = {snappy=3}, light_source = 11, selection_box = wl_cbox, - collision_box = wl_cbox + walkable = false }) minetest.register_alias("3dforniture:bars", "homedecor:bars") diff --git a/homedecor/init.lua b/homedecor/init.lua index 8ed64496..091ff5f4 100644 --- a/homedecor/init.lua +++ b/homedecor/init.lua @@ -135,7 +135,6 @@ dofile(homedecor.modpath.."/nightstands.lua") dofile(homedecor.modpath.."/clocks.lua") dofile(homedecor.modpath.."/misc-electrical.lua") -dofile(homedecor.modpath.."/paintings.lua") dofile(homedecor.modpath.."/window_treatments.lua") dofile(homedecor.modpath.."/furniture.lua") @@ -144,6 +143,7 @@ dofile(homedecor.modpath.."/furniture_recipes.lua") dofile(homedecor.modpath.."/climate-control.lua") dofile(homedecor.modpath.."/cobweb.lua") +dofile(homedecor.modpath.."/beds.lua") dofile(homedecor.modpath.."/books.lua") dofile(homedecor.modpath.."/exterior.lua") dofile(homedecor.modpath.."/trash_cans.lua") diff --git a/homedecor/kitchen_appliances.lua b/homedecor/kitchen_appliances.lua index 18242d97..f9bbcc4e 100644 --- a/homedecor/kitchen_appliances.lua +++ b/homedecor/kitchen_appliances.lua @@ -3,13 +3,13 @@ local S = homedecor.gettext -- steel-textured fridge - homedecor.register("refrigerator_steel", { mesh = "homedecor_refrigerator.obj", tiles = { "homedecor_refrigerator_steel.png" }, inventory_image = "homedecor_refrigerator_steel_inv.png", description = S("Refrigerator (stainless steel)"), groups = {snappy=3}, + sounds = default.node_sound_stone_defaults(), selection_box = homedecor.nodebox.slab_y(2), collision_box = homedecor.nodebox.slab_y(2), expand = { top="air" }, @@ -21,7 +21,6 @@ homedecor.register("refrigerator_steel", { }) -- white, enameled fridge - homedecor.register("refrigerator_white", { mesh = "homedecor_refrigerator.obj", tiles = { "homedecor_refrigerator_white.png" }, @@ -30,6 +29,7 @@ homedecor.register("refrigerator_white", { groups = {snappy=3}, selection_box = homedecor.nodebox.slab_y(2), collision_box = homedecor.nodebox.slab_y(2), + sounds = default.node_sound_stone_defaults(), expand = { top="air" }, infotext=S("Refrigerator"), inventory = { @@ -51,7 +51,6 @@ minetest.register_alias("homedecor:refrigerator_steel_bottom_locked", "homedecor minetest.register_alias("homedecor:refrigerator_steel_top_locked", "air") -- kitchen "furnaces" - homedecor.register_furnace("homedecor:oven", { description = S("Oven"), tile_format = "homedecor_oven_%s%s.png", @@ -86,7 +85,6 @@ homedecor.register_furnace("homedecor:microwave_oven", { extra_nodedef_fields = { drawtype = "nodebox", paramtype = "light", - --paramtype2 = "facedir", -- Not needed, set by register_furnace node_box = { type = "fixed", fixed = { { -0.5, -0.5, -0.125, 0.5, 0.125, 0.5 } }, @@ -115,9 +113,7 @@ homedecor.register("coffee_maker", { }, description = "Coffee Maker", inventory_image = "homedecor_coffeemaker_inv.png", - paramtype = "light", - paramtype2 = "facedir", - sunlight_propagates = true, + walkable = false, groups = {snappy=3}, selection_box = cm_cbox, node_box = cm_cbox @@ -160,20 +156,10 @@ minetest.register_abm({ }) homedecor.register("toaster", { - description = "Toaster", - tiles = { - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png", - "homedecor_toaster_sides.png" - }, + description = "Toaster", + tiles = { "homedecor_toaster_sides.png" }, inventory_image = "homedecor_toaster_inv.png", - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - sunlight_propagates = true, + walkable = false, groups = { snappy=3 }, node_box = { type = "fixed", @@ -201,10 +187,7 @@ homedecor.register("toaster_loaf", { "homedecor_toaster_sides.png", "homedecor_toaster_sides.png" }, - drawtype = "nodebox", - paramtype = "light", - paramtype2 = "facedir", - sunlight_propagates = true, + walkable = false, groups = { snappy=3, not_in_creative_inventory=1 }, node_box = { type = "fixed", @@ -233,8 +216,6 @@ homedecor.register("dishwasher", { "homedecor_dishwasher_back.png", "homedecor_dishwasher_front.png" }, - paramtype = "light", - paramtype2 = "facedir", node_box = { type = "fixed", fixed = { @@ -244,7 +225,7 @@ homedecor.register("dishwasher", { {-0.4375, -0.5, -0.5, 0.4375, 0.4375, 0.4375}, } }, - selection_box = { type = "regular" }, + sounds = default.node_sound_stone_defaults(), groups = { snappy = 3 }, }) @@ -261,8 +242,7 @@ homedecor.register("dishwasher_"..m, { "homedecor_dishwasher_back.png", "homedecor_dishwasher_front.png" }, - paramtype = "light", - paramtype2 = "facedir", groups = { snappy = 3 }, + sounds = default.node_sound_stone_defaults(), }) end diff --git a/homedecor/kitchen_furniture.lua b/homedecor/kitchen_furniture.lua index b66e52a6..58ee196c 100644 --- a/homedecor/kitchen_furniture.lua +++ b/homedecor/kitchen_furniture.lua @@ -79,7 +79,7 @@ homedecor.register("copper_pans", { inventory_image = "homedecor_copper_pans_inv.png", groups = { snappy=3 }, selection_box = cp_cbox, - collision_box = cp_cbox, + walkable = false, on_place = minetest.rotate_node }) @@ -95,7 +95,7 @@ homedecor.register("kitchen_faucet", { description = "Kitchen Faucet", groups = {snappy=3}, selection_box = kf_cbox, - collision_box = kf_cbox, + walkable = false }) homedecor.register("paper_towel", { @@ -107,13 +107,9 @@ homedecor.register("paper_towel", { inventory_image = "homedecor_paper_towel_inv.png", description = "Paper towels", groups = { snappy=3 }, + walkable = false, selection_box = { type = "fixed", fixed = { -0.4375, 0.125, 0.0625, 0.4375, 0.4375, 0.5 } }, - collision_box = { - type = "fixed", - fixed = { -0.4375, 0.125, 0.0625, 0.4375, 0.4375, 0.5 } - } }) - diff --git a/homedecor/laundry.lua b/homedecor/laundry.lua index 4a63d0eb..49ef9aed 100644 --- a/homedecor/laundry.lua +++ b/homedecor/laundry.lua @@ -17,7 +17,6 @@ homedecor.register("washing_machine", { {-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5}, } }, - selection_box = { type = "regular" }, groups = { snappy = 3 }, }) @@ -38,7 +37,6 @@ homedecor.register("dryer", { {-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5}, } }, - selection_box = { type = "regular" }, groups = { snappy = 3 }, }) @@ -59,4 +57,3 @@ homedecor.register("ironing_board", { selection_box = ib_cbox, collision_box = ib_cbox }) - diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index d49e5651..5f69ffa3 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -1,4 +1,3 @@ - -- This file supplies glowlights local dirs1 = { 20, 23, 22, 21 } @@ -83,7 +82,7 @@ homedecor.register("glowlight_half_"..color, { node_box = glowlight_nodebox.half, groups = { snappy = 3 }, light_source = LIGHT_MAX, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_glass_defaults(), on_place = minetest.rotate_node }) @@ -101,7 +100,7 @@ homedecor.register("glowlight_quarter_"..color, { node_box = glowlight_nodebox.quarter, groups = { snappy = 3 }, light_source = LIGHT_MAX-1, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_glass_defaults(), on_place = minetest.rotate_node }) @@ -121,7 +120,7 @@ homedecor.register("glowlight_small_cube_"..color, { node_box = glowlight_nodebox.small_cube, groups = { snappy = 3 }, light_source = LIGHT_MAX-1, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_glass_defaults(), on_place = minetest.rotate_node }) @@ -163,8 +162,7 @@ homedecor.register("candle", { }, inventory_image = "homedecor_candle_inv.png", selection_box = tc_cbox, - collision_box = tc_cbox, - sunlight_propagates = true, + walkable = false, groups = { snappy = 3 }, light_source = LIGHT_MAX-4, }) @@ -185,8 +183,6 @@ homedecor.register("candle_thin", { }, inventory_image = "homedecor_candle_thin_inv.png", selection_box = c_cbox, - collision_box = c_cbox, - sunlight_propagates = true, walkable = false, groups = { snappy = 3 }, light_source = LIGHT_MAX-4, @@ -209,8 +205,6 @@ homedecor.register("candlestick_wrought_iron", { }, inventory_image = "homedecor_candlestick_wrought_iron_inv.png", selection_box = cs_cbox, - collision_box = cs_cbox, - sunlight_propagates = true, walkable = false, groups = { snappy = 3 }, light_source = LIGHT_MAX-4, @@ -226,8 +220,6 @@ homedecor.register("candlestick_brass", { }, inventory_image = "homedecor_candlestick_brass_inv.png", selection_box = cs_cbox, - collision_box = cs_cbox, - sunlight_propagates = true, walkable = false, groups = { snappy = 3 }, light_source = LIGHT_MAX-4, @@ -247,7 +239,6 @@ homedecor.register("wall_sconce", { 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, @@ -271,9 +262,8 @@ homedecor.register("oil_lamp", { "homedecor_oil_lamp_top.png", }, inventory_image = "homedecor_oil_lamp_inv.png", - sunlight_propagates = true, selection_box = ol_cbox, - collision_box = ol_cbox, + walkable = false, groups = { snappy = 3 }, light_source = LIGHT_MAX-3, sounds = default.node_sound_glass_defaults(), @@ -307,7 +297,7 @@ homedecor.register("ground_lantern", { groups = {snappy=3}, light_source = 11, selection_box = gl_cbox, - collision_box = gl_cbox + walkable = false }) local hl_cbox = { @@ -324,7 +314,7 @@ homedecor.register("hanging_lantern", { groups = {snappy=3}, light_source = 11, selection_box = hl_cbox, - collision_box = hl_cbox + walkable = false }) local cl_cbox = { @@ -341,7 +331,7 @@ homedecor.register("ceiling_lantern", { groups = {snappy=3}, light_source = 11, selection_box = cl_cbox, - collision_box = cl_cbox, + walkable = false }) homedecor.register("lattice_lantern_large", { @@ -349,7 +339,7 @@ homedecor.register("lattice_lantern_large", { tiles = { 'homedecor_lattice_lantern_large.png' }, groups = { snappy = 3 }, light_source = LIGHT_MAX, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_glass_defaults(), }) homedecor.register("lattice_lantern_small", { @@ -369,7 +359,7 @@ homedecor.register("lattice_lantern_small", { }, groups = { snappy = 3 }, light_source = LIGHT_MAX-1, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_glass_defaults(), on_place = minetest.rotate_node }) @@ -422,7 +412,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) walkable = false, light_source = light, selection_box = tlamp_cbox, - collision_box = tlamp_cbox, + sounds = default.node_sound_wood_defaults(), groups = {cracky=2,oddly_breakable_by_hand=1, not_in_creative_inventory=((light ~= nil) and 1) or nil, }, @@ -451,7 +441,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) not_in_creative_inventory=((light ~= nil) and 1) or nil, }, selection_box = slamp_cbox, - collision_box = slamp_cbox, + sounds = default.node_sound_wood_defaults(), on_punch = function(pos, node, puncher) node.name = "homedecor:standing_lamp"..lampcolor.."_"..repl[suffix] minetest.set_node(pos, node) @@ -491,7 +481,7 @@ for _, color in ipairs(dlamp_colors) do inventory_image = "homedecor_desk_lamp_inv_"..color..".png", wield_image = "homedecor_desk_lamp_inv_"..color..".png", selection_box = dlamp_cbox, - collision_box = dlamp_cbox, + walkable = false, groups = {snappy=3}, }) end @@ -508,6 +498,7 @@ homedecor.register("ceiling_lamp", { inventory_image = "homedecor_ceiling_lamp_inv.png", light_source = LIGHT_MAX, groups = {snappy=3}, + walkable = false, on_punch = function(pos, node, puncher) minetest.set_node(pos, {name = "homedecor:ceiling_lamp_off"}) end, @@ -523,9 +514,9 @@ homedecor.register("ceiling_lamp_off", { "homedecor_generic_plastic_brown.png", }, groups = {snappy=3, not_in_creative_inventory=1}, + walkable = false, on_punch = function(pos, node, puncher) minetest.set_node(pos, {name = "homedecor:ceiling_lamp"}) end, drop = "homedecor:ceiling_lamp" }) - diff --git a/homedecor/misc-electrical.lua b/homedecor/misc-electrical.lua index a3a0187c..001c7035 100644 --- a/homedecor/misc-electrical.lua +++ b/homedecor/misc-electrical.lua @@ -22,7 +22,7 @@ homedecor.register("power_outlet", { } }, groups = {cracky=3,dig_immediate=2}, - sounds = default.node_sound_stone_defaults() + walkable = false }) homedecor.register("light_switch", { @@ -51,7 +51,7 @@ homedecor.register("light_switch", { } }, groups = {cracky=3,dig_immediate=2}, - sounds = default.node_sound_stone_defaults() + walkable = false }) @@ -60,6 +60,7 @@ homedecor.register("doorbell", { inventory_image = "homedecor_doorbell_inv.png", description = "Doorbell", groups = {snappy=3}, + walkable = false, node_box = { type = "fixed", fixed = { @@ -75,4 +76,3 @@ homedecor.register("doorbell", { }) end }) - diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 497aac40..a68a046b 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -6,11 +6,10 @@ homedecor.register("ceiling_paint", { tiles = { 'homedecor_ceiling_paint.png' }, inventory_image = 'homedecor_ceiling_paint_roller.png', wield_image = 'homedecor_ceiling_paint_roller.png', - sunlight_propagates = true, walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), - selection_box = { type = "wallmounted" }, + selection_box = { type = "wallmounted" }, }) homedecor.register("ceiling_tile", { @@ -19,11 +18,10 @@ homedecor.register("ceiling_tile", { tiles = { 'homedecor_ceiling_tile.png' }, wield_image = 'homedecor_ceiling_tile.png', inventory_image = 'homedecor_ceiling_tile.png', - sunlight_propagates = true, walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), - selection_box = { type = "wallmounted" }, + selection_box = { type = "wallmounted" }, }) local rug_sizes = {"small", "large"} @@ -35,7 +33,6 @@ homedecor.register("rug_"..s, { tiles = {"homedecor_rug_"..s..".png"}, wield_image = "homedecor_rug_"..s..".png", inventory_image = "homedecor_rug_"..s..".png", - sunlight_propagates = true, paramtype2 = "wallmounted", walkable = false, groups = {snappy = 3}, @@ -55,7 +52,7 @@ homedecor.register("flower_pot_"..p, { "homedecor_potting_soil.png" }, groups = { snappy = 3, potting_soil=1 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_stone_defaults(), }) end @@ -153,7 +150,6 @@ homedecor.register("fishtank", { type = "fixed", fixed = { -0.5, -0.5, -0.375, 0.5, 0.3125, 0.375 } }, - sunlight_propagates = true, groups = {cracky=3,oddly_breakable_by_hand=3}, sounds = default.node_sound_glass_defaults(), on_rightclick = function(pos, node, clicker) @@ -189,7 +185,6 @@ homedecor.register("fishtank_lighted", { type = "fixed", fixed = { -0.5, -0.5, -0.375, 0.5, 0.3125, 0.375 } }, - sunlight_propagates = true, groups = {cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, sounds = default.node_sound_glass_defaults(), on_rightclick = function(pos, node, clicker) @@ -206,7 +201,6 @@ homedecor.register("cardboard_box_big", { 'homedecor_cardbox_big_sides.png', }, groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), infotext=S("Cardboard box"), inventory = { size=24, @@ -227,7 +221,6 @@ homedecor.register("cardboard_box", { } }, groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), infotext=S("Cardboard box"), inventory = { size=8, @@ -243,7 +236,7 @@ homedecor.register("dvd_cd_cabinet", { "homedecor_dvdcd_cabinet_back.png" }, selection_box = homedecor.nodebox.slab_z(0.5), - groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3}, + groups = {choppy=2,oddly_breakable_by_hand=2}, sounds = default.node_sound_wood_defaults(), }) @@ -283,6 +276,7 @@ homedecor.register("pool_table", { selection_box = pooltable_cbox, collision_box = pooltable_cbox, expand = { forward="air" }, + sounds = default.node_sound_wood_defaults(), }) minetest.register_alias("homedecor:pool_table_2", "air") @@ -291,7 +285,8 @@ homedecor.register("coatrack_wallmount", { tiles = { "homedecor_generic_wood_beech.png" }, inventory_image = "homedecor_coatrack_wallmount_inv.png", description = "Coatrack (wallmounted)", - groups = {snappy=3}, + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), node_box = { type = "fixed", fixed = { @@ -317,21 +312,13 @@ homedecor.register("coat_tree", { inventory_image = "homedecor_coatrack_inv.png", description = "Coat tree", groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), expand = { top="air" }, + walkable = false, selection_box = { type = "fixed", fixed = { -0.4, -0.5, -0.4, 0.4, 1.5, 0.4 } }, - node_box = { -- this is used here to create a multi-part collision box. - type = "fixed", - fixed = { - { -8/16, 18/16, -8/16, 8/16, 22/16, 8/16 }, - { -4/16, 12/16, -4/16, 4/16, 18/16, 4/16 }, - { -10/32, 10/16, -10/32, 10/32, 12/16, 10/32 }, - { -1/16, 1/16, -1/16, 1/16, 10/16, 1/16 }, - { -10/32, -8/16, -10/32, 10/32, 1/16, 10/32 } - } - }, }) local cutlery_cbox = { @@ -350,7 +337,8 @@ homedecor.register("cutlery_set", { description = "Cutlery set", groups = {snappy=3}, selection_box = cutlery_cbox, - collision_box = cutlery_cbox + walkable = false, + sounds = default.node_sound_glass_defaults(), }) local bottle_cbox = { @@ -376,10 +364,9 @@ for _, b in ipairs(bottle_colors) do inventory_image = "homedecor_bottle_"..b.."_inv.png", description = "Bottle ("..b..")", mesh = "homedecor_bottle.obj", - sunlight_propagates = true, + walkable = false, groups = {snappy=3}, sounds = default.node_sound_glass_defaults(), - collision_box = bottle_cbox, selection_box = bottle_cbox }) @@ -393,10 +380,9 @@ for _, b in ipairs(bottle_colors) do inventory_image = "homedecor_4_bottles_"..b.."_inv.png", description = "Four "..b.." bottles", mesh = "homedecor_4_bottles.obj", - sunlight_propagates = true, + walkable = false, groups = {snappy=3}, sounds = default.node_sound_glass_defaults(), - collision_box = fbottle_cbox, selection_box = fbottle_cbox }) end @@ -409,10 +395,9 @@ homedecor.register("4_bottles_multi", { inventory_image = "homedecor_4_bottles_multi_inv.png", description = "Four misc brown/green bottles", mesh = "homedecor_4_bottles.obj", - sunlight_propagates = true, groups = {snappy=3}, + walkable = false, sounds = default.node_sound_glass_defaults(), - collision_box = fbottle_cbox, selection_box = fbottle_cbox }) @@ -423,14 +408,13 @@ homedecor.register("dartboard", { inventory_image = "homedecor_dartboard_inv.png", wield_image = "homedecor_dartboard_inv.png", paramtype2 = "wallmounted", - sunlight_propagates = true, walkable = false, selection_box = { type = "wallmounted", }, groups = {choppy=2,dig_immediate=2,attached_node=1}, legacy_wallmounted = true, - sounds = default.node_sound_defaults(), + sounds = default.node_sound_wood_defaults(), }) local piano_cbox = { @@ -451,6 +435,7 @@ homedecor.register("piano", { selection_box = piano_cbox, collision_box = piano_cbox, expand = { right="air" }, + sounds = default.node_sound_wood_defaults(), }) minetest.register_alias("homedecor:piano_left", "homedecor:piano") @@ -470,8 +455,8 @@ homedecor.register("trophy", { }, inventory_image = "homedecor_trophy_inv.png", groups = { snappy=3 }, + walkable = false, selection_box = tr_cbox, - collision_box = tr_cbox, }) local sb_cbox = { @@ -491,7 +476,8 @@ homedecor.register("sportbench", { inventory_image = "homedecor_sport_bench_inv.png", groups = { snappy=3 }, selection_box = sb_cbox, - collision_box = sb_cbox, + walkable = false, + sounds = default.node_sound_wood_defaults(), }) local skate_cbox = { @@ -507,7 +493,7 @@ homedecor.register("skateboard", { description = "Skateboard", groups = {snappy=3}, selection_box = skate_cbox, - collision_box = skate_cbox, + walkable = false, sounds = default.node_sound_wood_defaults(), on_place = minetest.rotate_node }) @@ -524,6 +510,7 @@ homedecor.register("beer_tap", { }, inventory_image = "homedecor_beertap_inv.png", groups = { snappy=3 }, + walkable = false, node_box = { type = "fixed", fixed = { @@ -572,9 +559,9 @@ homedecor.register("beer_mug", { tiles = { "homedecor_beer_mug.png" }, inventory_image = "homedecor_beer_mug_inv.png", groups = { snappy=3, oddly_breakable_by_hand=3 }, + walkable = false, sounds = default.node_sound_glass_defaults(), - selection_box = beer_cbox, - collision_box = beer_cbox + selection_box = beer_cbox }) homedecor.register("tool_cabinet", { @@ -607,7 +594,6 @@ homedecor.register("calendar", { inventory_image = "homedecor_calendar_inv.png", wield_image = "homedecor_calendar_inv.png", paramtype2 = "wallmounted", - sunlight_propagates = true, walkable = false, selection_box = { type = "wallmounted", @@ -618,6 +604,11 @@ homedecor.register("calendar", { groups = {choppy=2,attached_node=1}, legacy_wallmounted = true, sounds = default.node_sound_defaults(), + on_construct = function(pos) + local meta = minetest.get_meta(pos) + local date = os.date("%Y-%m-%d") -- ISO 8601 format + meta:set_string("infotext", "Date: "..date) + end }) local globe_cbox = { @@ -637,7 +628,8 @@ homedecor.register("desk_globe", { selection_box = globe_cbox, collision_box = globe_cbox, groups = {choppy=2}, - sounds = default.node_sound_defaults(), + walkable = false, + sounds = default.node_sound_wood_defaults(), }) local wine_cbox = homedecor.nodebox.slab_z(0.25) @@ -677,7 +669,34 @@ for _, i in ipairs(n) do wield_image = "homedecor_picture_frame"..i.."_inv.png", groups = {snappy = 3}, selection_box = pframe_cbox, - collision_box = pframe_cbox, + walkable = false, + sounds = default.node_sound_glass_defaults() + }) +end + +for i = 1,20 do + homedecor.register("painting_"..i, { + description = "Decorative painting #"..i, + tiles = { + "homedecor_painting_edges.png", + "homedecor_painting_edges.png", + "homedecor_painting_edges.png", + "homedecor_painting_edges.png", + "homedecor_painting_back.png", + "homedecor_painting"..i..".png" + }, + node_box = { + type = "fixed", + fixed = { + { -32/64, -32/64, 28/64, -30/64, 32/64, 32/64 }, -- left edge + { 30/64, -32/64, 28/64, 32/64, 32/64, 32/64 }, -- right edge + { -32/64, 30/64, 28/64, 32/64, 32/64, 32/64 }, -- top edge + { -32/64, -30/64, 28/64, 32/64, -32/64, 32/64 }, -- bottom edge + { -32/64, -32/64, 29/64, 32/64, 32/64, 29/64 } -- the canvas + } + }, + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), }) end @@ -754,4 +773,3 @@ for _, side in ipairs({"left", "right"}) do }) end end - diff --git a/homedecor/nightstands.lua b/homedecor/nightstands.lua index a7b3187d..caf29880 100644 --- a/homedecor/nightstands.lua +++ b/homedecor/nightstands.lua @@ -11,7 +11,6 @@ homedecor.register("nightstand_"..w.."_one_drawer", { 'homedecor_nightstand_'..w..'_left.png', 'homedecor_nightstand_'..w..'_back.png', 'homedecor_nightstand_'..w..'_1_drawer_front.png'}, - selection_box = { type = "regular" }, node_box = { type = "fixed", fixed = { @@ -39,7 +38,6 @@ homedecor.register("nightstand_"..w.."_two_drawers", { 'homedecor_nightstand_'..w..'_left.png', 'homedecor_nightstand_'..w..'_back.png', 'homedecor_nightstand_'..w..'_2_drawer_front.png'}, - selection_box = { type = "regular" }, node_box = { type = "fixed", fixed = { diff --git a/homedecor/paintings.lua b/homedecor/paintings.lua deleted file mode 100644 index 68952a82..00000000 --- a/homedecor/paintings.lua +++ /dev/null @@ -1,26 +0,0 @@ ---Various kinds of paintings - -for i = 1,20 do - homedecor.register("painting_"..i, { - description = "Decorative painting #"..i, - tiles = { - "homedecor_painting_edges.png", - "homedecor_painting_edges.png", - "homedecor_painting_edges.png", - "homedecor_painting_edges.png", - "homedecor_painting_back.png", - "homedecor_painting"..i..".png" - }, - node_box = { - type = "fixed", - fixed = { - { -32/64, -32/64, 28/64, -30/64, 32/64, 32/64 }, -- left edge - { 30/64, -32/64, 28/64, 32/64, 32/64, 32/64 }, -- right edge - { -32/64, 30/64, 28/64, 32/64, 32/64, 32/64 }, -- top edge - { -32/64, -30/64, 28/64, 32/64, -32/64, 32/64 }, -- bottom edge - { -32/64, -32/64, 29/64, 32/64, 32/64, 29/64 } -- the canvas - } - }, - groups = {snappy=3}, - }) -end diff --git a/homedecor/shingles.lua b/homedecor/shingles.lua index 58c40bc6..be0e9706 100644 --- a/homedecor/shingles.lua +++ b/homedecor/shingles.lua @@ -6,10 +6,8 @@ minetest.register_node("homedecor:skylight", { tiles = { "default_glass.png" }, wield_image = "default_glass.png", inventory_image = "homedecor_skylight_inv.png", - paramtype = "light", - sunlight_propagates = true, groups = { snappy = 3 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_glass_defaults(), selection_box = homedecor.nodebox.slab_y(0.1), }) @@ -19,11 +17,9 @@ minetest.register_node("homedecor:skylight_frosted", { tiles = { "homedecor_skylight_frosted.png" }, wield_image = "homedecor_skylight_frosted.png", inventory_image = "homedecor_skylight_frosted_inv.png", - paramtype = "light", - sunlight_propagates = true, use_texture_alpha = true, groups = { snappy = 3 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_glass_defaults(), selection_box = homedecor.nodebox.slab_y(0.1), }) @@ -39,7 +35,7 @@ minetest.register_node("homedecor:shingles_"..s, { paramtype = "light", walkable = false, groups = { snappy = 3 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.slab_y(0.1), }) end diff --git a/homedecor/shutters.lua b/homedecor/shutters.lua index 4b357e55..64b6c9cc 100644 --- a/homedecor/shutters.lua +++ b/homedecor/shutters.lua @@ -33,7 +33,6 @@ for i in ipairs(shutters) do description = S("Wooden Shutter ("..desc..")"), inventory_image = "homedecor_window_shutter_"..name.."_inv.png", wield_image = "homedecor_window_shutter_"..name.."_inv.png", - paramtype = "light", paramtype2 = "wallmounted", groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), diff --git a/homedecor/slopes.lua b/homedecor/slopes.lua index ec13a550..fa0496dd 100644 --- a/homedecor/slopes.lua +++ b/homedecor/slopes.lua @@ -1,5 +1,3 @@ --- Various kinds of shingles - local S = homedecor.gettext local slope_cbox = { @@ -41,9 +39,6 @@ homedecor.register_outer_corner = function(modname, subname, groups, slope_image drawtype = "mesh", mesh = "homedecor_slope_outer_corner.obj", tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" }, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, selection_box = ocorner_cbox, collision_box = ocorner_cbox, groups = groups, @@ -57,10 +52,6 @@ homedecor.register_inner_corner = function(modname, subname, groups, slope_image drawtype = "mesh", mesh = "homedecor_slope_inner_corner.obj", tiles = { "homedecor_slope_inner_corner_"..slope_image..".png" }, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - selection_box = { type = "regular" }, collision_box = icorner_cbox, groups = groups, on_place = minetest.rotate_node @@ -73,9 +64,6 @@ homedecor.register_slope = function(modname, subname, recipeitem, groups, slope_ drawtype = "mesh", mesh = "homedecor_slope.obj", tiles = { "homedecor_slope_"..slope_image..".png" }, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, selection_box = slope_cbox, collision_box = slope_cbox, groups = groups, @@ -248,4 +236,3 @@ homedecor.register_slope("homedecor", "glass", "glass", "Glass Shingles" ) - diff --git a/homedecor/tables.lua b/homedecor/tables.lua index 68aa343b..987b37b4 100644 --- a/homedecor/tables.lua +++ b/homedecor/tables.lua @@ -31,7 +31,6 @@ for i in ipairs(materials) do tiles = { 'homedecor_'..m..'_table_small_square.png' }, wield_image = 'homedecor_'..m..'_table_small_square_inv.png', inventory_image = 'homedecor_'..m..'_table_small_square_inv.png', - sunlight_propagates = true, groups = { snappy = 3 }, sounds = s, selection_box = tables_cbox, @@ -47,7 +46,6 @@ for i in ipairs(materials) do tiles = { "homedecor_"..m.."_table_small_round.png" }, wield_image = 'homedecor_'..m..'_table_small_round_inv.png', inventory_image = 'homedecor_'..m..'_table_small_round_inv.png', - sunlight_propagates = true, groups = { snappy = 3 }, sounds = s, selection_box = tables_cbox, @@ -69,7 +67,6 @@ for i in ipairs(materials) do }, wield_image = 'homedecor_'..m..'_table_large_inv.png', inventory_image = 'homedecor_'..m..'_table_large_inv.png', - sunlight_propagates = true, groups = { snappy = 3 }, sounds = s, node_box = { @@ -168,7 +165,7 @@ homedecor.register("table_legs_"..t, { wield_image = "homedecor_table_legs_"..t..".png", walkable = false, groups = {snappy=3}, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_wood_defaults(), selection_box = { type = "fixed", fixed = { -0.37, -0.5, -0.37, 0.37, 0.5, 0.37 } @@ -182,7 +179,6 @@ homedecor.register("utility_table_legs", { tiles = { 'homedecor_utility_table_legs.png' }, inventory_image = 'homedecor_utility_table_legs_inv.png', wield_image = 'homedecor_utility_table_legs.png', - sunlight_propagates = true, walkable = false, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), @@ -208,6 +204,7 @@ homedecor.register("desk", { inventory_image = "homedecor_desk_inv.png", selection_box = desk_cbox, collision_box = desk_cbox, + sounds = default.node_sound_wood_defaults(), groups = { snappy = 3 }, expand = { right="air" }, inventory = { @@ -216,4 +213,3 @@ homedecor.register("desk", { }) minetest.register_alias("homedecor:desk_r", "air") - diff --git a/homedecor/window_treatments.lua b/homedecor/window_treatments.lua index 637db48a..009dfb6f 100644 --- a/homedecor/window_treatments.lua +++ b/homedecor/window_treatments.lua @@ -82,7 +82,6 @@ homedecor.register("blinds_thick", { groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = wb1_cbox, - collision_box = wb1_cbox, }) local wb2_cbox = { @@ -102,7 +101,6 @@ homedecor.register("blinds_thin", { groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = wb2_cbox, - collision_box = wb2_cbox, }) local curtaincolors = { @@ -124,7 +122,6 @@ for c in ipairs(curtaincolors) do inventory_image = "homedecor_curtain_"..color..".png", wield_image = "homedecor_curtain_"..color..".png", drawtype = 'signlike', - sunlight_propagates = true, use_texture_alpha = true, walkable = false, groups = { snappy = 3 }, @@ -149,7 +146,6 @@ for c in ipairs(curtaincolors) do inventory_image = "homedecor_curtain_open_"..color..".png", wield_image = "homedecor_curtain_open_"..color..".png", drawtype = 'signlike', - sunlight_propagates = true, use_texture_alpha = true, walkable = false, groups = { snappy = 3 }, @@ -184,7 +180,6 @@ for i in ipairs(mats) do tiles = { texture }, inventory_image = "homedecor_curtainrod_"..material.."_inv.png", description = "Curtain Rod ("..mat_name..")", - sunlight_propagates = true, groups = { snappy = 3 }, node_box = { type = "fixed", @@ -205,6 +200,7 @@ homedecor.register("window_flowerbox", { "homedecor_flowerbox_sides.png" }, inventory_image = "homedecor_flowerbox_inv.png", + sounds = default.node_sound_stone_defaults(), groups = { snappy = 3 }, node_box = { type = "fixed", diff --git a/inbox/init.lua b/inbox/init.lua index e71531f8..0c6db754 100644 --- a/inbox/init.lua +++ b/inbox/init.lua @@ -1,10 +1,5 @@ local inbox = {} ---[[ -TODO -* Different node_box and texture for empty mailbox -]] - minetest.register_craft({ output ="inbox:empty", recipe = { @@ -108,5 +103,3 @@ function inbox.get_inbox_insert_formspec(pos) "list[current_player;main;0,5;8,4;]" return formspec end - -print("[Mod]Inbox Loaded!") diff --git a/lavalamp/init.lua b/lavalamp/init.lua index 2c796c54..8e0c3d57 100644 --- a/lavalamp/init.lua +++ b/lavalamp/init.lua @@ -38,6 +38,7 @@ for i in ipairs(lavalamps_list) do fixed = { -0.25, -0.5, -0.25, 0.25,0.5, 0.25 }, }, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, + sounds = default.node_sound_glass_defaults(), on_rightclick = function(pos, node, clicker) node.name = "lavalamp:"..colour.."_off" minetest.set_node(pos, node) @@ -61,7 +62,8 @@ for i in ipairs(lavalamps_list) do fixed = { -0.25, -0.5, -0.25, 0.25,0.5, 0.25 }, }, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1}, - drop = "lavalamp:"..colour, + sounds = default.node_sound_glass_defaults(), + drop = "lavalamp:"..colour, on_rightclick = function(pos, node, clicker) node.name = "lavalamp:"..colour minetest.set_node(pos, node) @@ -78,4 +80,3 @@ for i in ipairs(lavalamps_list) do }) end - diff --git a/lrfurn/init.lua b/lrfurn/init.lua index 81a765f6..416adafd 100644 --- a/lrfurn/init.lua +++ b/lrfurn/init.lua @@ -1,5 +1,3 @@ --- LRfurn mod by thefamilygrog66 - lrfurn = {} lrfurn.fdir_to_fwd = { diff --git a/plasmascreen/init.lua b/plasmascreen/init.lua index f013c2a0..36f5a384 100644 --- a/plasmascreen/init.lua +++ b/plasmascreen/init.lua @@ -1,6 +1,3 @@ ---Mod adding a plasma screen television by qwrwed - - minetest.register_node("plasmascreen:stand", { description = "Plasma Screen TV Stand", tiles = {"plasmascreen_back.png"},