From 9328ac4f728ca90df2eaf623f671e040c5909637 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sat, 31 Aug 2019 14:26:50 -0400 Subject: [PATCH] tweaked hair colors, head offsets, skin colors --- assets/voxygen/voxel/figure/beard/dwarf/1.vox | Bin 1824 -> 1824 bytes assets/voxygen/voxel/figure/beard/human/1.vox | Bin 44347 -> 1240 bytes .../danari/{male (unused).vox => male.vox} | Bin .../voxygen/voxel/figure/hair/danari/male.vox | Bin 1824 -> 1824 bytes .../voxel/figure/hair/dwarf/female.vox | Bin 2472 -> 2552 bytes .../voxygen/voxel/figure/hair/elf/female.vox | Bin 2676 -> 2676 bytes assets/voxygen/voxel/figure/hair/elf/male.vox | Bin 1880 -> 1880 bytes .../voxel/figure/hair/human/female_1.vox | Bin 2736 -> 2736 bytes .../voxel/figure/hair/human/female_2.vox | Bin 46031 -> 2924 bytes .../voxygen/voxel/figure/hair/human/male.vox | Bin 1824 -> 1824 bytes .../voxel/figure/hair/undead/female.vox | Bin 2012 -> 2012 bytes .../voxygen/voxel/figure/hair/undead/male.vox | Bin 1960 -> 1960 bytes .../voxel/figure/head/undead/female.vox | Bin 3300 -> 3300 bytes .../voxygen/voxel/figure/head/undead/male.vox | Bin 3016 -> 3016 bytes .../voxygen/voxel/humanoid_head_manifest.ron | 20 ++++++------ common/src/comp/body/humanoid.rs | 30 +++++++++--------- 16 files changed, 25 insertions(+), 25 deletions(-) rename assets/voxygen/voxel/figure/eyes/danari/{male (unused).vox => male.vox} (100%) diff --git a/assets/voxygen/voxel/figure/beard/dwarf/1.vox b/assets/voxygen/voxel/figure/beard/dwarf/1.vox index 6f0eb4240a7300002019639f0e8e8379b021ea75..acce14a4096b3758fa41d55a1de010ffcf186d79 100644 GIT binary patch delta 281 zcmW+xyG;Z^6kGd!=FLfWJs^-SI0%tI1QbF_F@(Te0awF9C0hk85P^3C>*;xHkKg5R zIlPZ6AR3zmDVRA@Ff({KQ}g5d=^mk_Bn+G2f_Mob5oIJpQzA|xR&w&hxWP*YtZVBS zZ+L!$`HtmHOhaw@Qb>{BpfC|xrG$Q pna4ZbRBX{%rfF;K)Geuo$?z58_t#$LNJ(8R^QrtlX+um z>IZv!k*9@fDkz1#;j8$ogu}qOYwQ|Y9cZD9_NBe4KWM+CLQr9J4fPMrOAG}@NLByV n?vW~0C7P=9`ly|$o2d!J1s8$4@b;UY%g^WiKCgc-JOA^4=wcS^ diff --git a/assets/voxygen/voxel/figure/beard/human/1.vox b/assets/voxygen/voxel/figure/beard/human/1.vox index 8184647295e105b68a9aefc6833c6605ebb8279c..227e10ef98b922705e6c9e0b288cb8b4f0005dc1 100644 GIT binary patch delta 52 zcmdmei|GcZP?&#&!ZZd3246={KOn_$gk_@8F5w_|Cr1Vr5TAj;!ouSJrcIkRuVVVi F3;=S`4$}Yt literal 44347 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 S|K(kt&*#76@%V9XKlTsd5ge`n delta 433 zcmW-du}uUq5Jl}j9*?~%T?8T^KrppNeXt`5iZ z_EMcOBc>K|9;xz@8DnE9bA#v{G{=q{FJ`Q2W8z1`cl F{Q>bo8Z7_- diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female.vox b/assets/voxygen/voxel/figure/hair/dwarf/female.vox index f85598608206bce574498444bc483ead0f8899bd..707596f7802e672fe9cdb71ec6689f7524048f7a 100644 GIT binary patch delta 793 zcmXAnyK0p|6oqH)x&QYNK?EU+9@5x|NYpN-5J3%Ch>ex4g>RsRrA_$7XGkX;^CYLX zu(0$2w9;?1Sgbv_Z}y(q=lj3*_gQ!t|Vt?jrY7E!QyAD;gUDdJ@abi9(Uo9!P-h%5aS&D3kTA%1-qs(GfhkE9? zR)Zqrqz>=#Uh9PpU&)0IRhi2uDZ7HQTpTPjE`f^u#Py?U?$Ll+JXuXBHXm^mnh!V$ z!(H#$X(ZL6^`qUmEyr00BPp5S39jI~Ob(?tS2^26T$x+H+u=rmd_8#w^7qscsK=Ny z#zvi9RqHK(XCv`|vS5yyy+u69@dl3UOE+5VCaoX*(RH4lzYP3enNrk^RNT#06R4H`*`(rrr`|vjz;WgLX?Po4-iF^kp2}ht8$q`xzIaxp>Y?B cC=nZT&mTQJcHw`k?{>RC+wJ!2m-yTN1v+Il?f?J) delta 713 zcmXAny>1mT5Jv6Kx*S7sG~-$Ocx><8>Uy>F?&9*{cjw&e)0b}u?rO8MS3ks_I(NA_dHzhH z&K1TPaUmlbF%ly&mxT&>>M%}qrcA!M-uo=&r2;4sL6O+8rBYccYf>W5%*oUfv8ciT zBk-MiW^L*YH^Kn*->ixuktgbjI+={z$P+6mM73A`Y_05>><1VXJz9v26GUnW+7Ey5 zUd{%nlFN{kU4bkYCt^}DP8{YmH&e|cOwjYWYJ%7!;|SIx-|vbIfef5AV_`G_ zq;|Ra^7Mnu;W|iBM$_4AroHK^lLiDw|FpwqzCSZAls## z(!o1>#rn%0HBpY8 delta 717 zcmW-ft!~vp5XE=T&dz=j)J0u^C`|=|T#afFiiV{5U-B*_FGLrz=yE5wT5dDB8{q53xH`kHky+2-b|@iWxiM8UGSP~^`>m#_@wTtsmUY%kZoycHv5g>ory(ffg;M4GUM h-R@?Nh3dv^eb@fHy16;p{k?kUhrE61{pwr$uK$F?GE@Kn diff --git a/assets/voxygen/voxel/figure/hair/elf/male.vox b/assets/voxygen/voxel/figure/hair/elf/male.vox index a1b7459ab117bfc7f5da2747590c0dcac1403274..c54c03ab97b884cd343a7794a24d06c53b132440 100644 GIT binary patch delta 584 zcmW-eO^Osj5QXzaL}ug<4DM7KX@N4&WsQgqg3p zs3fZLC*Jp7KHfau+<$&2^`hFFO;sC4wWjIK!cwQ7hg(@|wxY7ptrfG9raBrmtd>w| zZY!nJ!|QJfPqUi5sZ>+YIqB3(u~B3iuG&(AMjD}3Q~2AB+i*hfPGRA^dpXlPEeicm$cv7RNYUx)8b5#}Gr5kOL-&Rc*X*HXRm-ay*)-00soLJy z@x4aJP*!3{IRJAvjM5}}$KrNp$G2E1SRgj6PHaqSV0pW@<0q9G1ms$kLD0)kWNz&w z4bobnM58bWt#GB=Kl>nUul(>)iLP^V`+Yeal{)q?2yu4l$M>&aN|ft!xm=#l=kwp+ G{^T#+s30i- delta 584 zcmW-ePf7(b491%;ZQ9O&xDZqx@(@?zR@b5+?p?W1+<6VJ;A1Y}9lVSO@C2?D1pW05 z6Ou_Y`Tq1{=VRyf@<`T_N()U^)I}cQp{%OS!|GIu(3}f{u1Hdpl5X9cqpb!Jh{%yG8)UB4&>C8!y6ERR~6_(2_- zgh8>vA_mCFiN)IhAD{wY(620R+iA5v%CT z=CXnra`j5Ktl8n+INO>aRdlBqCOLuLmZ9zhvntFN1v9}vo{E+Ot&i0kf@;AAx)7L# zV2~!PcLXl?S|1`MApr-FIYD_MXJUEP`a-GD!QHtKCeT2nHxDK;YS04=P{q!~l`fw; sGcCKmI#&hP(LCr delta 48 zcmV-00MGxh6|fbsa0w$IARzx}BX<8xNV5L`gL?lJauxr!mjM5vMF9VP8XEr|9v-uk G2^|6P0~5Od diff --git a/assets/voxygen/voxel/figure/hair/human/female_2.vox b/assets/voxygen/voxel/figure/hair/human/female_2.vox index 425c47785040a081985e91c8d167a20e244b33b3..89a6e8714b39ceb3631aa8524caf59acf82d9179 100644 GIT binary patch delta 33 ncmX^Aoav32P?&#&!ZZd3246={KOn^r!M#z)kA1T?Cl3n%r{xG2 literal 46031 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 D$h?r1 diff --git a/assets/voxygen/voxel/figure/hair/human/male.vox b/assets/voxygen/voxel/figure/hair/human/male.vox index 09958c43563c96b6048cc2c04db52f5f325f50c3..807e008c88339dd1ee37f25fb718cf9c40b40472 100644 GIT binary patch delta 539 zcmW-eyG;aP41_)7*Z=QI*T5kWB1mX}1QKFsh>#R?4Nw9)S|GWSkdR>ZR{GYq?Db>z zWB0Lpd%Z?gb9A#eMq_r7U0@Y0okk~&c>ml#AuO<1aLP^t#~Ej^5iA1|g+Osp zqa};#h$ZB+I0dqBxWN7e)*90whI0{XB-a#`NK182O-fBnZ6cIgAUZimYQaXZ>E2{C zTuk}7#Ud1E$Y!Hmxono=l=ZPI)hL+7R^j0rw-Y^zB{dGexYUAh5r8=)2&q%4GhH%_ z?M$5?$}P$*%1zlRJ2qJ)!BAbB35ZRe&|xMZxm@vvq4Zs;-}Z)UFZqZYX{KP+ol{z_ z9#ThCU@aHq+KQW6o>zAgvM@E)Tv|y>tEB!1Ia2dehZR#iKR(=B*!ek~PJhSa@$1Te F{2%od8m9mN delta 539 zcmW-dF-`{3apjbh}1!$n5hC^@-N?OofV2^;r74}3_AR#R;JJOpU zJ5FN%{bs*;f4f#hs%I)EJvB05s3#HGl$l`32F#NC`s-Pb~|t)6u7bbvr8H@8nlKFRdfJTn=14p# zK^JtO1MO(C->J(|z+l?b7>rS-P1MDSf?_-M{AHECSX;ZnGlG>l2VSnV;SR(Ex2Ru} wHN)->+TKYV8&E1<;bp-`!!O~L;aM=8!}H_AeQD+NeZL%!S7$$8+xlDo0VP5i@Bjb+ diff --git a/assets/voxygen/voxel/figure/hair/undead/female.vox b/assets/voxygen/voxel/figure/hair/undead/female.vox index 13c463bbfdd46fcb1edeb4df27aeafe3fd9ec30b..2a600ad5409c56ed18a299013f34422342abec4e 100644 GIT binary patch delta 129 zcmcb^e}{hqJEQC_P7bzR49rZcxLAQSJKHJ-HXvpNVivYtlT{dvId?IzvI0d}cWq8! zRA6P7bzR49rZcxLAQSJKHJ-HXvpNVivYllT{dvIe|P@peXCA%?XSO ztj-h7=l|C?T=?I*v+2KNv*iEdix~c2iDvk}T0`T%rl#iq4CS)_J|3I?Gc;HI7cCO~ ezim3h|Anp$|Ldfr{>#b9{jXP@viUHZBqIQ0XfI3v diff --git a/assets/voxygen/voxel/figure/hair/undead/male.vox b/assets/voxygen/voxel/figure/hair/undead/male.vox index ee784ae74898fe1812522dde329beeb71b8952a7..2abb14b1192f420c39ffe8828f164c81897348c9 100644 GIT binary patch delta 33 mcmZ3%zk+|m0~Y2xckXO{%rcRYdDEs%lgrs;!2;9S1Q`JgB@YDv delta 32 ocmZ3%zk+|m1D44TSQR$0mM}6iG*?Y7XOm@4>2BLRolTGt0K*Lm&Hw-a diff --git a/assets/voxygen/voxel/figure/head/undead/female.vox b/assets/voxygen/voxel/figure/head/undead/female.vox index 9d7f4c4917c6b0470ee930a66dd27d05921afcfb..5e98230e45b5c29d2dea6f756e6ad93a890fc238 100644 GIT binary patch literal 3300 zcmbuBZ){h06~@oK_xtDGRSlC;2F%hGkQU5b0N4G6D7-H3~!Aw#&?gO^TQVlzA(}Lcz)l1 z=X=g`o^$T~v1jLlT_?6EY&b%x+$)I8d@K{5-NwjGzG7 zeMaAB4HEwODyqO9C_qyY!}ma0u?I4-O9LfqQ2V-I4lsMV@H0LHb!PBlbfg;dnq$sD z2`n%NRj2_Y982a!V(zi=QI@{0u2+`u;Wq9IjS~8Vz*)F%tgDDNfQz^%7WSq4ESUS9 z;5m4F>?{_I>)7HM`Hn5N7;?vBG7<|`_+xI)H!`ou(Y0|qYULpB?0bjF4;-}fHCPvtTB zS5PBQw#2sbgrQ_`3iNQG76DxY&q9Dxp!WjLLu?^4vd5LkdBiTdJs|?Z1bRN;JGvjZ z2eb(A4b&~5O`zTZT>^TvKGZItNkEf8E`d4(a-3CP zYcC~r3FH!}MWAN_B&jy`bOXIib=k)!c?X`~KmiE{7^zo4_rP-;&?%sIK+8aV0@?+7 zIZ(^Ma}uaapht;NH1LV!63Hn-B9dby*GSH-4;n<*19B04YT_k0W^$_G5xHM;UZZD% zZ%yo)c$s_?xkoffXpzZ1afc@Z8?xd&a-P_azVB=186U~-pix4<1P`9BBI7rbY=k$_ z@J$@&hVBjd)U;Y6|41zodNt0;eR=1hLDS;K8vEont}JPXT#j zkFSJ%#t)r^KUAl#+0W?rgw{2hXV(QZ{?7N@dEYl)FV@NH<>$mt+=+~lvq(NQzZuzk zkx#-;?HtiNd0mK+nAeO=i;L$&ukcJYAXD$i7`?~gAKka-4AV$2#a1sc@-j-;Cf+d_ zL^wt7UG_b4q=$L)Q;!M_JWKCpuZ#a~`fn-lGk>-~28o`_py8RTK?cd^zK2FN$RL4+ zMyo;gp7qgl;C+_i-Jp%Z(|BH6Z&UUR8{?kg&xmEj=gDIP)X}K1c^{y0M!%A=WPIS> z&u+4CHfPKCbtVo9=t*vKF=fQ-5!7*UZdz`QNL9)7r6Zr5<^BgT@bS)AW%+ zO&@hI8;UGvp-c)5B{ua^x(*~l%jGar>*?$E65rn!%sZa-%F#A~K{ z#Ps0_(`?oqub9?sZ`0PtXKCn}+4}Cqk7>)eY1gFbE9Xs5UEwaiJBPcqczl`GPW5ZS zXuGI}d&Aq05pE4cV zVtSGNU2EoRc%WNjyLxouu|AD|VVzFw->l!9{HFBVGg`i=LmT@RYTMmCdTh@+jched zJZw7s4b!C;Olv#mYjD|O?Ol7PMz^fjo@E^xUb8?)?_Hv)eJeDuag}!7vtC1=+oX{% z@6gzRAszenh^Edxr>k$gq^VPTHS^Q2tF5g~x6Qs)U0q#T)!VJLcYa)-?(5aDZ{4o* zFL&z?Z!Occcb4lEF{jR&-u{*8&%ZN`4fp89iPgIN>Sq1*kGnPc{45>)S-W1pGEdjE z@PE#K<~v{1^|QnOcmAtauh#e1oz{v~XSCtSvzj+CPjCL%^zN5Tuk`e&x3^dO7ah|5 z_g#=pjA_p399=wlqlSm)(>tA=dV0yE?%Hr%k3RpLZre9k@BDm;E)LDpakRQwf46gA z5AA+iqx+?&PM*`mPp0&}3vcL$zrLzZ9z3GEo;|H?Kf0vduU%Dtf4|;0$!ef~sJd!; z@0U0Dy+?ojw{xDt)^m3A*w@$B+V`)U&px=`dAL*ezpzqmE86s@Q?viWc1?e;?%r|3 L*9Y(Y+pql#58+5Q literal 3300 zcmbuBZ)}%W701u>JonGhHvk^ z=bn4+_k7Q}Pua8cq0WeQ3Y(E0CmM3ZUbe74P@>v4V0__8}MKbQZAk@e6Qfnf^%>yGo!;@ zfx)W)C9uF8RG|SF;aD;+5_7+s7|>^3%~Y0%;XWPT9sP;idWaP&Oz zFPQt8;5qpH_*rb!EQ%)2$UU)6Q{w1h@ zdH!XA4=6w=uro#j%t6uYf#OhwPla!VUuAv<%_1Pj3M~rP3w{+Emu`n!1*Zxw6&wm| z7U1f2a}Aj%?^$#r6ub-gV22|i;o~)MUyqB;80nKL!Hu(3WpJhc$e}8+`MLnk-R)iq zKks+Ky`V+~nw0ofUPtmYI0bq*P>X=BfwvIg6zILcdx%YBMr_20>__~f`=dcX(?HJ$ zVn>ey_rRqAzJa<05((5hpi4lHK=Ogw1vCk0638V`hd_=2?tvTw`~w^VIRtVF&XK&i z20M46f1u`p+Jsab3gi+HFwirBTm!uo&@|A?0TBZ4FpziP{Ra9VkawWR1NFk45j#3z zW`qm%VH}jpPKlyTN^#d=t4xG)ZWY$vtr(?*nA{*Mwg7n5v}}j*S@B|GPTOCJ7ev0f3QtZ z5AP+fBRQFKrYU)T#P{05g&ZOx`}NuP=y(78`o|=@E}-^rzUR*OzV>>tPF^qH$2oB( zGDh~IHwb?-c=GV@eEl-w`f;xdcW|8E@Lq8)o)6B9HQ7nScJ!dqD^ipj0 z0wZsicH!Gc9v~7ldhhxl3hs^caP}U=R&$m=3aq^@%t3bep1&=SL89j}sGA=NY>dh0 zZu3S286;3QFK6vN3$o_``3&zGZ492qdo}nNHp9m_XT&q^GVV8OW7Ny2qfuj{2pNqt z`jw0&;{*48b(4h~|5sVJZk@))#`Nh4(|xa8(Zbe$>hGeNB4ojRadeQlbvt6iN(ma6B>dRc#z4c{U=`+3=wHqF{@n)`(5 z_T#2I-!e6ZO`jb%&1T*9hH3To7HxfEmIj}ht)E=_g0_sAc1@VRbHVh~Rn8K-W2j4u z#(K48vQP6zTGe%|UA^ZPXvMorGUItFcWHE2w@yC3Qe)p-tCRaT>-VRAAboIFOBc3j$i>u-PBt&!(v>DVt@ z_4d_yx~>KPbN5V!_j9oZ+xEK{e|h{Z<*fc?p9Av zkM=J-to!e~C>tNuoRK-Ybm~S8kF?V}9UXdl@r3T)a6*qg|D0~yH&-A2YOyX2&eI9B z`gi@^&tpBj`+beV=E%=x4vXrY{{ls=J>(qisLGtle*2Q(s@7J~hc2 zK>tv6&GgA{Zt(kr{`znGyu#)?yV>ZQH`{aj&LbVV|Hb8MS=ORIpPv06zN`CsbkB~J IH@n0B1zyTjb^rhX diff --git a/assets/voxygen/voxel/figure/head/undead/male.vox b/assets/voxygen/voxel/figure/head/undead/male.vox index 807b9d5659cf5f36c60cdddad2c9c4a824226716..bf242e1f9f8073e30b8ed58bc0c7ffba98701c33 100644 GIT binary patch literal 3016 zcmbuAZ)}%W701u>-22@7JgXWerHnF5E#TT>1{4Gl+=|d`g#j`Yx5|h!n^MWL*(lkX z2D5c8;=+d5z?Lu(4MDREH_{S~FR+*xIN#ey$Pw7-0N z?>*<<^XGfc`Th3py0`m;neEs-ypzSI+syV1j|_dl5B%K#YS4gt?;9C@DzoA5PX+QS z7a1f_mbs`CXOMiYLQ!YdG86^66hhIkPkxSNk{JCZY!gGBYWDa9HE4W~tjfq)b3hInkj;H%bl71nv4fO&Jbo)Gkc&`M zMuhAWF;={(Qbp|81HtdPoR}-(tcVRQ_xv5JzbD^{+(S0}!U?G0COaR*U4w|Ou1a!7 z=lcXtp1ZRXkhf%Uu1X32_{hNT;3KhCaFLKDVr$S-3~W?$4d;X|xAdtf`DET?d=}WP z;H=8XL5A-X>jD9J1o&{B^Mp_02$>w5W0=4z^-A!@o;TT7;%EXgP+=>>L1qutlu}{J48}K$d2QenUE)sinsDD4rA+X}Tj$el zAgj0^@e}F42tN^jREM?)v52!skI{fg z031i^8DS#QXOW(YUOV<|K`4xUqQ@f~2lfp)M9&GXO1HyY1lHuSIqwNl-5)bnQuCVl zE1x&F)9Q2Y4+rvAZ%}XER^(NA?a8YmuZq0<6Pc5U|I+iIAER@Ky~<~m`~InjrS|^g zUGn~hi_D#b4Ya)DE&Uz6=iw+hN7St5PJ^6m$kSscA9|TgS!q0EB}hJx&MiJF-eR8q zp>A+ec@KD3!*%lS1mylSQs+p`Th^&-Ko_`^eGa@f{xwD^pc0!!VO|@0laT09^svZt z4*2)GEr0m+v%fR+s0|~Ddrmvy;KTW0kKP@)H|X{e@X=)T?+BMsXY`qX1FPZK;G*`v zg%ST>6SuizP=eq;ttdeeN9CEvZZ4fb#%(0S*IvmOgt<1eui7 z(!1Y~`zz_3{oXGz`+FmJF!4kg3}P(ogCA|W|YlYlOG zJ@5t-y!G5XKHmDi#UwcpTj{am&mb;9df;A3Z34NJJ}1mh;b%B3JvU%ZKHr@M{b~M& zbAZ?2arpfd=co{Vct7IbR@Ob?T)aTiI84VY)fs8udbLVF^TfFvr{I{=26B849@3`r%7cXmR`#<&f z_IAzA?vVezJUpYF+gIs<`!{Oh(00un8P?442Q+i?QLUeOMDqqav|x9qx(}~V-{}pq zp-Oh}2HBYp%Px0l-VW2khfOyhGkyFOQ+?3%!AaA6&K)nA*6wK2wuk3wx60dlQ_x8oFCh3I`$y)L#8c#rv0BZ9olMo9{KLIof;kL(fICOop@+K6Q5tN69=~F z*C)Rz{pO5TEbY*yfhF30d#@hayIu#knI`Wyo&JXD(sQPDU7Z^4U#5NQZq?Y<4cgn^ zq0zOAb@a~Vn%=)sLz`A>*Bu))^4ZNg_@$j1e`G|*zI{;B=bqM;*Iv~0sePLL$=B4@ z)~1{0->B~HZmsU?(YjkdrcVv@>DW^@>--OU^!qpZb@iMJnnl)?mz4fQHa`hQ) zJo2O#O)k>wKQg`ZMbk^Yz3S`h(}AUjboX5sWRv4sFt$J!PhP9x;ZAy|t4rTnKBe0> z9@m4Ei*y{WuIJzHxvl&5ys5DR(&H!3Y4XR@diKI=df``B^od80 z=(ZD7snSs+yDRo literal 3016 zcmbuAZ)}%W701tW?|ts`JgXWerHnF5E#TT>#$Wj(xD}z>3Ik*)Zj}*dwn%N3%|^-A zG?=Y(5f>a{12bVmGz85u+(=6_zQAUZWyxF?T#Sj5xfs*E^o23L`}#RQ-f4)5{?hO7 z-h0lu=g;??`|JKa_jjK(vt3(351 zln@lE{DITJ)w*yQ`q0ujPsAjTSW$x$S!D9c^b0}(Vd0ULJer6Mcxx&+sMtq}XcBTz zf$V^zrbGrRkU>Lj6fjqT%pP~#_Zjez^;Fg!)Htdd~w(L zbRWn{>=SVk^T$YVKi3J)5^_hs1}*u_!%=pQe8{kAkO%TL=ZE=B%yV`=sHs2}K=$|O-1-&n24*r) zXGs#J&j4KWlmTy!Lxn!k=R_fiekS@F(M4=3e+S+hz7kDJ%wEafyf@5diHs23V~?&t zp53+;kGOvJdxjnxqn{bO?Dp71a?S1seSt2vYC%s`7NRpk#NtHFi&WAwQt z=fHeWJpMC&c;g^CkQ;RuAb<#rz8Ac^03v(F#@kKq{;ZrsRtKC%dJ`!y!e{We=f5TN zDA3EmYRC)M0mH6vzJbAW) zNj6x@MsJdx{iy6phvw}vEqv5;>v7X3Up3XErVme==5y|N*|cs~n|3@pPs2~m*LN>{ zOxq_+d#6laxnO$o9q!`0YotfZCi=C0dO(ZE+SPNcQ~l?bX!RSnY2g9WvZwHU(zNBW z$v#i~@menwBzHNGSemSd+=8<^@Qod4@|S?O>e%&dBAjb z(DaM@OxM0@8s_}Oe$(-Xksmf~>oXnPXga*z^aAp|>pC?u*rV~iy*l~G8clp*gH9gW zrr(_Uru5shTCuc4Th=Vm&O3Yc$o>r)-C>%1&~)Y-rpwQp)^~MksDGIbtiN4j+c#-{ ze}_iaE!MHSmuvdqN)2vVtvz>b((vcDYV^yyHU8MJj(>Yp)90Vn)z@Ft^yved{pr`# z*4Cz5=HIOD?ryE_>(Tn#KcP>r>C^FNZq_8_Uqc)D|DKe)8|ZY{mS&0-iZkcXyxj& z+I;kBEt*`UH-2n-_e-XidwbQ_*QY~E59{80F3KjywP0+4E}gpG!y}!{PFI({wR}o< zY(AlfpLU%$Zs)!p*!Pyk4oOd*IUxH>$BLDyZ diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index 9ba9d36540..391373e8be 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -17,11 +17,11 @@ ), (Human, Female): ( offset: (-7.0, -7.5, -3.25), - head: ("figure.head.human.female", (0, 4, 2)), - eyes: ("figure.eyes.human.female", (2, 11, 4)), + head: ("figure.head.human.female", (0, 4, 3)), + eyes: ("figure.eyes.human.female", (2, 11, 5)), hair: { - Temp1: Some(("figure.hair.human.female_1", (1, 1, -5))), - Temp2: Some(("figure.hair.human.female_2", (1, -1, 0))), + Temp1: Some(("figure.hair.human.female_1", (1, 1, -4))), + Temp2: Some(("figure.hair.human.female_2", (1, -1, 1))), }, beard: { None: None, @@ -99,14 +99,14 @@ ), (Dwarf, Male): ( offset: (-6.0, -5.0, -2), - head: ("figure.head.dwarf.male", (0, -1, -1)), - eyes: ("figure.eyes.dwarf.male", (2, 6, 1)), + head: ("figure.head.dwarf.male", (0, 0, 0)), + eyes: ("figure.eyes.dwarf.male", (2, 7, 2)), hair: { None: None, }, beard: { None: None, - Some: Some(("figure.beard.dwarf.1", (1, 2, -10))), + Some: Some(("figure.beard.dwarf.1", (1, 3, -9))), }, accessory: { Nothing: None, @@ -181,10 +181,10 @@ ), (Danari, Female): ( offset: (-9.0, -7.5, -2.25), - head: ("figure.head.danari.female", (0, 6, 0)), - eyes: ("figure.eyes.danari.female", (4, 13, 2)), + head: ("figure.head.danari.female", (0, 7, 0)), + eyes: ("figure.eyes.danari.female", (4, 14, 2)), hair: { - Temp1: Some(("figure.hair.danari.female", (3, 0, -1))), + Temp1: Some(("figure.hair.danari.female", (3, 1, -1))), }, beard: { None: None, diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs index b3f866e6d0..f563615a35 100644 --- a/common/src/comp/body/humanoid.rs +++ b/common/src/comp/body/humanoid.rs @@ -66,29 +66,29 @@ pub const ALL_RACES: [Race; 6] = [ pub const DANARI_HAIR_COLORS: [(u8, u8, u8); 4] = [ (198, 169, 113), (146, 32, 32), - (198, 169, 113), - (198, 169, 113), + (199, 131, 58), + (107, 32, 60), ]; -pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 3] = [(126, 26, 26), (54, 46, 38), (54, 46, 38)]; -pub const ELF_HAIR_COLORS: [(u8, u8, u8); 3] = [(66, 83, 113), (13, 76, 41), (66, 83, 113)]; -pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 3] = [(73, 42, 36), (73, 42, 36), (73, 42, 36)]; -pub const ORC_HAIR_COLORS: [(u8, u8, u8); 3] = [(11, 11, 11), (54, 30, 26), (54, 30, 26)]; -pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 3] = [(0, 131, 122), (24, 19, 17), (0, 131, 122)]; +pub const DWARF_HAIR_COLORS: [(u8, u8, u8); 3] = [(126, 26, 26), (54, 46, 38), (99, 75, 49)]; +pub const ELF_HAIR_COLORS: [(u8, u8, u8); 3] = [(66, 83, 113), (13, 76, 41), (189, 185, 126)]; +pub const HUMAN_HAIR_COLORS: [(u8, u8, u8); 3] = [(107, 76, 51), (161, 63, 18), (64, 32, 18)]; +pub const ORC_HAIR_COLORS: [(u8, u8, u8); 3] = [(66, 66, 59), (54, 30, 26), (125, 111, 51)]; +pub const UNDEAD_HAIR_COLORS: [(u8, u8, u8); 3] = [(0, 131, 122), (66, 66, 59), (111, 54, 117)]; // Skin colors pub const DANARI_SKIN_COLORS: [(u8, u8, u8); 4] = [ + (104, 168, 196), + (30, 149, 201), (57, 120, 148), - (57, 120, 148), - (57, 120, 148), - (57, 120, 148), + (40, 85, 105), ]; -pub const DWARF_SKIN_COLORS: [(u8, u8, u8); 3] = [(215, 175, 123), (193, 136, 87), (193, 136, 87)]; -pub const ELF_SKIN_COLORS: [(u8, u8, u8); 3] = [(169, 145, 177), (145, 133, 148), (255, 200, 15)]; +pub const DWARF_SKIN_COLORS: [(u8, u8, u8); 3] = [(215, 175, 123), (191, 125, 94), (212, 128, 89)]; +pub const ELF_SKIN_COLORS: [(u8, u8, u8); 3] = [(176, 161, 181), (132, 139, 161), (138, 119, 201)]; pub const HUMAN_SKIN_COLORS: [(u8, u8, u8); 3] = - [(255, 200, 159), (220, 169, 125), (220, 169, 125)]; -pub const ORC_SKIN_COLORS: [(u8, u8, u8); 3] = [(68, 129, 44), (77, 150, 51), (45, 95, 32)]; + [(255, 200, 159), (186, 140, 104), (87, 57, 34)]; +pub const ORC_SKIN_COLORS: [(u8, u8, u8); 3] = [(77, 150, 51), (82, 117, 36), (71, 94, 42)]; pub const UNDEAD_SKIN_COLORS: [(u8, u8, u8); 3] = - [(255, 255, 255), (203, 255, 215), (213, 220, 180)]; + [(255, 255, 255), (178, 178, 178), (145, 135, 121)]; // Eye colors pub const DANARI_EYE_COLORS: [EyeColor; 7] = [