From 45486aa9c2b464d8e8c584dc32df5cbae56eb917 Mon Sep 17 00:00:00 2001 From: Oolnokk Date: Sun, 31 Oct 2021 22:58:25 -0400 Subject: [PATCH] 2 new beards, four new hairstyles and 1 new eye option for dwarf males --- .../voxel/figure/beard/dwarf/dwarf-21.vox | Bin 0 -> 1416 bytes .../voxel/figure/beard/dwarf/dwarf-22.vox | Bin 0 -> 1640 bytes .../voxel/figure/eyes/general/male_old_blind.vox | Bin 0 -> 1176 bytes .../voxygen/voxel/figure/hair/dwarf/male-4.vox | Bin 0 -> 1692 bytes .../voxygen/voxel/figure/hair/dwarf/male-5.vox | Bin 0 -> 1904 bytes .../voxygen/voxel/figure/hair/dwarf/male-6.vox | Bin 0 -> 2640 bytes .../voxygen/voxel/figure/hair/dwarf/male-7.vox | Bin 0 -> 3048 bytes assets/voxygen/voxel/humanoid_head_manifest.ron | 7 +++++++ common/src/comp/body/humanoid.rs | 6 +++--- 9 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox create mode 100644 assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox create mode 100644 assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox create mode 100644 assets/voxygen/voxel/figure/hair/dwarf/male-4.vox create mode 100644 assets/voxygen/voxel/figure/hair/dwarf/male-5.vox create mode 100644 assets/voxygen/voxel/figure/hair/dwarf/male-6.vox create mode 100644 assets/voxygen/voxel/figure/hair/dwarf/male-7.vox diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-21.vox new file mode 100644 index 0000000000000000000000000000000000000000..05688e540a9a7f524a071caa00fc5eeff57269eb GIT binary patch literal 1416 zcmbu8ZAjf!7{H(Z+kNp?xO|(s)O=}Pjrp2p+ICHCyE=8wvhC)i#YUQp4Oy~@7~8Fp zjWsjTHC$#P7BSl{S1I~nvSbX_7`G8Y$rurR?L$Q0em&QHD1*=Q;oL{LkrX z-Pk=@A--g^mf~p5EkAOR_28p zSJe&(vrWPmdxf=Egpk@Nx`eSq>K_yu{6f!@!eFCtLH!+-8T2*fGSpGX-Gxo+77Cy}7hZ{w#-702U_l(X7H@^~o{!SR`E964Bg4N3n{Ptrf17{OC z_h~X$Z>O_H_J2PA%3Ck+>s;UeK7U0;1@BhRP*OHa?dWOJ!|7cANVxN&z}y^uzn|W` zL3ZzoAmJfW22xm>y8jPHGW70bW$}8!1lw!JIdt|6n|so@^?3nHp>)QzSAXw+d|kZO z{?3~W^uo!hdBPt@c_(s>_rH$u#IaGfpPr%RgJn9e#0Ufe+|y4HkHQ~VG2!l)_rLG1 u-mia)>nmJ;XB)|QaHCk<-#(JX?(?PiN__k@o%D~jl>t9H+R8WDL;eDT*d<>8 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox b/assets/voxygen/voxel/figure/beard/dwarf/dwarf-22.vox new file mode 100644 index 0000000000000000000000000000000000000000..2b6d65148cc8a07546fc02e95c4479b3c4a130ad GIT binary patch literal 1640 zcmbu8e@LBW6vxl=yg#qE!sS(`E;WBNug3hDX4-a5ZM!-(=d$hQq{T*>j14K-M2zj$ zn2j|v(FHEE5Q~^?m#Y;0VX|Zl))==DLCF{q{o5ZA{rByAum2Si)cf#x&vVXs&U2pU zocHbSIFLIfB5e)9b_&^Vi*yA;%@4#CK1swPUUJ}IC|IC5;d73drYMUThElenv}r2p zN^3*YrnOD!P@1OJ7D*Vn*r3xU4sofQra`}!z?lXjDKVsoy<(Jm3?XhmG&A)+0nw4*iQt(nJR9)}s6#Bllc#Mc;H zLkz=VKCU4)=MJSCx0|$^v=f_i5m$MLD3^I$=AllM;c~sp!gFUL;?W)=%99xED&vxr z!+kVi`I(DT_QOiRUb3I;AkWKsb66x^A+AVhtRnS|Td=YTkIkMqtc4~9d$e!&GYw)U zJ{O6_Vu(Z{xIZD-b9oKnm&P= zrQ=8rq#?C46S<=$@Xyvlnk~pc5@haS$XXhb+XU&y1lz_1k6#tI1A+&`f)wg$p9!kk zyl6R=jL_*6yuJJgnnnbjlY*BQ1*h&XmV0OS=b>Pv7}e1LvIc#~yO4?E`5ctr*pBob zLBVP6Jte4L5y*b#A9f*=4?!Y6jBVe7g|bxKeL4$hc@&c(SSH_-U&!Q1!Qy*@)dj)L zYt#dRxn{u^`vmK+2tw3Pb_>Rj&^{z+^b2~Q6bv;9F45jum5Ki5JPdahVd`iFMxL+1 zR9_>$nSLGkb`B-^X{fKrLF=v}9PO^bK#L%JNHF`FVCABqIy)1=;sW$k@4#SFExL=- z&|j5>3%d&u?JY%feK|Uwtwrd$1`NE^j^X1WjK4L2=)zgVu3tuUrU$E^yb7<^i>)bJ zkei!}a(^DGcRYrtD*PCKa~l>v%)<{ii?M#Y1T)MTofq8tO7Qb{g5mxmTnblW?Mfql z`>_jy=aX^aQy;F~$-p{t{`37;&%J z0p{o7_xsV8KZLz|B9QPfQU_D9JiXDw(M*0j+1Yrba1uM~CUE5ZS#0f1$L-Gxu^h_4 z1Z(y8`p4JB_d3{h3xj>Ysp$oTKaS#^$aTE`bqr6O7{kspvuOQb1zlHT2m}JS&!dP- z@CS^T;NF)T=ex)6>)-tR3lsm@W-{*F%on$JjAmo+#WHwHz4&P+ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox b/assets/voxygen/voxel/figure/eyes/general/male_old_blind.vox new file mode 100644 index 0000000000000000000000000000000000000000..9e0687a34f12a03aecd00bf8e8f82fe5157515a8 GIT binary patch literal 1176 zcmbu8Z%7no7{H%94X>}=M|CUrSCA}P7ayiEuFnQzW!6ecFdH#=iV|&I#jGS55|<2OFd4=0OOj$z z+oUnASTu-n#wf<=B*momN{xvjVaZ@fSTrh0ib+|y97|j>YTdrZopqw?#|4#OFo^U# zVAr)t^34D6m)Xq3L~}gFb@vZ%B*kf=x_v9IPiwJnXTIC)QNTdZVv*~kw%sE9eq z@|m&qTX95kD48lCySVYQ_cGuj>a)$k1EJEi=6ZYZ={=#{GA*plJiu+Ok{u zO?jvcoe-jzg^5vN`lk9$VZ6@@6^mit;Sfl;*H|MSa+UFBKyH*O@>QHzEejDeCA=`oR`?>dA*|vl9Q9kNL@>A zZZ0Ku8x@=1VSA|^S4|0f->YKa>^h=f+4z0h!TjAKzR)#e5n<-Gu=uMG=qluDsEo<$ z_5ArqE55!I`oA@E^Ij(Nz|*)urT?*`!6di<5Fdq;*t@nd(V&=%4F(m z;r=0gx{(NWyB)vZ&-=S>A)x?izBI92$ z$z)K^?B(;1kBiTBuyqFCF*tc;l+ZUZ?#w;n^EU$?WHjH-{x LDvrLA)3Ndxv1K$p literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-4.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-4.vox new file mode 100644 index 0000000000000000000000000000000000000000..68acdf39aefd8d200353bcb52e5541b40600a6af GIT binary patch literal 1692 zcmbu8Z%AEr7{{OU?|06*$I9hZr!F=BG_S_|n`YW}O>Mh6HD{T-Icc$xCSyZNHW6dH zHD<%j%yfavEW{#a+eM}5g~^gJSYzBq1SMlc^tKlfz5DjP?Oh>39r)bu^L@_m{GR9c zoO3(dy0WK4q@^y@N|7^4q$3n=Oo$s^KJoyG`>y@rP?yet*Sql_PuE;xC_^)qp<6^T z7SCXwIo;GP-PBBjYEUgRY!OYFx~@z<#}!nID8@F`p^9hfE|CONbBTDaE*JC7#88s0qvyQxv_+wTi2i##8g8jEQ1w81x1`QSsPhY%*^t_M_O3Vn2#=P#Oou zUKD%b8ls5JoI@3xb!@7mG}lq=g`S9yo`^>!lE6IS1UYY;v!EJO%jUdo*0EW~=Dcmr z+h!e`b!^Vt=Dcmzv02CFd2QCAcj<}vs6;&Gi6qbyO*!1p;qwmrboji(c~KolcO9xr zPsB%0#H0793G_s>UCkllxLnV7>+;wyPv8PGyZXj#9}c-qfy+Q5bU|Qj$HpA z_|5Of+FA?Z*QL-hTANF7@IVcQ2b-}x8p86#K`c)nL)G$8BnDHE+@6l?ks<_Ut09dR zq~8abdl0gog2Wa<>Jh=ValxaP1x~-`~BZ&x~Ou}0$520aL&^{@6 zX;E{~NfE4&@5s+&^0;8}9l_dy;QAH%pkS_1@cBN$#>;{*{qau0 z_#x&81@!?z&*Or@2Ehg9+bh!1*O-H$_5w^DF2nG1Rha6n$Jf)Z0pHA_C^rSQWm#z6 zRe-~tRp@ULL=FgMUlpvL7gT1ZBUG4&?#dk)XsAYKVG8;xGBCC~A4@&OXsj(o+tbwu zKU0VP7h5rOG>q{#`?0ie8nLSvu{6_-wU1wc=Xuzgv<2DO*(eR*9Ou@3?`1Uf{&^ z0wNzR;av18-uo(s$BvC+=c!pVzrTu(%P|ClLEL34;t>1}BPO`>#l8OS@ca6=`}_<3 o^*`H8<2N_E7tgniWMc365_rWPew<1A$J&Zu0J~btHmf0j0*ELrw*UYD literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-5.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-5.vox new file mode 100644 index 0000000000000000000000000000000000000000..bce8f1b2ab27923da46fc1a914d6f8624f63ee52 GIT binary patch literal 1904 zcmbu8ZD>|y9LE3WocraR^Sm_Mi*DMsrl!vnbuVq1rjO~;IX9cDrB72blw3oUQA5Wt zbR{iO*BYA>ZLJt9LesI0q7ODq#4wR3iJ(LzqOX03=-bux=(j?GI`HGVumAtt*SXJq z?$f+^Yw>`H)UT;+ph$}qX{t@tL^Fn0NFE|H$kuJC+Ql9RyuKmIimR2$9gZEx zP(AC?yYw!->q^XZ0^(YaJ&!$)J&!%lwZ!#V_gN>J7-CtIn8$e@=PAxpuCmI}R6{Ir ze8suS@rWXt7-EUfp2U3z4jnT(hC(8Om zns74rz~{H{UB$5`hGR>7jwSG&fJo@O0g(tjktjWp7(J0VJy9k&txYhbY{2~BwDRfw zV2B}(Pb3VO6EG)W4trYDAD z&6+ZqTGZ7<=@>P}Ueqz1v0w1= zdBMS(oXhOO))LI?Dn->q60_TLP;$HgrK3eCySe}~TLkkCGkZX=@{&NFG)lY)^N!RK29w_g#Y=npgt zdUvtjAy}Ib?07=Zu}*M`^~TBqwAPfMvvDB?c9)~;`DzU8S&Od+UkAP&!J@f&SXo|# zy44G@ySW-|8wK6l1;eiiE}axq6&9ejbRJr&mY{vzax|Cbp|x^0j<27Oi5*K(v$71E zpIMI7vun`yQUf~orO^9U8z#n%B7ONRCeE~A`r}s-i9|3fdj^V&i&2&+LDiDS@ML)c zy>HIJ`439)!?jY}zOe{r_{@n>!Syc%KYu6aY+Z;`-4(cUZY_TMu?g+RvT*#999+Da zkJ~8v&+k9|_6zuRwDo_#e?>(F-mM9IsBDXykQ-k-v;h_Saox(!AF~1+HR`g-lv7?x^Vc}wa-oJ#V3uz>iN!;a9#3%RzURrSHi~H-l w!}IlTeg1{_{<8;Zrum>=roQ=5AvT>{hRD(gemax=k9#YV39N1?f6z1JFQLgc3jhEB literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-6.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-6.vox new file mode 100644 index 0000000000000000000000000000000000000000..4575c30b9c4b4cf8755cd25581482e8966235ac9 GIT binary patch literal 2640 zcmbuAYiyQh8ON{Za37w-`?ix(2F$_=I9kj&3L>}_q1y@rWGHTx5ofkYZI&&KlC2?_ zQC-A^4Y7flFcD3I#tgTnB^p0qGs&`KE=ygEiIQb8#;<-b#&3Ur5BsJeCi>?6z5n~V z?!$H6$M?|whnJr-v%Ncp_93>tG&?vnJXkjdA580n4tV&H;i1}7;BzwJr%uxXGM^>6 z&r%1TvV|-yz$&!DuCt_o%vFiYt2EEi40ZXigT&`)>hmN+bJT&S9MFhb$ddvr=4k;| zpck6e94$4{*qiv{AH3hw!;RO<8y8}ckZwQ-;@)V zCf<>oV~&n~jRCh2d^~x2#%R{SFN;AILkf?t%7!_<=nP z>|tPy0`Ws?F%TcSzy>SP61&0=R--lk7Jjfc+78UANLl$L)&=_!nPZb6s#T7q#ct8MN{se3`r=GG!$tDIXG+&0V3pC zNRmh!$RLLz7My`1Au!*9*l3BbDu|6;Q^!0C)W|t$(I1Uy(b#R~*d_)V(X@jyhKP+w1KRq4LI-+Al|fV=FAw7gKN^2GLPpt_*pQdlsONEV%>xy92OtLr9zv+nG*)QhP)0VRj58eNn9hTqxTd?{0c}-7G>w~kV2VS|Z6K=hdNE?c1|Xk3G6g$B*sN?5QEmo_$QS=bzS=*{9Sw(5;0BmT38jHR`*#RW|5k zqowT9M`YK#)w$QS=tg=`NkR>o#3pw@~kWda1PgPEDHWD*PV)0+Y{}u6)llciHsT>(~RPOM|9gJY>4@ z71J>GGlxuP9>;&ow6o82Q(XH(pmTAwutM$a8EgIcznt0T7@oT1QFPS#?EYVQ^N*&&Ox5jpD)uH}wjci(~ z)Az5^%#pPk+`eA>@7t>3&+gFZm-cD=sbQV@)~IGKKd<>WUeU~j!qf^?kkCeD}xnsSSNP^UXVS<%hlc!(08j@y;4uAm+@J>Fr;c{`@=B_{eI#Jh4&N zU)`y{{qdm2Ug*^6pLXf>cNgo1mi^E3pZoR~^w+78|9k!$H*VB-w_McP^_R5m)JZL# zSgbdHWP0z5CQVJLudh!>R~*xW4@}D@#bai;K&azhjzWzHS}RnBV)Hum4uhExdWpZlz7-t?C;8{u4cV@TGOC X)>it{g$4i7cGEzg?%lWHRx#{f#cD*J literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/figure/hair/dwarf/male-7.vox b/assets/voxygen/voxel/figure/hair/dwarf/male-7.vox new file mode 100644 index 0000000000000000000000000000000000000000..8dc38f5e3a2cced3fa9c5db7d9ef84d1c7331070 GIT binary patch literal 3048 zcmbuAU5r&%8HU$BYwz{D_Zcb!l%WC+U>PvwR}jH=5U?F6AVskqDY2%F;G}6ol(Z9q zX-6Bep+%fPO{j=U(3oO7nIRf4kW|t%sZBEyW1^&KjL}OkjPdUE+2WOknCMBKyx;e& zwby#j`q_Km?gtm1HpcASJhTfj*RwHuhlaP+ZNhKHzvw|9d}w&+2fnQu^XI}Cmzs`G zO%c0w5xR9JM)C%T19hL9A_Q{V=>%|Pr--&w_>vqVxg!tla~%|7J7#PO2R3(#8eDEV zb+=?3%Q&`Em6ow=$3uV!skB8|(FP7Y1c;C-TV%9!C^*KjK6Y%jof>RyiyFKwi(pH} zFAG;P9|VYysFhV&R8`6Nv_XIfiF$^TKUjeS4*?=1M>}fy<28hawW%8BC(mVJ>yr6P z=C7E)>O}mxvSNO6h;7`#e^oJm#r)*N0gaG|GnB4ke%ir1+R+G!IHT6n2P#hu%}^8D zP<3i3n_T23eP-c%z19sKEw@H`*f_$ukPJM!`1p1KTABSK|$W=N#eDwOV>S`og=0 z^Wh6udDhS4(c{tM(X)0Qe;$9dIoi+&i8!Oy(+4U~ABd31Gt^*%$0r(5u!%a@jDoGH zgKfyccFDWGh@9fAGWsjgW{lSWh2M zA2gvEYGNBuurc71JfUDSb+9#BlQ-1CcF`{5bC*5q>dJ_}h`)%x$bOSou+_XFO*-XFO*-=T7CR zgNFbSlFvmMa#01^z(artiF!uM$g|+ULx2bga^(4lw?rRs;2}VS1R1J!Ju(UoJOqf4 zAVV40j~Xw$v>kW|5FtUPEwk4Z?-|E?#zTMz392s7b#vj-01*!EKCYXOls2F@Y` z+n%$Ud(HR9@%?FI%lN+L-V;NB2+7y{hnh7(BkkZJK!g;jC+grKK!lX2XX@Y~K!lX3 z*PM--Is}N2plZ(yXT(FvIrrSV01-TAK0pLV?$Au1+@3YaoU59Bsaf+nvtIbhc*x9` z_$DU4tBJc<@y)FGR#v<}O8S&|E%9Y}*7B_7*$3|Z_-0ey{9aE_PitagLhqe2y6@#{ zTGab@{k6AOSFi3=`+H?*O1pNf)FTgX)X^h5GPx$)R`x>e(DL$7@VzHd-}BS z*m4b=+aR;8k{L-d=ieuDZMJ6YG@A3c(H$p^KJ=8omtx-pP}Jr zX6hT4->&sW6wX-uf<1~Y2Dr<=q2iV*7oVpwtkK7S*p{I zt=7>`uh;2=TlC8_UzUD#UdtEF)~3}9wBw$odTif%jchj>d)VmQmyE8wXtZvApN5t# z*8X*O>G0MK+P7@B4y~Q16ZbCBAU^&iwiM%93&2z44SDef~M!eqfH?{>c(u9-gaHtku7-f7`De>!H1G>F`16=`$BK z_Wen{F!8#+{flXR_{rnC``L5a@trH$`|7j?2M6^YR!ji>O?KMo-Jjj`_b%t_zqNA< r|9Q`DrETM_+S>Z=WAkU@Sc5p!V>{@-RIm|x*9Ai-R literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index 47c00b6117..e2eac6e513 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -216,6 +216,7 @@ Some(("figure.eyes.general.male_scar-0", (2, 10, 2))), Some(("figure.eyes.general.male_blind-0", (2, 10, 2))), Some(("figure.eyes.general.male_old", (1, 10, 1))), + Some(("figure.eyes.general.male_old_blind", (1, 10, 1))), ], hair: [ Some(("figure.hair.dwarf.bald", (0, 3, 1))), @@ -223,6 +224,10 @@ Some(("figure.hair.dwarf.male-1", (4, 0, 1))), //Some(("figure.hair.dwarf.male-2", (0, 2, -2))), Some(("figure.hair.dwarf.male-3", (1, 1, -3))), + Some(("figure.hair.dwarf.male-4", (1, -4, -3))), + Some(("figure.hair.dwarf.male-5", (1, -6, -3))), + Some(("figure.hair.dwarf.male-6", (1, -4, -3))), + Some(("figure.hair.dwarf.male-7", (-2, -4, -4))), ], beard: [ Some(("figure.beard.dwarf.dwarf-0", (4, 9, -2))), @@ -246,6 +251,8 @@ Some(("figure.beard.dwarf.dwarf-18", (2, 8, -4))), Some(("figure.beard.dwarf.dwarf-19", (1, 7, -8))), Some(("figure.beard.dwarf.dwarf-20", (1, 7,-4))), + Some(("figure.beard.dwarf.dwarf-21", (1, 7, -8))), + Some(("figure.beard.dwarf.dwarf-22", (1, 7, -8))), ], accessory: [ None, diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs index d165a26644..42b41b6e37 100644 --- a/common/src/comp/body/humanoid.rs +++ b/common/src/comp/body/humanoid.rs @@ -311,7 +311,7 @@ impl Species { (Species::Danari, BodyType::Female) => 4, (Species::Danari, BodyType::Male) => 5, (Species::Dwarf, BodyType::Female) => 8, - (Species::Dwarf, BodyType::Male) => 4, + (Species::Dwarf, BodyType::Male) => 8, (Species::Elf, BodyType::Female) => 21, (Species::Elf, BodyType::Male) => 4, (Species::Human, BodyType::Female) => 19, @@ -347,7 +347,7 @@ impl Species { (Species::Danari, BodyType::Female) => 6, (Species::Danari, BodyType::Male) => 8, (Species::Dwarf, BodyType::Female) => 6, - (Species::Dwarf, BodyType::Male) => 8, + (Species::Dwarf, BodyType::Male) => 9, (Species::Elf, BodyType::Female) => 6, (Species::Elf, BodyType::Male) => 7, (Species::Human, BodyType::Female) => 6, @@ -364,7 +364,7 @@ impl Species { (Species::Danari, BodyType::Female) => 1, (Species::Danari, BodyType::Male) => 16, (Species::Dwarf, BodyType::Female) => 1, - (Species::Dwarf, BodyType::Male) => 20, + (Species::Dwarf, BodyType::Male) => 22, (Species::Elf, BodyType::Female) => 1, (Species::Elf, BodyType::Male) => 1, (Species::Human, BodyType::Female) => 1,