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 'kemper/hitboxes' into 'master'

Browse Source 
Adjust hitboxes of husk and medium birds

See merge request veloren/veloren!3019
This commit is contained in:
Joshua Barretto 2021-11-19 13:22:48 +00:00
commit 0d779a754a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/comp/body.rs
View File

@ -319,11 +319,17 @@ impl Body {
biped_small::Species::Adlet => Vec3::new(1.0, 0.75, 2.0),
biped_small::Species::Sahagin => Vec3::new(1.0, 1.2, 1.7),
biped_small::Species::Myrmidon => Vec3::new(1.0, 0.75, 2.2),
biped_small::Species::Husk => Vec3::new(1.0, 0.75, 1.7),
biped_small::Species::Husk => Vec3::new(1.7, 0.7, 2.7),
_ => Vec3::new(1.0, 0.75, 1.4),
},
Body::BirdMedium(_) => Vec3::new(2.0, 1.0, 1.5),
Body::BirdMedium(body) => match body.species {
bird_medium::Species::Chicken => Vec3::new(1.0, 1.0, 1.35),
bird_medium::Species::Duck => Vec3::new(0.9, 1.0, 1.4),
bird_medium::Species::Goose => Vec3::new(1.0, 1.2, 1.5),
bird_medium::Species::Peacock => Vec3::new(1.3, 1.1, 1.4),
_ => Vec3::new(2.0, 1.0, 1.5),
},
Body::BirdLarge(_) => Vec3::new(2.0, 6.0, 3.5),
Body::Dragon(_) => Vec3::new(16.0, 10.0, 16.0),
Body::FishMedium(_) => Vec3::new(0.5, 2.0, 0.8),