From 2946b452f4bdd8b1eff5be7547e57b2ba5c6b335 Mon Sep 17 00:00:00 2001 From: Imbris Date: Sun, 1 Sep 2019 17:46:30 -0400 Subject: [PATCH] Remove derpy eyes :( , fix undead eye indices, fmt --- .../voxel/figure/eyes/undead/female.vox | Bin 1112 -> 44273 bytes .../voxygen/voxel/figure/eyes/undead/male.vox | Bin 1112 -> 44273 bytes common/src/comp/body/humanoid.rs | 38 ++++-------------- voxygen/src/scene/figure/mod.rs | 5 +-- 4 files changed, 10 insertions(+), 33 deletions(-) diff --git a/assets/voxygen/voxel/figure/eyes/undead/female.vox b/assets/voxygen/voxel/figure/eyes/undead/female.vox index 5bedc5ce774b6867648a23aabdb0674a9b8cf62a..1d76cde362c6029ead2d7f97fc75a8d8e83e2f1c 100644 GIT binary patch literal 44273 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 V9#_?Xmg=V|r`loeW4Fn#4*_}Pt`-0Q delta 73 zcmex(lj#PBP?&#&!ZZd3246={KOn{6!ZJ}vSEGfMfuV(gfw7Slh=bgn92r0g$K^9smFU diff --git a/assets/voxygen/voxel/figure/eyes/undead/male.vox b/assets/voxygen/voxel/figure/eyes/undead/male.vox index e3cd2602e15f88622dcf645b71531081e539c336..17215562d57f49bf72549408438b7c9dd03f1c67 100644 GIT binary patch literal 44273 zcmd7adwf*I6$kJ^L?fvdBnc2OtN|nmHr!2ilkg6Y2q7;>FhT^@o9xZ*CHv~#O-Rxd z3sEXk1TiJpq7W^O7D1p%sR7E1>%gZfHEf7$t^;gQ3%~7RG7A{bGEF*Gq za;Qb_03UD5V{+UF^j=&Xb$1tWC>_f0q~ZdN^tH38sjh%Jx8_slE}c4CLzLYaq*1vE z6u%;oY#XOj>b{vI@dtTb>z|nD~^)4CsNvhNn}4Y zjmEAKG-Z>_y<5EnE2u3`&~v4NE_wu2$aa0Xpq*}czE04hR6*-<1l27Tv`3y_;YcJi zFPR!wq|k07gPQKlrrq8}^ipdr(aUW#eR2ZL$(Te1^Hazu&!(DXf|}O~+7}UYe21W{ zq(sV3n?h@{(#cvplgiT)$aGAg?MtRo$GRDmH^)vTcg&=UbYR?yD-YpA1r z3!Ojl7lHzbW(w_T&ZLuv7SX$}myxw?6m5Sxj*gxiPZw#@|2+Th2kxSG4w(P< z{4+B%>EY~sG{fFTv$t-h@y+Au)Dwa(+%4!}N(!Z>rjmDZ9ThG;Mxwcq;;ne>|NyEwuQ#68%t-Ool0F5<7t;%tHJBfahz*)*%`9DL=CO&)cj-z zJ#_2@J^JE#a)!3jyv_Tl;PK;BcH}(e=H}9y@&P7dCdEq3r5f$ft)RW)+{%_^ITwg0&tmKM}QbyGj!d z8CB7?lOKUDGiXJdnX0KrR5ne;R{Lt}RVsDK=eAViav`6<7V^&wY#}c{wve|UTgbO7 zwvgYA*g}4wU<>&Xhb?3sws0i8Fcx0Oe_X@fN?ZajTn;Z>0WU0t7nZ>bSHcVL zgcp{>3-5v#u7Ve?h8I@A3-5*(u7MY>g%_@a7rNku_rMEvcwr^HunJ!2h8G&}!fJS- z2VUrf7n<{3^V#176q(FYJOBehpsu9K7&(c;VOKg)hJhzX31& zCcN-l@WSKp!WZF%-SEP1!wXNq3txg4o`e^E2VQszUie*j;c0l`_uz%!hZmlK7rqQH zJPR-U0le@Wyzqzc!t?OLSKx&g;DtYe7rqKF{4u=nHF)7q;DtYh7rqWJd;?y15nlK+ zc;O{@;m_fPZ^8?I0WW+DUieFR;oI=SU%?CCffxQ7Uice$;cwxEzk?V49$xqdc;O%6 zg@1wGraIG@WQ{s3*Unm{taIEKD_Yn@WKz^h5vvT{u5sKFL>d<;f4Q!7ycJs zNRUFSWZ|;OQpV*Pd5n;UE7A}$uH}jms8c8WLANnXp3pelloc-5$zx!+8K~wQE_1m2 zuBB(IMop}2WH_C+o`bu&^nk}_aA&7xb80G!ZW%fcs-V(@2*YpjVEw6Cl%mW9l z4VWK2D7*J_e_3MWF))Q5@hg?3H@MtUyQA+!%}5#VaN6vegQuX*`%PnDAfLG6MEQaz zI;|Y18a0^da;s_ewp2g67F{5_U9IsO(<}x2r+xOpofUF6mW9Shdt8kM8FM$VkuN>8z4fE*z+WIkVc1N?$PO zS3Ue@eRTh#`xLIyebF2DdfCaPheJkHMCIpAbw#|E5%vasY8~x7#$0)t%Yb!PeLYsN zHsDsnRRw)PizlC>+0-vJv^Qu)hgONEsWgM$Q+(Z3>FH0x)6i`4i^rbT(`CTeYNCeQ z6P>6Uxv!JTv%z#nywQQxDy{9w!cnSo-}-wj^D=*57PX7vkX~g5)JE9*)AGFJ+c86h z$hTw2r#Gn8V=n)%Y+U$W=^H4T%!ou}vdfl@JK5Fj!yEeRx~}S~Gvich)#3^Fw< Rgb { match self { @@ -315,7 +298,6 @@ impl EyeColor { EyeColor::Green => Rgb::new(110, 167, 113), EyeColor::Brown => Rgb::new(73, 42, 36), EyeColor::Red => Rgb::new(182, 0, 0), - EyeColor::White => Rgb::new(255, 255, 255), EyeColor::Orange => Rgb::new(161, 69, 0), } } @@ -326,15 +308,11 @@ impl EyeColor { EyeColor::Green => Rgb::new(81, 124, 84), EyeColor::Brown => Rgb::new(54, 30, 26), EyeColor::Red => Rgb::new(148, 0, 0), - EyeColor::White => Rgb::new(255, 255, 255), EyeColor::Orange => Rgb::new(148, 64, 0), } } pub fn white_rgb(self) -> Rgb { - match self { - EyeColor::White => Rgb::new(0, 0, 0), - _ => Rgb::new(255, 255, 255), - } + Rgb::new(255, 255, 255) } } diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index af195ddf34..d8b11c4b39 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -15,8 +15,7 @@ use crate::{ use client::Client; use common::{ comp::{ - ActionState::*, Body, - CharacterState, Last, MovementState::*, Ori, Pos, Scale, Stats, Vel, + ActionState::*, Body, CharacterState, Last, MovementState::*, Ori, Pos, Scale, Stats, Vel, }, terrain::TerrainChunkSize, vol::VolSize, @@ -24,8 +23,8 @@ use common::{ use hashbrown::HashMap; use log::debug; use specs::{Entity as EcsEntity, Join}; -use vek::*; use std::time::Instant; +use vek::*; const DAMAGE_FADE_COEFFICIENT: f64 = 5.0;