From 2bd4cbd3e394db1f81c386dd272a17e175cb21d8 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Fri, 5 Mar 2021 20:28:38 +0100 Subject: [PATCH] cleanup, icons --- .../icons/de_buffs/buff_damage_reduce_0.png | Bin 0 -> 2145 bytes assets/voxygen/element/icons/lifesteal.png | Bin 636 -> 2285 bytes voxygen/src/hud/img_ids.rs | 1 + voxygen/src/hud/mod.rs | 3 +-- voxygen/src/hud/skillbar.rs | 19 +++++++----------- 5 files changed, 9 insertions(+), 14 deletions(-) create mode 100644 assets/voxygen/element/icons/de_buffs/buff_damage_reduce_0.png diff --git a/assets/voxygen/element/icons/de_buffs/buff_damage_reduce_0.png b/assets/voxygen/element/icons/de_buffs/buff_damage_reduce_0.png new file mode 100644 index 0000000000000000000000000000000000000000..34048c64cae5a3c12b8d52b25eb6a44378e77b60 GIT binary patch literal 2145 zcmcIl&u`pB6ke19r4Wgh3RS&e91e|IuV=<1D|4kq7|$m6$qD$sz5Mem3}SY+4&E}oa~O3&SJv;`|a=!1m?N$2(woESP&CN~IouD!Cs@eemJARO->2UVSBAsa~_0=%lG5 z8a&uhtCS&lq= zS(@qD0MOwvm3p1FAKAT}+{d-yIWeoU)OU$jb88_R*VN=DHWvPg$ zgec&lL>qogdx{@TjSxyaVxbqrp75mvkv7CyoRfj+Umhh}Z}XT&ti1hsJd5j1{CQNUsxQW5Y)HBEoyl!tvaVN8#`85qhr%j5a))1S%Rixt{4s7!aBBy?wTXCh0ue}q3!*s2`dK>Etihc>wy_{~K2Km(RL=S5KCjbS4#@mGgWZBOc})21wGik!?6HE>5B zn!N|4`FIN&z;;_4K#x$#z%3GP+@&GUH=!i|szUWJ@)2D>nmR?;%{rNkVm3@oag&-h zG-QE%HN#>SaiAKbrT;I~hiPRk>Nh#;u&Vsu7jrzhAE?7&4S2jdfYSEw27^fl7NaH` z>p)@ZLGkUWeAFp<=;1_~(Xgfk+8kH+@~DNfG)tgD1d3%D(16fF)O9lo(=w)x9LLF6 z+Dt!g+xzG2LOE{|R4NoTD__oIoGs>2v22vGAzfZmN)hlf3 z)9=1{@9ypG-`pEplPBihI9ZwAe)IfWpL}G`*Plz@{UUl%d+p(c;QHI&e&&9E^VYqe e-d*_d*9oz6;==uB&%U1=>Xq_*>GQ(Num1)3dZeQO literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/icons/lifesteal.png b/assets/voxygen/element/icons/lifesteal.png index 15f7282fc88370d82c44dd691b48f3969fed89a2..46ec0ba9305773d9925799a37ca3efe9d092a1f7 100644 GIT binary patch literal 2285 zcmbVO32+lt7!IvaD5>QVIRCgrkJ zl#1;jP^MT2)&g<~!zC38Qx(MlEl>`XO9TdC5Jje_!|mI&jo<(>X7+gd-nZZX{m1(^ z?__3-jfoxT!%1!(%S(1a7jSz4TBAuw40u`2DJYO#aEKlge66V&hD6>3Pl~r;Hm_MI7SpEt zgzV`VIoxz7XXN3;(NIEw0R(PAVWEKA<&l|y2@dfxV60A~Fcg9)P7|D@8iev}nUGoX z2@tKr5DvpgNN?2PG!;+iM?nNeU?>ibcm&rolz|}$sN)9%Yd*e+$+Dz&*aA-`xL8rV z42t^wex0AxNj?XP8;wR3BT#}s00NQAJPI2?JaSwogGG=zpXgOY$pfj3tX(QmOfXQ| z?t2*`6`oVUd13K{1)RB#Dy!K26ki-)n^Vo8zYV(Br| z;pK-6fY91(VH=Os;&z8k$Vy5naHAt2k3`EkWnKZz5@e~w#|bH=KxUlkjh8X|1XhuJ zIg;e+OjKs4WQZViIP}sa(ZfrAdE^5x2o_cmOt6|Y1joUVLtqSMWXSlJF`U7$cBoC_ z#iFt>6h|-;!Qw+ulEL*4K|#sztit{$nCF-x$>(N)!=jsY2&mWNfT3_08MEY)e84bJ zM?N@jHJdYiQjzEa3v$-jWXPIgrg0-pBf!UyT$_!tdSr$5aDvrhfBab!WoDtIt2u>U9 z2(PDT#K_Vlf^!6q3woT!NxqY9yiWuhl65`Es;c4vqtRf{Q!Gy*b_2;GG(~|CK^7sr zfnxPMZ|8W-u9khft~5~wIWFtiNZG=)j*&}*LdCNOFMK{bv=Tj}tGmrB9arbg69D6qf$Ds{KFGJHo;hvmS>4 zIxGsS&Y)^9YEKIK?|g;U9_U-0aL^3ZVYmx}hj1SkJb>B@hNkdY^CR7t$bHWmWJ-0_i>lMXU zceu^@;})?QZ`;^)e)p6D|Lg$k8bf6|##A=GR3Lnn^+znotmyk~rNAbDr+uB&I9Rpm^J+^=fe>XyDs z&fc5Vtu^+Dw#v!h^$$C{{VzQ7*3rhpC!0=F)85ZMoj>@}#F+Yw#eJ+7qNi=^_ZE78 zbaF7JRXcwAn0>+8NeM@h0$+8)`s&kzl!hHkQ?4Fsyq0?y?MJTdMX!CX=Dh*tx%AeH z@7)Nr{o1uQA#xrOQ%je8ogp-hE?d^)$j`xs)RyFKB@yR|hRb#5M)vN5`I`$$b>D4S zm%aJ*MV|yAH<|mz_9K_toN`_@qa$&{a^ocM2 delta 603 zcmV-h0;K)z5&Q&@83+ad0051N9SxBo7k>gSNklT(H351Y{R&HmN;tCau6D6pKNjUJB z%=fKtcII+t%!AooW@bP0c{^`50$}EzE@SQY68xxb4DwTN#EhLaX-^ zZ1yhUWdCo|Qpbcq2vu0I63Luo#K@i5#C#xxFha+UnwxH2Y`8v!edu{4jn8cCkI*w@ z_!1$6{mYaVnx+~O%9#D}4UyF~G=KOXsDd;NH>$K>_g|(er+| zyX<8rD{L|JC#a>uUKJk7JwXaBjYMIguOlcKG0b(GLDOy)3iWLj#<4!!4(11jgc2_0 z1LG{&+}W*U3qd|%9Y>cyZ%F=DS~f4ruVvZ#MInIte-(YXRkS1LfXNu{WGA8( p*tg_NV=dhvp}wV>`oF8|;t&5-OOSCmo+|(V002ovPDHLkV1i0z9%29h diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 4c1e9eec99..2864542ffd 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -542,6 +542,7 @@ image_ids! { buff_energyplus_0: "voxygen.element.icons.de_buffs.buff_energyplus_0", buff_healthplus_0: "voxygen.element.icons.de_buffs.buff_healthplus_0", buff_invincibility_0: "voxygen.element.icons.de_buffs.buff_invincibility_0", + buff_dmg_red_0: "voxygen.element.icons.de_buffs.buff_damage_reduce_0", // Debuffs debuff_skull_0: "voxygen.element.icons.de_buffs.debuff_skull_0", diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 37f2af616d..444ed4ed3d 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -3305,8 +3305,7 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id { BuffKind::IncreaseMaxEnergy { .. } => imgs.buff_energyplus_0, BuffKind::IncreaseMaxHealth { .. } => imgs.buff_healthplus_0, BuffKind::Invulnerability => imgs.buff_invincibility_0, - // Do not merge until icon for this buff - BuffKind::ProtectingWard => imgs.buff_invincibility_0, + BuffKind::ProtectingWard => imgs.buff_dmg_red_0, // Debuffs BuffKind::Bleeding { .. } => imgs.debuff_bleed_0, BuffKind::Cursed { .. } => imgs.debuff_skull_0, diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 9eba391183..006e533ff1 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -30,7 +30,6 @@ use conrod_core::{ widget::{self, Button, Image, Rectangle, Text}, widget_ids, Color, Colorable, Positionable, Sizeable, Widget, WidgetCommon, }; -use inline_tweak::*; use vek::*; widget_ids! { @@ -926,28 +925,24 @@ impl<'a> Widget for Skillbar<'a> { let combo_txt = format!("{} Combo", combo.combo); let combo_cnt = combo.combo as f32; let time_since_last_update = comp::combo::COMBO_DECAY_START - combo.timer; - let alpha = (1.0 - time_since_last_update * tweak!(0.2)).min(1.0) as f32; + let alpha = (1.0 - time_since_last_update * 0.2).min(1.0) as f32; let fnt_col = Color::Rgba( // White -> Yellow -> Red text color gradient depending on count - (1.0 - combo_cnt / (combo_cnt + tweak!(20.0))).max(0.79), - (1.0 - combo_cnt / (combo_cnt + tweak!(80.0))).max(0.19), - (1.0 - combo_cnt / (combo_cnt + tweak!(5.0))).max(0.17), + (1.0 - combo_cnt / (combo_cnt + 20.0)).max(0.79), + (1.0 - combo_cnt / (combo_cnt + 80.0)).max(0.19), + (1.0 - combo_cnt / (combo_cnt + 5.0)).max(0.17), alpha, ); - let fnt_size = ((14.0 + combo.timer as f32 * tweak!(0.8)).min(tweak!(30.0))) as u32 - + if (time_since_last_update) < tweak!(0.1) { - tweak!(2) - } else { - 0 - }; // Increase size for higher counts, "flash" on update by increasing the font size by 2 + let fnt_size = ((14.0 + combo.timer as f32 * 0.8).min(30.0)) as u32 + + if (time_since_last_update) < 0.1 { 2 } else { 0 }; // Increase size for higher counts, "flash" on update by increasing the font size by 2 Rectangle::fill_with([10.0, 10.0], color::TRANSPARENT) .middle_of(ui.window) .set(state.ids.combo_align, ui); Text::new(combo_txt.as_str()) .mid_bottom_with_margin_on( state.ids.combo_align, - tweak!(-350.0) + time_since_last_update * tweak!(-8.0), + -350.0 + time_since_last_update * -8.0, ) .font_size(self.fonts.cyri.scale(fnt_size)) .font_id(self.fonts.cyri.conrod_id)