diff --git a/assets/voxygen/element/buttons/min_plus/mmap_button-min_hover.png b/assets/voxygen/element/buttons/min_plus/mmap_button-min_hover.png index f723687322..77fd062cec 100644 Binary files a/assets/voxygen/element/buttons/min_plus/mmap_button-min_hover.png and b/assets/voxygen/element/buttons/min_plus/mmap_button-min_hover.png differ diff --git a/assets/voxygen/element/buttons/min_plus/mmap_button-min_press.png b/assets/voxygen/element/buttons/min_plus/mmap_button-min_press.png index f723687322..bdae839474 100644 Binary files a/assets/voxygen/element/buttons/min_plus/mmap_button-min_press.png and b/assets/voxygen/element/buttons/min_plus/mmap_button-min_press.png differ diff --git a/assets/voxygen/element/misc_bg/inv_bg_0.png b/assets/voxygen/element/misc_bg/inv_bg_0.png new file mode 100644 index 0000000000..6df81ff85e Binary files /dev/null and b/assets/voxygen/element/misc_bg/inv_bg_0.png differ diff --git a/assets/voxygen/element/misc_bg/inv_bg_1.png b/assets/voxygen/element/misc_bg/inv_bg_1.png new file mode 100644 index 0000000000..d8e4c0aaf0 Binary files /dev/null and b/assets/voxygen/element/misc_bg/inv_bg_1.png differ diff --git a/assets/voxygen/element/misc_bg/inv_runes.png b/assets/voxygen/element/misc_bg/inv_runes.png index e8ac2b4805..acff8fa0a8 100644 Binary files a/assets/voxygen/element/misc_bg/inv_runes.png and b/assets/voxygen/element/misc_bg/inv_runes.png differ diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron index de0078c0b5..76a819a277 100644 --- a/assets/voxygen/i18n/en.ron +++ b/assets/voxygen/i18n/en.ron @@ -192,7 +192,9 @@ Enjoy your stay in the World of Veloren."#, // Inventory - "hud.bag.inventory": "'s Inventory", + "hud.bag.inventory": "'s Inventory", + "hud.bag.stats": "'s Stats", + "hud.bag.exp": "Exp", // Settings "hud.settings.general": "General", "hud.settings.none": "None", diff --git a/voxygen/src/hud/bag.rs b/voxygen/src/hud/bag.rs index 73fd1d66e9..f687dac683 100644 --- a/voxygen/src/hud/bag.rs +++ b/voxygen/src/hud/bag.rs @@ -138,7 +138,12 @@ impl<'a> Widget for Bag<'a> { None => return None, }; let exp_percentage = (self.stats.exp.current() as f64) / (self.stats.exp.maximum() as f64); - let exp_treshold = format!("{}/{}", self.stats.exp.current(), self.stats.exp.maximum()); + let exp_treshold = format!( + "{}/{} {}", + self.stats.exp.current(), + self.stats.exp.maximum(), + &self.localized_strings.get("hud.bag.exp") + ); let level = (self.stats.level.level()).to_string(); // Tooltips @@ -162,11 +167,15 @@ impl<'a> Widget for Bag<'a> { .desc_text_color(TEXT_COLOR); // BG - Image::new(self.imgs.inv_bg) - .w_h(424.0, 708.0) - .bottom_right_with_margins_on(ui.window, 60.0, 5.0) - .color(Some(UI_MAIN)) - .set(state.ids.bg, ui); + Image::new(if self.show.stats { + self.imgs.inv_bg_stats + } else { + self.imgs.inv_bg_armor + }) + .w_h(424.0, 708.0) + .bottom_right_with_margins_on(ui.window, 60.0, 5.0) + .color(Some(UI_MAIN)) + .set(state.ids.bg, ui); Image::new(self.imgs.inv_frame) .w_h(424.0, 708.0) .middle_of(state.ids.bg) @@ -214,12 +223,34 @@ impl<'a> Widget for Bag<'a> { .set(state.ids.inv_alignment, ui); if !self.show.stats { + // Title + Text::new(&format!( + "{}{}", + &self.stats.name, + &self.localized_strings.get("hud.bag.inventory") + )) + .mid_top_with_margin_on(state.ids.bg_frame, 9.0) + .font_id(self.fonts.cyri.conrod_id) + .font_size(self.fonts.cyri.scale(22)) + .color(Color::Rgba(0.0, 0.0, 0.0, 1.0)) + .set(state.ids.inventory_title_bg, ui); + Text::new(&format!( + "{}{}", + &self.stats.name, + &self.localized_strings.get("hud.bag.inventory") + )) + .top_left_with_margins_on(state.ids.inventory_title_bg, 2.0, 2.0) + .font_id(self.fonts.cyri.conrod_id) + .font_size(self.fonts.cyri.scale(22)) + .color(TEXT_COLOR) + .set(state.ids.inventory_title, ui); //Armor Slots //Slots BG Image::new(self.imgs.inv_runes) .w_h(424.0, 454.0) .mid_top_with_margin_on(state.ids.bg, 0.0) .color(Some(UI_HIGHLIGHT_0)) + .floating(true) .set(state.ids.slots_bg, ui); Image::new(self.imgs.inv_slots) .w_h(424.0, 401.0) @@ -228,6 +259,27 @@ impl<'a> Widget for Bag<'a> { .set(state.ids.slots_bg, ui); } else { // Stats + // Title + Text::new(&format!( + "{}{}", + &self.stats.name, + &self.localized_strings.get("hud.bag.stats") + )) + .mid_top_with_margin_on(state.ids.bg_frame, 9.0) + .font_id(self.fonts.cyri.conrod_id) + .font_size(self.fonts.cyri.scale(22)) + .color(Color::Rgba(0.0, 0.0, 0.0, 1.0)) + .set(state.ids.inventory_title_bg, ui); + Text::new(&format!( + "{}{}", + &self.stats.name, + &self.localized_strings.get("hud.bag.stats") + )) + .top_left_with_margins_on(state.ids.inventory_title_bg, 2.0, 2.0) + .font_id(self.fonts.cyri.conrod_id) + .font_size(self.fonts.cyri.scale(22)) + .color(TEXT_COLOR) + .set(state.ids.inventory_title, ui); // Alignment for Stats Rectangle::fill_with([418.0, 384.0], color::TRANSPARENT) .mid_top_with_margin_on(state.ids.bg_frame, 48.0) diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 6d6cdf548f..2c70bd4ab2 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -244,7 +244,8 @@ image_ids! { close_btn_press: "voxygen.element.buttons.close_btn_press", // Inventory - inv_bg: "voxygen.element.misc_bg.inv_bg", + inv_bg_armor: "voxygen.element.misc_bg.inv_bg_0", + inv_bg_stats: "voxygen.element.misc_bg.inv_bg_1", inv_frame: "voxygen.element.misc_bg.inv_frame", char_art: "voxygen.element.icons.character", inv_slot: "voxygen.element.buttons.inv_slot",