From c0f3dfe6bd07942508427a6573cb3a0d015a87e5 Mon Sep 17 00:00:00 2001 From: juliancoffee Date: Fri, 6 Aug 2021 11:57:42 +0300 Subject: [PATCH] Normalize masses in range 75-100. + Remove match on body_type --- common/src/comp/body.rs | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 0e52fc50c8..d4ec2262f9 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -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,