From 7ded921ecc7381c64e5dfcc8d29f74603d59f56b Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Mon, 16 Mar 2020 22:58:19 +0100 Subject: [PATCH] more UI visuals --- .../min_plus/mmap_button-min_hover.png | 4 +- .../min_plus/mmap_button-min_press.png | 4 +- assets/voxygen/element/misc_bg/inv_bg_0.png | 3 + assets/voxygen/element/misc_bg/inv_bg_1.png | 3 + assets/voxygen/element/misc_bg/inv_runes.png | 4 +- assets/voxygen/i18n/en.ron | 4 +- voxygen/src/hud/bag.rs | 64 +++++++++++++++++-- voxygen/src/hud/img_ids.rs | 3 +- 8 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 assets/voxygen/element/misc_bg/inv_bg_0.png create mode 100644 assets/voxygen/element/misc_bg/inv_bg_1.png 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 fdfb9d5003..89e0d5922e 100644 --- a/assets/voxygen/element/buttons/min_plus/mmap_button-min_hover.png +++ b/assets/voxygen/element/buttons/min_plus/mmap_button-min_hover.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a763570725e6388d29512e0069cd8ca09a4867735380bb26d288fd303bb52805 -size 222 +oid sha256:bb34dc3409ec0cdc69820a995044881a15b884e4f21ee0dfa5e3b233d45ca64b +size 750 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 fdfb9d5003..050b0ed017 100644 --- a/assets/voxygen/element/buttons/min_plus/mmap_button-min_press.png +++ b/assets/voxygen/element/buttons/min_plus/mmap_button-min_press.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a763570725e6388d29512e0069cd8ca09a4867735380bb26d288fd303bb52805 -size 222 +oid sha256:3c8692d5b49c945d3bc9487241fd36fd19ed2651c7c806580c8650234cf90067 +size 738 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..796bf67984 --- /dev/null +++ b/assets/voxygen/element/misc_bg/inv_bg_0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb15146cc53bf3060225f58f8a880d3ef22be23e305aa5106ba3d187e03b73a2 +size 126837 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..f81c744864 --- /dev/null +++ b/assets/voxygen/element/misc_bg/inv_bg_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9347f7533c16a1dbf742fb397e7267e6b72f467676138c10153bd9778b845b1 +size 68382 diff --git a/assets/voxygen/element/misc_bg/inv_runes.png b/assets/voxygen/element/misc_bg/inv_runes.png index 9410b0afd4..bbc2d60f4f 100644 --- a/assets/voxygen/element/misc_bg/inv_runes.png +++ b/assets/voxygen/element/misc_bg/inv_runes.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba2d049b990ab3e8e4279b0cbc8540afb056f82d6c6a5cde7d4f6bfe3286cf50 -size 17340 +oid sha256:44ab3306cdf5e3267b3d6bbb837bea688eb78c36d223af2f6d606888a48bddff +size 58594 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",