From f6b364c6449ff8830b640f6d27971ffe41a67156 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 | Bin 0 -> 293 bytes .../voxygen/element/de_buffs/debuff_cripple_0.png | Bin 0 -> 272 bytes voxygen/src/hud/img_ids.rs | 2 ++ voxygen/src/hud/mod.rs | 6 ++---- 4 files changed, 4 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 0000000000000000000000000000000000000000..1b8c0e36d2225052e15808857a5bd1b084bed842 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VTavfC3&Vd9T(EcfWS|IVfk$L9 z1B0G22s2hJwJ!q-9`$r_46!(!oRW}`;NkE8|GWdMLGd#mw_{(veEIJl${%>xhVAw3 zG9Dd+bC*NUOWvDXb6z1u&tsCJf$gQlNjxCn!xO^hb0bIPXlVs+OXYM4=ftcF%^j@) zHx@|u`SPrvzERR^O=1MEit4nDD^rz1nH9MsIVy$cyWY5BG;xwiM`x{A&bG&wJ9OI5 zs_Xnnnj$j&^|!2rRg$w$Z`dg^TPo%B%nzb7C5OWp#K~ g#vL#U+6@c_#=wTetJ>y&fF5G-boFyt=akR{04i~7y8r+H literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..21bfad719ac8ac5ece64f6c321cc170c1d17aa80 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VTavfC3&Vd9T(EcfWS|IVfk$L9 z1B0G22s2hJwJ!q-Zt!$*46!)9cIsZi76pM;c^<{iwJ~|D*9tyfbEz?nIQVp1Qqnuu z7pDq#|Jloucs&1JG@Ai~gNr(wMoR*Z;N114vIh@u(*m3z3s8&pR{$ P-Ok|Y>gTe~DWM4fvhQv# literal 0 HcmV?d00001 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, } }