From 745dfcdc959b271868b730a5846f3c9b0e72360a Mon Sep 17 00:00:00 2001 From: Monty Date: Tue, 4 May 2021 11:56:08 +0200 Subject: [PATCH] adjustments --- assets/common/npc_names.ron | 2 +- assets/voxygen/voxel/humanoid_head_manifest.ron | 10 ++++------ common/src/comp/body/humanoid.rs | 12 ++++++------ voxygen/anim/src/character/mod.rs | 8 ++++---- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/assets/common/npc_names.ron b/assets/common/npc_names.ron index e8e930351c..3b460cf249 100644 --- a/assets/common/npc_names.ron +++ b/assets/common/npc_names.ron @@ -314,7 +314,7 @@ undead: ( keyword: "undead", generic: "Undead" - ) + ), draugr: ( keyword: "draugr", generic: "Draugr" diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index ba29cdd3d6..a623cf142d 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -378,18 +378,16 @@ Some(("figure.accessory.danari.horns-0", (4, 9, 8))),] ), (Draugr, Male): ( - offset: (-9.0, -4.0, -2.0), - head: ("figure.head.draugr.male", (0, 2, 2)), - eyes: [ - Some(("figure.eyes.general.female_default-0", (4, 9, 4))), - ], + offset: (-6.0, -4.5, 0.5), + head: ("figure.head.draugr.male", (0, 3, 0)), + eyes: [None], hair: [None], beard: [None], accessory: [None], ), (Draugr, Female): ( offset: (-9.0, -4.0, -2.0), - head: ("figure.head.draugr.female", (0, 2, 2)), + head: ("figure.head.draugr.female", (6, 2, 2)), eyes: [ Some(("figure.eyes.general.female_default-0", (4, 9, 4))), ], diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs index ddcf50a985..ed4c26d86a 100644 --- a/common/src/comp/body/humanoid.rs +++ b/common/src/comp/body/humanoid.rs @@ -315,8 +315,8 @@ impl Species { (Species::Orc, BodyType::Male) => 8, (Species::Undead, BodyType::Female) => 6, (Species::Undead, BodyType::Male) => 5, - (Species::Draugr, BodyType::Female) => 0, - (Species::Draugr, BodyType::Male) => 0, + (Species::Draugr, BodyType::Female) => 1, + (Species::Draugr, BodyType::Male) => 1, } } @@ -334,8 +334,8 @@ impl Species { (Species::Orc, BodyType::Male) => 6, (Species::Undead, BodyType::Female) => 2, (Species::Undead, BodyType::Male) => 2, - (Species::Draugr, BodyType::Female) => 0, - (Species::Draugr, BodyType::Male) => 0, + (Species::Draugr, BodyType::Female) => 1, + (Species::Draugr, BodyType::Male) => 1, } } @@ -374,8 +374,8 @@ impl Species { (Species::Orc, BodyType::Male) => 3, (Species::Undead, BodyType::Female) => 1, (Species::Undead, BodyType::Male) => 1, - (Species::Draugr, BodyType::Female) => 0, - (Species::Draugr, BodyType::Male) => 0, + (Species::Draugr, BodyType::Female) => 1, + (Species::Draugr, BodyType::Male) => 1, } } } diff --git a/voxygen/anim/src/character/mod.rs b/voxygen/anim/src/character/mod.rs index a0441a21c2..ea7a366730 100644 --- a/voxygen/anim/src/character/mod.rs +++ b/voxygen/anim/src/character/mod.rs @@ -228,8 +228,8 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Undead, Female) => 0.72, (Danari, Male) => 0.56, (Danari, Female) => 0.56, - (Draugr, Male) => 0.56, - (Draugr, Female) => 0.56, + (Draugr, Male) => 0.8, + (Draugr, Female) => 0.75, }, head_scale: match (body.species, body.body_type) { (Orc, Male) => 0.9, @@ -244,8 +244,8 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Undead, Female) => 0.9, (Danari, Male) => 1.15, (Danari, Female) => 1.15, - (Draugr, Male) => 0.56, - (Draugr, Female) => 0.56, + (Draugr, Male) => 1.0, + (Draugr, Female) => 1.0, }, head: match (body.species, body.body_type) { (Orc, Male) => (-2.0, 9.0),