From a826eb76ecf7b8a24b65b7c9b4a36cc02fc3bcd7 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sun, 25 Aug 2019 15:52:23 -0400 Subject: [PATCH] proper head offsets, more options --- assets/voxygen/voxel/figure/beard/human/1.vox | 4 +- .../voxygen/voxel/figure/eyes/danari/male.vox | 3 + .../voxel/figure/eyes/dwarf/female.vox | 4 +- .../voxel/figure/eyes/human/female.vox | 4 +- .../voxel/figure/eyes/undead/female.vox | 3 + .../voxygen/voxel/figure/eyes/undead/male.vox | 3 + .../voxygen/voxel/figure/hair/danari/male.vox | 4 +- .../voxel/figure/hair/undead/female.vox | 3 + .../voxygen/voxel/figure/hair/undead/male.vox | 3 + .../voxel/figure/head/undead/female.vox | 3 + .../voxygen/voxel/figure/head/undead/male.vox | 3 + .../voxygen/voxel/humanoid_head_manifest.ron | 107 ++++++++---------- 12 files changed, 78 insertions(+), 66 deletions(-) create mode 100644 assets/voxygen/voxel/figure/eyes/danari/male.vox create mode 100644 assets/voxygen/voxel/figure/eyes/undead/female.vox create mode 100644 assets/voxygen/voxel/figure/eyes/undead/male.vox create mode 100644 assets/voxygen/voxel/figure/hair/undead/female.vox create mode 100644 assets/voxygen/voxel/figure/hair/undead/male.vox create mode 100644 assets/voxygen/voxel/figure/head/undead/female.vox create mode 100644 assets/voxygen/voxel/figure/head/undead/male.vox diff --git a/assets/voxygen/voxel/figure/beard/human/1.vox b/assets/voxygen/voxel/figure/beard/human/1.vox index 46b25e2a48..96b52b6b2d 100644 --- a/assets/voxygen/voxel/figure/beard/human/1.vox +++ b/assets/voxygen/voxel/figure/beard/human/1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a600da27caeb2970182441265c192b291969a86db1e10d761dd0bf926c5740ea -size 44478 +oid sha256:053f070898d37ad6cf1fa34ca1b1379e0d8e581c03950568542a60586ce3adc0 +size 1240 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..9b33731c09 --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/danari/male.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b934d2857cf6fa6406965542b5784603de4d92dc62fb9a233e9bb34b4e4cdb6a +size 1160 diff --git a/assets/voxygen/voxel/figure/eyes/dwarf/female.vox b/assets/voxygen/voxel/figure/eyes/dwarf/female.vox index 067cc02a3b..4919ac544b 100644 --- a/assets/voxygen/voxel/figure/eyes/dwarf/female.vox +++ b/assets/voxygen/voxel/figure/eyes/dwarf/female.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b940788de7051481f11f83de71c9f495f87bffc544674859e0ae8c52898ff2eb -size 55588 +oid sha256:d9b009ae959dba33eeb1b2c651b403bd8346a16db5102372f66c0c7b4b073689 +size 1152 diff --git a/assets/voxygen/voxel/figure/eyes/human/female.vox b/assets/voxygen/voxel/figure/eyes/human/female.vox index 14a784fd50..aee65788dc 100644 --- a/assets/voxygen/voxel/figure/eyes/human/female.vox +++ b/assets/voxygen/voxel/figure/eyes/human/female.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9fb60e62cb38d97455063805e44ac5bb974d3a6574194b2d724834c625eb774 -size 1160 +oid sha256:508cf3e2f06baa3da24d8283892a625c1280012ddc384ebbeac284cda6959ded +size 1152 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..0a00996743 --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/undead/female.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae13c10307da8261ba6dcfd7a08c77f061e38da0361f6d691491c56070bb3121 +size 1112 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..778e0650f6 --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/undead/male.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:293f434bc61dae6f7f9678f682c25fd383eb62b8a6607c3909d9d0da4df3bb8c +size 1112 diff --git a/assets/voxygen/voxel/figure/hair/danari/male.vox b/assets/voxygen/voxel/figure/hair/danari/male.vox index 9476acc4c4..be0b1290f0 100644 --- a/assets/voxygen/voxel/figure/hair/danari/male.vox +++ b/assets/voxygen/voxel/figure/hair/danari/male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67b4a9ff6d2739cebe1d84f07f9c6e78d68c031f6c55863409faf2c07f8929c1 -size 44947 +oid sha256:329471023f50020b085071a5a684fc32e637e07106f961d6334ac9e5a514654c +size 1824 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..656db587d4 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/undead/female.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19083310f37cedff66dc1ba3fee819dc4cd95a13b922c9cfa9286933cc20efee +size 2012 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..0d3f9559ad --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/undead/male.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7d76af7a3c69c87f2fd72324e2b980cc853968a92daff7cbd753422284dda47 +size 1960 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..1316f54815 --- /dev/null +++ b/assets/voxygen/voxel/figure/head/undead/female.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:684552eb6c0ed43f4b08b6c03fcded174d0ef28655d24ff8843c3e8b4673bf7c +size 3300 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..7262aac890 --- /dev/null +++ b/assets/voxygen/voxel/figure/head/undead/male.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7431df6a0fc7ffbebc29c909c4641c53e5e925e4838ce2095158a89041ac5c6 +size 3016 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,