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 'swilliams/collision-balance' into 'master'

Browse Source 
NPC Hitbox Adjustments

See merge request veloren/veloren!2403
This commit is contained in:
Marcel 2021-06-09 08:08:44 +00:00
commit ee5d55f773
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -131,6 +131,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Reworked yeti to have unique attacks
- Widened recipe name list in crafting menu
- Reworked animal loot tables
- NPC hitboxes better fit their model.
### Removed

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

@ -309,8 +309,8 @@ impl Body {
_ => Vec3::new(4.6, 3.0, 6.0),
},
Body::BipedSmall(_) => Vec3::new(1.0, 0.75, 1.4),
Body::BirdMedium(_) => Vec3::new(2.0, 1.0, 1.1),
Body::BirdLarge(_) => Vec3::new(2.0, 5.0, 2.4),
Body::BirdMedium(_) => 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),
Body::FishSmall(_) => Vec3::new(0.3, 1.2, 0.6),
@ -334,52 +334,52 @@ impl Body {
},
Body::Object(object) => object.dimensions(),
Body::QuadrupedMedium(body) => match body.species {
quadruped_medium::Species::Barghest => Vec3::new(2.0, 3.6, 2.5),
quadruped_medium::Species::Bear => Vec3::new(2.0, 3.6, 2.0),
quadruped_medium::Species::Barghest => Vec3::new(2.0, 4.4, 2.7),
quadruped_medium::Species::Bear => Vec3::new(2.0, 3.8, 3.0),
quadruped_medium::Species::Catoblepas => Vec3::new(2.0, 4.0, 2.9),
quadruped_medium::Species::Cattle => Vec3::new(2.0, 3.6, 2.0),
quadruped_medium::Species::Deer => Vec3::new(2.0, 3.0, 2.0),
quadruped_medium::Species::Dreadhorn => Vec3::new(2.0, 3.0, 2.5),
quadruped_medium::Species::Cattle => Vec3::new(2.0, 3.6, 2.4),
quadruped_medium::Species::Deer => Vec3::new(2.0, 3.0, 2.2),
quadruped_medium::Species::Dreadhorn => Vec3::new(2.0, 5.0, 4.0),
quadruped_medium::Species::Grolgar => Vec3::new(2.0, 4.0, 2.0),
quadruped_medium::Species::Highland => Vec3::new(2.0, 3.6, 2.0),
quadruped_medium::Species::Horse => Vec3::new(2.0, 3.0, 2.0),
quadruped_medium::Species::Lion => Vec3::new(2.0, 3.0, 2.0),
quadruped_medium::Species::Highland => Vec3::new(2.0, 3.6, 2.4),
quadruped_medium::Species::Horse => Vec3::new(2.0, 3.0, 2.4),
quadruped_medium::Species::Lion => Vec3::new(2.0, 3.3, 2.0),
quadruped_medium::Species::Moose => Vec3::new(2.0, 4.0, 2.5),
quadruped_medium::Species::Saber => Vec3::new(2.0, 4.0, 2.0),
quadruped_medium::Species::Saber => Vec3::new(2.0, 3.0, 2.0),
quadruped_medium::Species::Tarasque => Vec3::new(2.0, 4.0, 2.6),
quadruped_medium::Species::Yak => Vec3::new(2.0, 3.6, 2.0),
quadruped_medium::Species::Yak => Vec3::new(2.0, 3.6, 3.0),
_ => Vec3::new(2.0, 3.0, 2.0),
},
Body::QuadrupedSmall(body) => match body.species {
quadruped_small::Species::Dodarock => Vec3::new(1.2, 1.2, 1.5),
quadruped_small::Species::Holladon => Vec3::new(1.2, 1.2, 1.5),
quadruped_small::Species::Truffler => Vec3::new(1.2, 1.2, 2.0),
quadruped_small::Species::Dodarock => Vec3::new(1.2, 1.8, 1.5),
quadruped_small::Species::Holladon => Vec3::new(1.2, 1.6, 1.5),
quadruped_small::Species::Truffler => Vec3::new(1.2, 1.8, 2.2),
_ => Vec3::new(1.2, 1.2, 1.0),
},
Body::QuadrupedLow(body) => match body.species {
quadruped_low::Species::Asp => Vec3::new(1.0, 2.5, 1.3),
quadruped_low::Species::Crocodile => Vec3::new(1.0, 2.4, 1.3),
quadruped_low::Species::Deadwood => Vec3::new(1.0, 0.5, 1.3),
quadruped_low::Species::Lavadrake => Vec3::new(1.0, 2.5, 1.3),
quadruped_low::Species::Maneater => Vec3::new(1.0, 1.6, 4.0),
quadruped_low::Species::Asp => Vec3::new(1.0, 3.0, 1.8),
quadruped_low::Species::Crocodile => Vec3::new(1.0, 2.8, 1.3),
quadruped_low::Species::Deadwood => Vec3::new(1.0, 1.4, 1.3),
quadruped_low::Species::Lavadrake => Vec3::new(1.0, 3.0, 2.5),
quadruped_low::Species::Maneater => Vec3::new(1.0, 2.2, 4.0),
quadruped_low::Species::Monitor => Vec3::new(1.0, 2.3, 1.5),
quadruped_low::Species::Pangolin => Vec3::new(1.0, 2.0, 1.3),
quadruped_low::Species::Rocksnapper => Vec3::new(1.0, 1.6, 2.9),
quadruped_low::Species::Basilisk => Vec3::new(1.8, 2.2, 2.9),
quadruped_low::Species::Pangolin => Vec3::new(1.0, 2.6, 1.1),
quadruped_low::Species::Rocksnapper => Vec3::new(1.0, 3.0, 2.9),
quadruped_low::Species::Basilisk => Vec3::new(1.8, 3.4, 2.9),
quadruped_low::Species::Salamander => Vec3::new(1.0, 2.4, 1.3),
quadruped_low::Species::Tortoise => Vec3::new(1.0, 1.6, 2.0),
quadruped_low::Species::Tortoise => Vec3::new(1.0, 1.8, 1.6),
_ => Vec3::new(1.0, 1.6, 1.3),
},
Body::Ship(ship) => ship.dimensions(),
Body::Theropod(body) => match body.species {
theropod::Species::Archaeos => Vec3::new(4.0, 7.0, 8.0),
theropod::Species::Ntouka => Vec3::new(4.0, 6.0, 8.0),
theropod::Species::Odonto => Vec3::new(4.0, 6.5, 8.0),
theropod::Species::Archaeos => Vec3::new(4.0, 8.5, 8.0),
theropod::Species::Ntouka => Vec3::new(4.0, 7.0, 8.0),
theropod::Species::Odonto => Vec3::new(4.0, 7.0, 8.0),
theropod::Species::Sandraptor => Vec3::new(2.0, 3.0, 2.6),
theropod::Species::Snowraptor => Vec3::new(2.0, 3.0, 2.6),
theropod::Species::Sunlizard => Vec3::new(2.0, 3.6, 2.5),
theropod::Species::Woodraptor => Vec3::new(2.0, 3.0, 2.6),
theropod::Species::Yale => Vec3::new(1.5, 3.2, 6.0),
theropod::Species::Yale => Vec3::new(1.5, 3.2, 4.0),
},
}
}