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 'juliancoffee/normalize_mass' into 'master'

Browse Source 
Normalize masses in range 75-100.

See merge request veloren/veloren!2740
This commit is contained in:
Samuel Keiffer 2021-08-06 11:53:52 +00:00
commit 6b0fe3ae75
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,19 +205,18 @@ impl Body {
Body::FishSmall(_) => 1.0,
Body::Golem(_) => 10_000.0,
Body::Humanoid(humanoid) => {
match (humanoid.species, humanoid.body_type) {
(humanoid::Species::Orc, humanoid::BodyType::Male) => 120.0,
(humanoid::Species::Orc, humanoid::BodyType::Female) => 120.0,
(humanoid::Species::Human, humanoid::BodyType::Male) => 77.0, // ~✅
(humanoid::Species::Human, humanoid::BodyType::Female) => 59.0, // ~✅
(humanoid::Species::Elf, humanoid::BodyType::Male) => 77.0,
(humanoid::Species::Elf, humanoid::BodyType::Female) => 59.0,
(humanoid::Species::Dwarf, humanoid::BodyType::Male) => 70.0,
(humanoid::Species::Dwarf, humanoid::BodyType::Female) => 70.0,
(humanoid::Species::Undead, humanoid::BodyType::Male) => 70.0,
(humanoid::Species::Undead, humanoid::BodyType::Female) => 50.0,
(humanoid::Species::Danari, humanoid::BodyType::Male) => 80.0,
(humanoid::Species::Danari, humanoid::BodyType::Female) => 60.0,
// Understand that chaning the mass values can have effects
// on multiple systems.
//
// If you want to change that value, consult with
// Physics and Combat teams
match humanoid.species {
humanoid::Species::Orc => 100.0,
humanoid::Species::Elf => 85.0,
humanoid::Species::Human => 85.0,
humanoid::Species::Dwarf => 80.0,
humanoid::Species::Undead => 75.0,
humanoid::Species::Danari => 75.0,
}
},
Body::Object(obj) => obj.mass().0,