From 6416a4cf2fc015782098a5e8a17e7e5779750b08 Mon Sep 17 00:00:00 2001 From: Snowram Date: Tue, 23 Jun 2020 23:07:13 +0200 Subject: [PATCH] Add tarasque and grolgar improvements --- .../voxel/npc/grolgar/female/foot_bl.vox | Bin 1316 -> 1316 bytes .../voxel/npc/grolgar/female/foot_br.vox | Bin 1316 -> 1316 bytes .../voxel/npc/grolgar/female/foot_fl.vox | Bin 1564 -> 1564 bytes .../voxel/npc/grolgar/female/foot_fr.vox | Bin 1564 -> 1564 bytes .../voxel/npc/grolgar/female/head_upper.vox | Bin 4728 -> 4728 bytes .../voxel/npc/grolgar/male/foot_bl.vox | Bin 1316 -> 1316 bytes .../voxel/npc/grolgar/male/foot_br.vox | Bin 1316 -> 1316 bytes .../voxel/npc/grolgar/male/foot_fl.vox | Bin 1564 -> 1564 bytes .../voxel/npc/grolgar/male/foot_fr.vox | Bin 1564 -> 1564 bytes .../voxel/npc/grolgar/male/head_upper.vox | Bin 4728 -> 4728 bytes .../voxel/npc/tarasque/female/head_upper.vox | Bin 5056 -> 5512 bytes .../voxygen/voxel/npc/tarasque/male/ears.vox | Bin 1176 -> 1176 bytes .../voxel/npc/tarasque/male/foot_bl.vox | Bin 1508 -> 1508 bytes .../voxel/npc/tarasque/male/foot_br.vox | Bin 1508 -> 1508 bytes .../voxel/npc/tarasque/male/foot_fl.vox | Bin 2180 -> 2180 bytes .../voxel/npc/tarasque/male/foot_fr.vox | Bin 2180 -> 2180 bytes .../voxel/npc/tarasque/male/head_lower.vox | Bin 2408 -> 2408 bytes .../voxel/npc/tarasque/male/head_upper.vox | Bin 5056 -> 5512 bytes .../voxygen/voxel/npc/tarasque/male/jaw.vox | Bin 1760 -> 1760 bytes .../voxel/npc/tarasque/male/leg_bl.vox | Bin 1620 -> 1620 bytes .../voxel/npc/tarasque/male/leg_br.vox | Bin 1620 -> 1620 bytes .../voxel/npc/tarasque/male/leg_fl.vox | Bin 2068 -> 2068 bytes .../voxel/npc/tarasque/male/leg_fr.vox | Bin 2068 -> 2068 bytes .../voxygen/voxel/npc/tarasque/male/tail.vox | Bin 3316 -> 3316 bytes .../voxel/npc/tarasque/male/torso_back.vox | Bin 5280 -> 5280 bytes .../voxel/npc/tarasque/male/torso_front.vox | Bin 10088 -> 10088 bytes .../quadruped_medium_central_manifest.ron | 8 ++++---- voxygen/src/anim/src/quadruped_medium/mod.rs | 18 +++++++++--------- voxygen/src/scene/figure/mod.rs | 6 ++---- 29 files changed, 15 insertions(+), 17 deletions(-) diff --git a/assets/voxygen/voxel/npc/grolgar/female/foot_bl.vox b/assets/voxygen/voxel/npc/grolgar/female/foot_bl.vox index cc8d76b20d6767d1d6f38e5e07ba4cedc3048ecb..0d73b9b1b754254458e1732a742fd18b6530db8e 100644 GIT binary patch delta 16 YcmZ3&wS;R!02A}>X~mm^nJzK`05ezy0RR91 delta 16 XcmZ3&wS;R!02A|(CdbXeOc$8|G3W)v diff --git a/assets/voxygen/voxel/npc/grolgar/female/foot_br.vox b/assets/voxygen/voxel/npc/grolgar/female/foot_br.vox index a1d6c4974af524af29fff144fa98e2c7a8f77add..950b33e69bb6d54b2ff557f6c3edc68f09998b2f 100644 GIT binary patch delta 16 YcmZ3&wS;R!02A}>X~mm^nJzK`05ezy0RR91 delta 16 XcmZ3&wS;R!02A|(CdbXeOc$8|G3W)v diff --git a/assets/voxygen/voxel/npc/grolgar/female/foot_fl.vox b/assets/voxygen/voxel/npc/grolgar/female/foot_fl.vox index 9e2b073502df7d4a13883502facadb9af53e3915..c68529471f5f1938013af4aea251a289d6f9c0e9 100644 GIT binary patch delta 24 gcmbQkGlyq`2Q%~TX~mPhnPr)0RYh&iX5PpI0BNWQRsaA1 delta 20 ccmbQkGlyq`2Q%}LCdbL%EQOo*Fefkp082y${Qv*} diff --git a/assets/voxygen/voxel/npc/grolgar/female/foot_fr.vox b/assets/voxygen/voxel/npc/grolgar/female/foot_fr.vox index d1c66f00fdf7b8b190b391bdd1457831472d1dbc..b438522f4a2b4300971aeb9502d9c2bbd7c237a3 100644 GIT binary patch delta 24 gcmbQkGlyq`2Q%~TX~mPhnPr)0RYh&iX5PpI0BNWQRsaA1 delta 20 ccmbQkGlyq`2Q%}LCdbL%EQOo*Fefkp082y${Qv*} diff --git a/assets/voxygen/voxel/npc/grolgar/female/head_upper.vox b/assets/voxygen/voxel/npc/grolgar/female/head_upper.vox index 20211786390ed0d25ac9735229e2126e156f993d..a9ba5344bea99aa6263c8eee4a1c525f06294078 100644 GIT binary patch delta 48 zcmV-00MGyUB={t-qz@yzmUI6@DFFXoH~{~4L;(MoRsjD|G#dY5P(uHDVoU#;dRnu` G53vF(-WG@e delta 20 ccmeyN@X~mm^nJzK`05ezy0RR91 delta 16 XcmZ3&wS;R!02A|(CdbXeOc$8|G3W)v diff --git a/assets/voxygen/voxel/npc/grolgar/male/foot_br.vox b/assets/voxygen/voxel/npc/grolgar/male/foot_br.vox index a1d6c4974af524af29fff144fa98e2c7a8f77add..950b33e69bb6d54b2ff557f6c3edc68f09998b2f 100644 GIT binary patch delta 16 YcmZ3&wS;R!02A}>X~mm^nJzK`05ezy0RR91 delta 16 XcmZ3&wS;R!02A|(CdbXeOc$8|G3W)v diff --git a/assets/voxygen/voxel/npc/grolgar/male/foot_fl.vox b/assets/voxygen/voxel/npc/grolgar/male/foot_fl.vox index 9e2b073502df7d4a13883502facadb9af53e3915..c68529471f5f1938013af4aea251a289d6f9c0e9 100644 GIT binary patch delta 24 gcmbQkGlyq`2Q%~TX~mPhnPr)0RYh&iX5PpI0BNWQRsaA1 delta 20 ccmbQkGlyq`2Q%}LCdbL%EQOo*Fefkp082y${Qv*} diff --git a/assets/voxygen/voxel/npc/grolgar/male/foot_fr.vox b/assets/voxygen/voxel/npc/grolgar/male/foot_fr.vox index d1c66f00fdf7b8b190b391bdd1457831472d1dbc..b438522f4a2b4300971aeb9502d9c2bbd7c237a3 100644 GIT binary patch delta 24 gcmbQkGlyq`2Q%~TX~mPhnPr)0RYh&iX5PpI0BNWQRsaA1 delta 20 ccmbQkGlyq`2Q%}LCdbL%EQOo*Fefkp082y${Qv*} diff --git a/assets/voxygen/voxel/npc/grolgar/male/head_upper.vox b/assets/voxygen/voxel/npc/grolgar/male/head_upper.vox index 20211786390ed0d25ac9735229e2126e156f993d..a9ba5344bea99aa6263c8eee4a1c525f06294078 100644 GIT binary patch delta 48 zcmV-00MGyUB={t-qz@yzmUI6@DFFXoH~{~4L;(MoRsjD|G#dY5P(uHDVoU#;dRnu` G53vF(-WG@e delta 20 ccmeyN@oieswnjERF8C*L_ojW(H>kc0{G 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 E0x5WG8LoC){Ny~<8=1kYFbSe6%%<7%Vvp~ z9J)sY1~s~vg-BFZ;z&auOhPKKkctSxA|jGL^&ukq^7MO;6hcBBc+UH-_wwAI z|NHD4rf=DKPgPaRR~()&RNvZARo5LpdZ;NM{H=#tXe0ENw;nybI%2}#?{rmZ-}J3B zljP&ntJG_k``Rq^A;d`xaT+|Mk2A+!TeW>xb$v8?8mxizG#WdL-cF;{vzXnPWYr`% zI}MI~SI)6->si!#60Mzta>l!9=6rT$me>!`&Bl7vXP^5V+dgtXb2cgie>2Uo>7#P9 z6vJ`|ewq|_oSL@YE+=g#$#6dAJ}B;FzZ~Hovq2Vi6<(p~bI9=3lN?eXd_Bp|PO?vZ z)MlD&Jqg;*k}K==G=wk-tR;)i*wJ`3?TqiE50loL<%rB|*7c23la$cKm+x^OgP#Rc zWU6U4g@56zr^%>Ei@ap?B$%={>Kk~)nf!7n_l=$<_Ot0Yui;z# zsgUQmQ|v@vZDwtNx5vlmovfL(3O}Ml%J{GN#Hwk-T0nlM@FhBQb=xO&%jh2Qe_M_5 zAG*UYme}Hp82v1<9~APu=S+!_n?-!ok_VY{i5LdXwTid}Hw{Ifx+8yx0e3Qc4YG0w z%PIP4%e<{iJjxzx#4`s+tm7i6I8Q1J4f`#6W>XIhV}rkJ9fnp%=H#Ex^N|j{As-vt z^&RsT3andY7V8Xotn8vuvG2mTUuR;UOKzj{SdaUrw(|@nsNq~zc4##7+6}pOiv%^w z&9ibt7e?^F|FvIq9$6k+YCqS;aL%KjAF}fEF)~_X=B=@d*6KxLAZ_4b=CL-50L9u4 z0hzIO^MH)V{Q$)}upiJV42ij;4jgsRDvdrGe`xMR?!=)nYN4$e+FA`YzG$_=XVfP0 za;=cBhR$+FYi!d)rwu#}^MIaV(JK4~IcjQz&H?_pHbeAj2tLhYU<_&Qs3%9=#E9G& z7b(PfCY~vUGrrN!Ci2yJb0AY=k+nA3X_M^KXMe_db-*R}Gw*djHlc5bulK4CoNG$% z`Y^S`rU3&|bkh-MT&d4Q-a#pZX^3HFqkA^5)d@8QZ=1}miM-0pQ$lWL^Z}jxtb>Op zKU&7lLii^8xM=ZtXLH|zGYJf7*XpChKMvlTK9Td8+K!<4d}}G&U&ywPkm#_PxOrbOap!;c(mkH$ady~JzxWVBaTh9vrHZP zXb&_6FPefeV5kbS#^ZxBf)@>S?YP%aV=aDD}tF4V21^-T+y98wB(ipM|{C7^swNS1GmiD9Y1$qRtUC__@pVh z2hYGc&$`8T4%~`Gf6f>%*I>6Xb}-F9v=qoTQJChMV33ARSQ?JN9B1?dGH|)mN+^eu>n1>)nKQ= z&IIOU@FtQo35*HgNd{*!I1|8`v_=YDz;1A(0V^VFk#m-OFyO4g-c)qp%`o&lp5CUT zwl!~rFZD=XI(iz%oA0ULanYsZKJS#L=P>jezSI~sp?McPy@lp&aOAqDU+}z{&ebyy z59`%T^IjPG1lz;yDtWBtHN9BNT(8Bi8nms!L^UYZYrU@5_)|fi8gt;N0|OPlQq;E56>p>FZ5r_g z^Txq1C^b0Vat-!)aC5BJ6Z?8_^k1I49!#{oJhQhjCCRh46!o{ORktg zoHNvyLr04amN(CkXNDRxWlqjI>{1#%@kfok+H62?^ryyaYP?2QP2FqiTNV5$bL+rY zH)um0l{i6;x5PuvfxGNkM(wB<>jvZ8vf-?@mOFN#ORhRkFC6I~>6=}oPmN$D@1Ny; zv1QNGTe+Dxo|w}2Fa}HCwDt{Nn{u|S(`S{@fqlC4T-?)+m^0U94llj|NbWLfRW3#~yYXTSyPT4%q=#+JsH^xEONent-5lmi0ljjZbX}A+Kdh1O8MK4Lb zTGm@fABsORx+G$dkd^R%!j^=-i5MjG%IKT9lh)2Mk^>p)u)nn)KX`h(Kwm}t`R>S> zOztF2kA!a%K27*KIYwfi!I#Wis@8bWue#Fr(3cweTjrU0w&1->^bV!JWezp0b?_Zi zXPpHrshw8ymO-sygff({y`^7iO3wl%n-`hiaE&XNOz#Y}$ZDV#J`L28?@c*_ZjDAB z)FQJ*W{VEvQXA-Niq7!KMb~n-+(ReDx5hsmygT&i(4#Fpu*KsCj~_gK@c6;w2VZIc zS#GVTps(PZhKIv`$J`;;VZSZ=r7wXjYZ{pb{uVOGu#kg1HXCfUkb^unJM6LOYS76- z2L2W@@UVr-J~~+RbdW)YL54x5=AJA1a8A?9Y3^%eYGj#m79B128pwr6-`wy!VqHH1 zcSpo!gil6b;~0z?5w8(AGs1@>{51lDMqp6p-k9Ij9ly6bbh-Ab*IiMW=YEG@dg-OI zy1FWVI9bUXzWk(|z4QVfrAJ-JE7%av@trIPJ;SMu`jRuXQm zq&-o|2EI3avyzLKvs``4SdM;lgM9k27t58am0WYGl6OB`$p@e2?loIw$I31_XLYY! z^5{X?c6>>84O?aJgJ;RUAHPgC-&n~xABFclm0bRKCDogde`k>DR43IVOLEuw+vK4O zHp;JFvrXjcm&mEAlEc-bz-k zs^pFvD!F@QlYHWxm7KTlLYZB6tsFjbwOn!NO1b9Zt+H}xm)v>HZn@_@7s~4O`{kaS zUN294>do@!2Uq00vp31*7oH_Y4(yiq+^}D6zPgeVZ?EM3+bVf{QOPAcw#wnX=g5th zyi$%|`6{_#?*C7KOlek z$xr0u`*z8>J9kLVSzfeZot(dIEc^ECk_#_*sl0msE9CBvZyG6$`-@K7H*J*d8#l<(sFUk2ZRPrX z|G)hgU38IrZvXvq{=Ns~vb#PeTTX0|AAhZqU%jo8Z|>eLd-m*+o6f#n-uQ+`q&jh@ zY&^bE9=rFs7=CCgxwB)3eE8f`^4iNz%CXOULSFQa&GPf_oGXtV-6AJJ zTd#Xcj^8Bm!FwN)6JLK+=8ybHzVO3e$d;QI^6sbpDM!BYxE%YX$iagLHjA;GV*~(L{szGS diff --git a/assets/voxygen/voxel/npc/tarasque/male/foot_br.vox b/assets/voxygen/voxel/npc/tarasque/male/foot_br.vox index 957440783848cff396967b1745aecad641673bfc..85ebfc089c0d41092d8ebba0b7498619f0f45d84 100644 GIT binary patch delta 22 ecmaFD{e*kN8fGR=uF30|)0p@KHjA;GV*~(LvHjA;GV*~(L{szGS diff --git a/assets/voxygen/voxel/npc/tarasque/male/foot_fl.vox b/assets/voxygen/voxel/npc/tarasque/male/foot_fl.vox index c02dd99a61103921e54332834e4b1d70cb30f7b9..552d81b8e914db61ac785805a623e2fc49789a7c 100644 GIT binary patch delta 22 dcmZn>Y!Tex!^XtPHQA3XjfqcS^ES3~i~vG71?>O; delta 22 dcmZn>Y!Tex!^XtTJ=u>fjY&{w^ES3~i~vG{1@!;` diff --git a/assets/voxygen/voxel/npc/tarasque/male/foot_fr.vox b/assets/voxygen/voxel/npc/tarasque/male/foot_fr.vox index 03f2da135ae5219e17481183ce384f6942c5131f..150b7bbb4f3f49fcf28f368cde6b43c8c84d5aee 100644 GIT binary patch delta 22 dcmZn>Y!Tex!^XtPHQA3XjfqcS^ES3~i~vG71?>O; delta 22 dcmZn>Y!Tex!^XtTJ=u>fjY&{w^ES3~i~vG{1@!;` diff --git a/assets/voxygen/voxel/npc/tarasque/male/head_lower.vox b/assets/voxygen/voxel/npc/tarasque/male/head_lower.vox index c498fb81eb4b9b76a08fbb2cfe8ad9755f3769ab..55062ab9a854365345941eefcf9b626db0aa6dc7 100644 GIT binary patch delta 22 ecmaDM^g?KZ0Xq{X*JLC1G$uZQ&9m6gF#-TjWd>#d delta 22 ecmaDM^g?KZ0Xq{n_hcjXG$uiz&9m6gF#-TjuLf=a diff --git a/assets/voxygen/voxel/npc/tarasque/male/head_upper.vox b/assets/voxygen/voxel/npc/tarasque/male/head_upper.vox index 89e4fd10cc5ae55fb532ccd18c8452b010edd015..0bbe6fe2009e13fcaa27552d45592ff3ba7f07cc 100644 GIT binary patch literal 5512 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 E0x5WG8LoC){Ny~<8=1kYFbSe6%%<7%Vvp~ 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 delta 22 dcmcb@bA@Mv3=0!C_hdPiG$uiz&222_7y(G21@!;` diff --git a/assets/voxygen/voxel/npc/tarasque/male/leg_br.vox b/assets/voxygen/voxel/npc/tarasque/male/leg_br.vox index 875d1ba12fd6c105125313777e352acabc8d8fe8..881feae056b60dd0aa50c964dfc603d4c9206012 100644 GIT binary patch delta 22 dcmcb@bA@Mv3=0z{*JL@CG$uZQ&222_7y(FD1?>O; delta 22 dcmcb@bA@Mv3=0!C_hdPiG$uiz&222_7y(G21@!;` diff --git a/assets/voxygen/voxel/npc/tarasque/male/leg_fl.vox b/assets/voxygen/voxel/npc/tarasque/male/leg_fl.vox index 38835efb4d5f872e8c4854403f7a5f1bedffc815..b518f3912151aca04d4d1031ddb96132ad273ddd 100644 GIT binary patch delta 22 ecmbOtFhyX)9abhzuF3aU)0p@KHoLK%V*~(FmIk>1 delta 22 ecmbOtFhyX)9abi8?#cI9)0hN>HoLK%V*~(F;0D0} diff --git a/assets/voxygen/voxel/npc/tarasque/male/leg_fr.vox b/assets/voxygen/voxel/npc/tarasque/male/leg_fr.vox index 3dcbe012b521b75e5597ac3123a5746a5a481d2d..9704d4d62b1682b68235a5219e8fcec72f2213fb 100644 GIT binary patch delta 22 ecmbOtFhyX)9abhzuF3aU)0p@KHoLK%V*~(FmIk>1 delta 22 ecmbOtFhyX)9abi8?#cI9)0hN>HoLK%V*~(F;0D0} diff --git a/assets/voxygen/voxel/npc/tarasque/male/tail.vox b/assets/voxygen/voxel/npc/tarasque/male/tail.vox index c603af7695ca34d0afae1a331add9da78db50c82..07295e5a486a344131b97e02255db8f26a8bab01 100644 GIT binary patch delta 22 ecmew&`9*TW9xf(MuF3nj(wO)JHmh-;V*~(TPX{^x delta 22 ecmew&`9*TW9xf(s?#cVO(wGE=Hmh-;V*~(TnFm4u diff --git a/assets/voxygen/voxel/npc/tarasque/male/torso_back.vox b/assets/voxygen/voxel/npc/tarasque/male/torso_back.vox index da1f32367dfe673a169f0a30b161d7b3f6b4b9da..62d86e675041b41b9cddc6864ff389270f15bdd7 100644 GIT binary patch delta 22 ecmZ3Wxj=J6h7c1c*W@grG$uZQ&6kAEF#-TjYzEB$ delta 22 ecmZ3Wxj=J6h7c1s_v9?0G$uiz&6kAEF#-Tjwg%Mz diff --git a/assets/voxygen/voxel/npc/tarasque/male/torso_front.vox b/assets/voxygen/voxel/npc/tarasque/male/torso_front.vox index 2f7a4891991323ab814883a9fd88efa192b78668..b62a9f01c050abaec7335e73b1e986898bf014de 100644 GIT binary patch delta 22 ecmaFi_rh<3fhrRx*JLBrG$uZQ&9hX`F#-TwD+f3L delta 22 ecmaFi_rh<3fhrR>_hcj0G$uiz&9hX`F#-Twbq7EI diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index 33e977b3a2..d42e0f47c4 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -2,7 +2,7 @@ (Grolgar, Male): ( upper: ( offset: (-7.0, 0.0, -9.0), - central: ("npc.grolgar.female.head_upper"), + central: ("npc.grolgar.male.head_upper"), ), lower: ( offset: (-6.0, -4.5, -4.0), @@ -241,7 +241,7 @@ ), (Tarasque, Male): ( upper: ( - offset: (-9.0, -13.0, -10.5), + offset: (-10.0, -9.0, -10.0), central: ("npc.tarasque.male.head_upper"), ), lower: ( @@ -271,7 +271,7 @@ ), (Tarasque, Female): ( upper: ( - offset: (-9.0, -13.0, -10.5), + offset: (-10.0, -9.0, -10.0), central: ("npc.tarasque.female.head_upper"), ), lower: ( @@ -296,7 +296,7 @@ ), tail: ( offset: (-5.0, -19.0, -10.0), - central: ("npc.tarasque.male.tail"), + central: ("npc.tarasque.female.tail"), ), ), (Tiger, Male): ( diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs index 2a98e566b4..40c9e8aa2c 100644 --- a/voxygen/src/anim/src/quadruped_medium/mod.rs +++ b/voxygen/src/anim/src/quadruped_medium/mod.rs @@ -148,7 +148,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (-11.0, -3.0), (Tuskram, _) => (6.0, 1.0), (Lion, _) => (12.0, 2.0), - (Tarasque, _) => (14.0, 3.5), + (Tarasque, _) => (5.5, 3.5), (Tiger, _) => (2.0, 1.0), }, head_lower: match (body.species, body.body_type) { @@ -156,7 +156,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (1.0, 0.0), (Tuskram, _) => (1.0, 1.0), (Lion, _) => (0.5, 1.0), - (Tarasque, _) => (0.5, -2.0), + (Tarasque, _) => (0.5, -4.0), (Tiger, _) => (-5.0, -6.0), }, jaw: match (body.species, body.body_type) { @@ -164,7 +164,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (18.0, -1.0), (Tuskram, _) => (4.0, -4.0), (Lion, _) => (0.0, -4.5), - (Tarasque, _) => (0.0, -10.0), + (Tarasque, _) => (9.0, -10.0), (Tiger, _) => (7.0, -4.0), }, tail: match (body.species, body.body_type) { @@ -188,7 +188,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (-19.5, 0.0), (Tuskram, _) => (-18.0, -2.0), (Lion, _) => (-19.0, -1.0), - (Tarasque, _) => (-26.5, -1.0), + (Tarasque, _) => (-26.0, -1.0), (Tiger, _) => (-19.0, 0.0), }, ears: match (body.species, body.body_type) { @@ -196,7 +196,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (13.0, 7.0), (Tuskram, _) => (1.5, 9.5), (Lion, _) => (-8.0, 4.5), - (Tarasque, _) => (-5.0, 1.0), + (Tarasque, _) => (3.0, 1.0), (Tiger, _) => (2.5, 5.0), }, leg_f: match (body.species, body.body_type) { @@ -204,7 +204,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (7.0, -7.5, -3.5), (Tuskram, _) => (6.0, -6.5, -5.5), (Lion, _) => (7.5, -4.5, -6.0), - (Tarasque, _) => (7.5, -2.0, -6.0), + (Tarasque, _) => (7.0, -8.0, -6.0), (Tiger, _) => (7.0, -2.0, -1.0), }, leg_b: match (body.species, body.body_type) { @@ -212,7 +212,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (6.0, -1.0, -4.0), (Tuskram, _) => (5.0, 0.5, -3.5), (Lion, _) => (6.0, 0.0, -2.0), - (Tarasque, _) => (6.0, 4.5, -6.0), + (Tarasque, _) => (6.0, 7.5, -6.5), (Tiger, _) => (7.0, -2.0, -1.0), }, feet_f: match (body.species, body.body_type) { @@ -220,7 +220,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (1.0, 3.0, -1.0), (Tuskram, _) => (0.5, 2.0, -5.0), (Lion, _) => (0.0, 2.0, -4.5), - (Tarasque, _) => (2.0, -0.5, -4.5), + (Tarasque, _) => (1.0, 0.0, -3.0), (Tiger, _) => (1.0, 0.0, -5.0), }, feet_b: match (body.species, body.body_type) { @@ -228,7 +228,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (1.0, 0.0, 0.0), (Tuskram, _) => (0.5, 0.0, -4.0), (Lion, _) => (0.5, 0.5, -4.0), - (Tarasque, _) => (1.5, -0.5, -3.5), + (Tarasque, _) => (1.5, -2.5, -2.5), (Tiger, _) => (1.0, 0.5, -4.0), }, height: match (body.species, body.body_type) { diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 471406bdf7..afc3ff526c 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -929,7 +929,7 @@ impl FigureMgr { is_player, ); }, - Body::QuadrupedMedium(quadruped_body) => { + Body::QuadrupedMedium(_) => { let skeleton_attr = &self .quadruped_medium_model_cache .get_or_create_model( @@ -941,7 +941,6 @@ impl FigureMgr { None, ) .1; - let ref skeleton_attr = quadruped_body.into(); let state = self .quadruped_medium_states @@ -1013,7 +1012,7 @@ impl FigureMgr { is_player, ); }, - Body::QuadrupedLow(quadruped_body) => { + Body::QuadrupedLow(_) => { let skeleton_attr = &self .quadruped_low_model_cache .get_or_create_model( @@ -1025,7 +1024,6 @@ impl FigureMgr { None, ) .1; - let ref skeleton_attr = quadruped_body.into(); let state = self .quadruped_low_states