From a1c2a7161bf156d8050ac4122c10a6f39f4f6dc6 Mon Sep 17 00:00:00 2001
From: Monty Marz <m.marzouq@gmx.de>
Date: Mon, 10 May 2021 20:44:09 +0000
Subject: [PATCH] Fix 1h-axes

---
 assets/voxygen/item_image_manifest.ron        |  36 +++++++++---------
 .../voxygen/voxel/biped_weapon_manifest.ron   |  32 ++++++++--------
 .../voxel/weapon/axe_1h/bloodsteel-0.vox      | Bin 1372 -> 1372 bytes
 .../voxygen/voxel/weapon/axe_1h/cobalt-0.vox  | Bin 1460 -> 1460 bytes
 .../voxygen/voxel/weapon/axe_1h/steel-0.vox   | Bin 1456 -> 1456 bytes
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 34ce0dce67..1bdc21201c 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -585,75 +585,75 @@
     // 1h Axes
     Tool("common.items.weapons.axe_1h.bloodsteel-0"): VoxTrans(
         "voxel.weapon.axe_1h.bloodsteel-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.bloodsteel-1"): VoxTrans(
         "voxel.weapon.axe_1h.bloodsteel-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.bronze-0"): VoxTrans(
         "voxel.weapon.axe_1h.bronze-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.bronze-1"): VoxTrans(
         "voxel.weapon.axe_1h.bronze-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.cobalt-0"): VoxTrans(
         "voxel.weapon.axe_1h.cobalt-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.cobalt-1"): VoxTrans(
         "voxel.weapon.axe_1h.cobalt-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.iron-0"): VoxTrans(
         "voxel.weapon.axe_1h.iron-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.iron-1"): VoxTrans(
         "voxel.weapon.axe_1h.iron-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.iron-2"): VoxTrans(
         "voxel.weapon.axe_1h.iron-2",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.iron-3"): VoxTrans(
         "voxel.weapon.axe_1h.iron-3",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.orichalcum-0"): VoxTrans(
         "voxel.weapon.axe_1h.orichalcum-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.steel-0"): VoxTrans(
         "voxel.weapon.axe_1h.steel-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.steel-1"): VoxTrans(
         "voxel.weapon.axe_1h.steel-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.steel-2"): VoxTrans(
         "voxel.weapon.axe_1h.steel-2",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.stone-0"): VoxTrans(
         "voxel.weapon.axe_1h.stone-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.stone-1"): VoxTrans(
         "voxel.weapon.axe_1h.stone-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.wood-0"): VoxTrans(
         "voxel.weapon.axe_1h.wood-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     Tool("common.items.weapons.axe_1h.wood-1"): VoxTrans(
         "voxel.weapon.axe_1h.wood-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
     ),
     // Hammers
     Tool("common.items.weapons.hammer.hammer_1"): VoxTrans(
diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron
index 57dfec123d..70e4fe635f 100644
--- a/assets/voxygen/voxel/biped_weapon_manifest.ron
+++ b/assets/voxygen/voxel/biped_weapon_manifest.ron
@@ -369,7 +369,7 @@
         vox_spec: ("weapon.axe.parashu", (-1.5, -12.0, -6.0)),
         color: None
     ),
-    // 1h Axes
+    // 1h Axes    
     "common.items.weapons.axe_1h.bloodsteel-0": (
         vox_spec: ("weapon.axe_1h.bloodsteel-0", (-1.5, -2.0, -3.0)),
         color: None
@@ -379,31 +379,31 @@
         color: None
     ),
     "common.items.weapons.axe_1h.bronze-0": (
-        vox_spec: ("weapon.axe_1h.bronze-0", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.bronze-0", (-1.5, -2.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.bronze-1": (
-        vox_spec: ("weapon.axe_1h.bronze-1", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.bronze-1", (-1.5, -2.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.cobalt-0": (
-        vox_spec: ("weapon.axe_1h.cobalt-0", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.cobalt-0", (-1.5, -3.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.cobalt-1": (
-        vox_spec: ("weapon.axe_1h.cobalt-1", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.cobalt-1", (-1.5, -3.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.iron-0": (
-        vox_spec: ("weapon.axe_1h.iron-0", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.iron-0", (-1.5, -2.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.iron-1": (
-        vox_spec: ("weapon.axe_1h.iron-1", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.iron-1", (-1.5, -6.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.iron-2": (
-        vox_spec: ("weapon.axe_1h.iron-2", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.iron-2", (-1.5, -2.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.iron-3": (
@@ -411,35 +411,35 @@
         color: None
     ),
     "common.items.weapons.axe_1h.orichalcum-0": (
-        vox_spec: ("weapon.axe_1h.orichalcum-0", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.orichalcum-0", (-1.5, -6.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.steel-0": (
-        vox_spec: ("weapon.axe_1h.steel-0", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.steel-0", (-1.5, -2.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.steel-1": (
-        vox_spec: ("weapon.axe_1h.steel-1", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.steel-1", (-1.5, -2.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.steel-2": (
-        vox_spec: ("weapon.axe_1h.steel-2", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.steel-2", (-1.5, -2.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.stone-0": (
-        vox_spec: ("weapon.axe_1h.stone-0", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.stone-0", (-1.5, -2.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.stone-1": (
-        vox_spec: ("weapon.axe_1h.stone-1", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.stone-1", (-1.5, -2.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.wood-0": (
-        vox_spec: ("weapon.axe_1h.wood-0", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.wood-0", (-1.5, -3.0, -3.0)),
         color: None
     ),
     "common.items.weapons.axe_1h.wood-1": (
-        vox_spec: ("weapon.axe_1h.wood-1", (-1.5, -5.0, -3.0)),
+        vox_spec: ("weapon.axe_1h.wood-1", (-1.5, -2.0, -3.0)),
         color: None
     ),
     // Hammers    
diff --git a/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-0.vox b/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-0.vox
index 527b0d36f7d00096926f0cd5de5fae13eef695bd..0c07dd0eae73e3425beb5bd38a8fa3e844f6b0b6 100644
GIT binary patch
delta 288
zcmWlU?G1uJ5C!+`eR6Ol5UE01um%GbWDE9UI~L>cV=^yu*#v&=*FKN8*>193;9$-M
zzZ|ZvQ?8ffhulvoyyW4KB0bU*J<;=Bp6LY_?kcW$z{9RGY*J&lU9oK{ZBcF8TN;TY
zaa@!}9&p7rEv9J^IGD4+F9(Q_AVYyVann~*U!~3s+u6>(93eyPe8|jCLYQwn%&QV)
LC{X9`Q$79x1&tBd

delta 288
zcmW-b(UF5N5JUH^ZEOr?2Ii;&w{SIN2nD5u^m6T_m=pQXNGn^~{nSr=|Gvlvo;wT&
zEFB+CNGG125TAIwu(mmEgSML3UD~C;tPJ78!%0{+Y+jvtMKHl#TCkhL?Yp{N-IMlC
z{RL<V7gQOwW7Zv0sdW?FrM+k_dY5<4@h%<ZjR!$<X**e7nZ=WM+9}IU)S*#FWnqvW
b^d|{}<|LH*qd;BB<4#g2Dje(IgBJe*xd;*1

diff --git a/assets/voxygen/voxel/weapon/axe_1h/cobalt-0.vox b/assets/voxygen/voxel/weapon/axe_1h/cobalt-0.vox
index 76f6054e2ec3423e5c506e7f6cea2790ea79bf80..55bbf443c2972b7f4a5a8475341c5c5d32ac1da6 100644
GIT binary patch
delta 395
zcmW-dJ8r`;5JY#DKUtJ0yLDq&IY)}5NuN%F?xHLBE^(EkrAeM5U@-Gm3l70&eb&e8
zF1wrCUC5CIGV;UYF&C^^?k@@s2ROhHj&On#oZ$=?xWFCU!6*1ME1foF<URBLuH3IG
z{kF?13w2hmi%MP9)lC`}^I??_i{lo^fqZxz7A2HXfxBUojf-hqrEziGe58nsTObEA
zZjqfxK0J+_G431!bS$Y++9++jM5B}(+U$qNMk&guz+IzY;^Gq*pO{U|rcLR*Dx-4d
d|Ak@{Q9}8$eSW;ZS+xJ}dcFSMZeQQ}34f%PCd2>$

delta 395
zcmW-bJ95J?3`DWuN46+YcI(C?<s2!JCVe_;bQfJAcZsVUElu)d&b(PHxB&SmkMi}p
zr#vg2X5|E@7p1f)M>OICcLDEs#|y7Toz0#NZ?l0XYOq7&(a+>N<~sUk^o(9N<(_`e
zeZ|*BX<ByWiNRr2B+!k`^GI-PhI*n-)K49n)Nj(XDixNNS=~UM**uURRzLQH%POCm
z;@A|xK_mN_58%fha;oI&PJ;mzOpjhR*|f<EVLs&NO#z(R3Jk!ftZq6T4^$qi%~M@H
k*VRx%)zxNkTpg@KLHW9Ue!Ra~wCB0qZh!at_m6(VKf8t}1ONa4

diff --git a/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox b/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox
index 5197509dab83648ae26ab2ffcc7d542c91025026..1b66ba67ea1f019e8f2af8ffffccd653b62eb4b3 100644
GIT binary patch
delta 395
zcmW-cJ8r`;5C!>G{79lcCg4I)BP4(;@d_!DCcQ7DE958!(&b=jolyu3c6YcB1Rwd4
zzupe#b|<$>t{T-Dz0sewIlW$FAbXX88fK7Z1_fqNBp0icsHw`QMFAqH#kIKhssIsE
zi|_VB)>VbBC_?J4YCA4^0)18NaXqfbWn5-AvkNKXGk(Ai><+jAH!N~vaT<%jz!^Q*
zSsU;WAdUy2k<dtJA~X@22+<oo*jXF!5FkRD$V@ywR~f_^H{)i0ec^|YE{l9&hFF&S
X=f}JA?*FXo`rNkddAoi8=(qU;L^l}f

delta 395
zcmW-dJ8r`;42Jnrj%ZtcM1Tjui{S#9tSfYAm+rZcuh63e=+=XEO@GF~XOf>Dl=MiC
z^!<LS706J~%AqC)Osc$MJP>1rU3Nrb%^M=Iumf#DWHhBC7#0|I=#bHj8G)E_y;Uf4
zj0<Eeuz_x<h+|eFHs%xj;o=Jt2UAtATd!wMB$yWHlo7qb%&{q}dEN4GEe||#Bf99$
z>FB#dJim~J1ou6CPw)MNk(Z5fR`n#L3?)cBX)4f`O?%e;0(5jeUB}HbBax{9Gv{0v
p1jpS>cP$7$kL!cO*KPcTyK?{f{E$Xo-@2~PZQGu=+s`ll!avpN89D#}