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

Merge branch 'oolnokk/new_male_dwarf_customization_options' into 'master'

Browse Source 
Oolnokk/More Dwarf Male Customization Options

See merge request veloren/veloren!2980
This commit is contained in:
Justin Shipsey
2021-11-01 04:40:54 +00:00
parent 2ee11de6c7 81cbcdb412
commit c51d6154ec
9 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/hair/dwarf/male-4.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/hair/dwarf/male-5.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/hair/dwarf/male-6.vox Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/hair/dwarf/male-7.vox Normal file
View File

Binary file not shown.

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

@ -216,6 +216,7 @@
Some(("figure.eyes.general.male_scar-0", (2, 10, 2))), 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_blind-0", (2, 10, 2))),
Some(("figure.eyes.general.male_old", (1, 10, 1))), Some(("figure.eyes.general.male_old", (1, 10, 1))),
Some(("figure.eyes.general.male_old_blind", (1, 10, 1))),
], ],
hair: [ hair: [
Some(("figure.hair.dwarf.bald", (0, 3, 1))), 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-1", (4, 0, 1))),
//Some(("figure.hair.dwarf.male-2", (0, 2, -2))), //Some(("figure.hair.dwarf.male-2", (0, 2, -2))),
Some(("figure.hair.dwarf.male-3", (1, 1, -3))), 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: [ beard: [
Some(("figure.beard.dwarf.dwarf-0", (4, 9, -2))), 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-18", (2, 8, -4))),
Some(("figure.beard.dwarf.dwarf-19", (1, 7, -8))), Some(("figure.beard.dwarf.dwarf-19", (1, 7, -8))),
Some(("figure.beard.dwarf.dwarf-20", (1, 7,-4))), 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: [ accessory: [
None, None,

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

@ -311,7 +311,7 @@ impl Species {
(Species::Danari, BodyType::Female) => 4, (Species::Danari, BodyType::Female) => 4,
(Species::Danari, BodyType::Male) => 5, (Species::Danari, BodyType::Male) => 5,
(Species::Dwarf, BodyType::Female) => 8, (Species::Dwarf, BodyType::Female) => 8,
(Species::Dwarf, BodyType::Male) => 4, (Species::Dwarf, BodyType::Male) => 8,
(Species::Elf, BodyType::Female) => 21, (Species::Elf, BodyType::Female) => 21,
(Species::Elf, BodyType::Male) => 4, (Species::Elf, BodyType::Male) => 4,
(Species::Human, BodyType::Female) => 19, (Species::Human, BodyType::Female) => 19,
@ -347,7 +347,7 @@ impl Species {
(Species::Danari, BodyType::Female) => 6, (Species::Danari, BodyType::Female) => 6,
(Species::Danari, BodyType::Male) => 8, (Species::Danari, BodyType::Male) => 8,
(Species::Dwarf, BodyType::Female) => 6, (Species::Dwarf, BodyType::Female) => 6,
(Species::Dwarf, BodyType::Male) => 8, (Species::Dwarf, BodyType::Male) => 9,
(Species::Elf, BodyType::Female) => 6, (Species::Elf, BodyType::Female) => 6,
(Species::Elf, BodyType::Male) => 7, (Species::Elf, BodyType::Male) => 7,
(Species::Human, BodyType::Female) => 6, (Species::Human, BodyType::Female) => 6,
@ -364,7 +364,7 @@ impl Species {
(Species::Danari, BodyType::Female) => 1, (Species::Danari, BodyType::Female) => 1,
(Species::Danari, BodyType::Male) => 16, (Species::Danari, BodyType::Male) => 16,
(Species::Dwarf, BodyType::Female) => 1, (Species::Dwarf, BodyType::Female) => 1,
(Species::Dwarf, BodyType::Male) => 20, (Species::Dwarf, BodyType::Male) => 22,
(Species::Elf, BodyType::Female) => 1, (Species::Elf, BodyType::Female) => 1,
(Species::Elf, BodyType::Male) => 1, (Species::Elf, BodyType::Male) => 1,
(Species::Human, BodyType::Female) => 1, (Species::Human, BodyType::Female) => 1,