From 6ab4e2264ea68eb99bac6485b4c4101034f81cbb Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 28 Feb 2021 17:30:57 -0500 Subject: [PATCH] Buff icon --- assets/voxygen/element/icons/de_buffs/buff_invincibility_0.png | 3 +++ voxygen/src/hud/img_ids.rs | 1 + voxygen/src/hud/mod.rs | 3 +-- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 assets/voxygen/element/icons/de_buffs/buff_invincibility_0.png diff --git a/assets/voxygen/element/icons/de_buffs/buff_invincibility_0.png b/assets/voxygen/element/icons/de_buffs/buff_invincibility_0.png new file mode 100644 index 0000000000..1a411d1ab8 --- /dev/null +++ b/assets/voxygen/element/icons/de_buffs/buff_invincibility_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d535544809197d5d3611f106c4316aaab1e72176361f94eeab7e7d94e101c394 +size 2068 diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 9c031af1fb..d7da861e52 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -447,6 +447,7 @@ image_ids! { buff_campfire_heal_0: "voxygen.element.icons.de_buffs.buff_campfire_heal_0", 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", // 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 2081832dc6..9ba15d483a 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -3180,8 +3180,7 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id { BuffKind::CampfireHeal { .. } => imgs.buff_campfire_heal_0, BuffKind::IncreaseMaxEnergy { .. } => imgs.buff_energyplus_0, BuffKind::IncreaseMaxHealth { .. } => imgs.buff_healthplus_0, - // TODO: Before merge replace with actual icon - BuffKind::Invulnerability => imgs.buff_plus_0, + BuffKind::Invulnerability => imgs.buff_invincibility_0, // Debuffs BuffKind::Bleeding { .. } => imgs.debuff_bleed_0, BuffKind::Cursed { .. } => imgs.debuff_skull_0,