From b67558c1ba6d0aec3b6da3a18974d92f3aeadbda Mon Sep 17 00:00:00 2001 From: Oolnokk Date: Sun, 31 Oct 2021 22:58:25 -0400 Subject: [PATCH 1/3] 2 new beards, four new hairstyles and 1 new eye option for dwarf males --- assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox | 3 +++ assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox | 3 +++ .../voxygen/voxel/figure/eyes/general/male_old_blind.vox | 3 +++ assets/voxygen/voxel/figure/hair/dwarf/male-4.vox | 3 +++ assets/voxygen/voxel/figure/hair/dwarf/male-5.vox | 3 +++ assets/voxygen/voxel/figure/hair/dwarf/male-6.vox | 3 +++ assets/voxygen/voxel/figure/hair/dwarf/male-7.vox | 3 +++ assets/voxygen/voxel/humanoid_head_manifest.ron | 7 +++++++ common/src/comp/body/humanoid.rs | 6 +++--- 9 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox create mode 100644 assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox create mode 100644 assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox create mode 100644 assets/voxygen/voxel/figure/hair/dwarf/male-4.vox create mode 100644 assets/voxygen/voxel/figure/hair/dwarf/male-5.vox create mode 100644 assets/voxygen/voxel/figure/hair/dwarf/male-6.vox create mode 100644 assets/voxygen/voxel/figure/hair/dwarf/male-7.vox diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox new file mode 100644 index 0000000000..a764717075 --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:033c11472aa720a441b245b191ac07143d4c99162d19e24018cb63b2187e8a33 +size 1416 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox new file mode 100644 index 0000000000..439eee57fd --- /dev/null +++ b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9d8750c52704a078f7557a5b6948d83a4d3810a596533d06f628482f1dbac1a +size 1640 diff --git a/assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox b/assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox new file mode 100644 index 0000000000..69528e2110 --- /dev/null +++ b/assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02486a50a7485adb666e77488dc7c3f1bc0e92a3d7e3ba493abde2242d76764f +size 1176 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-4.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-4.vox new file mode 100644 index 0000000000..5217522841 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:813bcf7f1ed691ec2268a76161aa03ea45734351c8ba192b5830c10bf2071349 +size 1692 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-5.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-5.vox new file mode 100644 index 0000000000..03983032ef --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e37cb9e96ac340b26e59ed2434ce1cb92d8f53670f3f9fe5337ff29409ff648e +size 1904 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-6.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-6.vox new file mode 100644 index 0000000000..ae7a9af907 --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6131cfb0ea74af86cab91c7c59de55bc36fbf74b592a17b7f0c036ce235248cd +size 2640 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-7.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-7.vox new file mode 100644 index 0000000000..d68a4d07ed --- /dev/null +++ b/assets/voxygen/voxel/figure/hair/dwarf/male-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:baada06f31322d58ccf5efa839af0a1e5d80969c7360ae35fecc3af15bbe0ca5 +size 3048 diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index 47c00b6117..e2eac6e513 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -216,6 +216,7 @@ Some(("figure.eyes.general.male_scar-0", (2, 10, 2))), Some(("figure.eyes.general.male_blind-0", (2, 10, 2))), Some(("figure.eyes.general.male_old", (1, 10, 1))), + Some(("figure.eyes.general.male_old_blind", (1, 10, 1))), ], hair: [ Some(("figure.hair.dwarf.bald", (0, 3, 1))), @@ -223,6 +224,10 @@ Some(("figure.hair.dwarf.male-1", (4, 0, 1))), //Some(("figure.hair.dwarf.male-2", (0, 2, -2))), Some(("figure.hair.dwarf.male-3", (1, 1, -3))), + Some(("figure.hair.dwarf.male-4", (1, -4, -3))), + Some(("figure.hair.dwarf.male-5", (1, -6, -3))), + Some(("figure.hair.dwarf.male-6", (1, -4, -3))), + Some(("figure.hair.dwarf.male-7", (-2, -4, -4))), ], beard: [ Some(("figure.beard.dwarf.dwarf-0", (4, 9, -2))), @@ -246,6 +251,8 @@ Some(("figure.beard.dwarf.dwarf-18", (2, 8, -4))), Some(("figure.beard.dwarf.dwarf-19", (1, 7, -8))), Some(("figure.beard.dwarf.dwarf-20", (1, 7,-4))), + Some(("figure.beard.dwarf.dwarf-21", (1, 7, -8))), + Some(("figure.beard.dwarf.dwarf-22", (1, 7, -8))), ], accessory: [ None, diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs index d165a26644..42b41b6e37 100644 --- a/common/src/comp/body/humanoid.rs +++ b/common/src/comp/body/humanoid.rs @@ -311,7 +311,7 @@ impl Species { (Species::Danari, BodyType::Female) => 4, (Species::Danari, BodyType::Male) => 5, (Species::Dwarf, BodyType::Female) => 8, - (Species::Dwarf, BodyType::Male) => 4, + (Species::Dwarf, BodyType::Male) => 8, (Species::Elf, BodyType::Female) => 21, (Species::Elf, BodyType::Male) => 4, (Species::Human, BodyType::Female) => 19, @@ -347,7 +347,7 @@ impl Species { (Species::Danari, BodyType::Female) => 6, (Species::Danari, BodyType::Male) => 8, (Species::Dwarf, BodyType::Female) => 6, - (Species::Dwarf, BodyType::Male) => 8, + (Species::Dwarf, BodyType::Male) => 9, (Species::Elf, BodyType::Female) => 6, (Species::Elf, BodyType::Male) => 7, (Species::Human, BodyType::Female) => 6, @@ -364,7 +364,7 @@ impl Species { (Species::Danari, BodyType::Female) => 1, (Species::Danari, BodyType::Male) => 16, (Species::Dwarf, BodyType::Female) => 1, - (Species::Dwarf, BodyType::Male) => 20, + (Species::Dwarf, BodyType::Male) => 22, (Species::Elf, BodyType::Female) => 1, (Species::Elf, BodyType::Male) => 1, (Species::Human, BodyType::Female) => 1, From 3618a0e5f5b3aaa91bb366accf0259b7ac605c07 Mon Sep 17 00:00:00 2001 From: Oolnokk Date: Sun, 31 Oct 2021 23:44:29 -0400 Subject: [PATCH 2/3] Changes to formatting --- assets/voxygen/voxel/humanoid_head_manifest.ron | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index e2eac6e513..3d7bb6e6bf 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -216,7 +216,7 @@ Some(("figure.eyes.general.male_scar-0", (2, 10, 2))), Some(("figure.eyes.general.male_blind-0", (2, 10, 2))), Some(("figure.eyes.general.male_old", (1, 10, 1))), - Some(("figure.eyes.general.male_old_blind", (1, 10, 1))), + Some(("figure.eyes.general.male_old_blind", (1, 10, 1))), ], hair: [ Some(("figure.hair.dwarf.bald", (0, 3, 1))), @@ -224,10 +224,10 @@ Some(("figure.hair.dwarf.male-1", (4, 0, 1))), //Some(("figure.hair.dwarf.male-2", (0, 2, -2))), Some(("figure.hair.dwarf.male-3", (1, 1, -3))), - Some(("figure.hair.dwarf.male-4", (1, -4, -3))), - Some(("figure.hair.dwarf.male-5", (1, -6, -3))), - Some(("figure.hair.dwarf.male-6", (1, -4, -3))), - Some(("figure.hair.dwarf.male-7", (-2, -4, -4))), + Some(("figure.hair.dwarf.male-4", (1, -4, -3))), + Some(("figure.hair.dwarf.male-5", (1, -6, -3))), + Some(("figure.hair.dwarf.male-6", (1, -4, -3))), + Some(("figure.hair.dwarf.male-7", (-2, -4, -4))), ], beard: [ Some(("figure.beard.dwarf.dwarf-0", (4, 9, -2))), @@ -251,8 +251,8 @@ Some(("figure.beard.dwarf.dwarf-18", (2, 8, -4))), Some(("figure.beard.dwarf.dwarf-19", (1, 7, -8))), Some(("figure.beard.dwarf.dwarf-20", (1, 7,-4))), - Some(("figure.beard.dwarf.dwarf-21", (1, 7, -8))), - Some(("figure.beard.dwarf.dwarf-22", (1, 7, -8))), + Some(("figure.beard.dwarf.dwarf-21", (1, 7, -8))), + Some(("figure.beard.dwarf.dwarf-22", (1, 7, -8))), ], accessory: [ None, From b6f137bb7a2d983b7c980dc0fa2ea1a767e346da Mon Sep 17 00:00:00 2001 From: Oolnokk Date: Sun, 31 Oct 2021 23:49:46 -0400 Subject: [PATCH 3/3] Changes to formatting --- assets/voxygen/voxel/humanoid_head_manifest.ron | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index 3d7bb6e6bf..ff6f43c0c8 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -216,7 +216,7 @@ Some(("figure.eyes.general.male_scar-0", (2, 10, 2))), Some(("figure.eyes.general.male_blind-0", (2, 10, 2))), Some(("figure.eyes.general.male_old", (1, 10, 1))), - Some(("figure.eyes.general.male_old_blind", (1, 10, 1))), + Some(("figure.eyes.general.male_old_blind", (1, 10, 1))), ], hair: [ Some(("figure.hair.dwarf.bald", (0, 3, 1))), @@ -224,10 +224,10 @@ Some(("figure.hair.dwarf.male-1", (4, 0, 1))), //Some(("figure.hair.dwarf.male-2", (0, 2, -2))), Some(("figure.hair.dwarf.male-3", (1, 1, -3))), - Some(("figure.hair.dwarf.male-4", (1, -4, -3))), - Some(("figure.hair.dwarf.male-5", (1, -6, -3))), - Some(("figure.hair.dwarf.male-6", (1, -4, -3))), - Some(("figure.hair.dwarf.male-7", (-2, -4, -4))), + Some(("figure.hair.dwarf.male-4", (1, -4, -3))), + Some(("figure.hair.dwarf.male-5", (1, -6, -3))), + Some(("figure.hair.dwarf.male-6", (1, -4, -3))), + Some(("figure.hair.dwarf.male-7", (-2, -4, -4))), ], beard: [ Some(("figure.beard.dwarf.dwarf-0", (4, 9, -2))), @@ -251,8 +251,8 @@ Some(("figure.beard.dwarf.dwarf-18", (2, 8, -4))), Some(("figure.beard.dwarf.dwarf-19", (1, 7, -8))), Some(("figure.beard.dwarf.dwarf-20", (1, 7,-4))), - Some(("figure.beard.dwarf.dwarf-21", (1, 7, -8))), - Some(("figure.beard.dwarf.dwarf-22", (1, 7, -8))), + Some(("figure.beard.dwarf.dwarf-21", (1, 7, -8))), + Some(("figure.beard.dwarf.dwarf-22", (1, 7, -8))), ], accessory: [ None,