From 8cb963899aa994890d98d17dd6d10e586c38a071 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Sun, 16 Feb 2020 10:58:44 +0000 Subject: [PATCH] Fix healthbar background alignment --- assets/voxygen/element/frames/enemybar-0.vox | Bin 60720 -> 0 bytes assets/voxygen/element/frames/enemybar.png | Bin 1607 -> 245 bytes assets/voxygen/element/frames/enemybar_bg.png | Bin 0 -> 178 bytes voxygen/src/hud/img_ids.rs | 1 + voxygen/src/hud/mod.rs | 21 +++++++++--------- 5 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 assets/voxygen/element/frames/enemybar-0.vox create mode 100644 assets/voxygen/element/frames/enemybar_bg.png diff --git a/assets/voxygen/element/frames/enemybar-0.vox b/assets/voxygen/element/frames/enemybar-0.vox deleted file mode 100644 index ecf3ea214fe704ed4a5aa65abcb3f17f721f08e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60720 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 diff --git a/assets/voxygen/element/frames/enemybar.png b/assets/voxygen/element/frames/enemybar.png index 246a1422f0e08ee60012a0108fcce5008da8b4a2..43413d347da8c20da543c0aa5ad6a03334eb061d 100644 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^K0wUL!3HE}FrE4W;uLs97Bet#3xhBt!>lc6i0 zBKIe5`|rmWzFt55Yndm|NQNIS+kYp^{rr>qPu~;7~_{_8|4?DtwARKDRchM3W`65jNNzT+v}J=S4Hy6hHtCm1c}i;plKI{qb3ig z7_9A;YpB2db>}FoEbuCR%g9mOeZDt#14%A;aD~Cj z_kaKV&pC_*Tdx1m1Uo&TsET3kvi%2h=RMDi{KNAyW@ai}xX3zNULeD68_RNMm> zUZID9BEH-Bz-5N~(?6CVWmNJ1=Zn%Y`mg`>IsTZN_xhd{X-{^|B$V+ og*O1iRqzHE1Pq&4Xw7}izjfl)-)Z_Z=k!uRIn6zM*QRuQz3!nfBcX{?ZH8|2!}h5W4B`w7|Nk>HY?Wgc U@Y$G|3^aqm)78&qol`;+0OB??UH||9 literal 0 HcmV?d00001 diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 40720c90dc..084d3a54ae 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -265,6 +265,7 @@ image_ids! { // Enemy Healthbar enemy_health: "voxygen.element.frames.enemybar", + enemy_health_bg: "voxygen.element.frames.enemybar_bg", // Enemy Bar Content: enemy_bar: "voxygen.element.skillbar.enemy_bar_content", // Spell Book Window diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index d1dec24d09..c6908a992b 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -695,20 +695,19 @@ impl Hud { let ingame_pos = pos + Vec3::unit_z() * height_offset; // Background - Rectangle::fill_with( - [82.0 * BARSIZE + 1.0, 8.0], - Color::Rgba(0.1, 0.1, 0.1, 0.9), - ) - .x_y(0.0, MANA_BAR_Y + 7.0) //-25.0) - .position_ingame(ingame_pos) - .set(back_id, ui_widgets); + Image::new(self.imgs.enemy_health_bg) + .w_h(84.0 * BARSIZE, 10.0 * BARSIZE) + .x_y(0.0, MANA_BAR_Y + 6.5) //-25.5) + .color(Some(Color::Rgba(0.1, 0.1, 0.1, 0.8))) + .position_ingame(ingame_pos) + .set(back_id, ui_widgets); // % HP Filling Image::new(self.imgs.enemy_bar) - .w_h(72.9 * (hp_percentage / 100.0) * BARSIZE, 5.9 * BARSIZE) + .w_h(73.0 * (hp_percentage / 100.0) * BARSIZE, 6.0 * BARSIZE) .x_y( (4.5 + (hp_percentage / 100.0 * 36.45 - 36.45)) * BARSIZE, - MANA_BAR_Y + 9.0, + MANA_BAR_Y + 7.5, ) .color(Some(if hp_percentage <= 25.0 { crit_hp_color @@ -722,13 +721,13 @@ impl Hud { // % Mana Filling Rectangle::fill_with( [ - 73.0 * (energy.current() as f64 / energy.maximum() as f64) * BARSIZE, + 72.0 * (energy.current() as f64 / energy.maximum() as f64) * BARSIZE, MANA_BAR_HEIGHT, ], MANA_COLOR, ) .x_y( - ((4.5 + (energy_percentage / 100.0 * 36.5)) - 36.45) * BARSIZE, + ((3.5 + (energy_percentage / 100.0 * 36.5)) - 36.45) * BARSIZE, MANA_BAR_Y, //-32.0, ) .position_ingame(ingame_pos)