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..05688e540a Binary files /dev/null and b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox differ 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..2b6d65148c Binary files /dev/null and b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox differ 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..9e0687a34f Binary files /dev/null and b/assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox differ 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..68acdf39ae Binary files /dev/null and b/assets/voxygen/voxel/figure/hair/dwarf/male-4.vox differ 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..bce8f1b2ab Binary files /dev/null and b/assets/voxygen/voxel/figure/hair/dwarf/male-5.vox differ 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..4575c30b9c Binary files /dev/null and b/assets/voxygen/voxel/figure/hair/dwarf/male-6.vox differ 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..8dc38f5e3a Binary files /dev/null and b/assets/voxygen/voxel/figure/hair/dwarf/male-7.vox differ diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index 47c00b6117..ff6f43c0c8 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,