From 4da41b0dd0142175ba895b1a1b6d6ca79de612af Mon Sep 17 00:00:00 2001 From: Christof Petig Date: Sun, 2 Apr 2023 16:37:36 +0200 Subject: [PATCH] move alchemist set to single file (with reduced hat size) --- assets/voxygen/voxel/armor/alchemist.vox | 3 +++ assets/voxygen/voxel/armor/alchemist/belt.vox | 3 --- .../voxygen/voxel/armor/alchemist/chest.vox | 3 --- assets/voxygen/voxel/armor/alchemist/hat.vox | 3 --- .../voxygen/voxel/armor/alchemist/pants.vox | 3 --- .../voxel/humanoid_armor_belt_manifest.ron | 2 +- .../voxel/humanoid_armor_chest_manifest.ron | 2 +- .../voxel/humanoid_armor_head_manifest.ron | 24 +++++++++---------- .../voxel/humanoid_armor_pants_manifest.ron | 2 +- 9 files changed, 18 insertions(+), 27 deletions(-) create mode 100644 assets/voxygen/voxel/armor/alchemist.vox delete mode 100644 assets/voxygen/voxel/armor/alchemist/belt.vox delete mode 100644 assets/voxygen/voxel/armor/alchemist/chest.vox delete mode 100644 assets/voxygen/voxel/armor/alchemist/hat.vox delete mode 100644 assets/voxygen/voxel/armor/alchemist/pants.vox diff --git a/assets/voxygen/voxel/armor/alchemist.vox b/assets/voxygen/voxel/armor/alchemist.vox new file mode 100644 index 0000000000..66aea4ce6d --- /dev/null +++ b/assets/voxygen/voxel/armor/alchemist.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab47851ee89caf8c6529c33b521e4c9b1f467d082a31f37fd9c51b1eda03d50e +size 5803 diff --git a/assets/voxygen/voxel/armor/alchemist/belt.vox b/assets/voxygen/voxel/armor/alchemist/belt.vox deleted file mode 100644 index f0d1ac60d9..0000000000 --- a/assets/voxygen/voxel/armor/alchemist/belt.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c475b02c5119a0e41eddfc2f96aad350bb83b99401cef23f1b17a20175f1c760 -size 1512 diff --git a/assets/voxygen/voxel/armor/alchemist/chest.vox b/assets/voxygen/voxel/armor/alchemist/chest.vox deleted file mode 100644 index e4d5cb3bf8..0000000000 --- a/assets/voxygen/voxel/armor/alchemist/chest.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eab1f58e12b63b83828c5689534d781fe08848280c9eb2e5e104c5c2fd436d59 -size 2704 diff --git a/assets/voxygen/voxel/armor/alchemist/hat.vox b/assets/voxygen/voxel/armor/alchemist/hat.vox deleted file mode 100644 index 7d4c2056c1..0000000000 --- a/assets/voxygen/voxel/armor/alchemist/hat.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd6cc5ba8c3b5a25d76d7dc03c3c208a0895acb81e09039cfad07dd870ccdac0 -size 1272 diff --git a/assets/voxygen/voxel/armor/alchemist/pants.vox b/assets/voxygen/voxel/armor/alchemist/pants.vox deleted file mode 100644 index 6131dca49c..0000000000 --- a/assets/voxygen/voxel/armor/alchemist/pants.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc67d21bc4fe57f1e0ee3557bb15142c2169d7c93551afef37631541d35acbcb -size 2248 diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index 87653926f7..64da3dee17 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -117,7 +117,7 @@ color: None ), "common.items.armor.alchemist.belt":( - vox_spec: ("armor.alchemist.belt", (-4.0, -4.0, 2.5)), + vox_spec: ("armor.alchemist", (-4.0, -4.0, 2.5), 2), color: None ), "common.items.armor.blacksmith.belt":( diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index 0a2e60f19d..05acf8861d 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -187,7 +187,7 @@ color: None ), "common.items.armor.alchemist.chest": ( - vox_spec: ("armor.alchemist.chest", (-7.0, -4.0, 2.0)), + vox_spec: ("armor.alchemist", (-7.0, -4.0, 2.0), 1), color: None ), "common.items.armor.blacksmith.chest": ( diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 8f15dc98fc..789bf09542 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -325,51 +325,51 @@ ), // Alchemist Goggles (Human, Male, "common.items.armor.alchemist.hat"): ( - vox_spec: ("armor.alchemist.hat", (-4.0, 0.0, 1.0)), + vox_spec: ("armor.alchemist", (2.0, 9.0, 1.0), 0), color: None ), (Human, Female, "common.items.armor.alchemist.hat"): ( - vox_spec: ("armor.alchemist.hat", (-4.0, 1.0, 1.0)), + vox_spec: ("armor.alchemist", (2.0, 10.0, 1.0), 0), color: None ), (Elf, Male, "common.items.armor.alchemist.hat"): ( - vox_spec: ("armor.alchemist.hat", (-3.0, 0.0, 1.0)), + vox_spec: ("armor.alchemist", (3.0, 9.0, 1.0), 0), color: None ), (Elf, Female, "common.items.armor.alchemist.hat"): ( - vox_spec: ("armor.alchemist.hat", (-3.0, -1.0, 1.0)), + vox_spec: ("armor.alchemist", (3.0, 8.0, 1.0), 0), color: None ), (Dwarf, Male, "common.items.armor.alchemist.hat"): ( - vox_spec: ("armor.alchemist.hat", (-5.0, 1.0, 1.0)), + vox_spec: ("armor.alchemist", (1.0, 10.0, 1.0), 0), color: None ), (Dwarf, Female, "common.items.armor.alchemist.hat"): ( - vox_spec: ("armor.alchemist.hat", (-5.0, 1.0, 1.0)), + vox_spec: ("armor.alchemist", (1.0, 10.0, 1.0), 0), color: None ), (Danari, Male, "common.items.armor.alchemist.hat"): ( - vox_spec: ("armor.alchemist.hat", (-2.0, 0.0, 3.0)), + vox_spec: ("armor.alchemist", (4.0, 9.0, 3.0), 0), color: None ), (Danari, Female, "common.items.armor.alchemist.hat"): ( - vox_spec: ("armor.alchemist.hat", (-2.0, 1.0, 3.0)), + vox_spec: ("armor.alchemist", (4.0, 10.0, 3.0), 0), color: None ), (Draugr, Male, "common.items.armor.alchemist.hat"): ( - vox_spec: ("armor.alchemist.hat", (-6.0, 0.0, 3.0)), + vox_spec: ("armor.alchemist", (0.0, 9.0, 3.0), 0), color: None ), (Draugr, Female, "common.items.armor.alchemist.hat"): ( - vox_spec: ("armor.alchemist.hat", (-6.0, 0.0, 2.0)), + vox_spec: ("armor.alchemist", (0.0, 9.0, 2.0), 0), color: None ), (Orc, Male, "common.items.armor.alchemist.hat"): ( - vox_spec: ("armor.alchemist.hat", (-3.0, 2.0, 4.0)), + vox_spec: ("armor.alchemist", (3.0, 11.0, 4.0), 0), color: None ), (Orc, Female, "common.items.armor.alchemist.hat"): ( - vox_spec: ("armor.alchemist.hat", (-3.0, -1.0, 1.0)), + vox_spec: ("armor.alchemist", (3.0, 8.0, 1.0), 0), color: None ), // Chef hat diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index 50dd8b1d30..c7be27809d 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -145,7 +145,7 @@ color: None ), "common.items.armor.alchemist.pants": ( - vox_spec: ("armor.alchemist.pants", (-5.0, -4.0, 0.5)), + vox_spec: ("armor.alchemist", (-5.0, -4.0, 0.5), 3), color: None ), "common.items.armor.blacksmith.pants": (