diff --git a/homedecor/exterior.lua b/homedecor/exterior.lua index 0b08b853..77ec36c3 100644 --- a/homedecor/exterior.lua +++ b/homedecor/exterior.lua @@ -30,11 +30,19 @@ homedecor.register("barbecue", { minetest.register_alias("homedecor:barbecue_meat", "air") -local bl1_cbox = { +local bl1_sbox = { type = "fixed", fixed = { -0.5, -0.5, -0.25, 1.5, 0.5, 0.5 } } +local bl1_cbox = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.25, 1.5, 0, 0.5 }, + {-0.5, -0.5, 0.45, 1.5, 0.5, 0.5 }, + } +} + homedecor.register("bench_large_1", { mesh = "homedecor_bench_large_1.obj", tiles = { @@ -46,26 +54,34 @@ homedecor.register("bench_large_1", { groups = { snappy = 3 }, expand = { right="air" }, sounds = default.node_sound_wood_defaults(), - selection_box = bl1_cbox, - collision_box = bl1_cbox, + selection_box = bl1_sbox, + node_box = bl1_cbox, }) minetest.register_alias("homedecor:bench_large_1_left", "homedecor:bench_large_1") minetest.register_alias("homedecor:bench_large_1_right", "air") -local bl2_cbox = { +local bl2_sbox = { type = "fixed", fixed = { -0.5, -0.5, -0.25, 1.5, 0.5, 0.5 } } +local bl2_cbox = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.25, 1.5, 0, 0.5 }, + {-0.5, -0.5, 0.45, 1.5, 0.5, 0.5 }, + } +} + homedecor.register("bench_large_2", { description = "Garden Bench (style 2)", mesh = "homedecor_bench_large_2.obj", tiles = { "homedecor_generic_wood_neutral.png" }, inventory_image = "homedecor_bench_large_2_inv.png", groups = {snappy=3}, - selection_box = bl2_cbox, - collision_box = bl2_cbox, + selection_box = bl2_sbox, + node_box = bl2_cbox, expand = { right="air" }, sounds = default.node_sound_wood_defaults(), }) diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua index fe06ba67..a7eec9e1 100644 --- a/homedecor/furniture.lua +++ b/homedecor/furniture.lua @@ -50,6 +50,14 @@ local kc_cbox = { fixed = { -0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125 }, } +local ac_cbox = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0, 0.5 }, + {-0.5, -0.5, 0.4, 0.5, 0.5, 0.5 } + } +} + for i in ipairs(chaircolors) do local color = "_"..chaircolors[i][1] @@ -93,8 +101,9 @@ for i in ipairs(chaircolors) do "wool_dark_grey.png", "default_wood.png" }, - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, + groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), + node_box = ac_cbox }) minetest.register_craft({ @@ -123,6 +132,8 @@ minetest.register_node(":homedecor:openframe_bookshelf", { }, groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3}, sounds = default.node_sound_wood_defaults(), + paramtype = "light", + paramtype2 = "facedir", selection_box = ob_cbox, collision_box = ob_cbox, }) diff --git a/lrfurn/armchairs.lua b/lrfurn/armchairs.lua index 993647b5..153710b3 100644 --- a/lrfurn/armchairs.lua +++ b/lrfurn/armchairs.lua @@ -10,6 +10,14 @@ local armchairs_list = { { "White Armchair", "white"}, } +local armchair_cbox = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0, 0.5 }, + {-0.5, -0.5, 0.4, 0.5, 0.5, 0.5 } + } +} + for i in ipairs(armchairs_list) do local armchairdesc = armchairs_list[i][1] local colour = armchairs_list[i][2] @@ -24,8 +32,9 @@ for i in ipairs(armchairs_list) do }, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, + groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), + node_box = armchair_cbox, on_rightclick = function(pos, node, clicker) if not clicker:is_player() then return diff --git a/lrfurn/longsofas.lua b/lrfurn/longsofas.lua index d145846b..b90c1ae9 100644 --- a/lrfurn/longsofas.lua +++ b/lrfurn/longsofas.lua @@ -10,11 +10,18 @@ local longsofas_list = { { "White Long Sofa", "white"}, } -local longsofa_cbox = { +local longsofa_sbox = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 2.5} } +local longsofa_cbox = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0, 2.5 }, + {-0.5, -0.5, 0.5, -0.4, 0.5, 2.5 } + } +} for i in ipairs(longsofas_list) do local longsofadesc = longsofas_list[i][1] @@ -30,10 +37,10 @@ for i in ipairs(longsofas_list) do }, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, + groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - selection_box = longsofa_cbox, - collision_box = longsofa_cbox, + selection_box = longsofa_sbox, + node_box = longsofa_cbox, on_place = function(itemstack, placer, pointed_thing) local pos = pointed_thing.above local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) diff --git a/lrfurn/sofas.lua b/lrfurn/sofas.lua index 04594549..892223b3 100644 --- a/lrfurn/sofas.lua +++ b/lrfurn/sofas.lua @@ -10,11 +10,19 @@ local sofas_list = { { "White Sofa", "white"}, } -local sofa_cbox = { +local sofa_sbox = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 1.5} } +local sofa_cbox = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0, 1.5 }, + {-0.5, -0.5, 0.5, -0.4, 0.5, 1.5 } + } +} + for i in ipairs(sofas_list) do local sofadesc = sofas_list[i][1] local colour = sofas_list[i][2] @@ -29,10 +37,10 @@ for i in ipairs(sofas_list) do }, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, + groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - selection_box = sofa_cbox, - collision_box = sofa_cbox, + selection_box = sofa_sbox, + node_box = sofa_cbox, on_place = function(itemstack, placer, pointed_thing) local pos = pointed_thing.above local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false)