diff --git a/assets/voxygen/element/buttons/armor_slot.png b/assets/voxygen/element/buttons/armor_slot.png new file mode 100644 index 0000000000..2eb79d4449 --- /dev/null +++ b/assets/voxygen/element/buttons/armor_slot.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2fb5c403dced0781cff9dc7ea824a290178a114db9199e50cd762f8540f80c9 +size 2002 diff --git a/voxygen/src/hud/bag.rs b/voxygen/src/hud/bag.rs index f687dac683..c8348e4dd6 100644 --- a/voxygen/src/hud/bag.rs +++ b/voxygen/src/hud/bag.rs @@ -17,6 +17,7 @@ use conrod_core::{ widget_ids! { struct Ids { + test, bag_close, inv_alignment, inv_grid_1, @@ -38,8 +39,6 @@ widget_ids! { tab_2, tab_3, tab_4, - //Armor Slots - slots_bg, //Stats stats_alignment, level, @@ -50,7 +49,22 @@ widget_ids! { divider, statnames, stats, - + //Armor Slots + slots_bg, + head_bg, + neck_bg, + chest_bg, + shoulder_bg, + hands_bg, + pants_bg, + belt_bg, + ring-r_bg, + ring-l_bg, + foot_bg, + back_bg, + tabard_bg, + mainhand_bg, + offhand_bg, } } @@ -257,6 +271,40 @@ impl<'a> Widget for Bag<'a> { .mid_top_with_margin_on(state.ids.bg, 57.0) .color(Some(UI_HIGHLIGHT_0)) .set(state.ids.slots_bg, ui); + // Armor Slots + //Head + //Necklace + //Chest + Image::new(self.imgs.armor_slot) // different graphics for empty/non empty + .w_h(86.0, 86.0) + .mid_top_with_margin_on(state.ids.slots_bg, 162.0) + .color(Some(UI_HIGHLIGHT_0)) + .set(state.ids.chest_bg, ui); + Button::image(self.imgs.skull) + .w_h(80.0, 80.0) + .middle_of(state.ids.chest_bg) + .set(state.ids.test, ui); + //Shoulder + //Hands + //Belt + Image::new(self.imgs.armor_slot) + .w_h(44.0, 44.0) + .down_from(state.ids.chest_bg, 11.0) + .color(Some(UI_HIGHLIGHT_0)) + .set(state.ids.chest_bg, ui); + //Pants + Image::new(self.imgs.armor_slot) + .w_h(86.0, 86.0) + .down_from(state.ids.belt_bg, 11.0) + .color(Some(UI_HIGHLIGHT_0)) + .set(state.ids.pants_bg, ui); + //Ring-L + //Ring-R + //Foot + //Back + //Tabard + //Mainhand/Left-Slot + //Offhand/Right-Slot } else { // Stats // Title diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 2c70bd4ab2..bcdae37b80 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -257,6 +257,7 @@ image_ids! { inv_tab_inactive_press: "voxygen.element.buttons.inv_tab_inactive", inv_slots: "voxygen.element.misc_bg.inv_slots", inv_runes: "voxygen.element.misc_bg.inv_runes", + armor_slot: "voxygen.element.buttons.armor_slot",