From 7e232a24924d3c8201b2752e281d707dca96ac8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludvig=20B=C3=B6klin?= <ludvig.boklin@protonmail.com>
Date: Wed, 19 May 2021 14:18:49 +0200
Subject: [PATCH] Define humanoid dimensions as measured in-game

---
 common/src/comp/body.rs | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index 74ae6c1dd5..69e6f71c12 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -313,22 +313,21 @@ impl Body {
             Body::FishMedium(_) => Vec3::new(0.5, 2.0, 0.8),
             Body::FishSmall(_) => Vec3::new(0.3, 1.2, 0.6),
             Body::Golem(_) => Vec3::new(5.0, 5.0, 7.5),
-            Body::Humanoid(humanoid) => {
-                let scale = match (humanoid.species, humanoid.body_type) {
-                    (humanoid::Species::Orc, humanoid::BodyType::Male) => 0.91,
-                    (humanoid::Species::Orc, humanoid::BodyType::Female) => 0.81,
-                    (humanoid::Species::Human, humanoid::BodyType::Male) => 0.81,
-                    (humanoid::Species::Human, humanoid::BodyType::Female) => 0.76,
-                    (humanoid::Species::Elf, humanoid::BodyType::Male) => 0.82,
-                    (humanoid::Species::Elf, humanoid::BodyType::Female) => 0.76,
-                    (humanoid::Species::Dwarf, humanoid::BodyType::Male) => 0.67,
-                    (humanoid::Species::Dwarf, humanoid::BodyType::Female) => 0.62,
-                    (humanoid::Species::Undead, humanoid::BodyType::Male) => 0.78,
-                    (humanoid::Species::Undead, humanoid::BodyType::Female) => 0.72,
-                    (humanoid::Species::Danari, humanoid::BodyType::Male) => 0.56,
-                    (humanoid::Species::Danari, humanoid::BodyType::Female) => 0.56,
-                };
-                Vec3::new(0.7 * scale, 0.4 * scale, 2.15 * scale)
+            Body::Humanoid(humanoid) => match (humanoid.species, humanoid.body_type) {
+                (humanoid::Species::Orc, humanoid::BodyType::Male) => Vec3::new(1.25, 0.7, 2.0),
+                (humanoid::Species::Orc, humanoid::BodyType::Female) => Vec3::new(1.15, 0.6, 1.8),
+                (humanoid::Species::Human, humanoid::BodyType::Male) => Vec3::new(1.1, 0.55, 1.8),
+                (humanoid::Species::Human, humanoid::BodyType::Female) => Vec3::new(1.0, 0.55, 1.7),
+                (humanoid::Species::Elf, _) => Vec3::new(1.0, 0.6, 1.7),
+                (humanoid::Species::Dwarf, humanoid::BodyType::Male) => Vec3::new(0.9, 0.55, 1.5),
+                (humanoid::Species::Dwarf, humanoid::BodyType::Female) => {
+                    Vec3::new(0.85, 0.45, 1.4)
+                },
+                (humanoid::Species::Undead, humanoid::BodyType::Male) => Vec3::new(1.0, 0.5, 1.7),
+                (humanoid::Species::Undead, humanoid::BodyType::Female) => {
+                    Vec3::new(0.95, 0.5, 1.65)
+                },
+                (humanoid::Species::Danari, _) => Vec3::new(0.75, 0.65, 1.25),
             },
             Body::Object(object) => object.dimensions(),
             Body::QuadrupedMedium(body) => match body.species {