From 5a196f1684c47893464f4fca0187320de50df321 Mon Sep 17 00:00:00 2001 From: DoctorKompot Date: Fri, 24 Dec 2021 21:33:16 +0200 Subject: [PATCH] another shot at fixing turbans --- .../voxygen/voxel/armor/merchant/turban.vox | 3 +++ .../voxel/armor/merchant/turban_dwarf.vox | 3 --- .../voxel/armor/merchant/turban_human.vox | 3 --- .../voxel/armor/merchant/turban_orc.vox | 3 --- .../voxel/armor/merchant/turban_undead.vox | 3 --- .../voxel/humanoid_armor_head_manifest.ron | 24 +++++++++---------- 6 files changed, 15 insertions(+), 24 deletions(-) create mode 100644 assets/voxygen/voxel/armor/merchant/turban.vox delete mode 100644 assets/voxygen/voxel/armor/merchant/turban_dwarf.vox delete mode 100644 assets/voxygen/voxel/armor/merchant/turban_human.vox delete mode 100644 assets/voxygen/voxel/armor/merchant/turban_orc.vox delete mode 100644 assets/voxygen/voxel/armor/merchant/turban_undead.vox diff --git a/assets/voxygen/voxel/armor/merchant/turban.vox b/assets/voxygen/voxel/armor/merchant/turban.vox new file mode 100644 index 0000000000..22b87e556d --- /dev/null +++ b/assets/voxygen/voxel/armor/merchant/turban.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4eb45df45ac3e927a037e045c9887d500d16ee9299757ca95c579c21d6aecb79 +size 93667 diff --git a/assets/voxygen/voxel/armor/merchant/turban_dwarf.vox b/assets/voxygen/voxel/armor/merchant/turban_dwarf.vox deleted file mode 100644 index c5a4436420..0000000000 --- a/assets/voxygen/voxel/armor/merchant/turban_dwarf.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36801a29d54fa65c47975574b3aa950d0920ef00bfb6b1802c1d9b489910808e -size 68435 diff --git a/assets/voxygen/voxel/armor/merchant/turban_human.vox b/assets/voxygen/voxel/armor/merchant/turban_human.vox deleted file mode 100644 index 17b8cfdbbd..0000000000 --- a/assets/voxygen/voxel/armor/merchant/turban_human.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb8b8006965eb4ab6a136ab437e8d89f784bf43eae0b3b5a8a82e4c83052681b -size 79291 diff --git a/assets/voxygen/voxel/armor/merchant/turban_orc.vox b/assets/voxygen/voxel/armor/merchant/turban_orc.vox deleted file mode 100644 index bb1a199054..0000000000 --- a/assets/voxygen/voxel/armor/merchant/turban_orc.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:409c9693cf68132cb68e037c4d0df29de5cf5a27c492435630aacbf6c8731c4c -size 68439 diff --git a/assets/voxygen/voxel/armor/merchant/turban_undead.vox b/assets/voxygen/voxel/armor/merchant/turban_undead.vox deleted file mode 100644 index d21ad8561b..0000000000 --- a/assets/voxygen/voxel/armor/merchant/turban_undead.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3cb6a6bac3ced5ac86269ed8834d98aef6f1035009d84e1c33eb9e6e5bd6e51b -size 68339 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 3c5e95bfdb..73f630ec1d 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -864,51 +864,51 @@ ), // Merchant Turban (Human, Male, "Merchant"): ( - vox_spec: ("armor.merchant.turban_human", (-4.0, -7.0, 2.0)), + vox_spec: ("armor.merchant.turban", (-4.0, -7.0, -6.0)), color: None ), (Human, Female, "Merchant"): ( - vox_spec: ("armor.merchant.turban_human", (-4.0, -6.0, 2.0)), + vox_spec: ("armor.merchant.turban", (-4.0, -6.0, -6.0)), color: None ), (Elf, Male, "Merchant"): ( - vox_spec: ("armor.merchant.turban_human", (-3.0, -7.0, 2.0)), + vox_spec: ("armor.merchant.turban", (-3.0, -7.0, -6.0)), color: None ), (Elf, Female, "Merchant"): ( - vox_spec: ("armor.merchant.turban_human", (-3.0, -7.0, 2.0)), + vox_spec: ("armor.merchant.turban", (-3.0, -7.0, -6.0)), color: None ), (Dwarf, Male, "Merchant"): ( - vox_spec: ("armor.merchant.turban_dwarf", (-5.0, -6.0, 2.0)), + vox_spec: ("armor.merchant.turban", (-5.0, -6.0, -6.0)), color: None ), (Dwarf, Female, "Merchant"): ( - vox_spec: ("armor.merchant.turban_dwarf", (-5.0, -6.0, 2.0)), + vox_spec: ("armor.merchant.turban", (-5.0, -6.0, -6.0)), color: None ), (Danari, Male, "Merchant"): ( - vox_spec: ("armor.merchant.turban_human", (-2.0, -7.0, 4.0)), + vox_spec: ("armor.merchant.turban", (-2.0, -7.0, -4.0)), color: None ), (Danari, Female, "Merchant"): ( - vox_spec: ("armor.merchant.turban_human", (-2.0, -7.0, 4.0)), + vox_spec: ("armor.merchant.turban", (-2.0, -7.0, -4.0)), color: None ), (Undead, Male, "Merchant"): ( - vox_spec: ("armor.merchant.turban_undead", (-6.0, -7.0, 4.0)), + vox_spec: ("armor.merchant.turban", (-6.0, -7.0, -4.0)), color: None ), (Undead, Female, "Merchant"): ( - vox_spec: ("armor.merchant.turban_undead", (-6.0, -7.0, 3.0)), + vox_spec: ("armor.merchant.turban", (-6.0, -7.0, -5.0)), color: None ), (Orc, Male, "Merchant"): ( - vox_spec: ("armor.merchant.turban_orc", (-3.0, -5.0, 4.0)), + vox_spec: ("armor.merchant.turban", (-3.0, -5.0, -4.0)), color: None ), (Orc, Female, "Merchant"): ( - vox_spec: ("armor.merchant.turban_orc", (-3.0, -8.0, 2.0)), + vox_spec: ("armor.merchant.turban", (-3.0, -8.0, -6.0)), color: None ), //Winged Coronet -1, 5