Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

small UI fixes, new haste buff icon

Browse Source
This commit is contained in:
Monty Marz 2022-02-14 19:24:40 +01:00
parent 2bcf9b9a26
commit 900fff7ba9
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/de_buffs/buff_haste_0.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

1
voxygen/src/hud/img_ids.rs
View File

@ -620,6 +620,7 @@ image_ids! {
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",
buff_haste_0: "voxygen.element.de_buffs.buff_haste_0",
// Debuffs
debuff_skull_0: "voxygen.element.de_buffs.debuff_skull_0",

3
voxygen/src/hud/map.rs
View File

@ -940,8 +940,7 @@ impl<'a> Widget for Map<'a> {
Some(1) => QUALITY_COMMON,
Some(2) => QUALITY_MODERATE,
Some(3) => QUALITY_HIGH,
Some(4) => QUALITY_EPIC,
Some(5) => QUALITY_LEGENDARY,
Some(4 | 5) => QUALITY_EPIC,
_ => TEXT_COLOR,
},
SiteKind::Cave => TEXT_COLOR,

12
voxygen/src/hud/mod.rs
View File

@ -1541,11 +1541,17 @@ impl Hud {
.set(self.ids.player_rank_up, ui_widgets);
// Rank Number
let rank = display.total_points;
let fontsize = match rank {
1..=99 => (20, 8.0),
100..=999 => (18, 9.0),
1000..=9999 => (17, 10.0),
_ => (14, 12.0),
};
Text::new(&format!("{}", rank))
.font_size(20)
.font_size(fontsize.0)
.font_id(self.fonts.cyri.conrod_id)
.color(Color::Rgba(1.0, 1.0, 1.0, fade))
.mid_top_with_margin_on(self.ids.player_rank_up, 8.0)
.mid_top_with_margin_on(self.ids.player_rank_up, fontsize.1)
.set(self.ids.player_rank_up_txt_number, ui_widgets);
// Static "New Rank!" text
Text::new(i18n.get("hud.rank_up"))
@ -4296,7 +4302,7 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id {
BuffKind::ProtectingWard => imgs.buff_dmg_red_0,
BuffKind::Frenzied { .. } => imgs.buff_frenzy_0,
// TODO: Get unique icon
BuffKind::Hastened { .. } => imgs.buff_frenzy_0,
BuffKind::Hastened { .. } => imgs.buff_haste_0,
// Debuffs
BuffKind::Bleeding { .. } => imgs.debuff_bleed_0,
BuffKind::Cursed { .. } => imgs.debuff_skull_0,