Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maxicarlos08/cactus-fix' into 'master'

Browse Source 
Reduced large cacti sizes

See merge request veloren/veloren!4080
This commit is contained in:
Joshua Barretto 2023-08-16 20:16:44 +00:00
commit 13789b3de4
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/cacti/cactus_branch_large_1_flower.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/cacti/cactus_branch_large_2_flower.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/sprite/cacti/large_cactus.vox (Stored with Git LFS)
View File

Binary file not shown.

12
common/src/terrain/sprite.rs
View File

@ -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