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

adjustments

Browse Source
This commit is contained in:
Monty 2021-05-04 11:56:08 +02:00
parent 18b9bce677
commit 745dfcdc95
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/npc_names.ron
View File

@ -314,7 +314,7 @@
undead: ( undead: (
keyword: "undead", keyword: "undead",
generic: "Undead" generic: "Undead"
) ),
draugr: ( draugr: (
keyword: "draugr", keyword: "draugr",
generic: "Draugr" generic: "Draugr"

10
assets/voxygen/voxel/humanoid_head_manifest.ron
View File

@ -378,18 +378,16 @@
Some(("figure.accessory.danari.horns-0", (4, 9, 8))),] Some(("figure.accessory.danari.horns-0", (4, 9, 8))),]
), ),
(Draugr, Male): ( (Draugr, Male): (
offset: (-9.0, -4.0, -2.0), offset: (-6.0, -4.5, 0.5),
head: ("figure.head.draugr.male", (0, 2, 2)), head: ("figure.head.draugr.male", (0, 3, 0)),
eyes: [ eyes: [None],
Some(("figure.eyes.general.female_default-0", (4, 9, 4))),
],
hair: [None], hair: [None],
beard: [None], beard: [None],
accessory: [None], accessory: [None],
), ),
(Draugr, Female): ( (Draugr, Female): (
offset: (-9.0, -4.0, -2.0), offset: (-9.0, -4.0, -2.0),
head: ("figure.head.draugr.female", (0, 2, 2)), head: ("figure.head.draugr.female", (6, 2, 2)),
eyes: [ eyes: [
Some(("figure.eyes.general.female_default-0", (4, 9, 4))), Some(("figure.eyes.general.female_default-0", (4, 9, 4))),
], ],

12
common/src/comp/body/humanoid.rs
View File

@ -315,8 +315,8 @@ impl Species {
(Species::Orc, BodyType::Male) => 8, (Species::Orc, BodyType::Male) => 8,
(Species::Undead, BodyType::Female) => 6, (Species::Undead, BodyType::Female) => 6,
(Species::Undead, BodyType::Male) => 5, (Species::Undead, BodyType::Male) => 5,
(Species::Draugr, BodyType::Female) => 0, (Species::Draugr, BodyType::Female) => 1,
(Species::Draugr, BodyType::Male) => 0, (Species::Draugr, BodyType::Male) => 1,
} }
} }
@ -334,8 +334,8 @@ impl Species {
(Species::Orc, BodyType::Male) => 6, (Species::Orc, BodyType::Male) => 6,
(Species::Undead, BodyType::Female) => 2, (Species::Undead, BodyType::Female) => 2,
(Species::Undead, BodyType::Male) => 2, (Species::Undead, BodyType::Male) => 2,
(Species::Draugr, BodyType::Female) => 0, (Species::Draugr, BodyType::Female) => 1,
(Species::Draugr, BodyType::Male) => 0, (Species::Draugr, BodyType::Male) => 1,
} }
} }
@ -374,8 +374,8 @@ impl Species {
(Species::Orc, BodyType::Male) => 3, (Species::Orc, BodyType::Male) => 3,
(Species::Undead, BodyType::Female) => 1, (Species::Undead, BodyType::Female) => 1,
(Species::Undead, BodyType::Male) => 1, (Species::Undead, BodyType::Male) => 1,
(Species::Draugr, BodyType::Female) => 0, (Species::Draugr, BodyType::Female) => 1,
(Species::Draugr, BodyType::Male) => 0, (Species::Draugr, BodyType::Male) => 1,
} }
} }
} }

8
voxygen/anim/src/character/mod.rs
View File

@ -228,8 +228,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Undead, Female) => 0.72, (Undead, Female) => 0.72,
(Danari, Male) => 0.56, (Danari, Male) => 0.56,
(Danari, Female) => 0.56, (Danari, Female) => 0.56,
(Draugr, Male) => 0.56, (Draugr, Male) => 0.8,
(Draugr, Female) => 0.56, (Draugr, Female) => 0.75,
}, },
head_scale: match (body.species, body.body_type) { head_scale: match (body.species, body.body_type) {
(Orc, Male) => 0.9, (Orc, Male) => 0.9,
@ -244,8 +244,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Undead, Female) => 0.9, (Undead, Female) => 0.9,
(Danari, Male) => 1.15, (Danari, Male) => 1.15,
(Danari, Female) => 1.15, (Danari, Female) => 1.15,
(Draugr, Male) => 0.56, (Draugr, Male) => 1.0,
(Draugr, Female) => 0.56, (Draugr, Female) => 1.0,
}, },
head: match (body.species, body.body_type) { head: match (body.species, body.body_type) {
(Orc, Male) => (-2.0, 9.0), (Orc, Male) => (-2.0, 9.0),