From 36711e888551c710cb16c2f3b9ac2bfd9385353f Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Sun, 17 Jan 2021 14:38:29 -0500
Subject: [PATCH] wielding

---
 .../voxel/biped_small_central_manifest.ron    |  48 ----------
 .../voxel/biped_small_lateral_manifest.ron    |  48 +++++-----
 .../voxel/biped_small_weapon_manifest.ron     |  74 +++++++++++++++
 .../voxygen/voxel/npc/basilisk/male/chest.vox | Bin 10876 -> 10876 bytes
 .../voxel/npc/basilisk/male/head_lower.vox    | Bin 7428 -> 7576 bytes
 .../voxel/npc/basilisk/male/tail_front.vox    | Bin 4416 -> 4564 bytes
 .../voxel/npc/sunlizard/male/chest_back.vox   | Bin 2020 -> 2316 bytes
 voxygen/anim/src/biped_small/idle.rs          |   1 -
 voxygen/anim/src/biped_small/mod.rs           |  47 ++++++----
 voxygen/anim/src/biped_small/run.rs           |  15 ++--
 voxygen/anim/src/biped_small/wield.rs         |  85 ++++++++++++++++++
 voxygen/src/scene/figure/load.rs              |  50 +++++++----
 voxygen/src/scene/figure/mod.rs               |  34 ++++---
 13 files changed, 277 insertions(+), 125 deletions(-)
 create mode 100644 assets/voxygen/voxel/biped_small_weapon_manifest.ron
 create mode 100644 voxygen/anim/src/biped_small/wield.rs

diff --git a/assets/voxygen/voxel/biped_small_central_manifest.ron b/assets/voxygen/voxel/biped_small_central_manifest.ron
index 53bb7fdf2e..ee77358b9e 100644
--- a/assets/voxygen/voxel/biped_small_central_manifest.ron
+++ b/assets/voxygen/voxel/biped_small_central_manifest.ron
@@ -16,10 +16,6 @@
             offset: (-0.5, -5.0, -2.5),
             central: ("armor.empty"),
         ),
-        main: (
-            offset: (-1.5, -7.5, -5.0),
-            central: ("armor.empty"),
-        ),
     ),
     (Gnome, Female): (
         head: (
@@ -38,10 +34,6 @@
             offset: (-0.5, -5.0, -2.5),
             central: ("armor.empty"),
         ),
-        main: (
-            offset: (-1.5, -7.5, -5.0),
-            central: ("armor.empty"),
-        ),
     ),
     (Sahagin, Male): (
         head: (
@@ -60,10 +52,6 @@
             offset: (-1.5, -13.0, -5.0),
             central: ("npc.sahagin.male.tail"),
         ),
-        main: (
-            offset: (-0.5, -7.5, -5.0),
-            central: ("weapon.spear.sahagin"),
-        ),
     ),
     (Sahagin, Female): (
         head: (
@@ -82,10 +70,6 @@
             offset: (-1.5, -13.0, -5.0),
             central: ("npc.sahagin.male.tail"),
         ),
-        main: (
-            offset: (-0.5, -7.5, -5.0),
-            central: ("weapon.spear.sahagin"),
-        ),
     ),
     (Adlet, Male): (
         head: (
@@ -104,10 +88,6 @@
             offset: (-1.0, -5.0, -1.0),
             central: ("npc.adlet.male.tail"),
         ),
-        main: (
-            offset: (-0.5, -7.5, -5.0),
-            central: ("weapon.spear.adlet"),
-        ),
     ),
     (Adlet, Female): (
         head: (
@@ -126,10 +106,6 @@
             offset: (-1.0, -5.0, -1.0),
             central: ("npc.adlet.male.tail"),
         ),
-        main: (
-            offset: (-0.5, -7.5, -5.0),
-            central: ("weapon.spear.adlet"),
-        ),
     ),
     (Gnarling, Male): (
         head: (
@@ -148,10 +124,6 @@
             offset: (-1.5, -13.0, -3.0),
             central: ("npc.gnarling.male.tail"),
         ),
-        main: (
-            offset: (-0.5, -7.5, -5.0),
-            central: ("weapon.spear.adlet"),
-        ),
     ),
     (Gnarling, Female): (
         head: (
@@ -170,10 +142,6 @@
             offset: (-1.5, -13.0, -3.0),
             central: ("npc.gnarling.male.tail"),
         ),
-        main: (
-            offset: (-0.5, -7.5, -5.0),
-            central: ("weapon.spear.adlet"),
-        ),
     ),
     (Mandragora, Male): (
         head: (
@@ -192,10 +160,6 @@
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
         ),
-        main: (
-            offset: (-0.5, -7.5, -5.0),
-            central: ("weapon.spear.adlet"),
-        ),
     ),
     (Mandragora, Female): (
         head: (
@@ -214,10 +178,6 @@
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
         ),
-        main: (
-            offset: (-0.5, -7.5, -5.0),
-            central: ("weapon.spear.adlet"),
-        ),
     ),
     (Kappa, Male): (
         head: (
@@ -236,10 +196,6 @@
             offset: (-2.5, -10.0, -5.0),
             central: ("npc.kappa.male.tail"),
         ),
-        main: (
-            offset: (-0.5, -7.5, -5.0),
-            central: ("weapon.spear.adlet"),
-        ),
     ),
     (Kappa, Female): (
         head: (
@@ -258,9 +214,5 @@
             offset: (-2.5, -10.0, -5.0),
             central: ("npc.kappa.male.tail"),
         ),
-        main: (
-            offset: (-0.5, -7.5, -5.0),
-            central: ("weapon.spear.adlet"),
-        ),
     ),
 })
diff --git a/assets/voxygen/voxel/biped_small_lateral_manifest.ron b/assets/voxygen/voxel/biped_small_lateral_manifest.ron
index ae965ffae0..a891e4fdf2 100644
--- a/assets/voxygen/voxel/biped_small_lateral_manifest.ron
+++ b/assets/voxygen/voxel/biped_small_lateral_manifest.ron
@@ -1,11 +1,11 @@
 ({
     (Gnome, Male): (
         hand_l: (
-            offset: (-2.0, -2.0, -5.0),
+            offset: (-4.0, -2.0, -5.0),
             lateral: ("npc.gnome.male.hand_l"),
         ),
         hand_r: (
-            offset: (-2.0, -2.0, -5.0),
+            offset: (0.0, -2.0, -5.0),
             lateral: ("npc.gnome.male.hand_r"),
         ),
         foot_l: (
@@ -19,11 +19,11 @@
     ),
     (Gnome, Female): (
         hand_l: (
-            offset: (-2.0, -2.0, -5.0),
+            offset: (-4.0, -2.0, -5.0),
             lateral: ("npc.gnome.male.hand_l"),
         ),
         hand_r: (
-            offset: (-2.0, -2.0, -5.0),
+            offset: (0.0, -2.0, -5.0),
             lateral: ("npc.gnome.male.hand_r"),
         ),
         foot_l: (
@@ -37,11 +37,11 @@
     ),
     (Sahagin, Male): (
         hand_l: (
-            offset: (0.0, -4.0, -11.0),
+            offset: (-7.0, -4.0, -13.0),
             lateral: ("npc.sahagin.male.hand_l"),
         ),
         hand_r: (
-            offset: (0.0, -4.0, -11.0),
+            offset: (0.0, -4.0, -13.0),
             lateral: ("npc.sahagin.male.hand_r"),
         ),
         foot_l: (
@@ -55,11 +55,11 @@
     ),
     (Sahagin, Female): (
         hand_l: (
-            offset: (0.0, -4.0, -11.0),
+            offset: (-7.0, -4.0, -13.0),
             lateral: ("npc.sahagin.male.hand_l"),
         ),
         hand_r: (
-            offset: (-7.0, -4.0, -11.0),
+            offset: (0.0, -4.0, -13.0),
             lateral: ("npc.sahagin.male.hand_r"),
         ),
         foot_l: (
@@ -73,11 +73,11 @@
     ),
     (Adlet, Male): (
         hand_l: (
-            offset: (-2.0, -2.0, -6.0),
+            offset: (-4.0, -2.0, -7.0),
             lateral: ("npc.adlet.male.hand_l"),
         ),
         hand_r: (
-            offset: (-2.0, -2.0, -6.0),
+            offset: (0.0, -2.0, -7.0),
             lateral: ("npc.adlet.male.hand_r"),
         ),
         foot_l: (
@@ -91,11 +91,11 @@
     ),
     (Adlet, Female): (
         hand_l: (
-            offset: (-2.0, -2.0, -6.0),
+            offset: (-4.0, -2.0, -7.0),
             lateral: ("npc.adlet.male.hand_l"),
         ),
         hand_r: (
-            offset: (-2.0, -2.0, -6.0),
+            offset: (0.0, -2.0, -7.0),
             lateral: ("npc.adlet.male.hand_r"),
         ),
         foot_l: (
@@ -109,11 +109,11 @@
     ),
     (Gnarling, Male): (
         hand_l: (
-            offset: (-1.5, -1.5, -7.0),
+            offset: (-3.0, -1.5, -7.0),
             lateral: ("npc.gnarling.male.hand_l"),
         ),
         hand_r: (
-            offset: (-1.5, -1.5, -7.0),
+            offset: (0.0, -1.5, -7.0),
             lateral: ("npc.gnarling.male.hand_r"),
         ),
         foot_l: (
@@ -127,11 +127,11 @@
     ),
     (Gnarling, Female): (
         hand_l: (
-            offset: (-1.5, -1.5, -7.0),
+            offset: (-3.0, -1.5, -7.0),
             lateral: ("npc.gnarling.male.hand_l"),
         ),
         hand_r: (
-            offset: (-1.5, -1.5, -7.0),
+            offset: (0.0, -1.5, -7.0),
             lateral: ("npc.gnarling.male.hand_r"),
         ),
         foot_l: (
@@ -145,11 +145,11 @@
     ),
     (Mandragora, Male): (
         hand_l: (
-            offset: (-2.0, -1.5, -7.0),
+            offset: (-4.0, -1.5, -7.0),
             lateral: ("npc.mandragora.male.hand_l"),
         ),
         hand_r: (
-            offset: (-2.0, -1.5, -7.0),
+            offset: (0.0, -1.5, -7.0),
             lateral: ("npc.mandragora.male.hand_r"),
         ),
         foot_l: (
@@ -163,11 +163,11 @@
     ),
     (Mandragora, Female): (
         hand_l: (
-            offset: (-2.0, -1.5, -7.0),
+            offset: (-4.0, -1.5, -7.0),
             lateral: ("npc.mandragora.male.hand_l"),
         ),
         hand_r: (
-            offset: (-2.0, -1.5, -7.0),
+            offset: (0.0, -1.5, -7.0),
             lateral: ("npc.mandragora.male.hand_r"),
         ),
         foot_l: (
@@ -181,11 +181,11 @@
     ),
     (Kappa, Male): (
         hand_l: (
-            offset: (-3.0, -4.0, -10.0),
+            offset: (-6.0, -4.0, -12.0),
             lateral: ("npc.kappa.male.hand_l"),
         ),
         hand_r: (
-            offset: (-3.0, -4.0, -10.0),
+            offset: (0.0, -4.0, -12.0),
             lateral: ("npc.kappa.male.hand_r"),
         ),
         foot_l: (
@@ -199,11 +199,11 @@
     ),
     (Kappa, Female): (
         hand_l: (
-            offset: (-3.0, -4.0, -10.0),
+            offset: (-6.0, -4.0, -12.0),
             lateral: ("npc.kappa.male.hand_l"),
         ),
         hand_r: (
-            offset: (-3.0, -4.0, -10.0),
+            offset: (0.0, -4.0, -12.0),
             lateral: ("npc.kappa.male.hand_r"),
         ),
         foot_l: (
diff --git a/assets/voxygen/voxel/biped_small_weapon_manifest.ron b/assets/voxygen/voxel/biped_small_weapon_manifest.ron
new file mode 100644
index 0000000000..06850173f8
--- /dev/null
+++ b/assets/voxygen/voxel/biped_small_weapon_manifest.ron
@@ -0,0 +1,74 @@
+({
+    (Gnome, Male): (
+        main: (
+            offset: (-1.5, -3.0, -5.0),
+            weapon: ("weapon.spear.sahagin"),
+        ),
+    ),
+    (Gnome, Female): (
+        main: (
+            offset: (-1.5, -3.0, -5.0),
+            weapon: ("weapon.spear.sahagin"),
+        ),
+    ),
+    (Sahagin, Male): (
+        main: (
+            offset: (-1.5, -3.0, -5.0),
+            weapon: ("weapon.spear.sahagin"),
+        ),
+    ),
+    (Sahagin, Female): (
+        main: (
+            offset: (-1.5, -3.0, -5.0),
+            weapon: ("weapon.spear.sahagin"),
+        ),
+    ),
+    (Adlet, Male): (
+        main: (
+            offset: (-0.5, -3.0, -5.0),
+            weapon: ("weapon.spear.adlet"),
+        ),
+    ),
+    (Adlet, Female): (
+        main: (
+            offset: (-0.5, -3.0, -5.0),
+            weapon: ("weapon.spear.adlet"),
+        ),
+    ),
+    (Gnarling, Male): (
+        main: (
+            offset: (-0.5, -3.0, -5.0),
+            weapon: ("weapon.spear.adlet"),
+        ),
+    ),
+    (Gnarling, Female): (
+        main: (
+            offset: (-0.5, -3.0, -5.0),
+            weapon: ("weapon.spear.adlet"),
+        ),
+    ),
+    (Mandragora, Male): (
+        main: (
+            offset: (-0.5, -3.0, -5.0),
+            weapon: ("weapon.spear.adlet"),
+        ),
+    ),
+    (Mandragora, Female): (
+        main: (
+            offset: (-0.5, -3.0, -5.0),
+            weapon: ("weapon.spear.adlet"),
+        ),
+    ),
+    (Kappa, Male): (
+        main: (
+            offset: (-0.5, -3.0, -5.0),
+            weapon: ("weapon.spear.adlet"),
+        ),
+    ),
+    (Kappa, Female): (
+        main: (
+            offset: (-0.5, -3.0, -5.0),
+            weapon: ("weapon.spear.adlet"),
+        ),
+    ),
+})
diff --git a/assets/voxygen/voxel/npc/basilisk/male/chest.vox b/assets/voxygen/voxel/npc/basilisk/male/chest.vox
index 3d930ce6f31624d6f8026a9e8f9428e6d22259f4..47687b176b0db4efe13de2ee97ad4f72329d0bf1 100644
GIT binary patch
delta 71
zcmewp@+V}2HzRKhD+5y`8xXSt@#Y9de@0FqmpO`^fjM&X2By=Df>EptEI=WaXm%jY
T!N3x;xrarWi4iEvc19ThP}2|g

delta 71
zcmewp@+V}2HzRK(D+5z78xXTIFa>UoVDx9?jACP8j$&tEj^4b1=`^DtPz4K6h$WgG
Wh&dQoA~*N2C^IoeZQj6kMi~H1Ll5Er

diff --git a/assets/voxygen/voxel/npc/basilisk/male/head_lower.vox b/assets/voxygen/voxel/npc/basilisk/male/head_lower.vox
index ce8f95361ec8a4852ffbcd7519b966f0e56b10bb..fa519da302254a5a5beb46c978c493a9ae4fded8 100644
GIT binary patch
delta 894
zcmW-ezi!k(5XSADnVs3S&*75G-9-YCBE>xb6oCc`ib%GT`y&+pd5APfbZJr}Buj{g
zph5QnJOm|09)N<D3O=8upT2Kq*7mo%53jzyzI=aud;TR!lIrbM4M`rJCCT=xeV2~~
zo+&s2=is(!uXblJcy`|}|D`r5PFe!{H*Q5wa=5~Z4Qbvm{P0nJ(xjLT*Z#wjidk!M
z(&WXgXP{xynm(_GU;ctQEb2Y$pLCW>ag$lmGSus76~SPkeCl;pdEr(;gbz9|6$Cx4
zhr4idt}rUDH*swMri;>SSq58H3Wmq<^2ipY0yFAkK<^^n-Flc1mUSl5h)5g7H(opv
zF6)S38UE;@F^=AK9x7uJb&aX(12o2YZ8py4n7Pi}alQW?Khb<zsn|^r=_9_aqMh=z
z8a@}RRUixj^R&$UqAYY-IZz;>1JR$99_$~BA1=@Iq!ggxtQ@{gS1-)YN~2gAWu;28
zHc7St8Yss}rE7&oNjK(`t!c6|4%d4-Hh&+Po50*hPIn#{3+i!2vQrSy(?frpbECkR
zTVvlvrp_~AJ)uviv1`V$GxdQTdN_L2%7R+jz#cu{MtINCWz6?|hL<xe6oe3Xfscex
zgiy|{y>nY5gc=pKg5Xm4bQ2vn9%~gCArv8$qt=goXmHXSP$yk*m^<zi8XPs|2>pAc
zC!`{zBBUau!jCgTC_*TBffx9Ixe`7|*wLZJofGvQbtKm*Q5Ue*g9vYglLO(PxD&#i
SP_p)vt|L%vVzd9d%=kZ~qjJgs

delta 744
zcmWmAzi!k(5C(AH&dkot+UIb|CFe+yNRi??8Ylt{6cmwcC*&d&|9JtrG)Qzblqf>7
zgm?%VbT5#HprptHP~;8Zi>05wU3)w`_K#OzUY@=`zdrt+Wm)s)tVLuGM_INx>)#fS
z8(a(6fn&Jt`m?(V3tZ2Bo&K9yV(y%I+`bNLdXgx-E3LdFExJfyGkucZWGvHp{8%||
zSekc+B7NlZ-f6a({=^eDnq6*LA7;x$+~rpG5uFu`xu4AIBjY$k;a(vT^$~>;=_KQH
z;}^$<g-RGrLhqm?gA?~gJScLy_ZK@v7=T7I8Wrp5B;8y)M;sOVT%;3`K1uAN#4)j8
z3>k8qnByaJrY@H-<Q#f=oJ2!s8b(J7o|}b1P$Q@j)NKEzTRIR-Y!@yvCiGU(K^YT&
zE7xn|Fe(b2(THh`*e4Dspuy27Lc)4`U*3hncy^`WF#TMtpDSlq1`aCO#=s$>Aj<4A
zArsOfo+)bZx3{)y@w2g?D;14{QC=IR#_X_GKdeRf>KtO+s}lrU)g=V2ni7h*s+kwH
z(gN=<8f7F{*llAvXcNS=Lay5ANKmg@hv-$4y!y~68ak*|je}WLn_{o~t%K@8?T~cY
pL`b@i+;3RQivk!;O`o=0F2@3>T=w&F*>Sno7eFwF?bpMC{{!%hV{ZTe

diff --git a/assets/voxygen/voxel/npc/basilisk/male/tail_front.vox b/assets/voxygen/voxel/npc/basilisk/male/tail_front.vox
index 775c741267bfd38584d08affa21d520a89dd4825..ed1c161219c52114386ce587cad33636f1ae5295 100644
GIT binary patch
literal 4564
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
XBkRAd&&=QTem{RB@3p~i-0%J$Ppqg8

literal 4416
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
Je&g}({{S1;m<<2`

diff --git a/assets/voxygen/voxel/npc/sunlizard/male/chest_back.vox b/assets/voxygen/voxel/npc/sunlizard/male/chest_back.vox
index 59959b16abbf791dc5eaa32f37fd73bc0826b8ab..6f51b76f1cb9b365a2b761e455dd779beb0bb19b 100644
GIT binary patch
delta 941
zcmW-gJB|}U6h+^+TvZ+ki3l<RQUWBR36KZ~Cg39>p<x!lHk`K|FdB)3$Zo590c?Vl
zj0La=LQc7*>-T?ks$2g1=<xXZ^M~7K-$mrzo16C-`Bz0g-Q2ys8UfD+4S(3%FLyV;
z0*B|N-e13dV#OvG*;~XZ!_U5vLl)iNe|x_3kSWZTL~goR$Uew9v6-zp<kXURx7ATF
z@1c83W{E9yiV~+7ar!w+&Ype>^1jKVJN+e&u5yTsvm3Ga>_v2Xc%{ERb^lQ9#n&QJ
zhMgttSkg{XjAg`OM@yZQL!$sle<?QSh{a|TJ34({bTTfc)B~GX#fAc@<ASle+QScf
zy3<XriOMFHR9$rw_`U==Rb2#Ms2TZ0f$!#v`^e=Q=Ilb1ms$0o$f}>T`W#rVF?&rc
zFXB=geLiP3a=N2=4B6Q#@F?(uWm0V|C~8@}mesIPbI}_399#jwm+IuW1hqmgk)Tq6
zY8=+skE{XJfWmqMssYt@P+f|n5vm5&B_2aSHK0)72g{@Zg`xq~fWk%tssYu2YCz#j
z1By7Q6>^CLl?GJjtj>O9yAD-{3hN!J4i$ck;-wL&4%8(cLqK()P~gYt+45PCBSVUE
z>*P3W>x*F(E1l1}O>#*tm+Y~86n;wgwP3Szlb)+}77`o2UVH{RH|~XeS#oPE;!l7K
OUs36{3i|oSui`($521zt

delta 642
zcmXX@y^0n=5bUn%o}E1o1S8E1j?2u9E;ukS_yRQ$<h%#)HNJfJ3p_qBx#aeT-P|Y9
zcMyCHYs7`3x~jWthnds!-_LG7f4qD3-OS#<J$w+^&(7@A;r`ua6Z$0W;y>Sgxj#Iy
zxn_Ut;pX-QtDUm?2@!J!S9W%C>4$GuM^w%MY$*`FdF2xFC=Fou2C7$M0kKmE?X%|0
zw%fF_qQngSCz5NHT$r3wS?qEmHD6+)w|=aIv~kG_pU-dn7Zq@>c>PtJfz=XINz7KD
zFzLYL6)P$x3Zc3b=%5NTEHL?PwvRmo3J_e#p7JP<8^qr8{D_xFtK6bb`6)lQtg)F8
zUGAk)2zjXs$sJX>(opTHp_za(U0~?ql%-kJqJ8OFG+(yt+HCA5&pK}IzLmyZ9QSnJ
ziyEmg7qW*Aq#G8X+J#cFn?P@`qcCx}UZnV#>0^jp3^9uj8S?)5Ho9u04=6TJ9>ozp
dMB0G3Rzn3f#I!M@nKn|KEzC@z7=Gks`~?*-Z8HD>

diff --git a/voxygen/anim/src/biped_small/idle.rs b/voxygen/anim/src/biped_small/idle.rs
index 6dad997260..72348a531b 100644
--- a/voxygen/anim/src/biped_small/idle.rs
+++ b/voxygen/anim/src/biped_small/idle.rs
@@ -2,7 +2,6 @@ use super::{
     super::{vek::*, Animation},
     BipedSmallSkeleton, SkeletonAttr,
 };
-use std::{f32::consts::PI, ops::Mul};
 
 pub struct IdleAnimation;
 
diff --git a/voxygen/anim/src/biped_small/mod.rs b/voxygen/anim/src/biped_small/mod.rs
index f43aafdeca..c8bf4bdd1a 100644
--- a/voxygen/anim/src/biped_small/mod.rs
+++ b/voxygen/anim/src/biped_small/mod.rs
@@ -1,8 +1,9 @@
 pub mod idle;
 pub mod run;
+pub mod wield;
 
 // Reexports
-pub use self::{idle::IdleAnimation, run::RunAnimation};
+pub use self::{idle::IdleAnimation, run::RunAnimation, wield::WieldAnimation};
 
 use super::{make_bone, vek::*, FigureBoneData, Skeleton};
 use common::comp::{self};
@@ -20,6 +21,10 @@ skeleton_impls!(struct BipedSmallSkeleton {
     + hand_r,
     + foot_l,
     + foot_r,
+    control,
+    control_l,
+    control_r,
+
 });
 
 impl Skeleton for BipedSmallSkeleton {
@@ -38,15 +43,17 @@ impl Skeleton for BipedSmallSkeleton {
     ) -> Vec3<f32> {
         let chest_mat = base_mat * Mat4::<f32>::from(self.chest);
         let shorts_mat = chest_mat * Mat4::<f32>::from(self.shorts);
-
+        let control_mat = chest_mat * Mat4::<f32>::from(self.control);
+        let control_l_mat = Mat4::<f32>::from(self.control_l);
+        let control_r_mat = Mat4::<f32>::from(self.control_r);
         *(<&mut [_; Self::BONE_COUNT]>::try_from(&mut buf[0..Self::BONE_COUNT]).unwrap()) = [
             make_bone(chest_mat * Mat4::<f32>::from(self.head)),
             make_bone(chest_mat),
             make_bone(shorts_mat),
             make_bone(shorts_mat * Mat4::<f32>::from(self.tail)),
-            make_bone(chest_mat * Mat4::<f32>::from(self.main)),
-            make_bone(chest_mat * Mat4::<f32>::from(self.hand_l)),
-            make_bone(chest_mat * Mat4::<f32>::from(self.hand_r)),
+            make_bone(control_mat * Mat4::<f32>::from(self.main)),
+            make_bone(control_mat * control_l_mat * Mat4::<f32>::from(self.hand_l)),
+            make_bone(control_mat * control_r_mat * Mat4::<f32>::from(self.hand_r)),
             make_bone(base_mat * Mat4::<f32>::from(self.foot_l)),
             make_bone(base_mat * Mat4::<f32>::from(self.foot_r)),
         ];
@@ -61,6 +68,7 @@ pub struct SkeletonAttr {
     tail: (f32, f32),
     hand: (f32, f32, f32),
     foot: (f32, f32, f32),
+    grip: (f32, f32, f32),
 }
 
 impl<'a> std::convert::TryFrom<&'a comp::Body> for SkeletonAttr {
@@ -83,6 +91,7 @@ impl Default for SkeletonAttr {
             tail: (0.0, 0.0),
             hand: (0.0, 0.0, 0.0),
             foot: (0.0, 0.0, 0.0),
+            grip: (0.0, 0.0, 0.0),
         }
     }
 }
@@ -104,7 +113,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Sahagin, _) => (0.0, 15.0),
                 (Adlet, _) => (0.0, 11.0),
                 (Gnarling, _) => (0.0, 7.5),
-                (Mandragora, _) => (0.0, 8.5),
+                (Mandragora, _) => (0.0, 10.5),
                 (Kappa, _) => (0.0, 14.5),
             },
             shorts: match (body.species, body.body_type) {
@@ -112,7 +121,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Sahagin, _) => (0.5, -7.0),
                 (Adlet, _) => (0.0, -3.0),
                 (Gnarling, _) => (0.0, -3.0),
-                (Mandragora, _) => (0.0, -3.0),
+                (Mandragora, _) => (0.0, -6.5),
                 (Kappa, _) => (0.0, -3.0),
             },
             tail: match (body.species, body.body_type) {
@@ -120,16 +129,16 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Sahagin, _) => (-2.5, -2.0),
                 (Adlet, _) => (-4.5, -2.0),
                 (Gnarling, _) => (-2.0, 1.5),
-                (Mandragora, _) => (0.0, 0.0),
-                (Kappa, _) => (0.0, -3.0),
+                (Mandragora, _) => (0.0, -1.0),
+                (Kappa, _) => (0.0, -4.0),
             },
             hand: match (body.species, body.body_type) {
-                (Gnome, _) => (6.0, 0.5, -1.0),
-                (Sahagin, _) => (9.5, 3.5, -2.0),
-                (Adlet, _) => (6.0, -0.5, 0.0),
-                (Gnarling, _) => (5.0, 0.0, 1.5),
-                (Mandragora, _) => (6.0, -0.5, -2.5),
-                (Kappa, _) => (7.5, 3.5, -2.0),
+                (Gnome, _) => (4.0, 0.5, -1.0),
+                (Sahagin, _) => (3.5, 3.5, -2.0),
+                (Adlet, _) => (4.5, -0.5, 2.0),
+                (Gnarling, _) => (4.0, 0.0, 1.5),
+                (Mandragora, _) => (4.0, -0.5, -2.5),
+                (Kappa, _) => (4.0, 3.5, -0.5),
             },
             foot: match (body.species, body.body_type) {
                 (Gnome, _) => (3.0, 0.0, 4.0),
@@ -139,6 +148,14 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Mandragora, _) => (3.0, 0.0, 4.0),
                 (Kappa, _) => (3.0, 3.0, 9.0),
             },
+            grip: match (body.species, body.body_type) {
+                (Gnome, _) => (0.0, 0.0, 5.0),
+                (Sahagin, _) => (1.0, 0.0, 13.0),
+                (Adlet, _) => (0.0, 0.0, 7.0),
+                (Gnarling, _) => (0.0, 0.0, 7.0),
+                (Mandragora, _) => (0.0, 0.0, 7.0),
+                (Kappa, _) => (0.75, 1.0, 12.0),
+            },
         }
     }
 }
diff --git a/voxygen/anim/src/biped_small/run.rs b/voxygen/anim/src/biped_small/run.rs
index 3426dcb806..bf35df919e 100644
--- a/voxygen/anim/src/biped_small/run.rs
+++ b/voxygen/anim/src/biped_small/run.rs
@@ -19,7 +19,7 @@ impl Animation for RunAnimation {
 
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
-        (velocity, orientation, last_ori, global_time, avg_vel, acc_vel): Self::Dependency,
+        (velocity, orientation, last_ori, global_time, _avg_vel, acc_vel): Self::Dependency,
         anim_time: f64,
         rate: &mut f32,
         s_a: &SkeletonAttr,
@@ -27,7 +27,6 @@ impl Animation for RunAnimation {
         let mut next = (*skeleton).clone();
         let speed = Vec2::<f32>::from(velocity).magnitude();
         *rate = 1.0;
-        let impact = (avg_vel.z).max(-8.0);
         let speednorm = speed / 9.4;
 
         let lab = 1.0;
@@ -105,9 +104,7 @@ impl Animation for RunAnimation {
         ) / 13.0;
         next.chest.orientation = Quaternion::rotation_z(short * 0.06 + tilt * -0.6)
             * Quaternion::rotation_y(tilt * 1.6)
-            * Quaternion::rotation_x(
-                impact * 0.06 + shortalter * 0.035 + speednorm * -0.4 + (tilt.abs()),
-            );
+            * Quaternion::rotation_x(shortalter * 0.035 + speednorm * -0.4 + (tilt.abs()));
 
         next.shorts.position = Vec3::new(0.0, s_a.shorts.0, s_a.shorts.1);
         next.shorts.orientation = Quaternion::rotation_x(0.1 * speednorm)
@@ -136,10 +133,10 @@ impl Animation for RunAnimation {
         next.foot_l.position = Vec3::new(
             -s_a.foot.0 + footstrafel * sideabs * 3.0 + tilt * -2.0,
             s_a.foot.1
-                + (1.0 - sideabs) * (-1.0 * speednorm + footrotl * -4.5 * speednorm)
+                + (1.0 - sideabs) * (-1.0 * speednorm + footrotl * -1.5 * speednorm)
                 + (direction * 5.0).max(0.0),
             s_a.foot.2
-                + (1.0 - sideabs) * (2.0 * speednorm + ((footvertl * -2.1 * speednorm).max(-1.0)))
+                + (1.0 - sideabs) * (2.0 * speednorm + ((footvertl * -1.1 * speednorm).max(-1.0)))
                 + side * ((footvertsl * 1.5).max(-1.0)),
         ) / 13.0;
         next.foot_l.orientation = Quaternion::rotation_x(
@@ -151,10 +148,10 @@ impl Animation for RunAnimation {
         next.foot_r.position = Vec3::new(
             s_a.foot.0 + footstrafer * sideabs * 3.0 + tilt * -2.0,
             s_a.foot.1
-                + (1.0 - sideabs) * (-1.0 * speednorm + footrotr * -4.5 * speednorm)
+                + (1.0 - sideabs) * (-1.0 * speednorm + footrotr * -1.5 * speednorm)
                 + (direction * 5.0).max(0.0),
             s_a.foot.2
-                + (1.0 - sideabs) * (2.0 * speednorm + ((footvertr * -2.1 * speednorm).max(-1.0)))
+                + (1.0 - sideabs) * (2.0 * speednorm + ((footvertr * -1.1 * speednorm).max(-1.0)))
                 + side * ((footvertsr * -1.5).max(-1.0)),
         ) / 13.0;
         next.foot_r.orientation = Quaternion::rotation_x(
diff --git a/voxygen/anim/src/biped_small/wield.rs b/voxygen/anim/src/biped_small/wield.rs
new file mode 100644
index 0000000000..eaeed43738
--- /dev/null
+++ b/voxygen/anim/src/biped_small/wield.rs
@@ -0,0 +1,85 @@
+use super::{
+    super::{vek::*, Animation},
+    BipedSmallSkeleton, SkeletonAttr,
+};
+use std::f32::consts::PI;
+
+pub struct WieldAnimation;
+
+type WieldAnimationDependency = (Vec3<f32>, Vec3<f32>, Vec3<f32>, f64, Vec3<f32>, f32);
+
+impl Animation for WieldAnimation {
+    type Dependency = WieldAnimationDependency;
+    type Skeleton = BipedSmallSkeleton;
+
+    #[cfg(feature = "use-dyn-lib")]
+    const UPDATE_FN: &'static [u8] = b"biped_small_wield\0";
+
+    #[cfg_attr(feature = "be-dyn-lib", export_name = "biped_small_wield")]
+
+    fn update_skeleton_inner(
+        skeleton: &Self::Skeleton,
+        (velocity, _orientation, _last_ori, _global_time, _avg_vel, acc_vel): Self::Dependency,
+        anim_time: f64,
+        _rate: &mut f32,
+        s_a: &SkeletonAttr,
+    ) -> Self::Skeleton {
+        let mut next = (*skeleton).clone();
+        let speed = Vec2::<f32>::from(velocity).magnitude();
+
+        let fastacc = (acc_vel * 2.0).sin();
+        let fast = (anim_time as f32 * 10.0).sin();
+        let fastalt = (anim_time as f32 * 10.0 + PI / 2.0).sin();
+        let slow = (anim_time as f32 * 2.0).sin();
+
+        let speednorm = speed / 9.4;
+        let speednormcancel = 1.0 - speednorm;
+
+        next.foot_l.scale = Vec3::one() / 13.0;
+        next.foot_r.scale = Vec3::one() / 13.0;
+
+        next.chest.scale = Vec3::one() / 13.0;
+        next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1 + fast * -0.1 * speednormcancel);
+        next.head.orientation = Quaternion::rotation_x(0.45 * speednorm)
+            * Quaternion::rotation_y(fast * 0.15 * speednormcancel);
+        next.chest.position = Vec3::new(
+            0.0,
+            s_a.chest.0,
+            s_a.chest.1 + fastalt * 0.4 * speednormcancel + speednormcancel * -0.5,
+        ) / 13.0;
+
+        next.shorts.position = Vec3::new(0.0, s_a.shorts.0, s_a.shorts.1);
+        //next.main.position = Vec3::new(0.0, s_a.hand.2*-1.0, 0.0);
+
+        next.main.position = Vec3::new(0.0, 0.0, 0.0);
+
+        next.hand_l.position = Vec3::new(s_a.grip.0 * 4.0, 0.0, s_a.grip.2);
+        next.hand_r.position = Vec3::new(-s_a.grip.0 * 4.0, 0.0, s_a.grip.2);
+
+        next.hand_l.orientation = Quaternion::rotation_x(0.0);
+        next.hand_r.orientation = Quaternion::rotation_x(0.0);
+
+        next.control_l.position = Vec3::new(1.0 - s_a.grip.0 * 2.0, 2.0, -2.0);
+        next.control_r.position = Vec3::new(-1.0 + s_a.grip.0 * 2.0, 2.0, 2.0);
+
+        next.control.position = Vec3::new(
+            -3.0,
+            s_a.grip.2,
+            -s_a.grip.2 / 2.5 + s_a.grip.0 * -2.0 + fastacc * 1.5 + fastalt * 0.5 * speednormcancel,
+        );
+
+        next.control_l.orientation =
+            Quaternion::rotation_x(PI / 1.5 + slow * 0.1) * Quaternion::rotation_y(-0.3);
+        next.control_r.orientation =
+            Quaternion::rotation_x(PI / 1.5 + slow * 0.1 + s_a.grip.0 * 0.2)
+                * Quaternion::rotation_y(0.5 + slow * 0.0 + s_a.grip.0 * 0.2);
+
+        next.control.orientation = Quaternion::rotation_x(-1.35 + 0.5 * speednorm);
+
+        next.tail.position = Vec3::new(0.0, s_a.tail.0, s_a.tail.1);
+        next.tail.orientation = Quaternion::rotation_x(0.05 * fastalt * speednormcancel)
+            * Quaternion::rotation_z(fast * 0.15 * speednormcancel);
+
+        next
+    }
+}
diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs
index 412d1475e8..8483653367 100644
--- a/voxygen/src/scene/figure/load.rs
+++ b/voxygen/src/scene/figure/load.rs
@@ -2478,7 +2478,6 @@ struct SidedBSCentralVoxSpec {
     chest: BipedSmallCentralSubSpec,
     shorts: BipedSmallCentralSubSpec,
     tail: BipedSmallCentralSubSpec,
-    main: BipedSmallCentralSubSpec,
 }
 #[derive(Deserialize)]
 struct BipedSmallCentralSubSpec {
@@ -2500,11 +2499,24 @@ struct BipedSmallLateralSubSpec {
     lateral: VoxSimple,
 }
 
+#[derive(Deserialize)]
+struct BipedSmallWeaponSpec(HashMap<(BSSpecies, BSBodyType), SidedBSWeaponVoxSpec>);
+#[derive(Deserialize)]
+struct SidedBSWeaponVoxSpec {
+    main: BipedSmallWeaponSubSpec,
+}
+#[derive(Deserialize)]
+struct BipedSmallWeaponSubSpec {
+    offset: [f32; 3], // Should be relative to initial origin
+    weapon: VoxSimple,
+}
+
 make_vox_spec!(
     biped_small::Body,
     struct BipedSmallSpec {
         central: BipedSmallCentralSpec = "voxygen.voxel.biped_small_central_manifest",
         lateral: BipedSmallLateralSpec = "voxygen.voxel.biped_small_lateral_manifest",
+        weapon: BipedSmallWeaponSpec = "voxygen.voxel.biped_small_weapon_manifest",
     },
     |FigureKey { body, .. }, spec| {
         [
@@ -2524,7 +2536,7 @@ make_vox_spec!(
                 body.species,
                 body.body_type,
             )),
-            Some(spec.central.read().0.mesh_main(
+            Some(spec.weapon.read().0.mesh_main(
                 body.species,
                 body.body_type,
             )),
@@ -2619,22 +2631,6 @@ impl BipedSmallCentralSpec {
 
         (central, Vec3::from(spec.tail.offset))
     }
-
-    fn mesh_main(&self, species: BSSpecies, body_type: BSBodyType) -> BoneMeshes {
-        let spec = match self.0.get(&(species, body_type)) {
-            Some(spec) => spec,
-            None => {
-                error!(
-                    "No main specification exists for the combination of {:?} and {:?}",
-                    species, body_type
-                );
-                return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5));
-            },
-        };
-        let central = graceful_load_segment(&spec.main.central.0);
-
-        (central, Vec3::from(spec.main.offset))
-    }
 }
 
 impl BipedSmallLateralSpec {
@@ -2702,6 +2698,24 @@ impl BipedSmallLateralSpec {
         (lateral, Vec3::from(spec.foot_r.offset))
     }
 }
+impl BipedSmallWeaponSpec {
+    fn mesh_main(&self, species: BSSpecies, body_type: BSBodyType) -> BoneMeshes {
+        let spec = match self.0.get(&(species, body_type)) {
+            Some(spec) => spec,
+            None => {
+                error!(
+                    "No main specification exists for the combination of {:?} and {:?}",
+                    species, body_type
+                );
+                return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5));
+            },
+        };
+        let weapon = graceful_load_segment(&spec.main.weapon.0);
+
+        (weapon, Vec3::from(spec.main.offset))
+    }
+}
+
 ////
 
 #[derive(Deserialize)]
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index a9d645ae5f..8669f3b3ac 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -2624,23 +2624,37 @@ impl FigureMgr {
                             &mut state_animation_rate,
                             skeleton_attr,
                         ),
-                        _ => anim::biped_small::RunAnimation::update_skeleton(
+                        _ => anim::biped_small::IdleAnimation::update_skeleton(
                             &BipedSmallSkeleton::default(),
-                            (
-                                vel.0,
-                                ori,
-                                state.last_ori,
-                                time,
-                                state.avg_vel,
-                                state.acc_vel,
-                            ),
+                            (vel.0, ori, state.last_ori, time, state.avg_vel),
                             state.state_time,
                             &mut state_animation_rate,
                             skeleton_attr,
                         ),
                     };
 
-                    state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_base, dt_lerp);
+                    let target_bones = match &character {
+                        CharacterState::Wielding { .. } => {
+                            anim::biped_small::WieldAnimation::update_skeleton(
+                                &target_base,
+                                (
+                                    vel.0,
+                                    ori,
+                                    state.last_ori,
+                                    time,
+                                    state.avg_vel,
+                                    state.acc_vel,
+                                ),
+                                state.state_time,
+                                &mut state_animation_rate,
+                                skeleton_attr,
+                            )
+                        },
+                        // TODO!
+                        _ => target_base,
+                    };
+
+                    state.skeleton = anim::vek::Lerp::lerp(&state.skeleton, &target_bones, dt_lerp);
                     state.update(
                         renderer,
                         pos.0,