diff --git a/assets/voxygen/voxel/sprite/furniture/drawer_large-0.vox b/assets/voxygen/voxel/sprite/furniture/drawer_large-0.vox index 42a0b9be14..0e114c2b03 100644 Binary files a/assets/voxygen/voxel/sprite/furniture/drawer_large-0.vox and b/assets/voxygen/voxel/sprite/furniture/drawer_large-0.vox differ diff --git a/assets/voxygen/voxel/sprite/furniture/drawer_large-1.vox b/assets/voxygen/voxel/sprite/furniture/drawer_large-1.vox index cf51ac3090..6af43172f3 100644 Binary files a/assets/voxygen/voxel/sprite/furniture/drawer_large-1.vox and b/assets/voxygen/voxel/sprite/furniture/drawer_large-1.vox differ diff --git a/assets/voxygen/voxel/sprite/furniture/lamp_wall-1.vox b/assets/voxygen/voxel/sprite/furniture/lamp_wall-1.vox index 9e3f7e785d..0cc68cf161 100644 Binary files a/assets/voxygen/voxel/sprite/furniture/lamp_wall-1.vox and b/assets/voxygen/voxel/sprite/furniture/lamp_wall-1.vox differ diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_double-0.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_double-0.vox index 08e4952e5b..9add2d9d3b 100644 Binary files a/assets/voxygen/voxel/sprite/furniture/wardrobe_double-0.vox and b/assets/voxygen/voxel/sprite/furniture/wardrobe_double-0.vox differ diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_double-1.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_double-1.vox index b44b0ec8d6..6f52bbe7c2 100644 Binary files a/assets/voxygen/voxel/sprite/furniture/wardrobe_double-1.vox and b/assets/voxygen/voxel/sprite/furniture/wardrobe_double-1.vox differ diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_single-0.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_single-0.vox index 58991a8870..a6e85e6bd0 100644 Binary files a/assets/voxygen/voxel/sprite/furniture/wardrobe_single-0.vox and b/assets/voxygen/voxel/sprite/furniture/wardrobe_single-0.vox differ diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe_single-1.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe_single-1.vox index cdb6533a71..3522e1b145 100644 Binary files a/assets/voxygen/voxel/sprite/furniture/wardrobe_single-1.vox and b/assets/voxygen/voxel/sprite/furniture/wardrobe_single-1.vox differ diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index 4025ff8a47..3cdd6c986e 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -381,9 +381,9 @@ impl BlockKind { BlockKind::Radish => 0.18, BlockKind::Door => 3.0, BlockKind::Bed => 1.54, - BlockKind::Bench => 1.45, - BlockKind::ChairSingle => 1.36, - BlockKind::ChairDouble => 1.36, + BlockKind::Bench => 0.5, + BlockKind::ChairSingle => 0.5, + BlockKind::ChairDouble => 0.5, BlockKind::CoatRack => 2.36, BlockKind::Crate => 0.90, BlockKind::DrawerSmall => 1.0, @@ -456,6 +456,27 @@ impl Block { | BlockKind::Window2 | BlockKind::Window3 | BlockKind::Window4 + | BlockKind::Bed + | BlockKind::Bench + | BlockKind::ChairSingle + | BlockKind::ChairDouble + | BlockKind::CoatRack + | BlockKind::Crate + | BlockKind::DrawerLarge + | BlockKind::DrawerMedium + | BlockKind::DrawerSmall + | BlockKind::DungeonWallDecor + | BlockKind::HangingBasket + | BlockKind::HangingSign + | BlockKind::WallLamp + | BlockKind::Planter + | BlockKind::Shelf + | BlockKind::TableSide + | BlockKind::TableDining + | BlockKind::TableDouble + | BlockKind::WardrobeSingle + | BlockKind::WardrobeDouble + | BlockKind::Pot | BlockKind::Door => Some(self.color[0] & 0b111), _ => None, } diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs index 76bd95e974..0573816606 100644 --- a/voxygen/src/scene/terrain.rs +++ b/voxygen/src/scene/terrain.rs @@ -2195,7 +2195,7 @@ impl Terrain { (BlockKind::Bed, 0), make_models( "voxygen.voxel.sprite.furniture.bed-0", - Vec3::new(-9.5, -6.0, 0.0), + Vec3::new(-9.5, -14.5, 0.0), Vec3::one(), ), ), @@ -2452,7 +2452,7 @@ impl Terrain { (BlockKind::HangingBasket, 0), make_models( "voxygen.voxel.sprite.furniture.hanging_basket-0", - Vec3::new(-6.5, -4.5, 0.0), + Vec3::new(-6.5, -3.5, 0.0), Vec3::one(), ), ), @@ -2486,7 +2486,7 @@ impl Terrain { (BlockKind::WallLamp, 1), make_models( "voxygen.voxel.sprite.furniture.lamp_wall-1", - Vec3::new(-9.0, -10.5, 0.0), + Vec3::new(-10.5, -9.0, 0.0), Vec3::one(), ), ), @@ -2603,7 +2603,7 @@ impl Terrain { (BlockKind::TableDining, 0), make_models( "voxygen.voxel.sprite.furniture.table_dining-0", - Vec3::new(-13.5, -13.5, 0.0), + Vec3::new(-8.5, -8.5, 0.0), Vec3::one(), ), ), @@ -2611,7 +2611,7 @@ impl Terrain { (BlockKind::TableDining, 1), make_models( "voxygen.voxel.sprite.furniture.table_dining-1", - Vec3::new(-13.5, -13.5, 0.0), + Vec3::new(-8.5, -8.5, 0.0), Vec3::one(), ), ), @@ -2629,7 +2629,7 @@ impl Terrain { (BlockKind::WardrobeSingle, 0), make_models( "voxygen.voxel.sprite.furniture.wardrobe_single-0", - Vec3::new(-6.0, -5.5, 0.0), + Vec3::new(-5.5, -6.0, 0.0), Vec3::one(), ), ), @@ -2637,7 +2637,7 @@ impl Terrain { (BlockKind::WardrobeSingle, 1), make_models( "voxygen.voxel.sprite.furniture.wardrobe_single-1", - Vec3::new(-6.5, -5.5, 0.0), + Vec3::new(-5.5, -6.5, 0.0), Vec3::one(), ), ), @@ -2646,7 +2646,7 @@ impl Terrain { (BlockKind::WardrobeDouble, 0), make_models( "voxygen.voxel.sprite.furniture.wardrobe_double-0", - Vec3::new(-6.5, -10.5, 0.0), + Vec3::new(-10.5, -6.5, 0.0), Vec3::one(), ), ), @@ -2654,7 +2654,7 @@ impl Terrain { (BlockKind::WardrobeDouble, 1), make_models( "voxygen.voxel.sprite.furniture.wardrobe_double-1", - Vec3::new(-6.0, -10.5, 0.0), + Vec3::new(-10.5, -6.0, 0.0), Vec3::one(), ), ),