From b37c0962afb356ff1dd71c20b8fc2e8f8b433e3b Mon Sep 17 00:00:00 2001 From: Snowram Date: Thu, 30 Jul 2020 21:53:48 +0200 Subject: [PATCH] Add frog npc, tweak pig model --- assets/common/npc_names.json | 4 ++ assets/voxygen/voxel/npc/frog/male/chest.vox | Bin 0 -> 1980 bytes .../voxygen/voxel/npc/frog/male/foot_bl.vox | Bin 0 -> 1240 bytes .../voxygen/voxel/npc/frog/male/foot_br.vox | Bin 0 -> 1240 bytes .../voxygen/voxel/npc/frog/male/foot_fl.vox | Bin 0 -> 1164 bytes .../voxygen/voxel/npc/frog/male/foot_fr.vox | Bin 0 -> 1164 bytes assets/voxygen/voxel/npc/frog/male/head.vox | Bin 0 -> 1868 bytes assets/voxygen/voxel/npc/pig/female/chest.vox | Bin 3176 -> 0 bytes .../voxygen/voxel/npc/pig/female/foot_bl.vox | Bin 1240 -> 0 bytes .../voxygen/voxel/npc/pig/female/foot_br.vox | Bin 1240 -> 0 bytes .../voxygen/voxel/npc/pig/female/foot_fl.vox | Bin 1196 -> 0 bytes .../voxygen/voxel/npc/pig/female/foot_fr.vox | Bin 1196 -> 0 bytes assets/voxygen/voxel/npc/pig/female/head.vox | Bin 2576 -> 0 bytes assets/voxygen/voxel/npc/pig/female/tail.vox | Bin 1140 -> 0 bytes assets/voxygen/voxel/npc/pig/male/foot_bl.vox | Bin 1240 -> 1240 bytes assets/voxygen/voxel/npc/pig/male/foot_br.vox | Bin 1240 -> 1240 bytes assets/voxygen/voxel/npc/pig/male/foot_fl.vox | Bin 1196 -> 1196 bytes assets/voxygen/voxel/npc/pig/male/head.vox | Bin 2576 -> 2576 bytes assets/voxygen/voxel/npc/pig/male/tail.vox | Bin 1140 -> 1140 bytes .../quadruped_small_central_manifest.ron | 38 +++++++++++++-- .../quadruped_small_lateral_manifest.ron | 45 ++++++++++++++++-- common/src/comp/body/quadruped_small.rs | 6 ++- voxygen/src/anim/src/quadruped_small/mod.rs | 19 ++++++-- 23 files changed, 98 insertions(+), 14 deletions(-) create mode 100644 assets/voxygen/voxel/npc/frog/male/chest.vox create mode 100644 assets/voxygen/voxel/npc/frog/male/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/frog/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/frog/male/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/frog/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/frog/male/head.vox delete mode 100644 assets/voxygen/voxel/npc/pig/female/chest.vox delete mode 100644 assets/voxygen/voxel/npc/pig/female/foot_bl.vox delete mode 100644 assets/voxygen/voxel/npc/pig/female/foot_br.vox delete mode 100644 assets/voxygen/voxel/npc/pig/female/foot_fl.vox delete mode 100644 assets/voxygen/voxel/npc/pig/female/foot_fr.vox delete mode 100644 assets/voxygen/voxel/npc/pig/female/head.vox delete mode 100644 assets/voxygen/voxel/npc/pig/female/tail.vox diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index f97abf5008..02b904a488 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -457,6 +457,10 @@ "truffler": { "keyword": "truffler", "generic": "Truffler" + }, + "frog": { + "keyword": "frog", + "generic": "Frog" } } }, diff --git a/assets/voxygen/voxel/npc/frog/male/chest.vox b/assets/voxygen/voxel/npc/frog/male/chest.vox new file mode 100644 index 0000000000000000000000000000000000000000..00b9a892af8f210e65dcad849890716939cf24cf GIT binary patch literal 1980 zcmchWTWnNS6o%KnojF56K}w-5mO3*~<`gM(#$K#qp;RcfMW|G$KtLc;8-+B6KrhG*je6M5Lvmt$uvy@S!W?h(}hhX=~VNXz&>$+DY6H>m+8PE-lui zJ>r~-J5R-wQ!y8{38N&Ys9G~mbV967SWn_&bi#NN)5KYuHrA$$Wj9%N(b5LJ_Oj zkGLppVu%jan6!G?773cVSmOg)iG`(E@`7K&=D8ds7>n7rdr=7ji{uJ z*g&jGicx`!sKBG`8OEa~X^4)RKrwE86Ig2lZMoNw2-l2djB#UJuz|>muU0f8f{LT#Sx3A$(3Y45PVm9yYG4L1srIhI<+?+_w?K1KUwK zybTj;^N_!x7{$9wkvv)rsdtc$agby8K`!QDVv}I%3xesrf;nddeurQ}w_q~;yblHG zrW}0veF?s}F$?y&nYj@XE%{fS90#ppuqOda;u>%DNj?cjSOC^}P zR*=}kn&%5K{-XlOQ|#a6L;CN5oXbT|$s`QUn}QpU76Qv2K)(n^$T#Fi(!W!1>P^Au zpy2XZ`n7^%^@5LA3dWujw9(($D(KzJ_zpo`Qn0>Cuw${{5aTP-1!%92p=-r#9Nbcl z%&JNp+**gxSD(gD$J(t)ADeZcRxF?3`tMo&DC zoSYm?n>-1{#l@JPjG}n~Fu;<( z?i4Pbtivxqw4ihUL>%}a7iX{KV+=F?_w&!35dFvbQ>hfbeg8Dd<{v{%&tBwr=i}15 zf}dX`b%JCviLdq#;EAQ@Al+S<(m4eq19#uy?t%go6%}D*Qzzz?ZO7*Q`!H?&R9rnh z6C-W;=;K}e`~DZy^kr+UX}N;Vt-!8~pD literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/npc/frog/male/foot_bl.vox b/assets/voxygen/voxel/npc/frog/male/foot_bl.vox new file mode 100644 index 0000000000000000000000000000000000000000..2d5ca268dcefc9e759fda47940c8a66da07b454f GIT binary patch literal 1240 zcmchWYfPJU6voecK~XjZDX^9a^=-Kn=C~BOh+?-6p+h`I?@=jk!HzO zT_lJSBruXGqCqrfY{Noa{4j|l3vo_@#7hiWmc{tV#1Eo=`}uE4j2b_Ck|)pmJm>wN z^S`$3+Upz+iIpdz_yinIpW>o>%OiX??Q6_hP|_q7Lx701J^pzFHZ6y0s;hSxOo z3PaP~x~X)M@=e2Sn99?2uc;|kLk!KRFvaldnz(gC{b$6rrfP^=OA<>pbLpC9X{NZe zJH#c1f-Ww@&@I!{EkiVyE@EkhSi17HI5d^l)L2uj-3{BfB_^uoR$X09Bog7)kkI(n z0xsJh{A#l?Ki^C|&Ie`*HkER4e=U)oCT9Br%nlu7cC?$S*<+;oGO-_U;yhW5XS@cf zPeQuxMkek<7BWd~7P4LtHV+D0E(*zA!p5kOu5{){LPc{5Uw&V}7c2Qh7Vl?AL}(cn zo}Cs>EUo9g!4%w)A}V7(vcop40S85sxs+WiAge=gpHek1XS3mB2lABa-ntJYuVUBZH9Xl+L)U>I zy~o-ae5H%n)EW5wHnDRZ%zyAaDJdyzN>9V-bW-NAsN9;*!{r_ZU*630I~Lz97O{Gx zm~*OUY*M)Xsc`#ip*K{>*{GL=^L~E$p_OodDgz(dxU^(vmE8Y*{dpVj`p5dcUN7Ii ze}R&+32OUJV~^Uo_O9^riwb_huQG*wf41MCwvr6j7|}KFUIRLpELH^G7ok4QFnTr zrnj%qdT|+_&&MqRNmk%DjAbRRTC6-H+*J4Lzw$RP%U^l*1SxiGC(dP>LJ59Q zt0iquIPskqdM&|i`C|#L(IW{i@dqex46b{JP9=ED*b?dY+VN_k#2a2)TT5`fM?C(< F@+X-|6Jr1X literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/npc/frog/male/foot_br.vox b/assets/voxygen/voxel/npc/frog/male/foot_br.vox new file mode 100644 index 0000000000000000000000000000000000000000..2b778387c767d88b9ea8139c48f8b0e405465b54 GIT binary patch literal 1240 zcmchWZA@EL7{{M`Z&8#@K?LPJBMWg(g2a~?vMh`7lZhWh{r2VwC&pK7!i@??ZJ?OT(gL@2HWd5BphW)N_Q)%uNOEXlBMOV~a7G0bcL!5?1oVupD47JvEaT!TUDrab_kCJhh zxGYJk)~pk^mKbL-5+ju~CEcy-x?4+9v?ywdhVI_ouw%RVp{lT|s)}ed%IzVc@%#cV z>mU4TwK6~7Ou{Y%X9+cxa&UhQ(Viw|`-0349b|U2o66Z^r1~?l9dO_{S&V1A8mUi0 zy6#0L9zYf{No^LgUKBPD3R^D;$z8(6n2@gg%#Q?La|&O6U%(eD`9v2Vq%JD73=7Xq z3n!M=^WIPj?r0GeaX;A+E6xEsMU%OdT`wT3LvWu`J+EZ5;bS}Uw3^?Wj11q0%vk9w zNMourgO$g!Vdoaqy)dWrjna=w!^ef`w}kmAVezu^{lY}O@X2mr^?9LP`N!LY!NV%v zBLqA`XO+-XC!AIB7N4DPy_4RSLPn016WvqE$k71vuRX(0lVOTonLJvaOVi_p9BHeh zYo`#~FO0t|Tzylh$gvYFa???fe^jN z+8KPci}=(T`27y?a~;fo@B%3*DQrql!{KmH=5bQ7EuTlqJq*6Gndx_&e79J{>dj)# zshROf;l`)Jov(%7a3N=7UKTC{_~nOIBK@fhd}!tJl8sez|M&gpZM^3n`}caieEa@I zO3Egv={t=rX5;$1!p|=$1q6@B!&m*IJlQyd#CpkyWH2|neupRRc5-rZm^&1qw4|HE z{b$(JnZ?bEdCaxj7*c2T@AI#%88UnAYrR3_D4ZCbBKBUKH)cL(?6YMa?(U=Z^f*m# zU#0cZGJe0G+X9lT#BUhO%DLub*nGolYilMGGZOYU%AYAR B6G{L8 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/npc/frog/male/foot_fl.vox b/assets/voxygen/voxel/npc/frog/male/foot_fl.vox new file mode 100644 index 0000000000000000000000000000000000000000..d994053164168492adc00ea615950915f0a30ac7 GIT binary patch literal 1164 zcmchWYfRf^7{#Cezbrx76r_~3OsH+S6y~@Txrk!7g3w_*8Ln=Xk=1HO?POT=FoJ_ks$_$ zK~WdoVbFA&L3F#WX?8J)Jwwy&8KT=XU2M8RY?{in46%zY_PuSpc1o(bLPJ9Xu~>{- zBSQNdi`b37^NZ2Q!h(+!E_jppJE}N*u!&e-2gw01$&te($9t(yo*>(8!hFbz^;8AU z$ws7g6B51?nYssAG?DES@}Cp74GY^Z37KJGOI*lR-t>V`>&xPc?@IZ6wS?Hxy|l!H z&Qam%S>fdJM&0Gl!VxQ{F5#viV#GFNp?tcC>T9LscMFcws^^sgHh*YAo>23nnaJo} z$efXZ(i~>0@>qSi0CwNUs0j0lUn~BgINC4FzAh}x2uqihcMDUk!bf|BwP%E&^8Eo} z_^8VJ1dmhbX%PBagmWtIthEqowGr(sW9(QBv3>Q79rv*C@{{~H9iqZ+;-Q)%Ivy$G zSfHNpZXte9n0!IF`kGKzXu(_Vpu27dk(NdRdS1~ZIGs+u931Dd_BkXTB`=c4{P@Nlp0ZddEG%UHNQA1& zUXBi)Wou79H!c=4A2c(f&g$Ri-`q5k?scH+I+5dWa(ssPI|*K$`;>`KR(POyfaWuk zbi8?$u1hPp-EM9PNTwpcVpvh;GaIW<2{+aI`mg%UEAm%eeL*TLyGUuX)|*yeX(+At zYfa?ri=@}Zp;yuxD49rWqaI6ZrN>K6yMH4)ayqTsCzi>*+l)&KrT_5y`g&SZGgA1Q F${$tB4;26a literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/npc/frog/male/foot_fr.vox b/assets/voxygen/voxel/npc/frog/male/foot_fr.vox new file mode 100644 index 0000000000000000000000000000000000000000..362de03e04d7a8767c49bc223ed83f571713ef19 GIT binary patch literal 1164 zcmchWT}<0$7{#Cezbrx76r_~3OsH-7Xqn@q2viii6@(7yWH{U^Bb(deYNI2KA&fLj zw(255lpukTOc4#DF=HFH#Knu*C|QVe5+r`akY!nnS0-MFdiV2fF-DEop5)}b=RC>t z<~}y5`Wt;K(qDO;;_G9=$i6st!tWH6WuPFZWGaMnx@#<@XhEJ(^9M4KvAd9Y zBZH+m%vR>H`fvg4zK<~x78Ji${6TT7UzmGcNX`mNmzDPl)6K$1dxf=UgrM^MUBbvw zmG=ogr_fU`^fd|RRNhfzA=GSRprefOW7S0W)iHkDNAl$-`Ee#hx!uG=)kU;DQpT~a zI>Nh!*g;|H1>x#zLT#Z1zso^)?G7SM9=cp6LNx^pw-giasUYC1W6z@=9&hmwJ``Z! zM39k}!o+9K!f&^UpYJC5-m_$7WwA9k2dmXemD5J;juIZMb~5tfHs;>4@$Hg}wHxJ} zS2N=?!u5}Z+g}L-p)$_J+$>)3@$>hcM24~%e&5LDWix9O{qOrP-g3u3_V0GP`R3h= zR8&pVFn9)Y%*?g7g`b{R^a)OdU&^t)unJL=d zyh`V#6}(V5rJ{pJ<2eEPjzcxBRg_Bt=lJ;$-Uc*TMMQC@cR0CT2nJp_?yZf DQQ8j_ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/npc/frog/male/head.vox b/assets/voxygen/voxel/npc/frog/male/head.vox new file mode 100644 index 0000000000000000000000000000000000000000..4670f5fd75b79a2699103f3540b511aa3479d0fc GIT binary patch literal 1868 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 diff --git a/assets/voxygen/voxel/npc/pig/female/foot_fl.vox b/assets/voxygen/voxel/npc/pig/female/foot_fl.vox deleted file mode 100644 index d30124b8889b2e412c7d25341100bf5936345550..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1196 zcmc(ee@N7K7{{OQ_jJhIhRyTr&Zf7^*4-Ixdd?r4Yv=T;vsszV>FLCcB9Frs$0(IU zXg6a`T;dLMux2ep(sCs?+1MW@ArVA`MFb%cWAs}hq6iAZB@c(*zk&k$)2M?x=HLd{fc%5zF2ZeJX;pctA${``5y0=9bIiT^QLY+_O ztP+ma3*#DZDt8eLdFXHQGIp?x#0Qm(b=R@@<%c|;j8d}EK}}f^yWaJ3u%(h%gOL14 znD|UsI3-jRx(NG=>8RLByuO+izk_Ib0mC~sk?wq*$lh9FUAsvfX=iBQ5dEJ<7#WO_ zo;tzuwKHUAXR|(c9d5UqQlE#4t*`M`nU7FSDSNh8GxEg-X3u)Kf5XqptrEV|p6N;9 z=C8tUcZB|^m+@qPrAu}E@t~RbP!7Wv>|D9+WQC&t{rv-h0I9YJCe68H-!fVf$e*pe6GGzb& diff --git a/assets/voxygen/voxel/npc/pig/female/foot_fr.vox b/assets/voxygen/voxel/npc/pig/female/foot_fr.vox deleted file mode 100644 index 479eff66452edc38ce71da184fa969e6558758b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1196 zcmc(ee@NVQ7{{OQ_cSCc+&s_Sx%9fZc6W}Ip82C}o#|~mm)o3WdYV{l%;Rv4BQ}*o zSeK(EHnGDQY`HZ==5211n-u+FGGq+K7&amZ86%><-ZH0R7&0#wrt}-8 zoDkDYYcOM&ih40rTVvClH4F<|+AwWelXXSREcMwM)A3qdwP~9*#CAnHrbVop?Ae36 z->etilVvqEH6#)V9*qlo&M&jY{x^Tx?JO-dW7*a4&2`BOI&k*5aSxT@o2o@Z*+}eZ zRewIeN5Hs{jRmq+AeKA$Z-Ph&!8NeLg!2?O_a zZi|cJsE5*opQ=odqPQK;s0;se3FWu9QP?Gvp47D`gt|pR-q!wuIY{a`WZur{Z5x<* zxqt_+7eUhtq(oRyepG%{QvJf*7sAqvaOZ~Vpl~rHd~;A(Jt9O@_qPdShctd%Xz&T$ zHNx>mVN&BQl`f(o4}&dUCJtASc&D0)-UgOFeV5;+qm*rNP*+jH-Z#7)ZmTBNBqZMx zralrD&j?k;F2ep&x~g^%Z>*)w?;u)P#OUs=WV&A>a-g1A&pr~zIvE){!r+Gy#)e~L zW=^qk>pZ!+xopbcfZOe++~=Wc$BVpL;UiR6&i-AsjD511xeFeCy5nc{UK!`KXJ%Ts z`w%NFJk??cBKUWR;Tt{rdxf0I7}$lbu~$=y@M!(#h?w zg$JEN+Uv#V^U)XB#fj=B&Kzi`AYQ=2*~kBI$fb9uxR{W8J3C(+=g`P0Hgy+r@7h)t zB2LEj%>I4;R^3~B=ILm?OS~5b&d!j$l;QLFTYUNb3a=bH&CZXf*!$HYt=Crw27~-Q w0FtBd7q%7Q;kS?X$MEo4{*nB5{^8N1=o4IfXHW80@<}->zFux^;q~XsKk?c!VgLXD diff --git a/assets/voxygen/voxel/npc/pig/female/head.vox b/assets/voxygen/voxel/npc/pig/female/head.vox deleted file mode 100644 index c9b53e997aed0d7f480fb63446dbffdbbb7132b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2576 zcmc&!U5r&%6<&Mowf8=!sG%|pouR^XO6|H+L`tG(n{)oUfC*x=>dYs+Cd~f~$jfP2t1& zU`F1P_f=4>Q?UIZFrKHckLN?M+GRU$)YFbQLeScouY}~hZ=yQpa*d-rs?-JJ7r~lj zwqK*|PbB4cVN#{wiBGAgUywSQG?HTktDMs+dLgl_pl}4V8shdmlT2Z=y|d>{npCEH}mpjKLf+MAjM_%RV_r zw$o4tzG|U~#&2SZj1?_1M_?aAZOo;NVVTHBpJP)_+vGS;VO@@Oapp=&qP0@ysq@Y^ zp1t+r8*{EwzQLqc=NhGtI`&w!iCIor;+trnD0hK#rGIqPXFK`_;T}*HC^PZgySzWj zn9Rf6C3mId%u4oOIq#CQD~;q`<+)p)GY{Nb&)qWajpxjL)^Sfg{hTRv{N}tpcf)hm z-Yfg)X_HB-QnTFg)yC0JX|K%Zqg58UqkJPtqpwo*O%Yw~xRXU>pU6k%*T{R}omjq= z$h{+r^v@*WN+Ku^?yJ@@u&9QR-S-WwTCG9+4 zq`BL6b(*_j*2BEUxd`t<0`DVgBj$K_tbx6A?1y9Sf_IR(lLdR5=#z+5n5SSpiCBw# zKg3xON6K0`U}fxK@ei!Gx~O4=$cwM$Da<#(dKG}?%@ zybJA=TwCcM=@a=KqHBfd+c79#+DC0i%ETgH-?pUfz&Pe&D`b+;Hj*-T^05`g+R+92 zxpp*d3-f8l!Wb5P%QLPcR!2;M_Qv?$w58O0#`oEdc$9Ku93!s4Itq=FH^FbX;)nE0=I<*FW+1t}a}> zxCQz5#@Mf}OY=v%(X+P?eTSA~@YFiUXn;)K0D0}RkW1Z|zeTWUpWxukee*H?>;nAw+~=@qTCjCi@SU@Q1Mky!YcG~e^kdod5LS0auz0Eq z{YQH-bb2XPymLDi?G`M1ma$I=)?X0FH<_q}7GzZ@&>|zPJz{e04Ff`4-HI z;2h}>q>o9n&j`-`L~!wp;N7>#j|g5H75w^P!PUnFCjU~;oy z<`KcE?+GrvC|JFu7h^-quzU5LnA)@s+lRU_v1&1n-g6r|d%l42hc;kx?*o{AY8Q?i zdK?G8JC0+AC($|c9Im|m3g*q5hnp7Mh`zo)tQhRa>N`J=FRvWL==v3S@a}au_QRWT z_SJs;@!cU@eQ!B_%AB3kg3G@Z{Q38SgA)TdIWvq)Z*0Wh{s@&3{T^J! z(*Jw?!^6Xv-8qhvyLRK%z28R9Ob_1qx!{9cf_h*8gM)+EH+(m~zh*ODd}s$2PA$Z_ zm#)q5P%n39$r6nA-GRHlavYByc@8)2S%mj~c^l4+_ux2t_TT-_cK6@g!p?1%G4%v+ z;H5K|`9%jWwBE+czq^7jJ@q{9`oSsO_p=Mw_U09gjEvx~2LLHZ_y_zI!H2)Oh7X4i j&*?vs|E>S<$tS@poV&A6db9GAbXk5q-CW@7`^&!peZngP diff --git a/assets/voxygen/voxel/npc/pig/female/tail.vox b/assets/voxygen/voxel/npc/pig/female/tail.vox deleted file mode 100644 index f42417fa420a834ea536c74f5caef2cb67c6d1b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1140 zcmc(eZ%EU59LGP~PeIys=s9Pbp6-^_Hp5eA{<*Vmp01i@WtQnQv7@LlG#Q7dGKAVG z*NK1L8NZAPz8 zit2P)R7}B^s%^^73**p%5#h!p=(ztT(>rZ=;d<`8wip%X@EC zq`FO*+pSpp^Knd6Af99-um-vM1+riwwNA+F5VA*v&3A;9fUq_!q^sO?Qz)r3P}`A; z?^HU!&VETvNT`npKTHd~FH~*4g&e<)ypWU9n47Gi5!Stim4(eg|jjD<*WXjIk5d%>QzTHBbdSL`44y4Z&7b2CkKyp zGuyr$<>=5L>)JATetQG6J~N~0%sxK<__*CWqck@>BX|OO&rcD)9^<#@V=g>eWJ}i> zww<0}*X21H?kwVVyLsCSlA^#rXp6$@2OrkQz(B%Zk^lBzcXpz_VB(*BisR;|ytuxa KmuS3tz5ENOFevi? diff --git a/assets/voxygen/voxel/npc/pig/male/foot_bl.vox b/assets/voxygen/voxel/npc/pig/male/foot_bl.vox index 1fd30d5dee8e756b9de32fc83245ec6f347bf8bf..f32ab20fb3251ea784c0fbe2687224395d1303fe 100644 GIT binary patch delta 156 zcmWlR!3_d23ry?ieP7Y{Oc#pPZW^bf9mc$nvU&(zlG1;8<(;nS!Ur=_-PF)A`qui-M^!ff> F+8_P&9WDR> delta 156 zcmWlS!41Mt3`1=v`BJ4`*oVE~#tO`l-%Al=FhIw_|6o~h{E}6evSmZ2``uzEfVx3 yqrj1{Xo$Igbg?zSFR7>j-J5B}%`V^Namt-d4!J|lNJ2ZlBeq%Z*Ykn6elz~46&pwZ diff --git a/assets/voxygen/voxel/npc/pig/male/foot_fl.vox b/assets/voxygen/voxel/npc/pig/male/foot_fl.vox index d30124b8889b2e412c7d25341100bf5936345550..e96706c733827228c74acf48ef16392e8c613a7a 100644 GIT binary patch delta 111 zcmW-Y!4ZHk5CVZq9+|Nu%drP7!xDTa_tCLHi4TSa?y_Y&*Nw!3DdC{7LmD7o%Cdv% hm@FmDWF!>{mV}CLt2^`GJ1Yj^9npc}-#YGVDIb!+6yyK^ delta 111 zcmW-XyA6Oa5JPQWQbb}T#$g8-gAu5cYd{Q$L-FK~UbbxKx`B8&5e^7Dr9twAjFa@9 fUFzT@1{8KmQpH*Qx&Obnq63kH9ZaY8`&!Bel1&uk diff --git a/assets/voxygen/voxel/npc/pig/male/head.vox b/assets/voxygen/voxel/npc/pig/male/head.vox index c9b53e997aed0d7f480fb63446dbffdbbb7132b6..3b311170bf75e5be4580e5f7449673b5004a0470 100644 GIT binary patch delta 35 rcmbOrGC^d*Z`K#=Y%DJ}F=jLI7P7FhtYKwiS;fZ2QnrMQKfDW~NPy%nX~Dm>D-SGc#{yWMbLGz{tFb2}}d!7#TM+F)(dn J+L+4E0swP)3;qBA delta 57 zcmeyu@r7f80we20MQKeIW~NO{%nX~DnHe{;Ff(svVq)3E$jH2j8B7D^7#TM+Gcavp J-k8eI0swTr3<>}M diff --git a/assets/voxygen/voxel/quadruped_small_central_manifest.ron b/assets/voxygen/voxel/quadruped_small_central_manifest.ron index 28474862ca..d1d5628738 100644 --- a/assets/voxygen/voxel/quadruped_small_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_small_central_manifest.ron @@ -9,22 +9,22 @@ central: ("npc.pig.male.chest"), ), tail: ( - offset: (-2.5, -3.0, -0.0), + offset: (-2.0, -3.0, -0.0), central: ("npc.pig.male.tail"), ), ), (Pig, Female):( head: ( offset: (-5.0, 0.0, -4.0), - central: ("npc.pig.female.head"), + central: ("npc.pig.male.head"), ), chest: ( offset: (-5.0, -5.0, -3.5), - central: ("npc.pig.female.chest"), + central: ("npc.pig.male.chest"), ), tail: ( - offset: (-2.5, -3.0, -0.0), - central: ("npc.pig.female.tail"), + offset: (-2.0, -3.0, -0.0), + central: ("npc.pig.male.tail"), ), ), @@ -434,4 +434,32 @@ central: ("armor.empty"), ), ), + (Frog, Male):( + head: ( + offset: (-3.5, 0.0, -3.0), + central: ("npc.frog.male.head"), + ), + chest: ( + offset: (-3.5, -5.0, -3.0), + central: ("npc.frog.male.chest"), + ), + tail: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + ), + (Frog, Female):( + head: ( + offset: (-3.5, 0.0, -3.0), + central: ("npc.frog.male.head"), + ), + chest: ( + offset: (-3.5, -5.0, -3.0), + central: ("npc.frog.male.chest"), + ), + tail: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + ), }) \ No newline at end of file diff --git a/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron index aa991feeec..d89037e22b 100644 --- a/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron @@ -20,19 +20,19 @@ (Pig, Female): ( left_front: ( offset: (-1.0, -1.5, -5.0), - lateral: ("npc.pig.female.foot_fl"), + lateral: ("npc.pig.male.foot_fl"), ), right_front: ( offset: (-1.0, -1.5, -5.0), - lateral: ("npc.pig.female.foot_fr"), + lateral: ("npc.pig.male.foot_fr"), ), left_back: ( offset: (-1.0, -2.0, -6.0), - lateral: ("npc.pig.female.foot_bl"), + lateral: ("npc.pig.male.foot_bl"), ), right_back: ( offset: (-1.0, -2.0, -6.0), - lateral: ("npc.pig.female.foot_br"), + lateral: ("npc.pig.male.foot_br"), ), ), @@ -557,4 +557,41 @@ lateral: ("npc.truffler.male.foot_br"), ), ), + (Frog, Male): ( + left_front: ( + offset: (-2.5, -2.5, -4.0), + lateral: ("npc.frog.male.foot_fl"), + ), + right_front: ( + offset: (-2.5, -2.5, -4.0), + lateral: ("npc.frog.male.foot_fr"), + ), + left_back: ( + offset: (-2.5, -3.5, -4.0), + lateral: ("npc.frog.male.foot_bl"), + ), + right_back: ( + offset: (-2.5, -3.5, -4.0), + lateral: ("npc.frog.male.foot_br"), + ), + ), + + (Frog, Female): ( + left_front: ( + offset: (-2.5, -2.5, -4.0), + lateral: ("npc.frog.male.foot_fl"), + ), + right_front: ( + offset: (-2.5, -2.5, -4.0), + lateral: ("npc.frog.male.foot_fr"), + ), + left_back: ( + offset: (-2.5, -3.5, -4.0), + lateral: ("npc.frog.male.foot_bl"), + ), + right_back: ( + offset: (-2.5, -3.5, -4.0), + lateral: ("npc.frog.male.foot_br"), + ), + ), }) \ No newline at end of file diff --git a/common/src/comp/body/quadruped_small.rs b/common/src/comp/body/quadruped_small.rs index 63ce8f192c..63055e856a 100644 --- a/common/src/comp/body/quadruped_small.rs +++ b/common/src/comp/body/quadruped_small.rs @@ -43,6 +43,7 @@ pub enum Species { Hyena = 12, Rabbit = 13, Truffler = 14, + Frog = 15, } /// Data representing per-species generic data. @@ -65,6 +66,7 @@ pub struct AllSpecies { pub hyena: SpeciesMeta, pub rabbit: SpeciesMeta, pub truffler: SpeciesMeta, + pub frog: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -88,11 +90,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Hyena => &self.hyena, Species::Rabbit => &self.rabbit, Species::Truffler => &self.truffler, + Species::Frog => &self.frog, } } } -pub const ALL_SPECIES: [Species; 15] = [ +pub const ALL_SPECIES: [Species; 16] = [ Species::Pig, Species::Fox, Species::Sheep, @@ -108,6 +111,7 @@ pub const ALL_SPECIES: [Species; 15] = [ Species::Hyena, Species::Rabbit, Species::Truffler, + Species::Frog, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/voxygen/src/anim/src/quadruped_small/mod.rs b/voxygen/src/anim/src/quadruped_small/mod.rs index 5753307496..dc860029ec 100644 --- a/voxygen/src/anim/src/quadruped_small/mod.rs +++ b/voxygen/src/anim/src/quadruped_small/mod.rs @@ -132,9 +132,10 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Hyena, _) => (7.5, 2.0), (Rabbit, _) => (4.0, 3.0), (Truffler, _) => (7.5, -9.0), + (Frog, _) => (4.0, 2.0), }, chest: match (body.species, body.body_type) { - (Pig, _) => (0.0, 7.0), + (Pig, _) => (0.0, 6.0), (Fox, _) => (0.0, 8.0), (Sheep, _) => (2.0, 7.0), (Boar, _) => (0.0, 9.5), @@ -149,9 +150,10 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Hyena, _) => (-2.0, 9.0), (Rabbit, _) => (-2.0, 6.0), (Truffler, _) => (-2.0, 16.0), + (Frog, _) => (-2.0, 4.5), }, feet_f: match (body.species, body.body_type) { - (Pig, _) => (4.5, 3.0, -2.0), + (Pig, _) => (4.5, 3.5, -1.0), (Fox, _) => (3.0, 5.0, -5.5), (Sheep, _) => (3.5, 2.0, -2.0), (Boar, _) => (3.5, 6.0, -5.5), @@ -166,9 +168,10 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Hyena, _) => (2.5, 5.0, -4.0), (Rabbit, _) => (3.0, 3.0, -3.0), (Truffler, _) => (2.5, 5.0, -9.0), + (Frog, _) => (4.5, 6.5, 0.0), }, feet_b: match (body.species, body.body_type) { - (Pig, _) => (3.5, -2.0, -1.5), + (Pig, _) => (3.5, -2.0, 0.0), (Fox, _) => (3.0, -3.0, -3.0), (Sheep, _) => (3.5, -3.5, -2.0), (Boar, _) => (3.0, -3.0, -2.5), @@ -183,6 +186,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Hyena, _) => (3.0, -5.0, -2.5), (Rabbit, _) => (3.5, -2.0, -1.0), (Truffler, _) => (3.0, -5.0, -9.5), + (Frog, _) => (5.0, -3.5, 0.0), }, tail: match (body.species, body.body_type) { (Pig, _) => (-4.5, 2.5), @@ -199,7 +203,8 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Holladon, _) => (-1.0, 4.0), (Hyena, _) => (-7.0, 0.0), (Rabbit, _) => (-4.0, -0.0), - (Truffler, _) => (-7.0, 0.0), + (Truffler, _) => (0.0, 0.0), + (Frog, _) => (0.0, -0.0), }, scaler: match (body.species, body.body_type) { (Pig, _) => (0.9), @@ -217,6 +222,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Hyena, _) => (1.0), (Rabbit, _) => (0.7), (Truffler, _) => (1.0), + (Frog, _) => (0.7), }, tempo: match (body.species, body.body_type) { (Pig, _) => (1.0), @@ -234,6 +240,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Hyena, _) => (1.1), (Rabbit, _) => (1.15), (Truffler, _) => (1.0), + (Frog, _) => (1.15), }, maximize: match (body.species, body.body_type) { (Pig, _) => (1.0), @@ -251,6 +258,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Hyena, _) => (1.4), (Rabbit, _) => (1.3), (Truffler, _) => (1.0), + (Frog, _) => (1.3), }, minimize: match (body.species, body.body_type) { (Pig, _) => (0.6), @@ -268,6 +276,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Hyena, _) => (1.4), (Rabbit, _) => (0.8), (Truffler, _) => (1.0), + (Frog, _) => (0.8), }, spring: match (body.species, body.body_type) { (Pig, _) => (1.0), @@ -285,6 +294,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Hyena, _) => (1.4), (Rabbit, _) => (2.5), (Truffler, _) => (0.8), + (Frog, _) => (2.5), }, feed: match (body.species, body.body_type) { (Pig, _) => (1.0), @@ -302,6 +312,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Hyena, _) => (1.0), (Rabbit, _) => (1.2), (Truffler, _) => (0.6), + (Frog, _) => (1.2), }, } }