From 935aec743de458df34b049420b4eb6158b873a7a 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 | 3 +++ assets/voxygen/element/icons/lifesteal.png | 4 ++-- voxygen/src/hud/img_ids.rs | 1 + voxygen/src/hud/mod.rs | 3 +-- voxygen/src/hud/skillbar.rs | 19 +++++++------------ 5 files changed, 14 insertions(+), 16 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 0000000000..6ba084d2ff --- /dev/null +++ b/assets/voxygen/element/icons/de_buffs/buff_damage_reduce_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4b1e1dc6f09c4d8e114bfb4b6c0c2f3dedddf7754a5c6c6da46ac04a6f9ddd3 +size 2145 diff --git a/assets/voxygen/element/icons/lifesteal.png b/assets/voxygen/element/icons/lifesteal.png index c9e6120184..3e17b59a45 100644 --- a/assets/voxygen/element/icons/lifesteal.png +++ b/assets/voxygen/element/icons/lifesteal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:535c9bb15a0edc5a2e9b54e6f311c96e5b9f6869ade33dd02bcbe674d4116482 -size 636 +oid sha256:1a36f4708b16630ef1a148db1742d41cd517411b39bc95ee0d4e90ac6e2b7015 +size 2285 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)