From 7c66fff76748d685a679080feae784ab42015fa7 Mon Sep 17 00:00:00 2001
From: Froggy <aronis5@hotmail.com>
Date: Mon, 25 Dec 2023 12:14:24 +0000
Subject: [PATCH] Froggy/armor offset fixes

---
 .../voxel/humanoid_armor_back_manifest.ron    | 60 ++++++------
 .../voxel/humanoid_armor_belt_manifest.ron    | 18 ++--
 .../voxel/humanoid_armor_chest_manifest.ron   | 20 ++--
 .../voxel/humanoid_armor_foot_manifest.ron    |  4 +-
 .../voxel/humanoid_armor_hand_manifest.ron    | 40 ++++----
 .../voxel/humanoid_armor_head_manifest.ron    |  2 +-
 .../voxel/humanoid_armor_pants_manifest.ron   | 16 ++--
 .../humanoid_armor_shoulder_manifest.ron      | 96 +++++++++----------
 8 files changed, 128 insertions(+), 128 deletions(-)

diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
index 0db340b87a..8b3c86c360 100644
--- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
@@ -5,23 +5,23 @@
     ),
     map: {
         "common.items.armor.misc.back.short_0": (
-            vox_spec: ("armor.misc.back.short-0", (-5.0, -1.0, -11.0)),
+            vox_spec: ("armor.misc.back.short-0", (-5.0, -1.5, -11.0)),
             color: None
         ),
         "common.items.armor.misc.back.admin": (
-            vox_spec: ("armor.misc.back.admin", (-5.0, -1.0, -11.0)),
+            vox_spec: ("armor.misc.back.admin", (-5.0, -1.5, -11.0)),
             color: None
         ),
         "common.items.debug.admin_back": (
-            vox_spec: ("armor.misc.back.admin", (-5.0, -1.0, -11.0)),
+            vox_spec: ("armor.misc.back.admin", (-5.0, -1.5, -11.0)),
             color: None
         ),
         "common.items.armor.misc.back.dungeon_purple": (
-            vox_spec: ("armor.misc.back.dungeon_purple", (-5.0, -1.0, -14.0)),
+            vox_spec: ("armor.misc.back.dungeon_purple", (-5.0, -1.5, -14.0)),
             color: None
         ),
         "common.items.armor.misc.back.short_1": (
-            vox_spec: ("armor.misc.back.short-1", (-5.0, -1.0, -11.0)),
+            vox_spec: ("armor.misc.back.short-1", (-5.0, -1.5, -11.0)),
             color: None
         ),
         "common.items.armor.ferocious.back": (
@@ -29,55 +29,55 @@
             color: None
         ),
         "common.items.armor.boreal.back": (
-            vox_spec: ("armor.boreal.back", (-5.0, -2.0, -14.0)),
+            vox_spec: ("armor.boreal.back", (-5.0, -2.5, -13.0)),
             color: None
         ),
         "common.items.armor.brinestone.back": (
-            vox_spec: ("armor.brinestone.back", (-5.0, -2.0, -14.0)),
+            vox_spec: ("armor.brinestone.back", (-5.0, -2.5, -12.0)),
             color: None
         ),
         "common.items.armor.misc.back.backpack": (
-            vox_spec: ("armor.misc.back.backpack", (-7.0, -5.0, -10.0)),
+            vox_spec: ("armor.misc.back.backpack", (-7.0, -5.5, -10.0)),
             color: None
         ),
         "common.items.npc_armor.back.backpack_blue": (
-            vox_spec: ("armor.misc.back.backpack-grey", (-7.0, -5.0, -10.0)),
+            vox_spec: ("armor.misc.back.backpack-grey", (-7.0, -5.5, -10.0)),
             color: Some((76, 72, 178))
         ),
         "common.items.armor.velorite_mage.back": (
-            vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
+            vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.5, -14.0)),
             color: None
         ),
         "common.items.debug.admin_back": (
-            vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
+            vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.5, -14.0)),
             color: None
         ),
         "common.items.debug.admin_back": (
-            vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
+            vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.5, -14.0)),
             color: None
         ),
         "common.items.debug.dungeon_purple": (
-            vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
+            vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.5, -14.0)),
             color: None
         ),
         "common.items.npc_armor.back.leather_blue": (
-            vox_spec: ("armor.leather_blue.back", (-5.0, -1.0, -11.0)),
+            vox_spec: ("armor.leather_blue.back", (-5.0, -1.5, -10.0)),
             color: None
         ),
         "common.items.armor.hide.rawhide.back": (
-            vox_spec: ("armor.hide.rawhide.back", (-4.0, -1.0, -6.0)),
+            vox_spec: ("armor.hide.rawhide.back", (-4.0, -1.5, -7.0)),
             color: None
         ),
         "common.items.armor.hide.leather.back": (
-            vox_spec: ("armor.hide.leather.back", (-5.0, -1.0, -11.0)),
+            vox_spec: ("armor.hide.leather.back", (-5.0, -1.5, -11.0)),
             color: None
         ),
         "common.items.armor.miner.back": (
-            vox_spec: ("armor.hide.leather.back", (-5.0, -1.0, -11.0)),
+            vox_spec: ("armor.hide.leather.back", (-5.0, -1.5, -11.0)),
             color: None
         ),
         "common.items.armor.hide.scale.back": (
-            vox_spec: ("armor.hide.scale.back", (-5.0, -2.0, -10.5)),
+            vox_spec: ("armor.hide.scale.back", (-5.0, -1.5, -10.0)),
             color: None
         ),
         "common.items.armor.hide.carapace.back": (
@@ -85,7 +85,7 @@
             color: None
         ),
         "common.items.armor.hide.primal.back": (
-            vox_spec: ("armor.hide.primal.back", (-5.0, -4.5, -10.5)),
+            vox_spec: ("armor.hide.primal.back", (-5.0, -3.5, -10.0)),
             color: None
         ),
         "common.items.armor.hide.dragonscale.back": (
@@ -97,19 +97,19 @@
             color: None
         ),
         "common.items.armor.cloth.linen.back": (
-            vox_spec: ("armor.cloth.linen.back", (-4.0, -2.5, -8.5)),
+            vox_spec: ("armor.cloth.linen.back", (-4.0, -1.5, -8.0)),
             color: None
         ),
         "common.items.armor.cloth.woolen.back": (
-            vox_spec: ("armor.cloth.woolen.back", (-5.0, -2.5, -8.5)),
+            vox_spec: ("armor.cloth.woolen.back", (-5.0, -1.5, -8.0)),
             color: None
         ),
         "common.items.armor.cloth.silken.back": (
-            vox_spec: ("armor.cloth.silken.back", (-4.0, -2.5, -11.5)),
+            vox_spec: ("armor.cloth.silken.back", (-4.0, -1.5, -11.0)),
             color: None
         ),
         "common.items.armor.witch.back": (
-            vox_spec: ("armor.witch.back", (-4.0, -2.5, -11.5)),
+            vox_spec: ("armor.witch.back", (-4.0, -1.5, -11.0)),
             color: None
         ),
         "common.items.armor.cloth.druid.back": (
@@ -117,7 +117,7 @@
             color: None
         ),
         "common.items.armor.cloth.moonweave.back": (
-            vox_spec: ("armor.cloth.moonweave.back", (-4.0, -2.0, -12.5)),
+            vox_spec: ("armor.cloth.moonweave.back", (-4.0, -1.5, -12.5)),
             color: None
         ),
         "common.items.armor.cloth.sunsilk.back": (
@@ -125,19 +125,19 @@
             color: None
         ),
         "common.items.armor.mail.bronze.back": (
-            vox_spec: ("armor.mail.bronze.back", (-4.0, -2.5, -7.0)),
+            vox_spec: ("armor.mail.bronze.back", (-4.0, -1.5, -7.0)),
             color: None
         ),
         "common.items.armor.mail.iron.back": (
-            vox_spec: ("armor.mail.iron.back", (-4.0, -2.5, -10.0)),
+            vox_spec: ("armor.mail.iron.back", (-4.0, -1.5, -10.0)),
             color: None
         ),
         "common.items.armor.mail.steel.back": (
-            vox_spec: ("armor.mail.steel.back", (-4.0, -2.5, -12.0)),
+            vox_spec: ("armor.mail.steel.back", (-4.0, -1.5, -10.0)),
             color: None
         ),
         "common.items.armor.mail.cobalt.back": (
-            vox_spec: ("armor.mail.cobalt.back", (-4.0, -2.5, -12.0)),
+            vox_spec: ("armor.mail.cobalt.back", (-4.0, -1.5, -11.0)),
             color: None
         ),
         "common.items.armor.mail.bloodsteel.back": (
@@ -145,11 +145,11 @@
             color: None
         ),
         "common.items.armor.mail.orichalcum.back": (
-            vox_spec: ("armor.mail.orichalcum", (-5.0, -4.5, -12.0), 6),
+            vox_spec: ("armor.mail.orichalcum", (-5.0, -4.5, -12.5), 6),
             color: None
         ),
         "common.items.armor.merchant.back": (
-            vox_spec: ("armor.merchant.back", (-8.0, -7.0, -11.0)),
+            vox_spec: ("armor.merchant.back", (-8.0, -8.5, -11.0)),
             color: None
         ),
     },
diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
index a8cc2bb2a0..cb03437591 100644
--- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
@@ -53,7 +53,7 @@
             color: None
         ),
         "common.items.armor.leather_plate.belt": (
-            vox_spec: ("armor.leather_plate.belt", (-4.0, -4.5, 2.0)),
+            vox_spec: ("armor.leather_plate.belt", (-4.0, -3.5, 2.0)),
             color: None
         ),
         "common.items.armor.twigs.belt": (
@@ -113,7 +113,7 @@
             color: None
         ),
         "common.items.armor.savage.belt":(
-            vox_spec: ("armor.savage.belt", (-4.0, -4.0, 1.0)),
+            vox_spec: ("armor.savage.belt", (-4.0, -4.5, 2.0)),
             color: None
         ),
         "common.items.armor.witch.belt":(
@@ -121,19 +121,19 @@
             color: None
         ),
         "common.items.armor.pirate.belt":(
-            vox_spec: ("armor.pirate.belt", (-4.0, -4.0, 2.5)),
+            vox_spec: ("armor.pirate.belt", (-4.0, -3.5, 2.0)),
             color: None
         ),
         "common.items.armor.alchemist.belt":(
-            vox_spec: ("armor.alchemist", (-4.0, -4.0, 2.5), 2),
+            vox_spec: ("armor.alchemist", (-4.0, -3.5, 2.0), 2),
             color: None
         ),
         "common.items.armor.blacksmith.belt":(
-            vox_spec: ("armor.blacksmith.belt", (-4.0, -4.0, 2.0)),
+            vox_spec: ("armor.blacksmith.belt", (-4.0, -3.5, 2.0)),
             color: None
         ),
         "common.items.armor.chef.belt":(
-            vox_spec: ("armor.chef.belt", (-4.0, -4.0, 2.0)),
+            vox_spec: ("armor.chef.belt", (-4.0, -4.5, 2.0)),
             color: None
         ),
         "common.items.armor.cloth.linen.belt":(
@@ -173,7 +173,7 @@
             color: None
         ),
         "common.items.armor.mail.cobalt.belt":(
-            vox_spec: ("armor.mail.cobalt.belt", (-5.0, -4.5, 2.0)),
+            vox_spec: ("armor.mail.cobalt.belt", (-5.0, -3.5, 2.0)),
             color: None
         ),
         "common.items.armor.mail.bloodsteel.belt":(
@@ -185,11 +185,11 @@
             color: None
         ),
         "common.items.armor.cardinal.belt": (
-            vox_spec: ("armor.cardinal.belt", (-4.0, -3.8, 1.3)),
+            vox_spec: ("armor.cardinal.belt", (-4.0, -3.5, 2.0)),
             color: None
         ),
         "common.items.armor.merchant.belt": (
-            vox_spec: ("armor.merchant.belt", (-5.0, -4.0, 2.0)),
+            vox_spec: ("armor.merchant.belt", (-5.0, -3.5, 2.0)),
             color: None
         ),
     },
diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
index fdeb9f4f88..0e618cbeec 100644
--- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
@@ -135,7 +135,7 @@
             color: Some((30, 0, 64))
         ),
         "common.items.armor.leather_plate.chest": (
-            vox_spec: ("armor.leather_plate.chest", (-8.0, -5.5, 2.0)),
+            vox_spec: ("armor.leather_plate.chest", (-8.0, -4.5, 2.0)),
             color: None
         ),
         "common.items.armor.tarasque.chest":(
@@ -147,11 +147,11 @@
             color: None
         ),
         "common.items.armor.velorite_mage.chest": (
-            vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 0.5)),
+            vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 1.0)),
             color: None
         ),
         "common.items.debug.cultist_chest_blue": (
-          vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 0.5)),
+          vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 1.0)),
           color: None
         ),
         "common.items.armor.hide.rawhide.chest": (
@@ -187,23 +187,23 @@
             color: None
         ),
         "common.items.armor.witch.chest": (
-            vox_spec: ("armor.witch.chest", (-7.0, -4.0, 2.0)),
+            vox_spec: ("armor.witch.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
         "common.items.armor.pirate.chest": (
-            vox_spec: ("armor.pirate.chest", (-7.0, -4.0, 2.0)),
+            vox_spec: ("armor.pirate.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
         "common.items.armor.alchemist.chest": (
-            vox_spec: ("armor.alchemist", (-7.0, -4.0, 2.0), 1),
+            vox_spec: ("armor.alchemist", (-7.0, -3.5, 2.0), 1),
             color: None
         ),
         "common.items.armor.blacksmith.chest": (
-            vox_spec: ("armor.blacksmith.chest", (-7.0, -4.0, 2.0)),
+            vox_spec: ("armor.blacksmith.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
         "common.items.armor.chef.chest": (
-            vox_spec: ("armor.chef.chest", (-7.0, -4.0, 2.0)),
+            vox_spec: ("armor.chef.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
         "common.items.armor.cloth.linen.chest": (
@@ -255,11 +255,11 @@
             color: None
         ),
         "common.items.armor.cardinal.chest": (
-            vox_spec: ("armor.cardinal.chest", (-7.0, -4.0, 1.0)),
+            vox_spec: ("armor.cardinal.chest", (-7.0, -3.5, 2.0)),
             color: None
         ),
         "common.items.armor.merchant.chest": (
-            vox_spec: ("armor.merchant.chest", (-7.0, -4.0, 1.0)),
+            vox_spec: ("armor.merchant.chest", (-7.0, -3.5, 1.0)),
             color: None
         ),
     },
diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
index d201bf21b3..1635f8fa5e 100644
--- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
@@ -53,7 +53,7 @@
             color: None
         ),
         "common.items.armor.misc.foot.jackalope_slippers": (
-            vox_spec: ("armor.misc.foot.jackalope", (-2.5, -3.5, -2.0)),
+            vox_spec: ("armor.misc.foot.jackalope", (-2.5, -4.5, -2.0)),
             color: None
         ),
         "common.items.armor.twigs.foot": (
@@ -185,7 +185,7 @@
             color: None
         ),
         "common.items.armor.misc.foot.iceskate": (
-            vox_spec: ("armor.misc.foot.iceskate", (-2.5, -3.5, -2.0)),
+            vox_spec: ("armor.misc.foot.iceskate", (-2.5, -4.5, -2.0)),
             color: None
         ),
     },
diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
index 4fc5fca799..73bdcc198e 100644
--- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
@@ -32,11 +32,11 @@
         ),
         "common.items.armor.ferocious.hand": (
             left: (
-                vox_spec: ("armor.ferocious.hand", (-1.5, -1.5, -3.0)),
+                vox_spec: ("armor.ferocious.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.ferocious.hand", (-1.5, -1.5, -3.0)),
+                vox_spec: ("armor.ferocious.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
@@ -162,21 +162,21 @@
         ),
         "common.items.armor.velorite_mage.hand": (
             left: (
-                vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)),
+                vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -2.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)),
+                vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -2.5, -2.5)),
                 color: None
             )
         ),
         "common.items.debug.cultist_hands_blue": (
             left: (
-                vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)),
+                vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -2.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)),
+                vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -2.5, -2.5)),
                 color: None
             )
         ),
@@ -202,11 +202,11 @@
         ),
         "common.items.armor.miner.hand": (
             left: (
-                vox_spec: ("armor.mail.bronze.hand", (-1.5, -1.0, -3.0)),
+                vox_spec: ("armor.mail.bronze.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.mail.bronze.hand", (-1.5, -1.0, -3.0)),
+                vox_spec: ("armor.mail.bronze.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
@@ -252,41 +252,41 @@
         ),
         "common.items.armor.savage.hand": (
             left: (
-                vox_spec: ("armor.savage.hand", (-2.5, -3.0, -4.0)),
+                vox_spec: ("armor.savage.hand", (-2.5, -2.5, -3.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.savage.hand", (-1.5, -3.0, -4.0)),
+                vox_spec: ("armor.savage.hand", (-1.5, -2.5, -3.5)),
                 color: None
             )
         ),
         "common.items.armor.witch.hand": (
             left: (
-                vox_spec: ("armor.witch.hand", (-2.5, -2.5, -4.0)),
+                vox_spec: ("armor.witch.hand", (-2.5, -2.5, -3.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.witch.hand", (-1.5, -2.5, -4.0)),
+                vox_spec: ("armor.witch.hand", (-1.5, -2.5, -3.5)),
                 color: None
             )
         ),
         "common.items.armor.pirate.hand": (
             left: (
-                vox_spec: ("armor.pirate.hand", (-2.5, -2.5, -4.0)),
+                vox_spec: ("armor.pirate.hand", (-2.5, -2.5, -3.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.pirate.hand", (-1.5, -2.5, -4.0)),
+                vox_spec: ("armor.pirate.hand", (-1.5, -2.5, -3.5)),
                 color: None
             )
         ),
         "common.items.armor.blacksmith.hand": (
             left: (
-                vox_spec: ("armor.blacksmith.hand", (-1.5, -2.5, -4.0)),
+                vox_spec: ("armor.blacksmith.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.blacksmith.hand", (-1.5, -2.5, -4.0)),
+                vox_spec: ("armor.blacksmith.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
@@ -412,21 +412,21 @@
         ),
         "common.items.armor.cardinal.hand": (
             left: (
-                vox_spec: ("armor.cardinal.hand", (-2.5, -2.5, -4.0)),
+                vox_spec: ("armor.cardinal.hand", (-2.5, -2.5, -3.5)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.cardinal.hand", (-1.5, -2.5, -4.0)),
+                vox_spec: ("armor.cardinal.hand", (-1.5, -2.5, -3.5)),
                 color: None
             )
         ),
         "common.items.armor.merchant.hand": (
             left: (
-                vox_spec: ("armor.merchant.hand", (-2.5, -2.0, -4.0)),
+                vox_spec: ("armor.merchant.hand", (-1.5, -1.5, -2.5)),
                 color: None
             ),
             right:(
-                vox_spec: ("armor.merchant.hand", (-1.5, -2.0, -4.0)),
+                vox_spec: ("armor.merchant.hand", (-1.5, -1.5, -2.5)),
                 color: None
             )
         ),
diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron
index 1a88fbe655..187223a512 100644
--- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron
@@ -872,7 +872,7 @@
             color: None
         ),
         (Dwarf, Male, "common.items.armor.cultist.bandana"): (
-            vox_spec: ("armor.cultist.bandana", (-5.0, -2.0, -10.0)),
+            vox_spec: ("armor.cultist.bandana", (-5.0, -1.0, -10.0)),
             color: None
         ),
         (Dwarf, Female, "common.items.armor.cultist.bandana"): (
diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
index 5b99463b33..bf60623f17 100644
--- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
@@ -77,7 +77,7 @@
             color: Some((30, 0, 64))
         ),
         "common.items.armor.leather_plate.pants": (
-            vox_spec: ("armor.leather_plate.pants", (-5.0, -4.5, 1.0)),
+            vox_spec: ("armor.leather_plate.pants", (-5.0, -3.5, 1.0)),
             color: None
         ),
         "common.items.armor.twigs.pants": (
@@ -141,23 +141,23 @@
             color: None
         ),
         "common.items.armor.savage.pants": (
-            vox_spec: ("armor.savage.pants", (-5.0, -4.0, 0.5)),
+            vox_spec: ("armor.savage.pants", (-5.0, -3.5, 1.0)),
             color: None
         ),
         "common.items.armor.witch.pants": (
-            vox_spec: ("armor.witch.pants", (-5.0, -4.0, 0.5)),
+            vox_spec: ("armor.witch.pants", (-5.0, -3.5, 0.0)),
             color: None
         ),
         "common.items.armor.pirate.pants": (
-            vox_spec: ("armor.pirate.pants", (-5.0, -4.0, 1.5)),
+            vox_spec: ("armor.pirate.pants", (-5.0, -3.5, 0.0)),
             color: None
         ),
         "common.items.armor.alchemist.pants": (
-            vox_spec: ("armor.alchemist", (-5.0, -4.0, 0.5), 3),
+            vox_spec: ("armor.alchemist", (-5.0, -3.5, 0.0), 3),
             color: None
         ),
         "common.items.armor.blacksmith.pants": (
-            vox_spec: ("armor.blacksmith.pants", (-5.0, -4.0, 0.5)),
+            vox_spec: ("armor.blacksmith.pants", (-5.0, -3.5, 0.0)),
             color: None
         ),
         "common.items.armor.chef.pants": (
@@ -213,11 +213,11 @@
             color: None
         ),
         "common.items.armor.cardinal.pants": (
-            vox_spec: ("armor.cardinal.pants", (-5.0, -4.0, -0.4)),
+            vox_spec: ("armor.cardinal.pants", (-5.0, -3.5, 0.0)),
             color: None
         ),
         "common.items.armor.merchant.pants": (
-            vox_spec: ("armor.merchant.pants", (-6.0, -4.0, 0.5)),
+            vox_spec: ("armor.merchant.pants", (-5.0, -3.5, 0.0)),
             color: None
         ),
     },
diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
index ce4f75064e..ca0f4baf83 100644
--- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
@@ -23,11 +23,11 @@
         ),
         "common.items.armor.assassin.shoulder": (
             left: (
-                vox_spec: ("armor.assassin.shoulder", (-4.0, -3.5, 1.0)),
+                vox_spec: ("armor.assassin.shoulder", (-5.0, -3.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.assassin.shoulder", (-2.0, -3.5, 1.0)),
+                vox_spec: ("armor.assassin.shoulder", (-1.0, -3.5, 0.0)),
                 color: None
             )
         ),
@@ -53,71 +53,71 @@
         ),
         "common.items.armor.boreal.shoulder": (
             left: (
-                vox_spec: ("armor.boreal.shoulder", (-4.0, -3.5, -2.0)),
+                vox_spec: ("armor.boreal.shoulder", (-4.0, -3.5, -1.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.boreal.shoulder", (-1.0, -3.5, -2.0)),
+                vox_spec: ("armor.boreal.shoulder", (-1.0, -3.5, -1.0)),
                 color: None
             )
         ),
         "common.items.armor.brinestone.shoulder": (
             left: (
-                vox_spec: ("armor.brinestone.shoulder", (-6.0, -3.5, -2.0)),
+                vox_spec: ("armor.brinestone.shoulder", (-6.0, -3.5, -1.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.brinestone.shoulder", (-2.0, -3.5, -2.0)),
+                vox_spec: ("armor.brinestone.shoulder", (-2.0, -3.5, -1.0)),
                 color: None
             )
         ),
         "common.items.armor.cloth_purple.shoulder": (
             left: (
-                vox_spec: ("armor.cloth_purple.shoulder", (-4.0, -3.5, -1.0)),
+                vox_spec: ("armor.cloth_purple.shoulder", (-4.0, -3.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.cloth_purple.shoulder", (-1.0, -3.5, -1.0)),
+                vox_spec: ("armor.cloth_purple.shoulder", (-1.0, -3.5, 0.0)),
                 color: None
             )
         ),
         "common.items.armor.cloth_blue.shoulder_0": (
             left: (
-                vox_spec: ("armor.cloth_blue.shoulder_0", (-4.0, -3.5, -1.0)),
+                vox_spec: ("armor.cloth_blue.shoulder_0", (-4.0, -3.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.cloth_blue.shoulder_0", (-1.0, -3.5, -1.0)),
+                vox_spec: ("armor.cloth_blue.shoulder_0", (-1.0, -3.5, 0.0)),
                 color: None
             )
         ),
         "common.items.armor.cloth_green.shoulder": (
             left: (
-                vox_spec: ("armor.cloth_green.shoulder", (-4.0, -3.5, -1.0)),
+                vox_spec: ("armor.cloth_green.shoulder", (-4.0, -3.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.cloth_green.shoulder", (-1.0, -3.5, -1.0)),
+                vox_spec: ("armor.cloth_green.shoulder", (-1.0, -3.5, 0.0)),
                 color: None
             )
         ),
         "common.items.armor.cultist.shoulder": (
             left: (
-                vox_spec: ("armor.cultist.shoulder", (-3.0, -3.5, -2.0)),
+                vox_spec: ("armor.cultist.shoulder", (-3.0, -3.5, -1.0)),
                 color: Some((30, 0, 64))
             ),
             right: (
-                 vox_spec: ("armor.cultist.shoulder", (-2.0, -3.5, -2.0)),
+                 vox_spec: ("armor.cultist.shoulder", (-2.0, -3.5, -1.0)),
                 color: Some((30, 0, 64))
             )
         ),
         "common.items.armor.leather_plate.shoulder": (
             left: (
-                vox_spec: ("armor.leather_plate.shoulder", (-4.0, -4.5 , 0.0)),
+                vox_spec: ("armor.leather_plate.shoulder", (-4.0, -3.5 , 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.leather_plate.shoulder", (-0.9, -4.5, 0.0)),
+                vox_spec: ("armor.leather_plate.shoulder", (-0.9, -3.5, 0.0)),
                 color: None
             )
         ),
@@ -153,21 +153,21 @@
         ),
         "common.items.armor.cloth_blue.shoulder_1": (
             left: (
-                vox_spec: ("armor.cloth_blue.shoulder_1", (-4.0, -2.5, -0.5)),
+                vox_spec: ("armor.cloth_blue.shoulder_1", (-4.0, -2.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.cloth_blue.shoulder_1", (-1.0, -2.5, -0.5)),
+                vox_spec: ("armor.cloth_blue.shoulder_1", (-1.0, -2.5, 0.0)),
                 color: None
             )
         ),
         "common.items.armor.misc.shoulder.iron_spikes": (
             left: (
-                vox_spec: ("armor.misc.shoulder.iron_spikes", (-5.5, -3.8, -2.0)),
+                vox_spec: ("armor.misc.shoulder.iron_spikes", (-6.0, -3.5, -2.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.misc.shoulder.iron_spikes", (-1.5, -3.8, -2.0)),
+                vox_spec: ("armor.misc.shoulder.iron_spikes", (-1.0, -3.5, -2.0)),
                 color: None
             )
         ),
@@ -183,31 +183,31 @@
         ),
         "common.items.armor.misc.shoulder.leather_iron_2": (
             left: (
-                vox_spec: ("armor.misc.shoulder.leather_iron_2", (-5.0, -2.5, -0.5)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_2", (-5.0, -2.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.misc.shoulder.leather_iron_2", (-2.0, -2.5, -0.5)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_2", (-2.0, -2.5, 0.0)),
                 color: None
             )
         ),
         "common.items.armor.misc.shoulder.leather_iron_1": (
             left: (
-                vox_spec: ("armor.misc.shoulder.leather_iron_1", (-5.0, -2.5, -0.5)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_1", (-5.0, -2.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.misc.shoulder.leather_iron_1", (-2.0, -2.5, -0.5)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_1", (-2.0, -2.5, 0.0)),
                 color: None
             )
         ),
         "common.items.armor.misc.shoulder.leather_iron_0": (
             left: (
-                vox_spec: ("armor.misc.shoulder.leather_iron_0", (-6.0, -2.5, -0.5)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_0", (-6.0, -2.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.misc.shoulder.leather_iron_0", (-2.0, -2.5, -0.5)),
+                vox_spec: ("armor.misc.shoulder.leather_iron_0", (-2.0, -2.5, 0.0)),
                 color: None
             )
         ),
@@ -223,21 +223,21 @@
         ),
         "common.items.armor.tarasque.shoulder": (
             left: (
-                vox_spec: ("armor.tarasque.shoulder", (-5.0, -3.5 , 0.0)),
+                vox_spec: ("armor.tarasque.shoulder", (-4.0, -3.5 , -1.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.tarasque.shoulder", (-0.0, -3.5, 0.0)),
+                vox_spec: ("armor.tarasque.shoulder", (-1.0, -3.5, -1.0)),
                 color: None
             )
         ),
         "common.items.armor.bonerattler.shoulder": (
             left: (
-                vox_spec: ("armor.bonerattler.shoulder", (-4.0, -3.5 , 1.0)),
+                vox_spec: ("armor.bonerattler.shoulder", (-4.0, -3.5 , 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.bonerattler.shoulder", (-1.0, -3.5, 1.0)),
+                vox_spec: ("armor.bonerattler.shoulder", (-1.0, -3.5, 0.0)),
                 color: None
             )
         ),
@@ -263,11 +263,11 @@
         ),
         "common.items.armor.hide.rawhide.shoulder": (
             left: (
-                vox_spec: ("armor.hide.rawhide.shoulder", (-4.0, -3.5, -1.0)),
+                vox_spec: ("armor.hide.rawhide.shoulder", (-4.0, -3.5, 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hide.rawhide.shoulder", (-1.0, -3.5, -1.0)),
+                vox_spec: ("armor.hide.rawhide.shoulder", (-1.0, -3.5, 0.0)),
                 color: None
             )
         ),
@@ -323,37 +323,37 @@
         ),
         "common.items.armor.hide.dragonscale.shoulder": (
             left: (
-                vox_spec: ("armor.hide.dragonscale.shoulder", (-8.0, -3.5 , -1.0)),
+                vox_spec: ("armor.hide.dragonscale.shoulder", (-8.0, -3.5 , -2.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.hide.dragonscale.shoulder", (-1.0, -3.5, -1.0)),
+                vox_spec: ("armor.hide.dragonscale.shoulder", (-1.0, -3.5, -2.0)),
                 color: None
             )
         ),
         "common.items.armor.savage.shoulder": (
             left: (
-                vox_spec: ("armor.savage.shoulder", (-5.5, -4.0 , -2.0)),
+                vox_spec: ("armor.savage.shoulder", (-5.0, -3.5 , -2.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.savage.shoulder", (-0.5, -4.0, -2.0)),
+                vox_spec: ("armor.savage.shoulder", (-1.0, -3.5, -2.0)),
                 color: None
             )
         ),
         "common.items.armor.witch.shoulder": (
             left: (
-                vox_spec: ("armor.witch.shoulder", (-5.0, -4.0 , -2.0)),
+                vox_spec: ("armor.witch.shoulder", (-5.0, -3.5, -1.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.witch.shoulder", (-1.0, -4.0 , -2.0)),
+                vox_spec: ("armor.witch.shoulder", (-1.0, -3.5, -1.0)),
             color: None
             )
         ),
         "common.items.armor.pirate.shoulder": (
             left: (
-                vox_spec: ("armor.pirate.shoulder", (-5.0, -4.0 , -2.0)),
+                vox_spec: ("armor.pirate.shoulder", (-5.0, -3.5 , -1.0)),
                 color: None
             ),
             right: (
@@ -363,21 +363,21 @@
         ),
         "common.items.armor.cloth.linen.shoulder": (
             left: (
-                vox_spec: ("armor.cloth.linen.shoulder", (-3.0, -3.5 , -1.0)),
+                vox_spec: ("armor.cloth.linen.shoulder", (-3.0, -3.5 , 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.cloth.linen.shoulder", (-1.0, -3.5, -1.0)),
+                vox_spec: ("armor.cloth.linen.shoulder", (-1.0, -3.5, 0.0)),
                 color: None
             )
         ),
         "common.items.armor.cloth.woolen.shoulder": (
             left: (
-                vox_spec: ("armor.cloth.woolen.shoulder", (-5.0, -3.5, -3.0)),
+                vox_spec: ("armor.cloth.woolen.shoulder", (-5.0, -3.5, -2.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.cloth.woolen.shoulder", (-1.0, -3.5, -3.0)),
+                vox_spec: ("armor.cloth.woolen.shoulder", (-1.0, -3.5, -2.0)),
                 color: None
             )
         ),
@@ -423,11 +423,11 @@
         ),
         "common.items.armor.mail.bronze.shoulder": (
             left: (
-                vox_spec: ("armor.mail.bronze.shoulder", (-5.0, -3.5 , -1.0)),
+                vox_spec: ("armor.mail.bronze.shoulder", (-5.0, -3.5 , 0.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.mail.bronze.shoulder", (-1.0, -3.5, -1.0)),
+                vox_spec: ("armor.mail.bronze.shoulder", (-1.0, -3.5, 0.0)),
                 color: None
             )
         ),
@@ -463,11 +463,11 @@
         ),
         "common.items.armor.mail.bloodsteel.shoulder": (
             left: (
-                vox_spec: ("armor.mail.bloodsteel.shoulder", (-8.0, -5.5, -2.0)),
+                vox_spec: ("armor.mail.bloodsteel.shoulder", (-8.0, -5.5, -3.0)),
                 color: None
             ),
             right: (
-                vox_spec: ("armor.mail.bloodsteel.shoulder", (-1.0, -5.5, -2.0)),
+                vox_spec: ("armor.mail.bloodsteel.shoulder", (-1.0, -5.5, -3.0)),
                 color: None
             )
         ),
@@ -483,7 +483,7 @@
         ),
         "common.items.armor.cardinal.shoulder": (
             left: (
-                vox_spec: ("armor.cardinal.shoulder", (-5.0, -4.0, -2.0)),
+                vox_spec: ("armor.cardinal.shoulder", (-5.0, -2.5, -1.0)),
                 color: None
             ),
             right: (