From 9282ca00b4a7aef39d5620f47ffcf82c4f07a0b4 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Wed, 23 Oct 2019 19:40:45 +0000 Subject: [PATCH] Multiple Assets and UI fixes and additions --- .../element/frames/frame_art/frame-b_l.vox | Bin 0 -> 56632 bytes .../element/frames/frame_art/frame-b_r.vox | Bin 0 -> 56632 bytes .../element/frames/frame_art/frame-t_l.vox | Bin 0 -> 2148 bytes .../element/frames/frame_art/frame-t_r.vox | Bin 0 -> 56632 bytes assets/voxygen/element/icons/2haxe_m1.vox | Bin 62829 -> 57713 bytes assets/voxygen/element/icons/2haxe_m2.vox | Bin 63321 -> 57937 bytes assets/voxygen/element/icons/2hhammer_m1.vox | Bin 50649 -> 57721 bytes assets/voxygen/element/icons/2hhammer_m2.vox | Bin 50673 -> 57809 bytes assets/voxygen/element/icons/2hsword_m1.vox | Bin 51425 -> 57621 bytes assets/voxygen/element/icons/2hsword_m2.vox | Bin 51766 -> 58366 bytes assets/voxygen/element/icons/bow_m1.vox | Bin 64897 -> 61545 bytes assets/voxygen/element/icons/bow_m2.vox | Bin 61838 -> 55614 bytes .../voxygen/element/icons/debug_wand_m1.vox | Bin 63074 -> 58630 bytes .../voxygen/element/icons/debug_wand_m2.vox | Bin 63321 -> 59241 bytes assets/voxygen/element/icons/hammer_m1.vox | Bin 49340 -> 0 bytes assets/voxygen/element/icons/staff_m1.vox | Bin 61838 -> 58444 bytes assets/voxygen/element/icons/staff_m2.vox | Bin 61838 -> 60360 bytes assets/voxygen/item_image_manifest.ron | 2 +- assets/voxygen/voxel/armor/chest/none.vox | Bin 0 -> 55915 bytes assets/voxygen/voxel/armor/empty.vox | Bin 0 -> 55579 bytes .../voxel/armor/foot/dark_jester-elf_shoe.vox | Bin 55927 -> 55899 bytes .../voxel/armor/shoulder/chain_left-1.vox | Bin 0 -> 55919 bytes .../voxel/armor/shoulder/chain_left.vox | Bin 56079 -> 56079 bytes .../voxel/armor/shoulder/chain_right-1.vox | Bin 0 -> 55919 bytes .../voxel/armor/shoulder/chain_right.vox | Bin 56079 -> 56079 bytes assets/voxygen/voxel/figure/beard/orc/2.vox | Bin 0 -> 58452 bytes assets/voxygen/voxel/figure/body/chest.vox | Bin 45131 -> 55635 bytes .../voxel/figure/hair/human/female-9.vox | Bin 57588 -> 46276 bytes .../figure/hair/orc/{male.vox => male-0.vox} | Bin .../voxygen/voxel/figure/hair/orc/male-1.vox | Bin 0 -> 56554 bytes .../voxygen/voxel/figure/hair/orc/male-2.vox | Bin 0 -> 56399 bytes .../voxygen/voxel/figure/hair/orc/male-3.vox | Bin 0 -> 56527 bytes .../voxygen/voxel/figure/hair/orc/male-4.vox | Bin 0 -> 56083 bytes .../voxygen/voxel/figure/hair/orc/male-5.vox | Bin 0 -> 55875 bytes .../voxygen/voxel/figure/hair/orc/male-6.vox | Bin 0 -> 56515 bytes .../voxel/humanoid_armor_foot_manifest.ron | 4 +- .../humanoid_armor_shoulder_manifest.ron | 8 +- .../voxygen/voxel/humanoid_head_manifest.ron | 13 +- .../voxel/weapon/projectile/fire-bolt-2.vox | Bin 56287 -> 56123 bytes .../voxygen/voxel/weapon/projectile/leaf.vox | Bin 0 -> 55755 bytes .../voxel/weapon/projectile/nature-bolt.vox | Bin 0 -> 56123 bytes .../staff/{wood-0.vox => wood-fire.vox} | Bin .../voxel/weapon/staff/wood-nature.vox | Bin 0 -> 55932 bytes common/src/comp/body/humanoid.rs | 4 +- common/src/comp/inventory/item.rs | 6 +- common/src/sys/controller.rs | 2 +- server/src/lib.rs | 6 +- voxygen/src/hud/chat.rs | 10 +- voxygen/src/hud/minimap.rs | 86 +++---- voxygen/src/hud/mod.rs | 209 +++++++++++++++--- voxygen/src/hud/settings_window.rs | 146 ++++++++---- voxygen/src/hud/skillbar.rs | 58 ++++- voxygen/src/scene/figure/load.rs | 8 +- voxygen/src/session.rs | 8 + voxygen/src/settings.rs | 6 +- 55 files changed, 433 insertions(+), 143 deletions(-) create mode 100644 assets/voxygen/element/frames/frame_art/frame-b_l.vox create mode 100644 assets/voxygen/element/frames/frame_art/frame-b_r.vox create mode 100644 assets/voxygen/element/frames/frame_art/frame-t_l.vox create mode 100644 assets/voxygen/element/frames/frame_art/frame-t_r.vox delete mode 100644 assets/voxygen/element/icons/hammer_m1.vox create mode 100644 assets/voxygen/voxel/armor/chest/none.vox create mode 100644 assets/voxygen/voxel/armor/empty.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/chain_left-1.vox create mode 100644 assets/voxygen/voxel/armor/shoulder/chain_right-1.vox create mode 100644 assets/voxygen/voxel/figure/beard/orc/2.vox rename assets/voxygen/voxel/figure/hair/orc/{male.vox => male-0.vox} (100%) create mode 100644 assets/voxygen/voxel/figure/hair/orc/male-1.vox create mode 100644 assets/voxygen/voxel/figure/hair/orc/male-2.vox create mode 100644 assets/voxygen/voxel/figure/hair/orc/male-3.vox create mode 100644 assets/voxygen/voxel/figure/hair/orc/male-4.vox create mode 100644 assets/voxygen/voxel/figure/hair/orc/male-5.vox create mode 100644 assets/voxygen/voxel/figure/hair/orc/male-6.vox create mode 100644 assets/voxygen/voxel/weapon/projectile/leaf.vox create mode 100644 assets/voxygen/voxel/weapon/projectile/nature-bolt.vox rename assets/voxygen/voxel/weapon/staff/{wood-0.vox => wood-fire.vox} (100%) create mode 100644 assets/voxygen/voxel/weapon/staff/wood-nature.vox diff --git a/assets/voxygen/element/frames/frame_art/frame-b_l.vox b/assets/voxygen/element/frames/frame_art/frame-b_l.vox new file mode 100644 index 0000000000000000000000000000000000000000..d9b5e40de224b448f178a40f6928113db083d935 GIT binary patch literal 56632 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/frames/frame_art/frame-t_l.vox b/assets/voxygen/element/frames/frame_art/frame-t_l.vox new file mode 100644 index 0000000000000000000000000000000000000000..58e840bf33898f1bd4b381881c147aaab90258d4 GIT binary patch literal 2148 zcmXZc*=_7b5JuseeP1{$M}9Gs0wb^?!?+J#U_*v|17HeDK@k{W3Q9pKbP7sAZ{+Lv zYx+t$L-J==@pN&Zzkd7s`+pJY!rBmVsI^`~{d@beu8-;RI(^YzR3jD7twZxY-gObfHe!S^CYWM|ITl!A)ed6a4r9}fV%v^m*G^*J zPNQgNacJjpY!`8Aw{dGXQMSuCx9hmJtGKkgcxd-1aKI5KoN>VwC2ndT^m)+dLH&c; z2R$D2yLraRv(C8SiV{cpLCrzULCsOkNzEA-TwRy)tNUl`E;uH;=+R4(4z)gOgdD&E;Y~S2aV7 zFvbK^%rM6SOFf5r4)q-BIn*;BM~;~>CYZ{m){HU1RLw~37!%~{nS5^D-1<4M8LuHm z7-NE|eBimECe(zQP!npxdmp&Jux@TYbNgA?&(d)vTgsN!WmZ^QyOD3@J8SmV7WRIy z_oJB}&Gcxd`MvE?IN!;(?&aeig|&t2Jj1m<8-2F=?DW~oR_z}@|M)|E`(JVIf0EAz zH7dmYo}=U=$&)1n~pN3Dvr{UA^$s=v}G<+I94WEWjKjwZi*(U#1kmu3!srl4=YCbie{&n!F`P3w8 z53DusUy-8Pg4#vRr{>eYHa<0x*Q}LTp74kQ@re(-;|;HP!84xlh`4`#e%?PmKJM@D i@AtR2xBKhs>;2{B<^KHqe1Cd+x<5WX-ixBhYvVst%zV87 literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/frames/frame_art/frame-t_r.vox b/assets/voxygen/element/frames/frame_art/frame-t_r.vox new file mode 100644 index 0000000000000000000000000000000000000000..ca6786485f1553bd2fd737d2f14ebde282e203fa GIT binary patch literal 56632 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 hp|`x9jyHagV?F*gd%bfJSwDb90GslV;Ms}Qs z&3)d=kQ3(ipvCE#Ca9lzb&#*KRGMDg-JIC3(se6UEXxnJRq~CQYUw!tt5y6iF3cCE zN^^cAa>vRV7jNkeK83gRe7SI7b)#=snaEDAPSh+`TwJ8sam(g+d)0(5;d=<hZ|> bKXpQ{;CtSW-$@&j8|UE%PZi5$OUV5f;+$Zw literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/icons/2haxe_m1.vox b/assets/voxygen/element/icons/2haxe_m1.vox index cbbb685c063e94fdff32279d0f6880517a2295f2..850dee855eac41ad5a2238f9f50ebd1d27e250bb 100644 GIT binary patch delta 2114 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 Y?CCP2Y3I|7S%~?^4qjc~+Oq2Z19na-jQ{`u diff --git a/assets/voxygen/element/icons/2haxe_m2.vox b/assets/voxygen/element/icons/2haxe_m2.vox index cee2dd8470d96f44295a2af5768184439b2ab2b4..661c93df12e1047537c34d063f70965e396527d0 100644 GIT binary patch delta 2307 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 diff --git a/assets/voxygen/element/icons/2hhammer_m2.vox b/assets/voxygen/element/icons/2hhammer_m2.vox index 63722d7384b2129553f2a4cbe5b69ec6872b5bed..f2852a5fdffad7f3671947c8a588cadab0c6d3ca 100644 GIT binary patch literal 57809 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

R?2{(~8D!p2s%8xdo zms*lDTQ*ip)S*Ec2b8+DO)C=Qnn?jrQHoR-SF&fXnPu3 zk6vh`IJH;hp=V@@!&R+RH{G(f16K8!2bm+$YvoG2wPCzGoSSnmXlEf5&&BSA(uj(Y zDa@{`l`$Jko!#BZS8*Q8VL^jg)t*5MA9C{F=#Da@EPH zYOVp&*{w4fEM|vunUbD!f#KZ)xp5Xkg`b1aosmLuTz7JND`gd+v0J+fjg0kBb|^RT zZa(?!xZ0S`rJbrg16PWycV@6yE{|)1@xtE5RyMY5Vklc|9DaR2v+9C2&W76G%;ab_ zH!)f+>XN3_8aK|aanVuLbMv_UrD46?P`OyHD)`=1QvcLTkDkBkI?#gIK&qZ|Wl&Kw zgZX!ZsF73>Kh)aS&rZ2$?MA_d^SLWb(xyFy;mO%YNmuEf*(hq_+`_t(uNE%IUzzmM zdKV`u*`Y#7Z$#s*(_tGspX$^uxYCtkcAwrImG1QHLTYesp+>OW|!k literal 51425 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 diff --git a/assets/voxygen/element/icons/bow_m1.vox b/assets/voxygen/element/icons/bow_m1.vox index 42127209305988ed26fc7fef6102f8b83bd594bb..fb32a85d62545e8b26a85f80d9e395f0cbc3b895 100644 GIT binary patch delta 4096 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 Q{1I%!AH%+RQOdvnAH-fPdH?_b diff --git a/assets/voxygen/element/icons/bow_m2.vox b/assets/voxygen/element/icons/bow_m2.vox index 016c05e8e262d5764dcd7afedf8f3a9861827cf0..84229e144bf48c11c509a01d1d645bc54ff86dc9 100644 GIT binary patch delta 72 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 Wps17lLdg-pc zwAZDEUv{%$3yfV1-~Q$)J$c$=p$-SFr)L&DwbM$?muFp);01AB62jG>b3RuTz=E*> z;gCvvTdRHBX!N$#_}x-OF^DLng)XRxHJ(2YJ5An0bUZT;*z;Knfv4%|y(1K!R>Kwq zT7V1z#kj)*PaW$HFQSXDB?oiD<^8nAs9F;Qmz*tzJ>wN?R?BgXaS=2GrF7>~@=GD@ zd5r@BQ7WXku@MaprX?j_u~|!VuBE($Fej2+8mWQ1taSC(N_8pWDc~s( zvP5Vu?(A5rShIw_;%rA0YtGf2Yvwb}d4>0}q-RGyOLz*Y&&7$uxl{;f$WwE5Y*cJS zc-(6^E$2h_Rw1aK1=Z&m%S+A`oQt#`9sG{{YTmETRvU_@igO-f-!j6NkV?>F(oCv zq(ciDcxq5R<|s@EZ=$=OGO>7P@zN0T5cw&{hl1=60TN==onzCXp>BC!i3}cVA zt#%YFknp;r8}3f}2vt91gvjE_mg=>5WAHYVnDykc)0R#Y(ZwuP&K1S04aV*8EZ2w# z(WfQ6g<{TyCS#%Tz0i;w)Nr-CsnlTX)W?CC2!|MzUL13aGpB|@#Gr;&pnvs)5JC6O921_q54MW6mbPj1KB%YR3{<%&^di`D5)tLwExCgA;>r46(|e z!(6h+ockYZaZjL;=A);3?t6&h2Mo#$-t_eM@VucB`A}aE@L0}25Fz)07-bJ6W6pZc zxl+tGg_wIt8l0RA%JxGk_GQhBQc8G_B)bL(GcXwT66&K6dv7E_c|18u#tmNA60jB` zFrn%A+@kE}Bql1BM> z`UIYodtLGjCPXVGa+w|}%p-65aVUY~$#u{QEQzuaM+zVF-3f221nuTG zx_oI_Zy2`^(8~|%rkqHuc_v%D?pWW@Av~ z=xdRYNKXS^@#H#CUK1(Dc$QsJTXa75OQL!}2K_&~>``za*9Vk@7_gjsKs_F~_bZyj zhJP-Dk|pC94|5)?Kpeu{J(TK`mFm9c2O`5GUyG^Xwdx69Jbm$cf1f5AtKjd>rs_anSp4D>+G8ppt7sedH&kq8J;z z`t~2*uTLHBwz!${-<9#-m5_^!c;{e81v?r=#?M1UesgkGkk1@J1^Xp%paL~$Knn^A l%j1D6IUCXw63%wwD8~BM;&FpvfB(y$J~krXkL|zz^*_Oe9zFm7 literal 63074 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 diff --git a/assets/voxygen/element/icons/debug_wand_m2.vox b/assets/voxygen/element/icons/debug_wand_m2.vox index 4d04e746e68ae03e4f50b1cc654d2dd836b236a1..b89aa236f2ef29f50100520fef4266a38d2f7ae9 100644 GIT binary patch delta 2496 zcmXYzyN~1M5x{38O5*$RQGAG`L~8foY6}-BT%<^Vq_`k2AV_d=nl$MRunnL>Y`EOQ z7XhyGFD&fhij*mXvs?GRTcycgkRm?{SzvaC^UXK!nNQ#UXZi2<%hMlz^QQYsM1J+t z*S`kI?_WfI_xkgn`|}5Xp8$*h<2Qf&{Pm~d%oUlIB9*RsPph#~tB-WqJKFTVM(0Sj zQ>e}mX+B1hPO)a=MzyzrNX!&T0>o1&*^z(wwAMwx(Zvro;6R5`z%Qpnw&UBsH*pM3 zBt=;?#S%_$|5aMC1k>B=gCAq0lr0Vvk3+TlO4ofZ9^e8_pNS1@`b4rZlQr}T zZ|flw3y-TYmHR#xf4Y33LucUj4q3tnS?o>!}j&(a;;>Bmg;Y^obE;=g_8~cl& z*okb2G8?~sx3Kiji5OzfxoC(#gI;r*lTeFrR^%vwcZAnXHoTZTBvOpF*1gg77^#it z$j-^va*TC3gu0<{E}<90rLkUFq3*`Z&#dkgkc{AVQjei}gGXqt?$Mf#4lzg4Vg>iH zdWT$e^Q;&{Ip9e=-mCjzqs7_iW(;IM`O-|D)YB_ujoNrs4MtYz+6{@6qpRiMN;P?S z;%k0_xx)dEYV2^pAEFrpu^ONxoDF@&H^xG$Y-A0tNKL`LnzU5hEpg7Fon|9*UzXqq zV?}>|3&^>8niGCT8ur760teJAmeU?(0gUXt(Je(vFd7lbjvn115REG>>DBaXp=^Tz z7iVpFceI_4oC80?fkZ;0&CZDgqX$0`fAleuh=-#A_<*et$E?Zd3On(*KH;fhl2)X{ z;JJmD8PNhBKy&(i}IFq`9w4;4~76iUqdFdMtMYp)p+2$)$rPZ*Em{} zi9nj`f#_NdUOMnfGXnC)%e!@VvUE$m?xvPz=xCJVt$`Y9dAPcgerMDtRp#4{8X3Kt zj?~Z*^WMb)pLy~ySM#wGB6!UzuiM0;5j#sS132nE=Fu{AjxyB7V;L+tti9l;~x3|v}%3mz&8Avay7dA z;7WGhLmz;a?+)y6-muU1?6rmd!sl@DLkq)2na5#)l0Ac2t8?AZ%?IcuQ8Z*AS8FJc zap1eUeyOGI8>xuO?k}DF?v(2afi*3>rkKT$>zeOPzk{x*N6x4e2$v|^QFw-G+DiA7 z%8^?Ledji(3gU=~R2Rb*SkluO9bkc1XmtRWRb$v)HO29uBR#Ts)3bkrn6riO>1Y0Ja4XKjSn=%&;fVjNs?X4qq~-h%_yPl$ZLd;~8p_hXD2c4Vj>>nnyn z@i^)IutF%rhz&Rxb-;!Pt)d0(+xHgU9L*f{{5rNooFJ33cDCo`?f#Kg&&WWI%z;OY zoyGiYXwfyV?g|{?WW-p+w`Z*Dtv|tBa%lJk5#e1-R2zDHt=`9q)Eiz@!yA_9D|VGf zSv=%D$}$_uaG>D41a?3L%uBc7{mRdmfBFx;xh+h?s)zAk|4YlT*DqfNrN4n=^Ay_n zfB7cp9t=BmO#`iIB!}%{YczPQGn>uf>4CB}WH=#F_4v22^FxL|nx8i2`tlHVRy@Db NzYWW;-yHP&{{fNBwZi}a literal 63321 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 G<^KToShbV@ diff --git a/assets/voxygen/element/icons/hammer_m1.vox b/assets/voxygen/element/icons/hammer_m1.vox deleted file mode 100644 index cb3bbb9e99ac4d5fbe0f98153cebec5d49859d53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49340 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 literal 61838 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 delta 303 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/shoulder/chain_left.vox b/assets/voxygen/voxel/armor/shoulder/chain_left.vox index c7d2505d91ca32d2bf4e4c27430223ae2556b3ad..8210150807ae66c5dcee1e4267c86b27c418e9f0 100644 GIT binary patch delta 274 zcmWkoF-`Y;3*;}j_u@f z9yue?9}`~zS^E;|4K delta 265 zcmWkoyKO^33_Fq3Aqd=6;KRFadGtK@+ ZRP*r`sPNO_T}#yV8(;n24;x>0fB*B;87=?- diff --git a/assets/voxygen/voxel/armor/shoulder/chain_right-1.vox b/assets/voxygen/voxel/armor/shoulder/chain_right-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..faf8bad902202aa3a89272f69383ae01ad944c2b GIT binary patch literal 55919 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 SDPvp?{?LOfj6gsFT>k+H@g;-+ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/shoulder/chain_right.vox b/assets/voxygen/voxel/armor/shoulder/chain_right.vox index 388979f82f4748641baa67fd76eec8a5e240f56d..6236addb4ec82879845bd4f0c11e47ce55d87f05 100644 GIT binary patch delta 274 zcmWkov26oE43kLd9RzL+yn*Xn7_Kr%%B0LHUu6W__{IzT0{?&)$s{RNCA>nQM3I!P zPhOwAy&nqB=7uuE5yJb|+jqIK1uzn5lmJ4Yb8PHl=jh@MoX9BeJf&kyhCYXSc~vfN z5Mz)9X$+W5y$?F9nIQ}`>p3dKtBjq9sCni}Pn~al)sQccJOIctI$*jpXV^iCVvSeo}qM`0rKP?JHK}^b@ aM5T^rqC!uHcIl|cpI_Q<`*?7-fBgfb&=~Xp diff --git a/assets/voxygen/voxel/figure/beard/orc/2.vox b/assets/voxygen/voxel/figure/beard/orc/2.vox new file mode 100644 index 0000000000000000000000000000000000000000..7192af583cb8b04d08b80e8d0036d6b5222efb4b GIT binary patch literal 58452 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 N>$DGu&WVKZ^*;CJwqO7N diff --git a/assets/voxygen/voxel/figure/hair/human/female-9.vox b/assets/voxygen/voxel/figure/hair/human/female-9.vox index 946cd0c21286ed4781e99d4b20c8483223c73aa2..32862a73221aac0ef239e0208ee34852f3316250 100644 GIT binary patch literal 46276 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 literal 57588 zcmds#)0BX;&A`koGb7tIwSCVv+k5&w=e>+`(NM}atg>T=W!DZ9 z->}PG;FW#DD|?X3CAV|GA0&=$x6y8weT6(rl|9IX9F~JTCrmuZN8M9i;zADRn#hG* z$YHt2b&(7CsQbQ;b&&(PkOTRCP<8^p?4i%)e(cRrX4&Bwr3blYka&=fx^K7`?;^)3 zyU2C9u7x~3Pms6<#<39lC|%_w9^_+;V+CNre2@c1M_K5%&~KsN0&f5g><4lo$3{Nn z;0#?pNA5%Eq0Q%Z2c^Mne&V9;qI5V$-QjcQk{Mm(@qQG}U)eY_8)wGr8(7~!n}I&m zk>^2?UgM@l}*TiEE{#mfNaA{ zEZnt?JGCGaG9VlGW)=tE6u|!>{2##cArwI|6u|c(6hQ&}AHe$|6!3hQ zH^7;MTF8O_Ggv!<|3mmag7;%6LOtdf-jAUO-jAUOzK@{{6v6v36v6i~lz}36KZZj1 zKZNfiDAuKqeHqvn+MpN;;Qtuj&p;vkZ^HjE{2$=VLij(1_cKrc|A+8?1O@Pa4DV-H z@P7vWkKz3c6vO)&D1hffD1u@rfd6B7KLdsEegtLU{}|rSKmmLoLJ<_h`xz*J|6_P6 zfY)PqK16B4{~6RHZiD{=csz#pGf)8khaAKE87Sg9yq|#rcs_(8DCQErkD&|{*a7Yo zdxH04DB?Q&9K+`U{2#*e5$Yinp&p=&;s3x2lF-6fru$MAmu z|A+8?1jX=v28!YT416BL`xz*J|3mmchEHR(XW;(~e4l~;W0WzxpMe7QKYSGNUBUk$ z{2#;n85aB>!uJsrLm}=mg8xnAW-xCE-$zgk1@M3WMT-_3lm0S4@-u$9S5$wv&QJe& zi!L0MR@J^XE=}&k94FQLIOfNKcnYp_-oD)Ykc%kWkZowm_AfsF!ZDnHhx7T_H#gVk z&A4RI1g_K{?sK4gf1$6)L6%q8KZ_d=$;us^#d|y?tNGw8-q9ghEeB`Whs$a`IE#0E z$Xsm)XYt7#k~Qt%EdH0WL$caAYteb<%uu``JRKb!v}Vm3dVYhV^KW~ECXe|m{b|e? z+P!-|r_w#MchZ8nSt?w1I;~kgmv*k3O*=OfXy@huYTsFMBz6fM1KG+n>z z)iiUBqJFC-Rnsnm?ntI2vlza39I`UFQ$6bZF zHz_*fAw}vUtiRePwec0CwvVB8CmccBvSaC~Gmj>k^BUR+yX}I$1^ootxKh!*?^d*X zo1(|=M?788)>(=kSfuEglA@)ES1wVsz6x4Cr~nL60Kf1 zg*FwNY0c}~X;aU+^o7mCL|@%XCr%zmXEYy6bI+ba#U<_3J4eyl%M@)HQuNTxil$AR zK(nVFN0&}(qT0+;Y01=al(ZgAH=cJq?YR6D+Oua5ZQs6~mR>l6df&8wR#%tO`fGb> z$F}Qe@58szj$1FK-FKELiXu8{^byq1&_KDyNi?nLwRBo@Bdx#Y7`pfNN%Wn^rqVM{ zoJhA~%^i0rdi>Lhe)J7RtCJ~o%i0!t+6|-V#=FMQ{ZEdkXXx1fnSb{? z-atRQBl*AiTUuJ^UF}=wl-yQ2ecjbGe(iXA^n;3?dZVJdr%a*7#zyLyyqxBpzn#?D z)iky?mUeAU@9>HV@Xo}Ebmj3I>8#T?P}dFD(NUKlNl$$Ic-pmeJZ->P9en z_;ITB5Utw0jn;l>2i>&&VS4Z9_fp%yIy&p>Ej0H757FZL_R{p})9HD9!ITfti)8Ip z^z4J_{+@-uUalXnpnlK(TgjdOt&iI;xMCvByE#kIDG@z=>*zyrTcySQ- z$M5kjnzx55c=&6fsMy zwkfAa4Gt7L)3{9!;5a`}Z{bf)KB?ByutkT3Aw6A|+w!F>x1F4AYD>dhn%R*?E7GW4 zFVtNbUdj8=Bl4B5nhy4-;jgzG8fKS6!`Cc_h7Bo)hF@$sH2f8kL&G0rIW&PNnotxC z|M{*Qr!k2fnv5tK{@VmOck@b7H2fzya_;5`Q8cd-MKf9y4gYDSocCs|D4KDiXpR&` zbCf8W@uFz>Z&>7f(~cHJ!+$d;=Wbptie{oHnqx)LG>D>kjVPK)qG%?IqB%|!&GDjW zUMq^`1W`0oMA0;gqM0g+=0s66CyAmtSrko^D4J75(PTx@r;DOFLln)KqG-+%MRT?&n(3lwW{9FWM-Pu_&60 zMA5un6wMM*G;a_^bFnCzOGMEu6-Dz#Q8br|qPa{I&E=wK@}g+oB#NdWie{N8nodzP zU7~1;qG-BB(Ue5d^oXKKMA4K*(e#RXl3!-Qq5k>PwQ8bT=qWO|2n#V-Zd|4FDS47b~E{f)>qG+BFMe{XLG*616 z`MM~Yy`pHoA&TZHQ8eEaMe{9DG~X6Q^Bqw%-xWpkJyA5@7e({5D4J(P(fmLZ&9kCt zo)bm$yeOI49n14W-JT}gNM@LKQ_s%DEiZs>7uo3$<)hPLCQK zD0ZfCn;yV%exTlB^N^%kOT!i&7KZe6S#HahvfOrZwy7-*b7^Kr8m&m9cD+z{Wq2j; zLyyQ;x@tP8U2x8v$!O)rghoj8TE+h5x}mSyRUAoAbh1*+b6|SX-_3L6llrJGZwXGqSZDn@d z-j@^)Oyq{co)CAG((~wO)2min@?H8o_C`OyRy4l%I`a? zbe_Xrk8UiDocm!fTTfgm_7CdHK&@KV`TF3xtIK(c*0umY=L-YH+R$*Vn1VF7>76XA z6uOG}em!QthL;Svpbo*)k3i^3cT(xomEy{QDo>E!*779XvF<8#76)J2PpQzy7t`F- z%*S)_;bzu1v#e6B_GyB?WMz7l>6Hz37AmRv_4`@i7c}(--*0}Xr&b*7saEun=6H=W z>uVffRXw(Zx4*wjFV|VERBH_1k!{fb=%su1z3O_R6Y3N3d5#C^cq?gvWI5<$~O#1aj zq~AI{ZF=+BW}SjpdZ1ERrEiC~dv$#w?i^Vtovb)Cgvs_hHhtS8o6u9}s0gr^qGhFg a=K)bcM;cS#B#+58;D;XES*%nzA@?7UcJ15% diff --git a/assets/voxygen/voxel/figure/hair/orc/male.vox b/assets/voxygen/voxel/figure/hair/orc/male-0.vox similarity index 100% rename from assets/voxygen/voxel/figure/hair/orc/male.vox rename to assets/voxygen/voxel/figure/hair/orc/male-0.vox diff --git a/assets/voxygen/voxel/figure/hair/orc/male-1.vox b/assets/voxygen/voxel/figure/hair/orc/male-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..6aac6933f41fbfd6519781d97e946aae3315e393 GIT binary patch literal 56554 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 Jnn>vI{{jHH14;k@ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-2.vox b/assets/voxygen/voxel/figure/hair/orc/male-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..63aeec0ac9163f0fb5173a45f894a92467e40843 GIT binary patch literal 56399 zcmds_%oFN>iSWj!pW)-UJM`eik*#`D**7Wd7f zqMTdWi;A)qi<@=L;&G3bHHxGk#}#Q=7mLN>X7R9H*YvEH#VFEwT<3V5$8{dpa~^JW z&ERo^#|$1bc+B82BWG~yVbL{{$4zcs+`6*5ZsoizhGu2my#5|;4Yqq&OwHnXTRdML z;=+ zEL(J*IvJ-w_2Vw(AK8~r%baCP9uUm%o##Xh##qUc6QQCP!6Y77!h9um9GC2@EV^HZHDl@G#{^kTg3js^G+?WsK@SV6TYmJ%v_|A4KuW;k0GWg|vU|B&uC9gPN{cM4hRtX!CV3+K{ZJtv5E& z{yjI*iB}#Zuh&aM2Ao4BB_$Ln9YvwCi|CT_QmUC2pv9L@p{+NZM|ZXk}v}-6GxnIz0SMjU6dpDJqmQs6rJ1v;I zk3`o78kinP2kvn8@Va6A?u-~gx81m%rcd2Q(akr}khO#9rAIHM1GPhG8?RaK^+je@T@UQ1TlPIicRh2Af~ie3edA8L;@*R_{IO$HU0qElcq+nT zp)6^~1ik%~Grza_{rX?y`6DRrLUrDHv`_Co)5ezWKHdA$`ILV0YS%`{|6 zn1)ZekMzPuUhL;b^>}p{>=H*GYJt9gj6;q+dW@ zLg93>E!HS6Kz~_4MYX2vdPfhc0I7#ld5gSq!trF(qFD_^Qwv3N6%@@HD4MIGXx2i}grR7zfue~((bPfF z)I-rkp=fLf0wnEX|21TM-7D^N6dL($v=MRP9{%}ywq`=DrcLDAd~Me_g@%~zpl zc0xABVJMn!K+!w`MY9)*=20k`$Dn8)hoadBMe|K4n*C5T zPe9QefTH;p6wQ-RG*3a%d>e}9X(*cSK+${`ispMzGzXz*o`Iq{1V!^K6wPx`G~b7! zISfVf11Op!P&Cg&(Yydf^Ft__A3@O^g`#;8ismIKnjb^aybMM23KY#TD4JKHXkLS& z`3V%w>rga5g`#-_isolfG(U%;c@v7}Ehw7fP&B`QqInyN=9f@3C!lCfLeabfMe{2t zns=dSeho$Q8z`FJLecyVistuFG=G4i`6Cp~pP*>|3`O%7D4O@6X#NUC^EW7(zeCZy z4@L72D4Hx3O%96Y11Oq*LeYE(Me{Exntwyl{0EBWzfd#;MI-tN;bS6$C7fBGvMt$( z#v2;iT5Xr?ue0N^#tgfOfGPEKvMtuAanD~CP*JTZyWY`*DnRPtRNkV?ka#lfs1-_$ zWK=r8w1s1SX`ART3p#4R@to{v>m0306>3Pdb;xj1lN{hx@n+o%*Vo&)82b%}0sR@CWa#?AizGJj$oVgJftNx)wzS3udD<91I+Y3OsE9h(XXocCBMWm?Z)QU>7CyCRPM$tjOc`T^^^fQC z$=Mh3sZPRfX;qz6I(e<~R}0vXY?mo2gK`1H_n zQZC9DmFasHZHOnDmBsEzC1rwuD%u`*W~_!H^>*v&`NSg4a%0NN%H{H`>MOI_nYu(W z*{qT^$2**@bhfOuK9W!ez^~3|L>^M-6w3V#XByLXYhyB@mNX!1T$-;TlN4sJVq<&* zv_w_8`eY)RmhhAPCF++d-FWJ_t3+e-iR5|~63MLLy4dL?a>QT4AF}q;d`OSlD%Ot1 z)UgYz%7q}6XI(s+X>_*8ua@cRd>ZMdqUHUjI};4 O68=!B>g_~Axqk$GEZN2Y literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-3.vox b/assets/voxygen/voxel/figure/hair/orc/male-3.vox new file mode 100644 index 0000000000000000000000000000000000000000..fb6138688941ccca08f093c859972e6278486d7b GIT binary patch literal 56527 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 Y{buoMr@oYu!RO&$I#rz+i|O$H0&a$eRR910 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-5.vox b/assets/voxygen/voxel/figure/hair/orc/male-5.vox new file mode 100644 index 0000000000000000000000000000000000000000..ee91e0f36f4596a59912e1307fc361b77555ab90 GIT binary patch literal 55875 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 CQBK4F literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/figure/hair/orc/male-6.vox b/assets/voxygen/voxel/figure/hair/orc/male-6.vox new file mode 100644 index 0000000000000000000000000000000000000000..249009da39127dacd50f34c202fb1b23ed0fe155 GIT binary patch literal 56515 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 HgmV8c7zOwc literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index 3f22aabd81..77ccd35b65 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -9,11 +9,11 @@ color: None ), Sandal: ( - vox_spec: ("armor.foot.cloth_sandals", (-2.5, -3.5, -9.0)), + vox_spec: ("armor.foot.cloth_sandals", (-2.5, -2.5, -9.0)), color: None ), Jester: ( - vox_spec: ("armor.foot.dark_jester-elf_shoe", (-2.5, -3.5, -9.0)), + vox_spec: ("armor.foot.dark_jester-elf_shoe", (-2.5, -3.0, -9.0)), color: None ) }) \ No newline at end of file diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index 81cc061c03..7d4722990e 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -2,11 +2,11 @@ //This shouldn't be the none option, but what is? None: ( left: ( - vox_spec: ("armor.shoulder.brown_left", (-3.0, -3.5, 0.1)), + vox_spec: ("armor.empty", (-3.0, -3.5, 0.1)), color: None ), right: ( - vox_spec: ("armor.shoulder.brown_right", (-2.0, -3.5, 0.1)), + vox_spec: ("armor.empty", (-2.0, -3.5, 0.1)), color: None ) ), @@ -22,11 +22,11 @@ ), Chain: ( left: ( - vox_spec: ("armor.shoulder.chain_left", (-3.0, -3.5, 0.1)), + vox_spec: ("armor.shoulder.chain_left-1", (-4.0, -3.5, 0.1)), color: None ), right: ( - vox_spec: ("armor.shoulder.chain_right", (-2.0, -3.5, 0.1)), + vox_spec: ("armor.shoulder.chain_right-1", (-2.0, -3.5, 0.1)), color: None ) ) diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index b7182388ae..6d1c51ecb8 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -52,11 +52,18 @@ eyes: ("figure.eyes.orc.male-0", (5, 10, 6)), hair: [ Some(("figure.hair.dwarf.bald", (0, 3, -1))), - Some(("figure.hair.orc.male", (4, 2, 0))), + Some(("figure.hair.orc.male-0", (4, 2, 0))), + Some(("figure.hair.orc.male-1", (0, 0, -1))), + Some(("figure.hair.orc.male-2", (0, 0, 0))), + Some(("figure.hair.orc.male-3", (0, 0, 0))), + Some(("figure.hair.orc.male-4", (0, 0, 0))), + Some(("figure.hair.orc.male-5", (0, 0, 0))), + Some(("figure.hair.orc.male-6", (0, 0, 0))), ], beard: [ None, - Some(("figure.beard.orc.1", (7, 8, 1))), + Some(("figure.beard.orc.1", (7, 11, 0))), + Some(("figure.beard.orc.2", (3, 8, -2))), ], accessory: [ Some(("figure.accessory.orc.teeth-0", (5, 11, 3))), @@ -67,7 +74,7 @@ ], ), (Orc, Female): ( - offset: (-8.0, -4.0, -6.0), + offset: (-8.0, -3.0, -6.0), head: ("figure.head.orc.female", (0, 2, 0)), eyes: ("figure.eyes.orc.female-0", (3, 9, 2)), hair: [ diff --git a/assets/voxygen/voxel/weapon/projectile/fire-bolt-2.vox b/assets/voxygen/voxel/weapon/projectile/fire-bolt-2.vox index 1dab743856232bd2a3800b54ead1990ec2b27d3f..caee1ba7492a421796b95dd2e64152811ff8ea41 100644 GIT binary patch delta 673 zcmYk#v1(O86ouiv_gXuB5UedOSf&qx95|7aLQR?^O4^t{fwZ>^7B)61d;qZ%6ugB` z-~))Ik23zJv-oD#tQlti-Rb8K?Vr8Ac=8YtFQ?;IZ1MEt{-f<4VRiB5?eV78I^sPl zV-m7rDhNi3GX$^MWK`rNWad;53_juyItWH1M6cZP85b}bX&yuHnwyM_Vo1$`$&tk{ zItWH1s^%6*tdIYVy`;6a=FY zqL-Fp7mVJrgta6JG8brM(>0G_RG8sjGR;tOnxST(8At~e9U39tq9B=po*QX8$ey2> zrJ6&ppY|eT^->Uw6lVxtv&s0TKlOa`VlxiT4#wfT!*O(XG*0hN$K}K2xc+=SZgw|g c`LK+WPbcI2%lWwadNpo$xBvV8c<IRb^rhX delta 839 zcmW-fy=s(E5Qb;onX~)tS_QGzB37|Vmr55w5=4z4CI&$iQtW>FhiR-m%8Tc6DA(d6JUA9ne1>-y#z#Q=_9 zoE-dAyEgj_yS+x+i-zI;9yX?Kn$Z?1qi&=NP{MlDKnT9S%BU8KdJj4 l_Uqy2!+P}PsGfd3t!Ec!_2&JD_4d<~dgs;j{B8Ml^$*WEheQAX diff --git a/assets/voxygen/voxel/weapon/projectile/leaf.vox b/assets/voxygen/voxel/weapon/projectile/leaf.vox new file mode 100644 index 0000000000000000000000000000000000000000..14062b39e6353f324ce79df9de6015bdc9d18a2e GIT binary patch literal 55755 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 bw|7b{qHCI|cT)NUOZZE7?)8#MX%PGmlEOdV literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/staff/wood-0.vox b/assets/voxygen/voxel/weapon/staff/wood-fire.vox similarity index 100% rename from assets/voxygen/voxel/weapon/staff/wood-0.vox rename to assets/voxygen/voxel/weapon/staff/wood-fire.vox diff --git a/assets/voxygen/voxel/weapon/staff/wood-nature.vox b/assets/voxygen/voxel/weapon/staff/wood-nature.vox new file mode 100644 index 0000000000000000000000000000000000000000..231a3203f54594e46382bf92981df4fd3e92d07e GIT binary patch literal 55932 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 Y=G8UL)H^ACoObm?cWyPpVF_^l7cmGbmjD0& literal 0 HcmV?d00001 diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs index c027f90dca..5f76bb630c 100644 --- a/common/src/comp/body/humanoid.rs +++ b/common/src/comp/body/humanoid.rs @@ -339,7 +339,7 @@ impl Race { (Race::Human, BodyType::Female) => 19, (Race::Human, BodyType::Male) => 4, (Race::Orc, BodyType::Female) => 1, - (Race::Orc, BodyType::Male) => 2, + (Race::Orc, BodyType::Male) => 8, (Race::Undead, BodyType::Female) => 4, (Race::Undead, BodyType::Male) => 3, } @@ -371,7 +371,7 @@ impl Race { (Race::Human, BodyType::Female) => 1, (Race::Human, BodyType::Male) => 3, (Race::Orc, BodyType::Female) => 1, - (Race::Orc, BodyType::Male) => 2, + (Race::Orc, BodyType::Male) => 3, (Race::Undead, BodyType::Female) => 1, (Race::Undead, BodyType::Male) => 1, } diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs index f3ab23a370..daa2026015 100644 --- a/common/src/comp/inventory/item.rs +++ b/common/src/comp/inventory/item.rs @@ -49,11 +49,7 @@ impl Tool { } Tool::Hammer => "Use with caution around nails.", Tool::Bow => "An old but sturdy hunting bow.", - Tool::Staff => { - "A carved stick.\n\ - The wood smells like magic.\n\ - NOT YET AVAILABLE." - } + Tool::Staff => "The wood smells like magic.", } } } diff --git a/common/src/sys/controller.rs b/common/src/sys/controller.rs index 03b3b6505e..a4a8e11257 100644 --- a/common/src/sys/controller.rs +++ b/common/src/sys/controller.rs @@ -231,7 +231,7 @@ impl<'a> System<'a> for Sys { } } Some(Item::Tool { .. }) => { - // Attack + // Melee Attack if controller.primary && (character.movement == Stand || character.movement == Run diff --git a/server/src/lib.rs b/server/src/lib.rs index ecce8c1850..5a114e220c 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -189,10 +189,8 @@ impl Server { .with(comp::Vel(Vec3::zero())) .with(comp::Ori(Vec3::unit_y())) .with(comp::Body::Object(object)) - .with(comp::LightEmitter { - offset: Vec3::unit_z(), - ..comp::LightEmitter::default() - }) + .with(comp::Mass(100.0)) + .with(comp::Gravity(1.0)) //.with(comp::LightEmitter::default()) } diff --git a/voxygen/src/hud/chat.rs b/voxygen/src/hud/chat.rs index b9e2119285..c8c5ca759e 100644 --- a/voxygen/src/hud/chat.rs +++ b/voxygen/src/hud/chat.rs @@ -2,6 +2,7 @@ use super::{ img_ids::Imgs, Fonts, BROADCAST_COLOR, FACTION_COLOR, GAME_UPDATE_COLOR, GROUP_COLOR, KILL_COLOR, META_COLOR, PRIVATE_COLOR, SAY_COLOR, TELL_COLOR, TEXT_COLOR, }; +use crate::GlobalState; use client::Event as ClientEvent; use common::{msg::validate_chat_msg, ChatType}; use conrod_core::{ @@ -31,6 +32,7 @@ pub struct Chat<'a> { force_input: Option, force_cursor: Option, + global_state: &'a GlobalState, imgs: &'a Imgs, fonts: &'a Fonts, @@ -44,6 +46,7 @@ pub struct Chat<'a> { impl<'a> Chat<'a> { pub fn new( new_messages: &'a mut VecDeque, + global_state: &'a GlobalState, imgs: &'a Imgs, fonts: &'a Fonts, ) -> Self { @@ -53,6 +56,7 @@ impl<'a> Chat<'a> { force_cursor: None, imgs, fonts, + global_state, common: widget::CommonBuilder::default(), history_max: 32, } @@ -121,7 +125,7 @@ impl<'a> Widget for Chat<'a> { fn update(self, args: widget::UpdateArgs) -> Self::Event { let widget::UpdateArgs { id, state, ui, .. } = args; - + let transp = self.global_state.settings.gameplay.chat_transp; // Maintain scrolling. if !self.new_messages.is_empty() { state.update(|s| s.messages.extend(self.new_messages.drain(..))); @@ -197,7 +201,7 @@ impl<'a> Widget for Chat<'a> { _ => 0.0, }; Rectangle::fill([470.0, y]) - .rgba(0.0, 0.0, 0.0, 0.8) + .rgba(0.0, 0.0, 0.0, transp + 0.1) .bottom_left_with_margins_on(ui.window, 10.0, 10.0) .w(470.0) .set(state.ids.input_bg, ui); @@ -216,7 +220,7 @@ impl<'a> Widget for Chat<'a> { // Message box Rectangle::fill([470.0, 174.0]) - .rgba(0.0, 0.0, 0.0, 0.4) + .rgba(0.0, 0.0, 0.0, transp) .and(|r| { if input_focused { r.up_from(state.ids.input_bg, 0.0) diff --git a/voxygen/src/hud/minimap.rs b/voxygen/src/hud/minimap.rs index ba73702f83..66c0291c6c 100644 --- a/voxygen/src/hud/minimap.rs +++ b/voxygen/src/hud/minimap.rs @@ -157,50 +157,52 @@ impl<'a> Widget for MiniMap<'a> { const FADE_HOLD: f32 = 1.0; const FADE_OUT: f32 = 3.0; - match self.client.current_chunk() { - Some(chunk) => { - let current = chunk.meta().name(); - // Check if no other popup is displayed and a new one is needed - if state.last_update.elapsed() - > Duration::from_secs_f32(FADE_IN + FADE_HOLD + FADE_OUT) - && state - .last_region_name - .as_ref() - .map(|l| l != current) - .unwrap_or(true) - { - // Update last_region - state.update(|s| s.last_region_name = Some(current.to_owned())); - state.update(|s| s.last_update = Instant::now()); - } + if !self.show.intro { + match self.client.current_chunk() { + Some(chunk) => { + let current = chunk.meta().name(); + // Check if no other popup is displayed and a new one is needed + if state.last_update.elapsed() + > Duration::from_secs_f32(FADE_IN + FADE_HOLD + FADE_OUT) + && state + .last_region_name + .as_ref() + .map(|l| l != current) + .unwrap_or(true) + { + // Update last_region + state.update(|s| s.last_region_name = Some(current.to_owned())); + state.update(|s| s.last_update = Instant::now()); + } - let seconds = state.last_update.elapsed().as_secs_f32(); - let fade = if seconds < FADE_IN { - seconds / FADE_IN - } else if seconds < FADE_IN + FADE_HOLD { - 1.0 - } else { - (1.0 - (seconds - FADE_IN - FADE_HOLD) / FADE_OUT).max(0.0) - }; - // Region Name - Text::new(state.last_region_name.as_ref().unwrap_or(&"".to_owned())) - .mid_top_with_margin_on(ui.window, 200.0) - .font_size(70) - .font_id(self.fonts.alkhemi) - .color(Color::Rgba(0.0, 0.0, 0.0, fade)) - .set(state.ids.zone_display_bg, ui); - Text::new(state.last_region_name.as_ref().unwrap_or(&"".to_owned())) - .top_left_with_margins_on(state.ids.zone_display_bg, -2.5, -2.5) - .font_size(70) - .font_id(self.fonts.alkhemi) - .color(Color::Rgba(1.0, 1.0, 1.0, fade)) - .set(state.ids.zone_display, ui); + let seconds = state.last_update.elapsed().as_secs_f32(); + let fade = if seconds < FADE_IN { + seconds / FADE_IN + } else if seconds < FADE_IN + FADE_HOLD { + 1.0 + } else { + (1.0 - (seconds - FADE_IN - FADE_HOLD) / FADE_OUT).max(0.0) + }; + // Region Name + Text::new(state.last_region_name.as_ref().unwrap_or(&"".to_owned())) + .mid_top_with_margin_on(ui.window, 200.0) + .font_size(70) + .font_id(self.fonts.alkhemi) + .color(Color::Rgba(0.0, 0.0, 0.0, fade)) + .set(state.ids.zone_display_bg, ui); + Text::new(state.last_region_name.as_ref().unwrap_or(&"".to_owned())) + .top_left_with_margins_on(state.ids.zone_display_bg, -2.5, -2.5) + .font_size(70) + .font_id(self.fonts.alkhemi) + .color(Color::Rgba(1.0, 1.0, 1.0, fade)) + .set(state.ids.zone_display, ui); + } + None => Text::new(" ") + .middle_of(ui.window) + .font_size(14) + .color(HP_COLOR) + .set(state.ids.zone_display, ui), } - None => Text::new(" ") - .middle_of(ui.window) - .font_size(14) - .color(HP_COLOR) - .set(state.ids.zone_display, ui), } // TODO: Subregion name display diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 6dd7c4bde3..25dffe41d4 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -58,6 +58,7 @@ use crate::{discord, discord::DiscordUpdate}; const XP_COLOR: Color = Color::Rgba(0.59, 0.41, 0.67, 1.0); const TEXT_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0); +const MENU_BG: Color = Color::Rgba(0.0, 0.0, 0.0, 0.4); //const TEXT_COLOR_2: Color = Color::Rgba(0.0, 0.0, 0.0, 1.0); const TEXT_COLOR_3: Color = Color::Rgba(1.0, 1.0, 1.0, 0.1); //const BG_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 0.8); @@ -89,6 +90,15 @@ widget_ids! { health_bars[], health_bar_backs[], + // Intro Text + intro_bg, + intro_text, + intro_close, + intro_close_2, + intro_close_3, + intro_check, + intro_check_text, + // Test bag_space_add, @@ -116,8 +126,8 @@ widget_ids! { window_frame_4, window_frame_5, - // Contents button_help2, + button_help3, // External chat, @@ -168,8 +178,10 @@ pub enum Event { ChangeFOV(u16), ChangeAaMode(AaMode), CrosshairTransp(f32), + ChatTransp(f32), CrosshairType(CrosshairType), ToggleXpBar(XpBar), + Intro(Intro), ToggleBarNumbers(BarNumbers), ToggleShortcutNumbers(ShortcutNumbers), UiScale(ScaleChange), @@ -197,6 +209,11 @@ pub enum CrosshairType { Edges, } #[derive(Clone, Copy, Debug, Serialize, Deserialize)] +pub enum Intro { + Show, + Never, +} +#[derive(Clone, Copy, Debug, Serialize, Deserialize)] pub enum XpBar { Always, OnGain, @@ -216,6 +233,7 @@ pub enum ShortcutNumbers { pub struct Show { ui: bool, + intro: bool, help: bool, debug: bool, bag: bool, @@ -381,6 +399,9 @@ pub struct Hud { new_messages: VecDeque, inventory_space: usize, show: Show, + never_show: bool, + intro: bool, + intro_2: bool, to_focus: Option>, force_ungrab: bool, force_chat_input: Option, @@ -417,8 +438,11 @@ impl Hud { ids, new_messages: VecDeque::new(), inventory_space: 8, + intro: false, + intro_2: false, show: Show { help: false, + intro: true, debug: true, bag: false, esc_menu: false, @@ -437,6 +461,7 @@ impl Hud { ingame: true, }, to_focus: None, + never_show: false, force_ungrab: false, force_chat_input: None, force_chat_cursor: None, @@ -457,7 +482,6 @@ impl Hud { env!("CARGO_PKG_VERSION"), common::util::GIT_VERSION.to_string() ); - if self.show.ingame { // Crosshair if !self.show.help { @@ -595,6 +619,131 @@ impl Hud { .set(bar_id, ui_widgets); } } + // Introduction Text + let intro_text: &'static str = + "Welcome to the Veloren Alpha!\n\ + \n\ + \n\ + Some tips before you start:\n\ + \n\ + \n\ + MOST IMPORTANTLY: To set your respawn point type /waypoint into the chat.\n\ + \n\ + This can also be done when you are already dead!\n\ + \n\ + \n\ + Press F1 to see the available key commands.\n\ + \n\ + Type /help into the chat to see chat commands\n\ + \n\ + \n\ + There are chests and other objects randomly spawning in the World!\n\ + \n\ + Right-Click to collect them.\n\ + \n\ + To actually use whatever you loot from those chests open your inventory with 'B'.\n\ + \n\ + Double click the items in your bag to use or equip them.\n\ + \n\ + Throw them away by clicking them once and clicking outside of the bag\n\ + \n\ + \n\ + Nights can get pretty dark in Veloren.\n\ + \n\ + Light your lantern by typing /lantern into the chat\n\ + \n\ + \n\ + Want to free your cursor to close this window? Press TAB!\n\ + \n\ + \n\ + Enjoy your stay in the World of Veloren."; + if self.show.intro && !self.show.esc_menu && !self.intro_2 { + match global_state.settings.gameplay.intro_show { + Intro::Show => { + Rectangle::fill_with([800.0, 850.0], Color::Rgba(0.0, 0.0, 0.0, 0.80)) + .mid_left_with_margin_on(ui_widgets.window, 10.0) + .set(self.ids.intro_bg, ui_widgets); + Text::new(intro_text) + .top_left_with_margins_on(self.ids.intro_bg, 10.0, 10.0) + .font_size(20) + .font_id(self.fonts.cyri) + .color(TEXT_COLOR) + .set(self.ids.intro_text, ui_widgets); + if Button::image(self.imgs.button) + .w_h(100.0, 50.0) + .mid_bottom_with_margin_on(self.ids.intro_bg, 10.0) + .label("Close") + .label_font_size(20) + .label_color(TEXT_COLOR) + .hover_image(self.imgs.button_hover) + .press_image(self.imgs.button_press) + .set(self.ids.intro_close, ui_widgets) + .was_clicked() + { + if self.never_show { + events.push(Event::Intro(Intro::Never)); + self.never_show = !self.never_show; + self.intro = false; + self.intro_2 = false; + } else { + self.show.intro = !self.show.intro; + self.intro = false; + self.intro_2 = false; + } + } + if Button::image(if self.never_show { + self.imgs.checkbox_checked + } else { + self.imgs.checkbox + }) + .w_h(20.0, 20.0) + .right_from(self.ids.intro_close, 10.0) + .hover_image(if self.never_show { + self.imgs.checkbox_checked_mo + } else { + self.imgs.checkbox_mo + }) + .press_image(self.imgs.checkbox_press) + .set(self.ids.intro_check, ui_widgets) + .was_clicked() + { + self.never_show = !self.never_show + }; + Text::new("Don't show this on Startup") + .right_from(self.ids.intro_check, 10.0) + .font_size(10) + .font_id(self.fonts.cyri) + .color(TEXT_COLOR) + .set(self.ids.intro_check_text, ui_widgets); + } + Intro::Never => {} + } + } + + if self.intro_2 && !self.show.esc_menu { + Rectangle::fill_with([800.0, 850.0], Color::Rgba(0.0, 0.0, 0.0, 0.80)) + .mid_left_with_margin_on(ui_widgets.window, 10.0) + .set(self.ids.intro_bg, ui_widgets); + Text::new(intro_text) + .top_left_with_margins_on(self.ids.intro_bg, 10.0, 10.0) + .font_size(20) + .font_id(self.fonts.cyri) + .color(TEXT_COLOR) + .set(self.ids.intro_text, ui_widgets); + if Button::image(self.imgs.button) + .w_h(100.0, 50.0) + .mid_bottom_with_margin_on(self.ids.intro_bg, 10.0) + .label("Close") + .label_font_size(20) + .label_color(TEXT_COLOR) + .hover_image(self.imgs.button_hover) + .press_image(self.imgs.button_press) + .set(self.ids.intro_close_3, ui_widgets) + .was_clicked() + { + self.intro_2 = false; + } + } // Display debug window. if self.show.debug { @@ -712,6 +861,23 @@ impl Hud { .middle_of(ui_widgets.window) .w_h(1260.0, 519.0) .set(self.ids.help, ui_widgets); + // Show tips + if Button::image(self.imgs.button) + .w_h(120.0, 50.0) + .hover_image(self.imgs.button_hover) + .press_image(self.imgs.button_press) + .label("Show Tips") + .label_font_size(20) + .label_color(TEXT_COLOR) + .mid_bottom_with_margin_on(self.ids.help, 20.0) + .set(self.ids.button_help3, ui_widgets) + .was_clicked() + { + self.show.help = false; + self.show.intro = false; + self.intro = false; + self.intro_2 = true; + }; // X-button if Button::image(self.imgs.close_button) .w_h(40.0, 40.0) @@ -788,10 +954,15 @@ impl Hud { } // Chat box - match Chat::new(&mut self.new_messages, &self.imgs, &self.fonts) - .and_then(self.force_chat_input.take(), |c, input| c.input(input)) - .and_then(self.force_chat_cursor.take(), |c, pos| c.cursor_pos(pos)) - .set(self.ids.chat, ui_widgets) + match Chat::new( + &mut self.new_messages, + global_state, + &self.imgs, + &self.fonts, + ) + .and_then(self.force_chat_input.take(), |c, input| c.input(input)) + .and_then(self.force_chat_cursor.take(), |c, pos| c.cursor_pos(pos)) + .set(self.ids.chat, ui_widgets) { Some(chat::Event::SendMessage(message)) => { events.push(Event::SendMessage(message)); @@ -825,6 +996,9 @@ impl Hud { settings_window::Event::AdjustMouseZoom(sensitivity) => { events.push(Event::AdjustMouseZoom(sensitivity)); } + settings_window::Event::ChatTransp(chat_transp) => { + events.push(Event::ChatTransp(chat_transp)); + } settings_window::Event::ToggleZoomInvert(zoom_inverted) => { events.push(Event::ToggleZoomInvert(zoom_inverted)); } @@ -834,6 +1008,9 @@ impl Hud { settings_window::Event::CrosshairTransp(crosshair_transp) => { events.push(Event::CrosshairTransp(crosshair_transp)); } + settings_window::Event::Intro(intro_show) => { + events.push(Event::Intro(intro_show)); + } settings_window::Event::AdjustMusicVolume(music_volume) => { events.push(Event::AdjustMusicVolume(music_volume)); } @@ -1143,23 +1320,3 @@ impl Hud { } } } - -// Get the text to show in the help window and use the -// length of the longest line to resize the window. -/*fn get_help_text(cs: &ControlSettings) -> String { - format!( - "{free_cursor:?} = Free cursor\n\ - {escape:?} = Open/close menus\n\ - \n\ - {help:?} = Toggle this window\n\ - {toggle_interface:?} = Toggle interface\n\ - \n\ - {chat:?} = Open chat\n\ - Mouse Wheel = Scroll chat/zoom", - free_cursor = cs.toggle_cursor, - escape = cs.escape, - help = cs.help, - toggle_interface = cs.toggle_interface, - chat = cs.enter - ) -}*/ diff --git a/voxygen/src/hud/settings_window.rs b/voxygen/src/hud/settings_window.rs index 904d432d98..47533f0db2 100644 --- a/voxygen/src/hud/settings_window.rs +++ b/voxygen/src/hud/settings_window.rs @@ -1,5 +1,6 @@ use super::{ - img_ids::Imgs, BarNumbers, CrosshairType, Fonts, ShortcutNumbers, Show, XpBar, TEXT_COLOR, + img_ids::Imgs, BarNumbers, CrosshairType, Fonts, Intro, ShortcutNumbers, Show, XpBar, MENU_BG, + TEXT_COLOR, }; use crate::{ render::AaMode, @@ -43,6 +44,8 @@ widget_ids! { general_txt, debug_button, debug_button_label, + tips_button, + tips_button_label, interface, mouse_pan_slider, mouse_pan_label, @@ -102,6 +105,9 @@ widget_ids! { show_bars_button, show_bars_text, placeholder, + chat_transp_title, + chat_transp_text, + chat_transp_slider } } @@ -154,6 +160,7 @@ pub enum Event { ToggleShortcutNumbers(ShortcutNumbers), ChangeTab(SettingsTab), Close, + Intro(Intro), AdjustMousePan(u32), AdjustMouseZoom(u32), ToggleZoomInvert(bool), @@ -167,6 +174,7 @@ pub enum Event { CrosshairTransp(f32), CrosshairType(CrosshairType), UiScale(ScaleChange), + ChatTransp(f32), } pub enum ScaleChange { @@ -273,11 +281,12 @@ impl<'a> Widget for SettingsWindow<'a> { let crosshair_transp = self.global_state.settings.gameplay.crosshair_transp; let crosshair_type = self.global_state.settings.gameplay.crosshair_type; let ui_scale = self.global_state.settings.gameplay.ui_scale; + let chat_transp = self.global_state.settings.gameplay.chat_transp; Text::new("General") .top_left_with_margins_on(state.ids.settings_content, 5.0, 5.0) .font_size(18) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.general_txt, ui); @@ -300,7 +309,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Show Help Window") .right_from(state.ids.button_help, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .graphics_for(state.ids.button_help) .color(TEXT_COLOR) .set(state.ids.show_help_label, ui); @@ -324,16 +333,43 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Show Debug Info") .right_from(state.ids.debug_button, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .graphics_for(state.ids.debug_button) .color(TEXT_COLOR) .set(state.ids.debug_button_label, ui); + // Tips + if Button::image(match self.global_state.settings.gameplay.intro_show { + Intro::Show => self.imgs.checkbox_checked, + Intro::Never => self.imgs.checkbox, + }) + .w_h(20.0, 20.0) + .down_from(state.ids.debug_button, 8.0) + .hover_image(match self.global_state.settings.gameplay.intro_show { + Intro::Show => self.imgs.checkbox_checked_mo, + Intro::Never => self.imgs.checkbox_mo, + }) + .press_image(self.imgs.checkbox_press) + .set(state.ids.tips_button, ui) + .was_clicked() + { + match self.global_state.settings.gameplay.intro_show { + Intro::Show => events.push(Event::Intro(Intro::Never)), + Intro::Never => events.push(Event::Intro(Intro::Show)), + } + }; + Text::new("Show Tips on Startup") + .right_from(state.ids.tips_button, 10.0) + .font_size(14) + .font_id(self.fonts.cyri) + .graphics_for(state.ids.button_help) + .color(TEXT_COLOR) + .set(state.ids.tips_button_label, ui); // Ui Scale Text::new("UI-Scale") - .down_from(state.ids.debug_button, 20.0) + .down_from(state.ids.tips_button, 20.0) .font_size(18) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.ui_scale_label, ui); @@ -367,7 +403,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Relative Scaling") .right_from(state.ids.relative_to_win_button, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .graphics_for(state.ids.relative_to_win_button) .color(TEXT_COLOR) .set(state.ids.relative_to_win_text, ui); @@ -402,7 +438,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Custom Scaling") .right_from(state.ids.absolute_scale_button, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .graphics_for(state.ids.absolute_scale_button) .color(TEXT_COLOR) .set(state.ids.absolute_scale_text, ui); @@ -429,7 +465,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new(&format!("{:.2}", scale)) .right_from(state.ids.ui_scale_slider, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.ui_scale_value, ui); } else { @@ -579,13 +615,13 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Crosshair") .down_from(state.ids.absolute_scale_button, 20.0) .font_size(18) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.ch_title, ui); Text::new("Transparency") .right_from(state.ids.ch_3_bg, 20.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.ch_transp_text, ui); @@ -610,7 +646,7 @@ impl<'a> Widget for SettingsWindow<'a> { .right_from(state.ids.ch_transp_slider, 8.0) .font_size(14) .graphics_for(state.ids.ch_transp_slider) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.ch_transp_value, ui); @@ -618,7 +654,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Hotbar") .down_from(state.ids.ch_1_bg, 20.0) .font_size(18) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.hotbar_title, ui); // Show xp bar @@ -647,7 +683,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Always show Experience Bar") .right_from(state.ids.show_xpbar_button, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .graphics_for(state.ids.show_xpbar_button) .color(TEXT_COLOR) .set(state.ids.show_xpbar_text, ui); @@ -681,7 +717,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Always show Shortcuts") .right_from(state.ids.show_shortcuts_button, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .graphics_for(state.ids.show_shortcuts_button) .color(TEXT_COLOR) .set(state.ids.show_shortcuts_text, ui); @@ -691,7 +727,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Energybar Numbers") .down_from(state.ids.show_shortcuts_button, 20.0) .font_size(18) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.bar_numbers_title, ui); @@ -721,7 +757,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("None") .right_from(state.ids.show_bar_numbers_none_button, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .graphics_for(state.ids.show_bar_numbers_none_button) .color(TEXT_COLOR) .set(state.ids.show_bar_numbers_none_text, ui); @@ -752,7 +788,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Values") .right_from(state.ids.show_bar_numbers_values_button, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .graphics_for(state.ids.show_bar_numbers_values_button) .color(TEXT_COLOR) .set(state.ids.show_bar_numbers_values_text, ui); @@ -783,13 +819,43 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Percentages") .right_from(state.ids.show_bar_numbers_percentage_button, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .graphics_for(state.ids.show_bar_numbers_percentage_button) .color(TEXT_COLOR) .set(state.ids.show_bar_numbers_percentage_text, ui); - Rectangle::fill_with([20.0 * 4.0, 1.0 * 4.0], color::TRANSPARENT) - .down_from(state.ids.show_bar_numbers_percentage_button, 8.0) + // Chat Transp + Text::new("Chat") + .down_from(state.ids.show_bar_numbers_percentage_button, 20.0) + .font_size(18) + .font_id(self.fonts.cyri) + .color(TEXT_COLOR) + .set(state.ids.chat_transp_title, ui); + Text::new("Background Transparency") + .right_from(state.ids.chat_transp_slider, 20.0) + .font_size(14) + .font_id(self.fonts.cyri) + .color(TEXT_COLOR) + .set(state.ids.chat_transp_text, ui); + + if let Some(new_val) = ImageSlider::continuous( + chat_transp, + 0.0, + 0.9, + self.imgs.slider_indicator, + self.imgs.slider, + ) + .w_h(104.0, 22.0) + .down_from(state.ids.chat_transp_title, 8.0) + .track_breadth(12.0) + .slider_length(10.0) + .pad_track((5.0, 5.0)) + .set(state.ids.chat_transp_slider, ui) + { + events.push(Event::ChatTransp(new_val)); + } + Rectangle::fill_with([40.0 * 4.0, 1.0 * 4.0], color::TRANSPARENT) + .down_from(state.ids.chat_transp_title, 30.0) .set(state.ids.placeholder, ui); } @@ -829,7 +895,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Pan Sensitivity") .top_left_with_margins_on(state.ids.settings_content, 10.0, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.mouse_pan_label, ui); @@ -853,7 +919,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new(&format!("{}", display_pan)) .right_from(state.ids.mouse_pan_slider, 8.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.mouse_pan_value, ui); @@ -861,7 +927,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Zoom Sensitivity") .down_from(state.ids.mouse_pan_slider, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.mouse_zoom_label, ui); @@ -885,7 +951,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new(&format!("{}", display_zoom)) .right_from(state.ids.mouse_zoom_slider, 8.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.mouse_zoom_value, ui); @@ -910,7 +976,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Invert Scroll Zoom") .right_from(state.ids.mouse_zoom_invert_button, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .graphics_for(state.ids.button_help) .color(TEXT_COLOR) .set(state.ids.mouse_zoom_invert_label, ui); @@ -1020,7 +1086,7 @@ impl<'a> Widget for SettingsWindow<'a> { ) .color(TEXT_COLOR) .top_left_with_margins_on(state.ids.settings_content, 5.0, 5.0) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .font_size(18) .set(state.ids.controls_text, ui); // TODO: Replace with buttons that show actual keybinds and allow the user to change them. @@ -1093,7 +1159,7 @@ impl<'a> Widget for SettingsWindow<'a> { ) .color(TEXT_COLOR) .right_from(state.ids.controls_text, 0.0) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .font_size(18) .set(state.ids.controls_controls, ui); } @@ -1132,7 +1198,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("View Distance") .top_left_with_margins_on(state.ids.settings_content, 10.0, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.vd_text, ui); @@ -1159,7 +1225,7 @@ impl<'a> Widget for SettingsWindow<'a> { )) .right_from(state.ids.vd_slider, 8.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.vd_value, ui); @@ -1167,7 +1233,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Maximum FPS") .down_from(state.ids.vd_slider, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.max_fps_text, ui); @@ -1194,7 +1260,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new(&format!("{}", self.global_state.settings.graphics.max_fps)) .right_from(state.ids.max_fps_slider, 8.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.max_fps_value, ui); @@ -1202,7 +1268,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Field of View (deg)") .down_from(state.ids.max_fps_slider, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.fov_text, ui); @@ -1226,7 +1292,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new(&format!("{}", self.global_state.settings.graphics.fov)) .right_from(state.ids.fov_slider, 8.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.fov_value, ui); @@ -1234,7 +1300,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("AntiAliasing Mode") .down_from(state.ids.fov_slider, 8.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.aa_mode_text, ui); let mode_label_list = [ @@ -1298,7 +1364,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Music Volume") .top_left_with_margins_on(state.ids.settings_content, 10.0, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.audio_volume_text, ui); @@ -1323,7 +1389,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Sound Effects Volume") .down_from(state.ids.audio_volume_slider, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.sfx_volume_text, ui); @@ -1350,7 +1416,7 @@ impl<'a> Widget for SettingsWindow<'a> { Text::new("Audio Device") .down_from(state.ids.sfx_volume_slider, 10.0) .font_size(14) - .font_id(self.fonts.opensans) + .font_id(self.fonts.cyri) .color(TEXT_COLOR) .set(state.ids.audio_device_text, ui); @@ -1359,8 +1425,10 @@ impl<'a> Widget for SettingsWindow<'a> { if let Some(clicked) = DropDownList::new(&device_list, selected) .w_h(400.0, 22.0) - .down_from(state.ids.audio_device_text, 10.0) + .color(MENU_BG) + .label_color(TEXT_COLOR) .label_font_id(self.fonts.opensans) + .down_from(state.ids.audio_device_text, 10.0) .set(state.ids.audio_device_list, ui) { let new_val = device_list[clicked].clone(); diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 44361ea2f6..8064b2ffec 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -4,6 +4,7 @@ use super::{ }; use crate::GlobalState; use common::comp::{item::Debug, item::Tool, Item, Stats}; + use conrod_core::{ color, widget::{self, Button, Image, Rectangle, Text}, @@ -163,6 +164,7 @@ impl<'a> Widget for Skillbar<'a> { let shortcuts = self.global_state.settings.gameplay.shortcut_numbers; const BG_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 0.8); + const BG_COLOR_2: Color = Color::Rgba(0.0, 0.0, 0.0, 0.99); // Stamina Wheel /* @@ -503,8 +505,15 @@ impl<'a> Widget for Skillbar<'a> { } // M1 Slot Image::new(self.imgs.skillbar_slot_big_bg) - .w_h(37.0 * scale, 37.0 * scale) - .color(Some(BG_COLOR)) + .w_h(36.0 * scale, 36.0 * scale) + .color(match self.stats.equipment.main { + Some(Item::Tool { kind, .. }) => match kind { + Tool::Bow => Some(BG_COLOR_2), + Tool::Staff => Some(BG_COLOR_2), + _ => Some(BG_COLOR_2), + }, + _ => Some(BG_COLOR_2), + }) .middle_of(state.ids.m1_slot) .set(state.ids.m1_slot_bg, ui); Button::image(match self.stats.equipment.main { @@ -519,7 +528,22 @@ impl<'a> Widget for Skillbar<'a> { Some(Item::Debug(Debug::Boost)) => self.imgs.flyingrod_m1, _ => self.imgs.twohaxe_m1, }) // Insert Icon here - .w_h(38.0 * scale, 38.0 * scale) + .w(match self.stats.equipment.main { + Some(Item::Tool { kind, .. }) => match kind { + Tool::Bow => 30.0 * scale, + Tool::Staff => 30.0 * scale, + _ => 38.0 * scale, + }, + _ => 38.0 * scale, + }) + .h(match self.stats.equipment.main { + Some(Item::Tool { kind, .. }) => match kind { + Tool::Bow => 30.0 * scale, + Tool::Staff => 36.0 * scale, + _ => 38.0 * scale, + }, + _ => 38.0 * scale, + }) .middle_of(state.ids.m1_slot_bg) .set(state.ids.m1_content, ui); // M2 Slot @@ -528,8 +552,15 @@ impl<'a> Widget for Skillbar<'a> { .right_from(state.ids.m1_slot, 0.0) .set(state.ids.m2_slot, ui); Image::new(self.imgs.skillbar_slot_big_bg) - .w_h(37.0 * scale, 37.0 * scale) - .color(Some(BG_COLOR)) + .w_h(36.0 * scale, 36.0 * scale) + .color(match self.stats.equipment.main { + Some(Item::Tool { kind, .. }) => match kind { + Tool::Bow => Some(BG_COLOR_2), + Tool::Staff => Some(BG_COLOR_2), + _ => Some(BG_COLOR_2), + }, + _ => Some(BG_COLOR_2), + }) .middle_of(state.ids.m2_slot) .set(state.ids.m2_slot_bg, ui); Button::image(match self.stats.equipment.main { @@ -544,7 +575,22 @@ impl<'a> Widget for Skillbar<'a> { Some(Item::Debug(Debug::Boost)) => self.imgs.flyingrod_m2, _ => self.imgs.twohaxe_m2, }) // Insert Icon here - .w_h(38.0 * scale, 38.0 * scale) + .w(match self.stats.equipment.main { + Some(Item::Tool { kind, .. }) => match kind { + Tool::Bow => 30.0 * scale, + Tool::Staff => 30.0 * scale, + _ => 38.0 * scale, + }, + _ => 38.0 * scale, + }) + .h(match self.stats.equipment.main { + Some(Item::Tool { kind, .. }) => match kind { + Tool::Bow => 30.0 * scale, + Tool::Staff => 30.0 * scale, + _ => 38.0 * scale, + }, + _ => 38.0 * scale, + }) .middle_of(state.ids.m2_slot_bg) .set(state.ids.m2_content, ui); //Slot 5 diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index 7c9b16458a..ec84ac025f 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -331,7 +331,7 @@ impl HumArmorChestSpec { ) }; - let bare_chest = graceful_load_mat_segment("armor.chest.grayscale"); + let bare_chest = graceful_load_mat_segment("armor.chest.none"); let mut chest_armor = graceful_load_mat_segment(&spec.vox_spec.0); @@ -385,13 +385,13 @@ impl HumArmorHandSpec { }; let hand_segment = color_segment( - graceful_load_mat_segment(&spec.left.vox_spec.0), + graceful_load_mat_segment(&spec.right.vox_spec.0), body.race.skin_color(body.skin), body.race.hair_color(body.hair_color), body.race.eye_color(body.eye_color), ); - generate_mesh(&hand_segment, Vec3::from(spec.left.vox_spec.1)) + generate_mesh(&hand_segment, Vec3::from(spec.right.vox_spec.1)) } } @@ -519,7 +519,7 @@ pub fn mesh_main(item: Option<&Item>) -> Mesh { Tool::Dagger => ("weapon.hammer.rusty_2h", Vec3::new(-2.5, -5.5, -4.0)), Tool::Shield => ("weapon.axe.rusty_2h", Vec3::new(-2.5, -6.5, -2.0)), Tool::Bow => ("weapon.bow.simple-bow", Vec3::new(-1.0, -6.0, -2.0)), - Tool::Staff => ("weapon.staff.wood-0", Vec3::new(-1.0, -6.0, -3.0)), + Tool::Staff => ("weapon.staff.wood-fire", Vec3::new(-1.0, -6.0, -3.0)), }, Item::Debug(_) => ("weapon.debug_wand", Vec3::new(-1.5, -9.5, -4.0)), _ => return Mesh::new(), diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs index 040912e180..ddccc1134c 100644 --- a/voxygen/src/session.rs +++ b/voxygen/src/session.rs @@ -408,10 +408,18 @@ impl PlayState for SessionState { global_state.settings.gameplay.crosshair_transp = crosshair_transp; global_state.settings.save_to_file_warn(); } + HudEvent::ChatTransp(chat_transp) => { + global_state.settings.gameplay.chat_transp = chat_transp; + global_state.settings.save_to_file_warn(); + } HudEvent::CrosshairType(crosshair_type) => { global_state.settings.gameplay.crosshair_type = crosshair_type; global_state.settings.save_to_file_warn(); } + HudEvent::Intro(intro_show) => { + global_state.settings.gameplay.intro_show = intro_show; + global_state.settings.save_to_file_warn(); + } HudEvent::ToggleXpBar(xp_bar) => { global_state.settings.gameplay.xp_bar = xp_bar; global_state.settings.save_to_file_warn(); diff --git a/voxygen/src/settings.rs b/voxygen/src/settings.rs index c9f1f0ab3a..be070b981c 100644 --- a/voxygen/src/settings.rs +++ b/voxygen/src/settings.rs @@ -1,5 +1,5 @@ use crate::{ - hud::{BarNumbers, CrosshairType, ShortcutNumbers, XpBar}, + hud::{BarNumbers, CrosshairType, Intro, ShortcutNumbers, XpBar}, render::AaMode, ui::ScaleMode, window::KeyMouse, @@ -97,7 +97,9 @@ pub struct GameplaySettings { pub zoom_sensitivity: u32, pub zoom_inversion: bool, pub crosshair_transp: f32, + pub chat_transp: f32, pub crosshair_type: CrosshairType, + pub intro_show: Intro, pub xp_bar: XpBar, pub shortcut_numbers: ShortcutNumbers, pub bar_numbers: BarNumbers, @@ -111,7 +113,9 @@ impl Default for GameplaySettings { zoom_sensitivity: 100, zoom_inversion: false, crosshair_transp: 0.6, + chat_transp: 0.4, crosshair_type: CrosshairType::Round, + intro_show: Intro::Show, xp_bar: XpBar::OnGain, shortcut_numbers: ShortcutNumbers::On, bar_numbers: BarNumbers::Off,