diff --git a/assets/voxygen/element/buttons/x.vox b/assets/voxygen/element/buttons/x.vox index e45fc41417..9086a70699 100644 --- a/assets/voxygen/element/buttons/x.vox +++ b/assets/voxygen/element/buttons/x.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab197899725e8f34376b1e74c318611580bb9ac3e6a5ebbb64e6d7705cbb0bb1 +oid sha256:5f604ac7fa307a80bed9dff02e5bb631d537e83e2081ff881bb0821a101dd4cd size 237548 diff --git a/assets/voxygen/element/icons/head.vox b/assets/voxygen/element/icons/head.vox index 145491b44d..fc5bfc7078 100644 --- a/assets/voxygen/element/icons/head.vox +++ b/assets/voxygen/element/icons/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6de57cc2446344b13a2f55571b7db49b363ac5ea909cc58723c7147f63821558 -size 20624 +oid sha256:12c1ec53fd540a6fc20f1dcad46665741d8c2d9fd978964a490000e056424f5b +size 63732 diff --git a/voxygen/src/hud/character_window.rs b/voxygen/src/hud/character_window.rs index c4a1a36e8d..753bb17fc4 100644 --- a/voxygen/src/hud/character_window.rs +++ b/voxygen/src/hud/character_window.rs @@ -130,7 +130,7 @@ impl<'a> Widget for CharacterWindow<'a> { // Title Text::new("Character Name") // Add in actual Character Name - .mid_top_with_margin_on(state.charwindow_frame, 4.0) + .mid_top_with_margin_on(state.charwindow_frame, 6.0) .font_id(self.fonts.metamorph) .font_size(14) .color(TEXT_COLOR) @@ -143,13 +143,123 @@ impl<'a> Widget for CharacterWindow<'a> { // Contents - //Head BG and Grid - + //Head Image::new(self.imgs.head_bg) - .w_h(28.0 * 4.0, 28.0 * 4.0) + .w_h(28.0 * 2.0, 28.0 * 2.0) .mid_top_with_margin_on(state.content_align, 5.0) .set(state.head_bg, ui); - + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.head_bg) + .set(state.head_grid, ui); + // Shoulders + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .top_right_with_margins_on(state.content_align, 65.0, 40.0) + .set(state.shoulders_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.shoulders_bg) + .set(state.shoulders_grid, ui); + // Hands + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.belt_bg, 10.0) + .set(state.hands_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.hands_bg) + .set(state.hands_grid, ui); + // Belt + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.legs_bg, 10.0) + .set(state.belt_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.belt_bg) + .set(state.belt_grid, ui); + // Legs + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.feet_bg, 10.0) + .set(state.legs_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.legs_bg) + .set(state.legs_grid, ui); + // Feet + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.ring_r_bg, 10.0) + .set(state.feet_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.feet_bg) + .set(state.feet_grid, ui); + // Ring R + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .bottom_right_with_margins_on(state.content_align, 20.0, 20.0) + .set(state.ring_r_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.ring_r_bg) + .set(state.ring_r_grid, ui); + // Ring L + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .bottom_left_with_margins_on(state.content_align, 20.0, 20.0) + .set(state.ring_l_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.ring_l_bg) + .set(state.ring_l_grid, ui); + // Tabard + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.ring_l_bg, 10.0) + .set(state.tabard_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.tabard_bg) + .set(state.tabard_grid, ui); + // Chest + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.tabard_bg, 10.0) + .set(state.chest_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.chest_bg) + .set(state.chest_grid, ui); + // Back + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.chest_bg, 10.0) + .set(state.back_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.back_bg) + .set(state.back_grid, ui); + // Gem + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .up_from(state.back_bg, 10.0) + .set(state.gem_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.gem_bg) + .set(state.gem_grid, ui); + //Necklace + Image::new(self.imgs.head_bg) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .top_left_with_margins_on(state.content_align, 65.0, 40.0) + .set(state.necklace_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 2.0, 28.0 * 2.0) + .middle_of(state.necklace_bg) + .set(state.necklace_grid, ui); // Stats Tab // Tab BG diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 5fc20576d4..a9b660fa64 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -69,8 +69,8 @@ impl<'a> Widget for Skillbar<'a> { // TODO: Read from parameter / character struct let xp_percentage = 0.4; - let hp_percentage = 0.4; - let mana_percentage = 0.4; + let hp_percentage = 1.0; + let mana_percentage = 1.0; // Experience-Bar Image::new(self.imgs.xp_bar)