diff --git a/decor_api/shelves.lua b/decor_api/shelves.lua index 5f40e0f..07e4104 100644 --- a/decor_api/shelves.lua +++ b/decor_api/shelves.lua @@ -117,8 +117,9 @@ function shelves.set_shelves(pos) local list_name = shelves.build_name_from_tmp(node.name, "list", i) local padding = 0.25 + local width = shelf_data.inv_size.w > 8 and shelf_data.inv_size.w or 8 local fs_size = { - w = shelf_data.inv_size.w+1+(shelf_data.inv_size.w-1)*padding, + w = width+1+(width-1)*padding, h = shelf_data.inv_size.h+5.5+(shelf_data.inv_size.h-1)*padding+3*padding } local player_list_y = shelf_data.inv_size.h+1+(shelf_data.inv_size.h-1)*padding diff --git a/logo.png b/logo.png new file mode 100644 index 0000000..537276a Binary files /dev/null and b/logo.png differ diff --git a/modern/living_room.lua b/modern/living_room.lua index ea430a9..f341a55 100644 --- a/modern/living_room.lua +++ b/modern/living_room.lua @@ -291,6 +291,7 @@ local pots_defs = { mesh = "multidecor_glass_vase", tiles = {"multidecor_gloss.png^[opacity:120"}, inventory_image = "multidecor_glass_vase_inv.png", + wield_image = "multidecor_glass_vase_inv.png", use_texture_alpha = "blend", bounding_boxes = {{-0.2, -0.5, -0.2, 0.2, 0.2, 0.2}}, sounds = default.node_sound_glass_defaults(), @@ -307,6 +308,7 @@ for name, def in pairs(pots_defs) do cdef.mesh = def.mesh .. ".b3d" cdef.tiles = def.tiles cdef.inventory_image = def.inventory_image + cdef.wield_image = def.wield_image cdef.collision_box = { type = "fixed", fixed = def.bounding_boxes diff --git a/modern/models/multidecor_glass_vase.b3d b/modern/models/multidecor_glass_vase.b3d index 853346a..c566ae5 100644 Binary files a/modern/models/multidecor_glass_vase.b3d and b/modern/models/multidecor_glass_vase.b3d differ diff --git a/modern/models/multidecor_glass_vase.blend b/modern/models/multidecor_glass_vase.blend index dbddfb7..d1bc642 100644 Binary files a/modern/models/multidecor_glass_vase.blend and b/modern/models/multidecor_glass_vase.blend differ diff --git a/modern/models/multidecor_glass_vase.blend1 b/modern/models/multidecor_glass_vase.blend1 index 59d7edb..dbddfb7 100644 Binary files a/modern/models/multidecor_glass_vase.blend1 and b/modern/models/multidecor_glass_vase.blend1 differ diff --git a/modern/models/multidecor_glass_vase_with_flower.b3d b/modern/models/multidecor_glass_vase_with_flower.b3d index 1058222..235e39e 100644 Binary files a/modern/models/multidecor_glass_vase_with_flower.b3d and b/modern/models/multidecor_glass_vase_with_flower.b3d differ diff --git a/modern/models/multidecor_glass_vase_with_flower.blend b/modern/models/multidecor_glass_vase_with_flower.blend index f7a8871..ee755d4 100644 Binary files a/modern/models/multidecor_glass_vase_with_flower.blend and b/modern/models/multidecor_glass_vase_with_flower.blend differ diff --git a/modern/models/multidecor_glass_vase_with_flower.blend1 b/modern/models/multidecor_glass_vase_with_flower.blend1 index 59d7edb..f7a8871 100644 Binary files a/modern/models/multidecor_glass_vase_with_flower.blend1 and b/modern/models/multidecor_glass_vase_with_flower.blend1 differ