From d99623b298e8dc98fc6e19051ff9fa5e70afabfa Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 4 May 2021 08:44:47 -0400 Subject: [PATCH] Buff icons --- assets/voxygen/element/de_buffs/buff_frenzy_0.png | 3 +++ assets/voxygen/element/de_buffs/debuff_cripple_0.png | 3 +++ voxygen/src/hud/img_ids.rs | 2 ++ voxygen/src/hud/mod.rs | 6 ++---- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 assets/voxygen/element/de_buffs/buff_frenzy_0.png create mode 100644 assets/voxygen/element/de_buffs/debuff_cripple_0.png diff --git a/assets/voxygen/element/de_buffs/buff_frenzy_0.png b/assets/voxygen/element/de_buffs/buff_frenzy_0.png new file mode 100644 index 0000000000..fe6ca236cb --- /dev/null +++ b/assets/voxygen/element/de_buffs/buff_frenzy_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d67ffc40362607cc885ff15d494396bad67cbb735c8e705a300fd867a7ab6de1 +size 293 diff --git a/assets/voxygen/element/de_buffs/debuff_cripple_0.png b/assets/voxygen/element/de_buffs/debuff_cripple_0.png new file mode 100644 index 0000000000..898145c2d6 --- /dev/null +++ b/assets/voxygen/element/de_buffs/debuff_cripple_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d6f2e4416e8e38478ac6154b404776fc5dff1a63ae6af36d288f4f22ed699c2 +size 272 diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index b74af470be..2e670e7517 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -569,11 +569,13 @@ image_ids! { buff_healthplus_0: "voxygen.element.de_buffs.buff_healthplus_0", buff_invincibility_0: "voxygen.element.de_buffs.buff_invincibility_0", buff_dmg_red_0: "voxygen.element.de_buffs.buff_damage_reduce_0", + buff_frenzy_0: "voxygen.element.de_buffs.buff_frenzy_0", // Debuffs debuff_skull_0: "voxygen.element.de_buffs.debuff_skull_0", debuff_bleed_0: "voxygen.element.de_buffs.debuff_bleed_0", debuff_burning_0: "voxygen.element.de_buffs.debuff_burning_0", + debuff_crippled_0: "voxygen.element.de_buffs.debuff_cripple_0", // Animation Frames // Buff Frame diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 83ad74a6d5..6ac6c7a17b 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -3622,14 +3622,12 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id { BuffKind::IncreaseMaxHealth { .. } => imgs.buff_healthplus_0, BuffKind::Invulnerability => imgs.buff_invincibility_0, BuffKind::ProtectingWard => imgs.buff_dmg_red_0, - // TODO: Get buff icon - BuffKind::Frenzied { .. } => imgs.buff_invincibility_0, + BuffKind::Frenzied { .. } => imgs.buff_frenzy_0, // Debuffs BuffKind::Bleeding { .. } => imgs.debuff_bleed_0, BuffKind::Cursed { .. } => imgs.debuff_skull_0, BuffKind::Burning { .. } => imgs.debuff_burning_0, - // TODO: Get buff icon - BuffKind::Crippled { .. } => imgs.debuff_bleed_0, + BuffKind::Crippled { .. } => imgs.debuff_crippled_0, } }