From 77205f7a8ff43d724f3dc4f6050248dcd6343b06 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Thu, 29 Aug 2019 02:29:49 +0200 Subject: [PATCH] changed debug wand visuals, added icons for 2h sword main and alt attack --- assets/voxygen/element/icons/2hsword_m1.vox | Bin 49374 -> 51425 bytes assets/voxygen/element/icons/2hsword_m2.vox | Bin 50430 -> 51766 bytes assets/voxygen/voxel/weapon/debug_wand.vox | Bin 29771 -> 45980 bytes voxygen/src/hud/skillbar.rs | 36 ++++++++++++++++---- voxygen/src/scene/figure.rs | 2 +- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/assets/voxygen/element/icons/2hsword_m1.vox b/assets/voxygen/element/icons/2hsword_m1.vox index c920f452af4f20aee1931d1a5032a80ccc8d9968..d1aa6f9d584c736a55e2edd1ed62b7aef7aa8e45 100644 GIT binary patch literal 51425 zcmd6vd7NZNUBK)0-S74N`dxh=Gvolm%w{*cAsibZKyH$dO$f(ic6Ty6?Ci`q-RT^L zATt9J5C|a#P#_#)IOH^m9BK%NfC6GbL=F*=Lq$bJ1h4X2Z#GMk1^M{jufsQ0uj*G- z-&a-dz3!e4`!2k^cbih`{4>wKfJA-flS*B3_7!Ip%mJ^5LE>n7`7^FKJ8YR!rP5iY zQdVzVv!*s(Yq%L&!|}kH8Yd}BTh=&ZB|uHmP`3u7td$(6;^W?UNNk;Ym$)fwFz(aN zvdZHMF;&Ww#3d|iVp)mFz?z03W!5-BokdKavJ}Td+V;q&DesbIsH??&_8F^BY!y#SXPC(7>f z?>=d6qEsGi*2=8waMLn#8_61y^&;3BxoB^?{co@I_XoM;GA5_!-<1qlQ|w(4(D#h3no)mlk*&o zhV-E zvhmnvUP9p9tup5{WZxy|qc@678yK?w$|_B!S-)wsHWq8hHQ8b8iZxiYiE$WXitCX3 z)1(M_%52JpTzkqYOiCP2vxdbu?NFcOn6+WOrpKGV#91E(zKFwLAt#?NwCbM^=n zVVd=sX6~z2e{-6(oMwM0%Vth{Ba5|aG6x~^(xQ(xewldwrnnx>oDb_MG;3bz%i2wGo(+zonK&luB@I za-SznkWO*Gx4358#17;8|6t7H22VBNaWlz4f@`_J`D9?g_1>p0M|q!og8Ax^Ch-Z# z7fDN8H)-m7#C56bl6FYj&>`QXu1(q?%|n@e*5WuK-z04j*D%Krg2T80X@Pb2Nt>n~ zA_yS>A3Ou~b#P6}ag8)Zzg5x-l)0%a&c5%N}VBcy$Sm;%QE zd56>{wMiYyZOFqE_s*QjQ=T)hPhIwDhjH4FWxozs^9uXBLB2}g7T1u)eJ8`*)re`* zrobE)nZpv#nX=VitXMtn%SEoi9+c=K1fP8wa4q!6o9D8*pC!jWUKZEyfcsY8tQX}& z_Q#OADW0Qg`gUN7aSQQ!4K_-QQD%%D@qOY4#9Efmy)Q*vn&Tq(A~Qyb<1UoBP6ix1 z+(>!)Dwe zeN6Ez8^rH7OkZ6nQ`W(2Fq)#@5Qm693p_)Lcn#vYH19#eQJa2)_}_H zasEl#=ec*7d2q&c&M_CybAvsQ#LL{<`?T*7Yq4(T9y(x83>mw>F<|c$;(3Th8QRro zKV)9BsyaOMhAR zO_~@p7JE%)={vix34O+DsO+U}E3?(2z8`xSpAs0?;;2b^13Fe_)U~n@P{(|!H2q{o zO_jN{0c|TyojHd*F6pf<9!4cFw=jN_whi#fcdRV2Io^NeM}5m41(ZdM z7vhxUocj>r-Lg`n1pPHxgF5r$L6`lQBDTkT^sEBy1LBM9#mrWSYZTA9%Xw5;>kP43 z_DyE1W94u%bDL+4&AQcC!!+&89NLsc^y7>|+Gl9jXAk$|F&tcN`ZDugpbs+_Mf%NA z?}J&}8v8P{=*d68SRu3i*IJ zDUvV5ZBo>wAxnJ@=M?p6?ro-x87oD3ntNV$6tWLIj(zH@q!Ig}tL#yQ`Z~uRHL?XObqa$F~^#d)qbm75RP+eyYtnDOGg*=N~HU6mizRes3>U*#_iRDNHm@|Q&_ zzrUgK2b$zt(1s4N3HD$TQjmrWWFZH6u)%=>6rluVs6dr{SYuzfT2LZ9X#+MfDj^RKoeTTw@EutQpHgjDo|C$ zl^VFJxLOB~yswJOfhyu%#JkA7uZVXM?;^fMe9b+ih;I>J^Lez0ZxP=j&$S}Ywc=I* zicq4w3>BzC4P2;$2R;N4LIe$HLW{O-=zyb2qXHD6q)IDgs6bVfR%_s@(psHkPnDK^ z2viC865b{5-6fn$IG1oP;atMGgmY<>gS=JRvcaLO07WQ487feP8n{pg4}1t9gow5c z(k5vO+Vt5m{i^cF21k`w3Q&ZSDzBEI0##LBtAR^-oj6aGkN6OfPw-qzLJHE5vC4dh zRNl%#o?{yvC_oWPP=*Rrp$0D0!2=%x2x%YDSA(<(E%I&3JCIeCQ4aE|vSNdyDys!3 zLJ7)HQI)kS)Tnof^}vS&&(0*IAZ=B6-&EPklFvaNY;d3eMJPcTDo}+QxKO8^N9sdB zKBTXRe1o(JE%I&XKt@$ZSyf%hL0(l?ZE&CfMJTE2S{W)(C8kDvg6C=yQdV`8wyIkh z@>$419&B)+07WQ487feP8o0Ep)7~TXAs`=89zg?|(1JE}AgyYnjH<0mYZfFhKj3>BzCjdm{W>*PIB9|H0r zM9_dHw4e6rluVsL-ZL+ZuTn>fnJ70fZ1i1Deo+ zHgq7RJRCh7Jsdq8y|p~p;6OonR~D%+5tpz${5DSH<*(%+ zuly@*aFqYu0`*1W5|+<Q zw*a>Qw*a>Qw*a>Qw*a>Qw}9tRz%xEzZ3El_+ydMJ+ydMJ+ydMJ+ydMJ+ydOp=lTG* z0Ji|Q5VsJwko66@RzmJSA@`qguMn>guMn>guMn>guMn>guMn>guMn>guMn>YuZVreXI98U4)S0_!isQ; zaEfq>aEfq>aEfq>aEfq>cxFeNMJvK7!YRTj!YRTj!YRTj!YRTj!YRTj!YRTj!pVG= zjBtu@GM^_K8%e9d-fnPzXmGD>@Jwj%3~TTVYw*l%@XT#&7NAIMiO({ z4j%XrKnM{upb0H#LkB#*^QeOlUi`grn?6ig6WX*lbxmkf-(idv^-X9~Z@x=t5z~Y= zF&$#MxU`6Cg6XS6T$k}%#5Te7*&()zcZ=92w2AEy+r_a(Y!lkVc8KjVuPv^RCh={q zVdK!{JX*vyp-rsu=yEN!_|B zjW%&D;#$NtiE9v7Ag*XN`7WhRd}p(4bvHZ2wTWvJ*CMV-oI_l}YC@a%4zXSSCevbm zo6shhCO%Uexo6W<}$#5MVh+9s|;T$erDTFeoXBPLIbja#3(9(5VKv(#nr&f%Sp>$>ds z)@FwCMBKhZU3VizSsJHg+^(~cr7X#OrzlG?k7?#H!+a-Lt7IJ4<~i5lJ%cH0ZX|F@ zGH#0Y3DPuUW?<#%7hiDnPlWuHaQkJE=%X)_H?NhaT>Lb?JC0xXmzgvHrjPTttKwr* z&Ud(KZe{++0$*mS(cz`#<^A*PbEDXDLgJ}_MuVcq>hW)@z5w^ zbX?S_4~^mrEfo+F30{mmEL*2qt7`~(O0~{)i1fbt)Fy*(ih#T^!|4%eck71dr?DomIiw2hLiPa zckb2A^|~Istf5bSYgf;H;shN$OX;Z>(D!XhKjt2#)zcaO`kYp`mb7|*UEg#36?M>3i=``cv=Yc(2lLI!oyfT&(oh7L~q&<7@XR zee*%eCrUr@B&DCTN9oCvlzt867wv55rLzY5`ioA~m!ENhzUHD``o?{G^lgWpsNZqz z`TF5QUq5C?SD*X%6ZOKr-TLr3N^d?}>D$L_`|sVOPwO=F*(XowXPtJ6UVqZ*df&;u zUfS8zKmPWI^nD+Dy*}$Pv--j(pRTWX+L`+Bl^5viSFg}FzwofW^NttA^|L1r^u2F; zu72brAE`sPs(Zbj-nnz9KJAo;=|}H4N#DHH((iubK!52|C+n|$_Tl<$R@`J?CQ?|(zj}KOZ)~u4IvxG|>09;V&bUP%eCdmH z_?$q0_C3@3?kggF3v>0*@lBlR>lv4PTCX3{`np%&p*P=hr+)eSKc-*%k^A(nwVU+g zHg4DFzTqBy$$Rh9d-v|u-(V?K4)hOo@;;@%{=sd(ud}~?UOks!e4YKQ)KvbgI#Yh( zjU9d7D`s?gZ&`o!b?$MoJNKTXAAdo7(>kt>_WXe4>F3>MGDlzhF>U*%J-%*jfxpnH zxr0krU3K+n!Q4*fu31=GJTx}gK$HBx+UDu{HRm*D)W;r;fDN(P`DvK zzY}g~KKRSthx}YkxFJ8v5pKv&frJ~H?}B9SLw=qn+|UB&&mlkR6mH1RVTBu- z?`>sY%ly<>xS{#tUiKXF({SO2{19HaVOP9iPrPAYydnPqi12+l6mK{s-f&vH;lsom zo*>@vMDd0vi8nl1yy3&e8$Lq3;UmQxo+94xQQ{3}#2e0vH{2oK@Ko`JJH;FB5^s2# zc*EV|4flvQJYBruqs1GZA>QyY;td}w-tcka4IeMwaIbj7GsPP|LA>D;#T!0Jyy02m z4WBID@G0UApDNz)Z1INYh&Mb}yy1D`4b6XcCi^eo7l=2!P`u&O#2a2D-tc1ahL?yp ze7bnUOT`=R6K{B#c*D!Z8$Lt4;T7TypDEt(S>g?!E#B}s;tl7-8(t~ia9+IOe({C} z#2X$IZ@3`d@G9|!i{cFri8ovlZ}?pChKI!)E{iujBHnOCyy2>N!!_}SzaZXlUA*B) zyx~~9;nm^|C*lpS5pQ^{c*E<&8(uHo@E64!-XPxadEyOk6mR%^@rJ)7-tYzD4L8Ia zZi+YD5^wlI@rExFZ}`jN4PPwY@FwwwFA;C}Qt^hrBHr+2;tgLe-tZOT4R022_)77H zw}>}@rG{@Z+N?S!#9dI ze3N*?H;XrXi+ID|5O4Ta@rJ)C-tZ3bhHn#Z_;&Gz?+|bJPVt7nCEoB|;tk&|-tax* z4c{x?@O|P9-!I8~&+y!~4V=eqOxc7sMO>nRvr5iZ}do@rGX#Z}=DD4Zkej@GIgC zzbfAFYvK+6QoP~U#T)*Wc*AdqH~eeyhTjx#_&4GWza`%A+u{wsBi``4;tl^+yy4%8 zH~f3?hTju!_z&U@|53c*KZ!T|zIelb7H{}3;tl^*yx|YT8~&Sk!yk$_{CDw&KN4^F zWATRnA>Qym#T)*Yc*Fk|Z}>mr4Yf$a^$VYH&Jt$km4P(Ojjvlfh5>Ft_{dzoKfm^Z!5oHDaJE;zU}I&7H&Gw5zI z=4E<*@Ss<(EdBgJO&4!8?Rn+k!ClOckHl8%^ViKC+;-o2tl+Rs{LWpy*_oZ@6yowD zOA8MUGzCBPL`}uw_G#_e6_2`l>fFKjwC+EO+s)2wPtfdae7dI_QC<%^T_Zks)#~Eh z{inR$&rh9YbHdMyyLiY6$D=MUtc>CnyJ~e}n(y2dA01r1YFl;3w(7#QYpX_eHm;p4 zEymu)X>PQgkCpZ>&mUZvTZtgtiW_ajT!ZqNMo z437@XFE7L$WX*8%qqT(tT)~-vu2D_kB;%68QUIgbtT?vbMprl zMsXMMfQ$1-Oze(Rc9`am{b|kPp%>RzuUct9y?c4KevDJC!Ls@nI8X`u^)Z3$?@t72N$>JDIWP)qqv`ImJW^&Z4Vru!LyI{ zVxo=>9A_5Smmc7Mte1GHMr-p2mR91$oc&3+=DfHLcf=uFhil98*Bx6;^Z&1AUU@h+ z&~|4F<1w8*VA@Qh+4$^7*Zd?uKOg6h$;DmAN9KfoaNvL5adsxGgLfA_xM-{(vSB%z=F>2v9ibI$ud&+qxZ z%Q^SXouOA;a%F3uG3KH(*IdlOeDyhF)~#8;IxZKyjzgY9$1AT|zb2oTR%84DWQu(s z3Lw8JpiKLweU_+ql9l3Rq@Rr2j4WR;hmy(sXqYYfQj|nzQQ!Tli;?gMS*;@K2#SHIgtC@i*jq@b}>7#otS9AANq-sl|DbS{eF^ z)JhXuq*jVrvagcVlD(B+Eu~f()u@v~b?PKhgIWpv3e1hcuRu*tzs|h1snuZaI@D`0 ze@*7E$^5k#cNnh{u_3&Q9D{fjI0js=JT>D;YNk+~dP&rvUII0#8AmPr41OMJdO6Bm z`Z#Y<)6X$ZT|-+FC1`7)B(-J!^VCklkf(M6hCH?7NY*cgWWOa*gSrXSq;4Fws2f8A z)b>!*OC2BcBz63Z!9$GzeqQFl;P0cBpZN*UC;K}`TMmXK`(O5Ff<2ytA&z7Z#gOdz zC~8wbftu8hqZajJXn^`r)Mk7hIArWHZa)kGYGh#uQoqx$!BA)J8*XfrSmBPrkR_+Z z{nvs;7_zX$xff+W$B^8AQPhSbf;w=-Q45Y38h|5;+HgcrhdLhWc=7k)E%P7X7>6my zx$Nx_$3)+8=c++_lD0ZEGaOUg^BL|Z1B=}6ajs>4V)UosiJ~?<5!8Vv3`-2jGcAhR zutZP?mN4t#VeB5fS}^(WYrztrevozWQai*N`KTLaF8s_{fO=`-)6{ISHYw&NMeP)A z!ji%x#(9eVC~CtKK^=I)@PuFy4q*tx5TbskUu8U1#_qsU;aEl?RCn{`DEC7U#sL&# z?xc2-W1RX)`kF8#sV@vk>I;MHVR;U<@rs}h9AP*@a0KCqz!8Qc1V<2$1mkX?BnmP1 zFyoHEBWxbnWIpQT%YBlfuZGfiHF>TXJesVFhv!8CmN?IX1S~N)W#2?m8EYv?gMZ%7_V^3{s=QivNs}(U+T$z=}=ErK zj>2Hz^1$e&z7G#!Y@!654fsPGlf-pkt`pm4KH|j7ds>W~7F?4S(u(uTXrUW#*+&j|9&uD};XZP;YpJFtae z3&9qIEdZMzHXm$W*gUZLVe`S}g+tbTzBd7yk7`_mELHGjj`Qej2;)TxxpMlQ@pBFw4 z9tO4|j0IGpj@;LEl%jSGrD1iDJO`^>M>%F;k$bNSi-)-{u(q-Wc|7Djq(gs<`4;vl zYQrew>A)C1yA!CRld7rAm*nuw$UkJV+d~(nF;gjdH z7d{Vs@_tpsr+`X$=aGC4OXFK%?i{WMP>lW-iW4vIE%I3)!?~<$mG}n7EOS{wIe5z` zPh5%lY;!EYC39t93ULg=6oAPOlMf~@OdgmFUPXKhs6@RyDpOy^T_IQYp45|Pb{(at zE6>k3^N~e{am)L2ntDEJ%QHtlgJxK}4CiUqRpzckUx)TI@gaPJFa==p!{md>3zG*X zLyaQ!3aA8A9+mNtxv#*KMOD_T4VS~%MH$9krJj7|@^F-O%u=gGOpLnnypna3`=`#@ z%QGbkm%OLfXp6uUged@%A0{76UYO+lRX%?eVJe^!OnFo$Pwu@6xmi@@JWUOUJ_qjz z^CLe$L|~E6h%z5O@~cQbmsC&=?lQ`=58LpT;F5h;Ah!sQFa==p!zAwoUYI;E$^Bd; zUp|k@y(ag)?4KN}z#)6HO1$iQhg^AHhVk*jCGU&!^NZa320lM+@~mrd9_C)?&@M+= zuQpsA`UV(-^m|Z%em`D5e7)50z$DLR`5Z2vi%T%&Q5mKjs=$;*GC#6+Wq#yyLycpQ zqj$EBYR1RWH=8y7*&M1O2i1&!vW^;@H&NCE=nv2zpg%x=fc^me0r~^8X%n2ypsWdY zb12Vw0hLh&RZZ|t2h}*QqqGSTA0j?Pe2DlE@gd?v#D|Cv5g#HxM7+d>sUM!rn{c;) zikz2F*@W+`pepAM%9;pq5#l1mMTm^1yzZ0P}(GjPY|CVK0$nf z_yq9@;uFLth))ooAU-jhG|AZ%N}FUigR&+$nL~M#geM74l5r&&R}!8i^Ofv5sK$96 zB~6O_6!|IgQ{<<}Pm!M@KSh3u{1o{q@>Are$WM`b*0 zH-VBSJDEahlkH_tmcAUyb6!AElOsMye2(}W@j2pi#OH|55uYPIM|_U>TrX_$vk??E z`ECrwO@1y_D7lM3oikjkN48={cmq1DSQYg)N24ztW1x<;(5_u)^O5~NuE0I?suS8ynyb^gO@=D~D z$Sd{yraT)!K~wIAP}r0wBPeRhy%>tqmq1C*Qz(rxC~L}lawu=gw-k`yRPd?bQ^BW# zPX(U}J{5c__*C$z;8Ve;f=>mX3O*HlD)?0Jso+z^r;1Ot7eZkaK~dUbD9(8TB~5it z3Z*&Epe)LvJSw1~soqjTe&gWh;OF4y;OF4y;OF4y;OF4y;OF4y;OF4y;OF4y;OF4y z;OF4y;8(-1hF^{Ot})*=*0;v`));4van|sw;a6jvHO5)nlR;TiyCsM6v=vYhl~5T~ zP!&1IZ|eBh@vq}w$G?t$9sfH1b^Po2*YU68U&p_We;xli{&oE8_}B5T<6p_1ll&(6P4b)M zH_303-z2|Dev|wr`OV(sYwa%AgRo|Bm^6W#8Hk?G-??o@wx!^HUThH*aNx53lv5DQr z=D03CX6%xSV)p#4X}kWWoc+Wzb$iY(V=vol?1m?d-SH~9msM?JqHT}cwZJahzsfq( zdE36DY8O1xv_mhRU`tmUd)!TU?=$w)XN@(NQ-5dJn!QPDp3d9bPRQ6t2MhM~(;REh zAFzAbZ_l8wqwk=-+l_tVQ^p>A)YzAv;(C>_53e@%OKXjNW8B#FTyMX^*tH=VkNkzOhAi*9Vu|eVfm=2lsr)&OS0>PwW)!sf(KS zf-~mXu`8C_E$17%`x;{(>>K;+UB)hJRPCAt$JwiwEwt0;th84wDB6i7j=kgD6v!Rbr;*6Q|s;BAKzm4KYFWu?fD1n{`;@C2S5K28;iwkIhV1m zR?7~}Z`)-H-)B!=G~eEROU*vv-j;@ zY+rc%Z2R4BuCvp(r|lhI$lIr0t=Kng^Z$MPix)4ppIrW+J!$A+d&+G$+sf{Weetu# zzW!ljADcJN&YwTuZtiTe7oPXDHM@7(!gRqtbMM?5-dJVtG#d6}$M3bLpK^~Kz5P~O zzP4mv`Qq{Rne`QW4|8?&{7am8UA69IJH6T39rr$JcYkibz4Phk?Wdo6%`WZTW>3HQ zL3_bxp0(?qe9f*}waUK5Bg}-6{l4|RX6&0^p5uFy{q^Jexe49->_;7?^GEeb`z1Fv z?1gs?+SIC){nq`tV`7)Ans3jz*nMan(?>qPJ-YnDeR6W>#ZP5(PwoDW-WWeJn&Huj zO`EQt8I#A!@C{=VEpGULX*XxeV^d~k-!=OBshNq{lAKxrb#KDC_?!$kkH@0!^ zdZ|2dh9{<`=Pnn!mm_`GZP1O~)V+SYYvp!zN2lG3cN0p3ZbEs_&`l`QubWVoUpJv_ zSKWkiH|i#o2a0Y&dBo`^6gu66e5SDC-`P)^9-=_n_Z?`?J8%lyrm zazgp$UiTdG_l(L3`D;(*giZB?E%k&0>IvKG2|MZuk5f;0yn4d-sV6)^J>fj{g!9!C zE>KT+qI$yjt0(*k^@I!66P~1=a8Nzrkb1&J>IoOCCtRYQaH)F2W$Fo+t0!Eco^Yjl z!jsh#o}!-cRP}_XsV6*LJ>ePZ30J8nJX1a4S?USTR!?}2dcxJ}2|u8o@LctT=cy-L zqn_}5^@JCwC%jNS;YI2R<-d&6{X6iGc z6JDvF@GA9$>(vu}SUus@>Itt=Pk60*!eRA<*QqBQQBSx*J>f?6grn*S$J7&UQcpOp zo^Z2z!U^?+A5l-ZMLl6xJ>gdMgp=wCr_>Yn)D!-sdctY-gfr?1`|1g=S5LT2J>d=N z3Ad{!+@YRur+UJlQct)`J>f^y6W*wv@MG!;e_B1^P3j46R!_KFJ>f0t2|uo$@K*JN zKck*-k9xw})DwO}J>l)@34c~S;T`G;?^I8CmwLjx)f0YFJ>fm-2|uNtaIbp8pHok` zPd(wi>Iv^tPxxu|gg>vI@E6n*-mjkU0riBRQBU}wdcud)6F#h-@U!X(Kc}AX7u6F! zqMq=V)Du3cp78VP3BRD8@R!vSKBk`VSJV?euAcA-^@LwkPxz#I!l%>|KCPbcSJe~l zS5J6AJ>fIz34cvJ;g{4Cepx-?ud65gih9D|P*3=q>Ir{KJ>j$J37=C>cu+mzZ>uMK zUOnOOs3&|uJ>l=FCwx&o;qR#@d`UgwSJe~#zIwu!)f4`Kdcs%K6aJxk!dKN3{*ijZ z*VGe!O+Df3>Iwf?J>l2Y6aI;M!f&W2{8ROWf2N-Bo9YR_rJnE&^@M+}p72fegnyx) z@GbR(f2p4E+v*AbN5sVDqr z^@QJ5PxvqD3IA0+;lHUT{GNKke^*cVef5O@p`P#u>Iwf-J>h?;C;V^qg#V+S@PE}4 z{-1h6tCDc~lC#dAfJ|ON6hOoM9lbHXoJ>q^^14SK{~lbp+`ZTm<6_a$rL9AfwBeD- z@$Q%;FCAoQPUI!dM;5()a^lAq6^n-?pH~QYUQ>=+)MV_$N(VM~ZYN>GQ~-fa`(F1IiZ&&-{>NE^B%qhrI9Zs)rirribs zx$+Q*)OPF3j&Ub)Lw9OwtLwgXV*A|8&&}}6#*yxrYY>uhBQw3RjeYl8mSecTd3tPS z^HkTJfg!1}_)v`_W^At5)TF!BhDSDz&A1kB!SRu;61!;OB1u2(z0%#%hNc(=x&pgDv-euF>YH={a(jP?TV2=)KJ~`7Cnc_nTu<59xJ_M`e2;vYv_$G-H;tWyaN6pm zLYo$vwmEE>NtZU$#;1QArV{n^rL07oGJTt*ZOS^7P1z`I@{=gGB9!^a*v_Ovov|@E z+bE82>do||O8>a{HN{DbwuFuAGI0==0`>GWsfkayj~`=`*lAK%!B+xCX*)H}qiI{5 zA6xRuqL?slbzD!y{kzjr$j%obL zdXo9>5&H(pArHxX6(%fU?8*2HW0!Rzv5QTt4daVGHj4VR?-DCvBGz0R(_xOKZH<1G zG3HsXGX5U1fSGl`{vlr`jyY7Job@I)f_+kDzWb9H`KGjI{?Y-b>=j}`+i83lIHy_n z()sEk9LCE>tEnsV7gb;h5dt<*=xb^64yH_f>*Eql$>;E-`ijEI}fQ07fS zoL$rG%W3MTO_p`ZdPXs9CukqWo}oM!*e#D!;*&GP3u4$~uge@`i}S{?_YHg9m?-;I z##h4r6g&+$#BYi{9vU}bOTac|OQ^~G$k`+7Tgr;#4rw>IZjGz7Z&8;D@&)2x$GzaX zJuZ^AsY?g>JbgPTMSD44Ep}vIip?DAa<<5sIW^7%Wm(F4;{w+W%A2GE)aTl;cMP%a z(Kbt2hO#M}L46da%@pyKaY&!gI7gZd+IZ9tP?~Z%%Pe)W{zA03;~{C@#zsBXK*7dG zG3Kej+1G_R#+e@HT<+i}PkqtWZ|!0yPhEkuiQl%((k6`G2=yLm6uU9($5Dc_Au}q| zzfS)e{c^Oc(zilcmG(Yq!PajnG9Lr_45@F~JnUhvYbc7J0{x<+aNwsn4$-EM?HF|- zJETpFn1<<>!-lZ*VHVpSek4ufD~10g_Y`kbA@7r~k}pwTwrR>zlqD$><}_s~`X(t$ zP$pxEF@`8(Ov9U^O^R_PX_KH$oHjCM8G8i(VcJQI#D0=?3EIVJ7o%O2cCr_wjnpUb z6{kK%eU$nL^uaNhH_A%lmd{N3Hl!xJn z(Kbq1gfhv?I3nc3tYJ}v;9{}{21F&_!q$l3_A_L9s;jCv`Pwz9So z`1L4DG8bv;g;8vzNX34GIg4N~%w7p&GfbNdWwI_Zv`I1M2JO@ENL%TbW*tf#Jj!C& zsFRP=KSAF#wj!e{>#s-Kj7e-2ZS9sm`!&wVI%);iY5JrY({R)e z+IZL%jw(K7tyUR}j4z9y;m9+IQPN~aHP&Mt^@2XqH^W$EUDaV1-YoTX`sMIXKiDgj zrA&6zg1ZfO2R~hG7qHQzEN!yeWt$zfvDKoi30H>l2KI6&OTNZ<64=U6-zRPf8y?ju z>yj_xrx%Q=N&g5wqA(@kU|*ReYbQ&YM_n4$Lc*~ij9&Ny=T zmwhd3DTn{;*fZI!626A)&6;hE(%7ln7VBxq7;?m>JxXA|74(VHKL($~vd!4Tq%v<= z;xWW#7N0p-Bz7JA<*Dxww*qT;$e5Glv)IVdHjm9AToKj)@xrc$?iV=1Ujyo7US&*jMo68+FOSb0HX92)u9L(jj?(n;SR?(wr;NKa>M)K0 zerw!&hA4%PdN4n-rxN%}!jZy9n)#OVGK=jfV~HV&HFH3_G_1{lr@fV=tY8Nl9T@VY zT^MqtDfUb+I8SAsg*Q)s8GnIs4mSF5WJm{a^s(Iy#wKew28W!*5%>oiUJ!pd7owvK z>)T@u_;6L>8`?5!RM;Xg4MttK^0W_;)`GPt`=r1)2lyUfqrH_u$>3VnzKlDGzZ8BY z<{8o)HV4EYPaLJ6hmAChamJN|S?*Z{?g<0@7ROQ2K4XZGrl=dhl%ic4WwD!~Z=H4? z`6_cc-8kcZN=^B7CaB(~!w zzLhem?KJs@scfdGubc8_&6GB)rnu>w!e+(fH_Il+wZH1oHiNP#XHr`wlif_hlt6Km z3S!hAHB5W6Zd%xBVy8jh`evT?aTCL5ayyFelu2)=QPoseE2f5z>SoFKn?>O;$*lq$ zc{p-#WKo7|4`qUWQkG_n2{_WDJW3gFJ84pf5?rT^x8;$~8gC)Z7~;m;Oqk4O48|nP zDaPY5t~APUou@vD-CWSl8x>4?Gt3#AG8q^%*!389e3V036f^Pdgo%!!+?&}BXNw#WV`aZdF%;wHQqMG@?Tu^+~62=)*xAy`7Ngz(*GZG{A42)hN;fH^NdY@0pM+lrEANi)bpDb{itrjR_F<2P)}8)5Dn?O^ZqI2($bOFi~y ziMYtwSZ1Bc*;s+EM_rbE)Pu7}e7fxK?nZ?)f}g5wZ8VI}dajIWrc7OHR5c~e&+6ER zJ<9khra)VsIZU2?ksX&fBU0?;BIiZOmQe$y5;16!%ClUIwUylVPzGgLrwz{Ugw5Vt zu`SMr4ELKZ_n|KL`Y!j)7S}EIRtt_M91R%iBj41BQEQ=Ms@!`D`1jef-R%;rZN^-L z*Mp}3ZyK9> z{uyj}L7HbybL`c|YTeXVYo@l^Ftz2nsV?VfUo-x4l-SfvWjVsw>*T|nHx24Dur*9` z)x&n3{%LI2u#w`-^6(k5#f=bbVOwB6+r*7CkXYqW46ZnPCvG#Wz38C?eIu-$Bz@EL zO)-B-<}pDUC$=$^BZgU&L7v3Zc9_2|?OO{G(iCZxvR1G^IvZK|D&#Z4e01pJu~u4J zX?!GD2Pw|ikd;`rVa&tW;aRh@-6oDv_=;S|;OhkI%_Dvt;wXKG*hvxd&Q=a(Q3iP^ zjZ!Fy--PXOKa)A=@V?R^ZEeKx8zm+Y6s0T&V}!KIey`f*hHsnjHKD!+y z_EE+WA@(uG5hj*#SmLlGU`cX+@HsDPrn*u$wUvgcuT)HNxyroxrbJp^E}Oz~h8F+)BY@Us+`>gt(uDUE57^t{fFvZm<{R^hBnh%s;$(j6hW!hC}9}dpd$e|D{ zA^e4TFAH<_MS}H_!f%>54Dp%5XA+p#SM zUWj{t7(ZeBMDP>EPYgdf{AA(HpeARsN4~*%)ZjeIne3sg$sDTLB7508)MCxXvF~yJ zN^&nsa!*gflQhYN6xX4^ehT|Z?8`f;Jfk+*Gfm>x-fA(9B=(!E^#p6MfxQNGY33t^ zoiyit3Pm{kqui^avWK~ch2RZiGlI=%uqKow8BM)Uz7UfVL6;KhCP#IO&XFh2aMc8{$o4+@P;wWMB_a#xv=I>8) zANEiNWl;|0Q2`ZE36)U=`PiwFMmS%hws2nz#Zdw!ZQ=eDN^|CWD1)*nhw`X^il~Ij zsDgY{#a6@?7osSJ;wXWVC}oS-ljlTvE@tha9Ll2tDxwl9qYCm-6-8_bdnMvm+K!VZ zP!gpmPutSG$DCzQ)|T$ip*+_GR753IMiu0vDvGc^qqYoRnfWMhCrFbhMOoUGu~(kY zpe)LvJSxzq$b6Pi8C8&vswiSB8&TGN%vKn01-=UQDxBRF?uoJ|DxB{Xo^2~U<5qaq zt#A*mV6QS?Vy%=>1^K9oBG!k`XN~&YSA5QBpZknY{CxO);^#A7pYi&{&nJHVLID*~ ziF_GVkdLY;!g&|9RrsnruT{BURk6o2BT6F=Wl$F7P#zUf5tVFpzD!y{KB}S!XIK=) zYz@8|_G;LxVQa`cNqKC!7iVmZbD_47qrAqL>L|lIZ;5=F@(QVsswl$Q6h$#x$6g(K zb?nvgJ=myn?)WHU>)gZY*sF8)$(c~UCCzsfCGus;E7bd3S5btsCyHY1$GB}^uYtV= z;~DVGHK6@~`DkFTfxQN{Y8!R9y@0PleFJ-qtsdVMchP`%jXvk?fU~|w+9w@wzv*(_ zHuWv)o1+1|P5QN{Yg5;uu1j5yetqf&jK9hANQ=5Qbsg%u)b)r#pSl6@ zZc^8xu1#Hsx-R{C)b*(wFuxtf+@!umeVh6Y^d>C?nf9p1^J$AdZTfUrcU}7Q=+otywZk)On`hP*&#XC>W5 z8$TWTbOS$~<*sQjcT9_)0h`M$(^zhrI;wG9r>=XvV>-v%roGxSt<@&akxgv0u+e4@ zbxil0ZPPj0GVS9{(>mTW-IcECtaMC!rEOX(Ez?|Sn#M{e;1eGWd^MMQ_-spVU_%lm`j;_cO&oZ@;&WZ4TE26&d>3xHM_Qf_J?yQ%;Ht~{&F_?tCFf3j z0(48fI>Fer2)D#pu}5^76v``rK%FZ9KQI zbYyPf2tQf`PDqS&c+}V&k0r*;?(OaE?cTq7^@YzD1M-m$@{xv*el9)#C0Ft5;K|P^ zo+UFQ!+2~fDLk#!?BiR>s7`CO`|+)W=(JXQ9^Z;z^GgG_xM))`gVG& za~|JH0(hFO{nF~H=RNCuBS3u4J@;I9^UXKAuis(Zh41{78clpbVtF9Q=y4|?%`H*pmW5#7}HLgV7|A29OFH5_NSMu)QM#;VLp|*R@ z&Bk4Mr*RAS8+YRu=zC?ub(RKh>gF@uIS(9g&GoVyyt(1dytnISKm9~keW`I%8`!?f zxTk&GIP(Jh-;{9X&a5*ZDZAUASa91j75Am5H=Vn<@9t#1J%qlD{uJGLgK_u&uyGG> z8~2$HlRseGdoD2UqgNUC)g#6oB!9y-#@&9H^6QOz_AcXIey(xXKgYPYQGVs#hFiK| z;BLC|40qS!Zg=ww_q)4}KHEL~h8MYS+`HtST=(76c6Z$+&pg8|UbEjFyV$r}UuN7r zW8*&lR^!g;G~7jJPPvz!bGBQ5&Ux;dGkv$Tx9Q&eylMB%uiWP@c-pMH;<@L!gU>(T z9ec&)?xwYa?)KLma}R94-aYckce?gRV z?B3;W-)y=2-#u`@{h2e}S3iH2dj~!rxYxMP{hV=s{6*t#S~|nM?bbc+cRz8d`_}JW z?bhFvcW-`w*?ss6b@x@*{eO@Dtl_ESpRIcT=kY)A@+Z4Jd-k{=+JBFG^6Y!uQ*XP) zT{f?xBNqcSo;xTKuJ**m}v;pL6R+oxAbwZFlQ?A8>E^$S2*~ zf9Vmo@Az%*8MoZyE_v6--PIp@#2q+rz{!evMe#L7#?$Wo;xZHu9`~7#6PHVgOz%KX9%Y#Gfv^x6pS2-`Z^e(wL@!{9# zol|>!F`l7bmImFCvhCP$9S zi8yoiY;gFGjxQeC$?uaBXKrb2eJ8so$j*-gYcoOHYnLZC1g3(j<-_Yi=COoQpqo(c z8M+B2{JIHc`gIe^a@9>JyHPix94NX8<%rWwD0I3B`712tg#2xrazgn_S>3bD-$5!T zi+^3C~hb_&w?gpQN7fZ1sdsR!=yio^Vz@;coSWd(;!|RZqB2 zJ>fa(3HPffJXby8dFlzDqMq=n>It8wp781F37?^!@R{lf52zhfI z6JDU6@VV*ezl2`^Poc$s=a`Im9Je*wQjJ>m1!6JDvF@GA9$ zSF0y{fqKFhswccgJ>iSg6TVnI;Y-vL9#l{Gz3K^Hs-Ey=>Iq-2o^Vb*;VaY=&Z{R} zP)~SBJ>g;Xgp2A4uT@WYL_OhA^@L0639nO6cuYOvvUEJO7(>6 z>Ip~c3CHRQC+Z2WS5NpV^@KO5C%jQT;Z5oZzfV2k&FTqXt)B2T>Iq+~p78tC6K<#{ zyhT0Xt?CIk)f2u>J>l!s6aIjD!Z)ZVyiGmf8`TrONj>2YswaH2dcwD;Cw!}V!rRpo z{*ZdYJJb{YuzJEf)f4`RdcwQZ6W*#nUN7WPln0mr@s3&}07N{ptySQa#}Z)D!-cdcynE6W*_$ z@Pq0JKct@U!|Dk?qMq=l)e}CTp725Sgb%4F{2BFxA5~BIG4+H$tDf-Z)D!-^dct2& zPxy=K2|uo$@R!sRKCGVb6Y2>+sh;qc)f0Y7J>jpYC;YT}!e3QS_!;$tpH)xzYw8I< zr=IZF)f0YRJ>hStC;WnX!rxR+_=tMKFRCZ}l6u15Qcw70^@LwhPx#yF34cdD;qR&^ z{5|!AzptL~tLh2=Kt18t)D!-pdcv=(C;TJzgnz7_@K4ke{;7JxKT}Wm4fTZIR8RQl z>IwfsJ>g%fC;Th*gnzA`@Nd);{;hh#Z>cBzJN1Nrub%K9)D!-rdcuEFPx#O33I9bs z;kVTj{;PVze^XER@9GKvLp|Ytswey}^@L6(;rbQNx_AjP`NU8Z&5dt7z8H~3?@BCf+Um`6SS(Cg#U00oD5ajdO>0*!P|+IF_RQ-hI8)M{V!@;l~%?15tXLbTKI~xr5JOSl%%5VjI?%K5@ zbB_*r$If?+vJCjufr-ZrIPki>xH<}E?Ao>KrTgA}LGJL{wL7T0cTg8^IKC#RvqA0k zOGg53VVWE5Tn9)C%kzg9=T?Kt#}upw1p@No6CmO{@GmPS2;{=@+S*EBeP!u}oyhM* zcywrfc`+~$7kBfcQefDnY{`BwGJ#c+weQmOOIG{bWw!F43BRqGe7yLIcbaZWfhdkhT;t4|% z){|qE`niQ8-!URJGd=zzzMpcU%jxKghmY*UDe!!gX@!Uf$1P81O85K;mF*fQ*uGSnSe7`Akt^H$AA7CQ;Rdn literal 50430 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 diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 88906fe71a..2535564ed2 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -3,7 +3,7 @@ use super::{ /*FOCUS_COLOR, RAGE_COLOR,*/ HP_COLOR, LOW_HP_COLOR, MANA_COLOR, TEXT_COLOR, XP_COLOR, }; use crate::GlobalState; -use common::comp::Stats; +use common::comp::{Stats,item::Tool}; use conrod_core::{ color, widget::{self, Button, Image, Rectangle, Text}, @@ -92,7 +92,8 @@ pub struct Skillbar<'a> { stats: &'a Stats, #[conrod(common_builder)] common: widget::CommonBuilder, - current_resource: ResourceType, + current_resource: ResourceType, + pub character_tool: Option, } impl<'a> Skillbar<'a> { @@ -102,13 +103,14 @@ impl<'a> Skillbar<'a> { fonts: &'a Fonts, stats: &'a Stats, ) -> Self { - Self { + Self { imgs, _fonts: fonts, stats, global_state, - current_resource: ResourceType::Mana, + current_resource: ResourceType::Mana, common: widget::CommonBuilder::default(), + character_tool: Some(Tool::Sword), // TODO: Pass the actual equipped weapon } } } @@ -155,7 +157,7 @@ impl<'a> Widget for Skillbar<'a> { let energy_percentage = self.stats.energy.current() as f64 / self.stats.energy.maximum() as f64 * 100.0; - let scale = 2.0; + let scale = 2.0; let bar_values = self.global_state.settings.gameplay.bar_numbers; let shortcuts = self.global_state.settings.gameplay.shortcut_numbers; @@ -351,7 +353,17 @@ impl<'a> Widget for Skillbar<'a> { .color(Some(BG_COLOR)) .middle_of(state.ids.m1_slot) .set(state.ids.m1_slot_bg, ui); - Button::image(self.imgs.twohhammer_m1) // Insert Icon here + Button::image( + match self.character_tool { + Some(Tool::Sword) => {self.imgs.twohsword_m1} + Some(Tool::Axe) => {self.imgs.twohhammer_m1} + Some(Tool::Hammer) => {self.imgs.twohhammer_m1} + Some(Tool::Bow) => {self.imgs.twohhammer_m1} + Some(Tool::Daggers) => {self.imgs.twohhammer_m1} + Some(Tool::Staff) => {self.imgs.twohhammer_m1} + _ => {self.imgs.twohhammer_m1} + } + ) // Insert Icon here .w_h(38.0 * scale, 38.0 * scale) .middle_of(state.ids.m1_slot_bg) .set(state.ids.m1_content, ui); @@ -365,7 +377,17 @@ impl<'a> Widget for Skillbar<'a> { .color(Some(BG_COLOR)) .middle_of(state.ids.m2_slot) .set(state.ids.m2_slot_bg, ui); - Button::image(self.imgs.twohhammer_m2) // Insert Icon here + Button::image( + match self.character_tool { + Some(Tool::Sword) => {self.imgs.twohsword_m2} + Some(Tool::Axe) => {self.imgs.twohhammer_m2} + Some(Tool::Hammer) => {self.imgs.twohhammer_m2} + Some(Tool::Bow) => {self.imgs.twohhammer_m2} + Some(Tool::Daggers) => {self.imgs.twohhammer_m2} + Some(Tool::Staff) => {self.imgs.twohhammer_m2} + _ => {self.imgs.twohhammer_m2} + } + ) // Insert Icon here .w_h(38.0 * scale, 38.0 * scale) .middle_of(state.ids.m2_slot_bg) .set(state.ids.m2_content, ui); diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index 11c27e5a8d..7f5651e73e 100644 --- a/voxygen/src/scene/figure.rs +++ b/voxygen/src/scene/figure.rs @@ -321,7 +321,7 @@ impl FigureModelCache { Tool::Bow => ("weapon.hammer.rusty_2h", Vec3::new(-2.5, -5.5, -4.0)), Tool::Staff => ("weapon.axe.rusty_2h", Vec3::new(-2.5, -6.5, -2.0)), }, - Item::Debug(_) => ("weapon.debug_wand", Vec3::new(-2.5, -6.5, -2.0)), + Item::Debug(_) => ("weapon.debug_wand", Vec3::new(-1.5, -9.5, -4.0)), _ => ("figure.empty", Vec3::default()), }; Self::load_mesh(name, offset)