diff --git a/assets/voxygen/voxel/figure/beard/human/1.vox b/assets/voxygen/voxel/figure/beard/human/1.vox index de41dd579b..322704c787 100644 Binary files a/assets/voxygen/voxel/figure/beard/human/1.vox and b/assets/voxygen/voxel/figure/beard/human/1.vox differ diff --git a/assets/voxygen/voxel/figure/eyes/danari/male.vox b/assets/voxygen/voxel/figure/eyes/danari/male.vox new file mode 100644 index 0000000000..2734bbd2e9 Binary files /dev/null and b/assets/voxygen/voxel/figure/eyes/danari/male.vox differ diff --git a/assets/voxygen/voxel/figure/eyes/dwarf/female.vox b/assets/voxygen/voxel/figure/eyes/dwarf/female.vox index 067d00e1f8..f9629af515 100644 Binary files a/assets/voxygen/voxel/figure/eyes/dwarf/female.vox and b/assets/voxygen/voxel/figure/eyes/dwarf/female.vox differ diff --git a/assets/voxygen/voxel/figure/eyes/human/female.vox b/assets/voxygen/voxel/figure/eyes/human/female.vox index f68c691396..afd6e8b528 100644 Binary files a/assets/voxygen/voxel/figure/eyes/human/female.vox and b/assets/voxygen/voxel/figure/eyes/human/female.vox differ diff --git a/assets/voxygen/voxel/figure/eyes/undead/female.vox b/assets/voxygen/voxel/figure/eyes/undead/female.vox new file mode 100644 index 0000000000..5bedc5ce77 Binary files /dev/null and b/assets/voxygen/voxel/figure/eyes/undead/female.vox differ diff --git a/assets/voxygen/voxel/figure/eyes/undead/male.vox b/assets/voxygen/voxel/figure/eyes/undead/male.vox new file mode 100644 index 0000000000..e3cd2602e1 Binary files /dev/null and b/assets/voxygen/voxel/figure/eyes/undead/male.vox differ diff --git a/assets/voxygen/voxel/figure/hair/danari/male.vox b/assets/voxygen/voxel/figure/hair/danari/male.vox index 9c01bc238b..217c15ab4b 100644 Binary files a/assets/voxygen/voxel/figure/hair/danari/male.vox and b/assets/voxygen/voxel/figure/hair/danari/male.vox differ diff --git a/assets/voxygen/voxel/figure/hair/undead/female.vox b/assets/voxygen/voxel/figure/hair/undead/female.vox new file mode 100644 index 0000000000..13c463bbfd Binary files /dev/null and b/assets/voxygen/voxel/figure/hair/undead/female.vox differ diff --git a/assets/voxygen/voxel/figure/hair/undead/male.vox b/assets/voxygen/voxel/figure/hair/undead/male.vox new file mode 100644 index 0000000000..ee784ae748 Binary files /dev/null and b/assets/voxygen/voxel/figure/hair/undead/male.vox differ diff --git a/assets/voxygen/voxel/figure/head/undead/female.vox b/assets/voxygen/voxel/figure/head/undead/female.vox new file mode 100644 index 0000000000..9d7f4c4917 Binary files /dev/null and b/assets/voxygen/voxel/figure/head/undead/female.vox differ diff --git a/assets/voxygen/voxel/figure/head/undead/male.vox b/assets/voxygen/voxel/figure/head/undead/male.vox new file mode 100644 index 0000000000..807b9d5659 Binary files /dev/null and b/assets/voxygen/voxel/figure/head/undead/male.vox differ diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index b7bba4b6f4..9ba9d36540 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -1,16 +1,14 @@ ({ (Human, Male): ( - offset: (-7.0, -5.0, -1.25), - head: ("figure.head.human.male", (0, 0, -1)), - eyes: ("figure.eyes.human.male", (3, 7, 1)), + offset: (-7.0, -5.0, -2.25), + head: ("figure.head.human.male", (0, 1, 0)), + eyes: ("figure.eyes.human.male", (3, 8, 2)), hair: { - None: None, - Temp1: Some(("figure.hair.human.male", (1, 0, 0))), - Temp2: Some(("figure.hair.human.male", (1, 0, 1))), + Temp1: Some(("figure.hair.human.male", (1, 0, 1))), }, beard: { None: None, - Some: Some(("figure.beard.human.1", (1, 8, -7))), + Some: Some(("figure.beard.human.1", (4, 5, -2))), }, accessory: { Nothing: None, @@ -19,12 +17,11 @@ ), (Human, Female): ( offset: (-7.0, -7.5, -3.25), - head: ("figure.head.human.female", (0, 4, 3)), + head: ("figure.head.human.female", (0, 4, 2)), eyes: ("figure.eyes.human.female", (2, 11, 4)), hair: { - None: None, - Temp1: Some(("figure.hair.human.female_1", (1, 1, -4))), - Temp2: Some(("figure.hair.human.female_2", (1, -1, 1))), + Temp1: Some(("figure.hair.human.female_1", (1, 1, -5))), + Temp2: Some(("figure.hair.human.female_2", (1, -1, 0))), }, beard: { None: None, @@ -36,16 +33,16 @@ }, ), (Orc, Male): ( - offset: (-7.0, -7.5, -3.25), - head: ("figure.head.orc.male", (-1, 3, 2)), - eyes: ("figure.eyes.orc.male", (-1, 4 , 5)), + offset: (-8.0, -5.0, -2.25), + head: ("figure.head.orc.male", (0, 1, 1)), + eyes: ("figure.eyes.orc.male", (0, 2, 4)), hair: { None: None, - Temp1: Some(("figure.hair.orc.male", (3, 2, 2))), + Temp1: Some(("figure.hair.orc.male", (4, 0, 1))), }, beard: { None: None, - Some: None, + Some: Some(("figure.beard.orc.1", (7, 9, 1))), }, accessory: { Nothing: None, @@ -53,12 +50,11 @@ }, ), (Orc, Female): ( - offset: (-7.0, -7.5, -3.25), - head: ("figure.head.orc.female", (-1, -1, 0)), - eyes: ("figure.eyes.orc.female", (2, 8, 1)), + offset: (-8.0, -8.0, -2), + head: ("figure.head.orc.female", (0, 0, -1)), + eyes: ("figure.eyes.orc.female", (3, 9, 0)), hair: { - None: None, - Temp1: Some(("figure.hair.orc.female", (4, 1, 0))), + Temp1: Some(("figure.hair.orc.female", (5, 2, -1))), }, beard: { None: None, @@ -70,12 +66,11 @@ }, ), (Elf, Male): ( - offset: (-7.0, -7.5, -3.25), - head: ("figure.head.elf.male", (-1, 3, 1)), - eyes: ("figure.eyes.elf.male", (3, 10, 3)), + offset: (-8.0, -5.0, -2.25), + head: ("figure.head.elf.male", (0, 2, 0)), + eyes: ("figure.eyes.elf.male", (4, 9, 2)), hair: { - None: None, - Temp1: Some(("figure.hair.elf.male", (1, 2, 2))), + Temp1: Some(("figure.hair.elf.male", (2, 1, 1))), }, beard: { None: None, @@ -87,12 +82,11 @@ }, ), (Elf, Female): ( - offset: (-7.0, -7.5, -3.25), - head: ("figure.head.elf.female", (-1, 4, 2)), - eyes: ("figure.eyes.elf.female", (2, 11, 3)), + offset: (-8.0, -5.5, -2.0), + head: ("figure.head.elf.female", (0, 3, 1)), + eyes: ("figure.eyes.elf.female", (3, 10, 2)), hair: { - None: None, - Temp1: Some(("figure.hair.elf.female", (1, 2, 0))), + Temp1: Some(("figure.hair.elf.female", (2, 1, -1))), }, beard: { None: None, @@ -104,15 +98,15 @@ }, ), (Dwarf, Male): ( - offset: (-7.0, -7.5, -3.25), - head: ("figure.head.dwarf.male", (1, 1, 1)), - eyes: ("figure.eyes.dwarf.male", (3, 8, 3)), + offset: (-6.0, -5.0, -2), + head: ("figure.head.dwarf.male", (0, -1, -1)), + eyes: ("figure.eyes.dwarf.male", (2, 6, 1)), hair: { None: None, }, beard: { None: None, - Some: None, + Some: Some(("figure.beard.dwarf.1", (1, 2, -10))), }, accessory: { Nothing: None, @@ -120,12 +114,11 @@ }, ), (Dwarf, Female): ( - offset: (-7.0, -7.5, -3.25), - head: ("figure.head.dwarf.female", (1, 4, 2)), - eyes: ("figure.eyes.dwarf.female", (2, 11, 3)), + offset: (-6.0, -6.0, -2), + head: ("figure.head.dwarf.female", (0, 3, 0)), + eyes: ("figure.eyes.dwarf.female", (1, 10, 2)), hair: { - None: None, - Temp1: Some(("figure.hair.dwarf.female", (2, 1, -5))), + Temp1: Some(("figure.hair.dwarf.female", (1 , 0, -7))), }, beard: { None: None, @@ -137,12 +130,12 @@ }, ), (Undead, Male): ( - offset: (-7.0, -7.5, -3.25), - head: ("figure.head.undead.male", (1, 1, 1)), - eyes: ("figure.eyes.undead.male", (3, 8, 3)), + offset: (-5.5, -5.0, -2.25), + head: ("figure.head.undead.male", (1, 1, -1)), + eyes: ("figure.eyes.undead.male", (3, 7, 3)), hair: { None: None, - Temp1: Some(("figure.hair.undead.male", (2, 1, -5))), + Temp1: Some(("figure.hair.undead.male", (0, 0, 0))), }, beard: { None: None, @@ -154,12 +147,11 @@ }, ), (Undead, Female): ( - offset: (-7.0, -7.5, -3.25), - head: ("figure.head.undead.female", (1, 4, 2)), - eyes: ("figure.eyes.undead.female", (2, 11, 3)), + offset: (-6.0, -5.0, -2.5), + head: ("figure.head.undead.female", (1, 1, -1)), + eyes: ("figure.eyes.undead.female", (3, 7, 2)), hair: { - None: None, - Temp1: Some(("figure.hair.undead.female", (2, 1, -5))), + Temp1: Some(("figure.hair.undead.female", (1, 0, -1))), }, beard: { None: None, @@ -171,12 +163,12 @@ }, ), (Danari, Male): ( - offset: (-7.0, -7.5, -3.25), - head: ("figure.head.danari.male", (-2, 2, 1)), - eyes: ("figure.eyes.danari.male", (3, 8, 30)), + offset: (-9.0, -5.0, -2.75), + head: ("figure.head.danari.male", (0, 1, -1)), + eyes: ("figure.eyes.danari.male", (5, 7, 1)), hair: { None: None, - Temp1: Some(("figure.hair.danari.male", (1, 1, 1))), + Temp1: Some(("figure.hair.danari.male", (3, 0, -1))), }, beard: { None: None, @@ -188,12 +180,11 @@ }, ), (Danari, Female): ( - offset: (-7.0, -7.5, -3.25), - head: ("figure.head.danari.female", (-2, 6, 1)), - eyes: ("figure.eyes.danari.female", (2, 13, 3)), + offset: (-9.0, -7.5, -2.25), + head: ("figure.head.danari.female", (0, 6, 0)), + eyes: ("figure.eyes.danari.female", (4, 13, 2)), hair: { - None: None, - Temp1: Some(("figure.hair.danari.female", (1, 0, 1))), + Temp1: Some(("figure.hair.danari.female", (3, 0, -1))), }, beard: { None: None,