diff --git a/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1.vox b/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1.vox index 7d09bfecc1..a09b1e201f 100644 --- a/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1.vox +++ b/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfa91e4a989463bf746cd7d6ca3d2487ab749358ad54c75b70b22b23f0c1ce8b -size 32940 +oid sha256:e2636e71acc0b801e891a54bff4fbeabd6e8818c8b2bb3269cec236cc004fc79 +size 32672 diff --git a/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1_flower.vox b/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1_flower.vox index 75b26b00df..cecb0167e3 100644 --- a/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1_flower.vox +++ b/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1_flower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50cb5f8707679730c3966f7668a29dd2d8826a24c5d1bd554958f7488358a096 -size 33009 +oid sha256:0d6a79b17fd1b9830f853e3ce25af0f3fce4dd08f9b0bb7de33b9ea0b42fe1d0 +size 32749 diff --git a/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2.vox b/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2.vox index eece74a26b..e4445a0b7c 100644 --- a/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2.vox +++ b/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16da2bc27651ef7d310ca859f7f18fa482470cc93b157ec06c859be1e28df1cd -size 36229 +oid sha256:29e592f4bc9771078bed64409ec0d0906ac522da643ae016116e8f3d989af185 +size 34725 diff --git a/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2_flower.vox b/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2_flower.vox index ebea7b7947..2d45890d97 100644 --- a/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2_flower.vox +++ b/assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2_flower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c098fcfcececb6b5909ef2268f0aa40a8eb827624cb61058500ecd225e328d58 -size 36365 +oid sha256:66ddadc8424d8e867745f3cfe02712c49a5dc8cab4cb6d03f69a6892f45fa73e +size 34881 diff --git a/assets/voxygen/voxel/sprite/cacti/large_cactus.vox b/assets/voxygen/voxel/sprite/cacti/large_cactus.vox index b505a8bdf4..266eb8ed43 100644 --- a/assets/voxygen/voxel/sprite/cacti/large_cactus.vox +++ b/assets/voxygen/voxel/sprite/cacti/large_cactus.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f5e9424d35678637c25fa28d8d29b68c8c463419310232bd7221732ed03ad68 -size 32971 +oid sha256:1f2f69373c6a9048fd5e0e445ae83b792aa7e8882eff46894a9339c636f9ad7b +size 36687 diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index 373dd0cee4..125a4c60ac 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -283,7 +283,7 @@ impl SpriteKind { SpriteKind::Tomato => 1.65, SpriteKind::BarrelCactus => 1.0, SpriteKind::LargeCactus => 3.0, - SpriteKind::TallCactus => 2.5, + SpriteKind::TallCactus => 2.63, SpriteKind::Scarecrow => 3.0, SpriteKind::Turnip => 0.36, SpriteKind::Pumpkin => 0.81, @@ -339,12 +339,12 @@ impl SpriteKind { SpriteKind::DismantlingBench => 1.18, SpriteKind::IceSpike => 1.0, SpriteKind::RepairBench => 1.2, + SpriteKind::RoundCactus => 0.72, + SpriteKind::ShortCactus => 1.36, + SpriteKind::MedFlatCactus => 1.36, + SpriteKind::ShortFlatCactus => 0.91, // TODO: Find suitable heights. - SpriteKind::RoundCactus - | SpriteKind::ShortCactus - | SpriteKind::MedFlatCactus - | SpriteKind::ShortFlatCactus - | SpriteKind::Apple + SpriteKind::Apple | SpriteKind::Beehive | SpriteKind::Velorite | SpriteKind::VeloriteFrag