diff --git a/assets/voxygen/element/skillbar/skillbar_slot.png b/assets/voxygen/element/skillbar/skillbar_slot.png new file mode 100644 index 0000000000..811579b09d --- /dev/null +++ b/assets/voxygen/element/skillbar/skillbar_slot.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3804ce85831c53666987128f7589faa40b08cd37f01a8d112bd7e2eca07cd724 +size 2344 diff --git a/assets/voxygen/element/skillbar/skillbar_slot.vox b/assets/voxygen/element/skillbar/skillbar_slot.vox deleted file mode 100644 index 4578c91645..0000000000 --- a/assets/voxygen/element/skillbar/skillbar_slot.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:850e4bda7520d9055e61a39cef6a8989f89e532a43496bd12bc90a3fd577a94c -size 44796 diff --git a/assets/voxygen/element/skillbar/skillbar_slot_active.png b/assets/voxygen/element/skillbar/skillbar_slot_active.png new file mode 100644 index 0000000000..97dbb17702 --- /dev/null +++ b/assets/voxygen/element/skillbar/skillbar_slot_active.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11caed86e7b99aa9a552bfe2f3bce3ea84c175e39069a909b5bc7e2ac2cbfe7e +size 3533 diff --git a/assets/voxygen/element/skillbar/skillbar_slot_active.vox b/assets/voxygen/element/skillbar/skillbar_slot_active.vox deleted file mode 100644 index 3ffc53119a..0000000000 --- a/assets/voxygen/element/skillbar/skillbar_slot_active.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3349a0ac930db681061036315a4136ba2a0009014ce659e287e1ea8c882915e -size 56172 diff --git a/assets/voxygen/element/skillbar/skillbar_slot_bg.vox b/assets/voxygen/element/skillbar/skillbar_slot_bg.vox deleted file mode 100644 index 9cfb3425a4..0000000000 --- a/assets/voxygen/element/skillbar/skillbar_slot_bg.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e46b2e376ee048ed6dfda089e104b983e456c7ed3743a2aab702d1d27813246 -size 45484 diff --git a/assets/voxygen/element/skillbar/skillbar_slot_l.png b/assets/voxygen/element/skillbar/skillbar_slot_l.png new file mode 100644 index 0000000000..69a87a9c96 --- /dev/null +++ b/assets/voxygen/element/skillbar/skillbar_slot_l.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05cafd02908849e40fe20fb1cc2877b54ebb5d198b73663fe0c61e22ea3d021c +size 2343 diff --git a/assets/voxygen/element/skillbar/skillbar_slot_l.vox b/assets/voxygen/element/skillbar/skillbar_slot_l.vox deleted file mode 100644 index 97f44dc171..0000000000 --- a/assets/voxygen/element/skillbar/skillbar_slot_l.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:592fc1ed4126ea63b1c851f294eaee0b587113320cec61acc0b29f5029f94f42 -size 44788 diff --git a/assets/voxygen/element/skillbar/skillbar_slot_l_active.png b/assets/voxygen/element/skillbar/skillbar_slot_l_active.png new file mode 100644 index 0000000000..3e629d7c6c --- /dev/null +++ b/assets/voxygen/element/skillbar/skillbar_slot_l_active.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48ed7345f1920bc9a6105771659ebef797a07d690369cdb2bb299d92bb583e65 +size 3533 diff --git a/assets/voxygen/element/skillbar/skillbar_slot_l_active.vox b/assets/voxygen/element/skillbar/skillbar_slot_l_active.vox deleted file mode 100644 index af526240ec..0000000000 --- a/assets/voxygen/element/skillbar/skillbar_slot_l_active.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2330b4bb03aa2eff449dcd55640198bdc805020080c0f81055eae5a866d49774 -size 56164 diff --git a/assets/voxygen/element/skillbar/skillbar_slot_r.png b/assets/voxygen/element/skillbar/skillbar_slot_r.png new file mode 100644 index 0000000000..c9caaf553e --- /dev/null +++ b/assets/voxygen/element/skillbar/skillbar_slot_r.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f58abab20455ea0b8c5b96ad96b8c39d1d0aaac996afc507074be45cbc928b73 +size 2344 diff --git a/assets/voxygen/element/skillbar/skillbar_slot_r.vox b/assets/voxygen/element/skillbar/skillbar_slot_r.vox deleted file mode 100644 index 54f3148e0c..0000000000 --- a/assets/voxygen/element/skillbar/skillbar_slot_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16d8f4c48dc9046358e9c8e66f5f892033ee9fc9aa737b8b6bd9e14c140379eb -size 44788 diff --git a/assets/voxygen/element/skillbar/skillbar_slot_r_active.png b/assets/voxygen/element/skillbar/skillbar_slot_r_active.png new file mode 100644 index 0000000000..6ba1610d29 --- /dev/null +++ b/assets/voxygen/element/skillbar/skillbar_slot_r_active.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cfe0bef782ebdff6665e866e1ec659f139d36ded000a3c9fac298037ae86787 +size 3533 diff --git a/assets/voxygen/element/skillbar/skillbar_slot_r_active.vox b/assets/voxygen/element/skillbar/skillbar_slot_r_active.vox deleted file mode 100644 index 9c4cadf52b..0000000000 --- a/assets/voxygen/element/skillbar/skillbar_slot_r_active.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e87dca4630698130ff836d412a4e18d43d398169dbb446c375433b8cf102138 -size 56164 diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 719018b21d..98c3e7986f 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -25,13 +25,6 @@ image_ids! { xp_bar_mid: "voxygen.element.skillbar.xp_bar_mid", xp_bar_left: "voxygen.element.skillbar.xp_bar_left", xp_bar_right: "voxygen.element.skillbar.xp_bar_right", - skillbar_slot: "voxygen.element.skillbar.skillbar_slot", - skillbar_slot_act: "voxygen.element.skillbar.skillbar_slot_active", - skillbar_slot_l: "voxygen.element.skillbar.skillbar_slot_l", - skillbar_slot_r: "voxygen.element.skillbar.skillbar_slot_r", - skillbar_slot_l_act: "voxygen.element.skillbar.skillbar_slot_l_active", - skillbar_slot_r_act: "voxygen.element.skillbar.skillbar_slot_r_active", - skillbar_slot_bg: "voxygen.element.skillbar.skillbar_slot_bg", skillbar_slot_big: "voxygen.element.skillbar.skillbar_slot_big", skillbar_slot_big_act: "voxygen.element.skillbar.skillbar_slot_big_active", skillbar_slot_big_bg: "voxygen.element.skillbar.skillbar_slot_big_bg", @@ -151,6 +144,14 @@ image_ids! { + // Skillbar + skillbar_slot: "voxygen.element.skillbar.skillbar_slot", + skillbar_slot_act: "voxygen.element.skillbar.skillbar_slot_active", + skillbar_slot_l: "voxygen.element.skillbar.skillbar_slot_l", + skillbar_slot_r: "voxygen.element.skillbar.skillbar_slot_r", + skillbar_slot_l_act: "voxygen.element.skillbar.skillbar_slot_l_active", + skillbar_slot_r_act: "voxygen.element.skillbar.skillbar_slot_r_active", + // Skill Icons twohsword_m1: "voxygen.element.icons.2hsword_m1", twohsword_m2: "voxygen.element.icons.2hsword_m2", diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 8879a42623..784ec156ab 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -228,7 +228,6 @@ impl<'a> Widget for Skillbar<'a> { let bar_values = self.global_state.settings.gameplay.bar_numbers; let shortcuts = self.global_state.settings.gameplay.shortcut_numbers; - const BG_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 0.8); const BG_COLOR_2: Color = Color::Rgba(0.0, 0.0, 0.0, 0.99); let hp_ani = (self.pulse * 4.0/* speed factor */).cos() * 0.5 + 0.8; //Animation timer let crit_hp_color: Color = Color::Rgba(0.79, 0.19, 0.17, hp_ani); @@ -803,8 +802,8 @@ impl<'a> Widget for Skillbar<'a> { // TODO: is a separate image needed for the frame? empty_slot: self.imgs.skillbar_slot, filled_slot: self.imgs.skillbar_slot, - selected_slot: self.imgs.skillbar_slot, - background_color: Some(BG_COLOR), + selected_slot: self.imgs.skillbar_slot_act, + background_color: None, content_size: ContentSize { width_height_ratio: 1.0, max_fraction: 0.9, @@ -917,6 +916,9 @@ impl<'a> Widget for Skillbar<'a> { .set(state.ids.slot1_act, ui); }, }*/ + slot_maker.empty_slot = self.imgs.skillbar_slot_l; + slot_maker.filled_slot = self.imgs.skillbar_slot_l; + slot_maker.selected_slot = self.imgs.skillbar_slot_l_act; let slot = slot_maker .fabricate(hotbar::Slot::One, [20.0 * scale as f32; 2]) .left_from(state.ids.slot2, 0.0); @@ -946,6 +948,9 @@ impl<'a> Widget for Skillbar<'a> { _ => {}, }*/ // Slot 6 + slot_maker.empty_slot = self.imgs.skillbar_slot; + slot_maker.filled_slot = self.imgs.skillbar_slot; + slot_maker.selected_slot = self.imgs.skillbar_slot_act; let slot = slot_maker .fabricate(hotbar::Slot::Six, [20.0 * scale as f32; 2]) .bottom_right_with_margins_on(state.ids.m2_slot, 0.0, -20.0 * scale); @@ -990,9 +995,9 @@ impl<'a> Widget for Skillbar<'a> { slot.set(state.ids.slot9, ui); } // Quickslot - slot_maker.filled_slot = self.imgs.skillbar_slot_r; - slot_maker.selected_slot = self.imgs.skillbar_slot_r; slot_maker.empty_slot = self.imgs.skillbar_slot_r; + slot_maker.filled_slot = self.imgs.skillbar_slot_r; + slot_maker.selected_slot = self.imgs.skillbar_slot_r_act; let slot = slot_maker .fabricate(hotbar::Slot::Ten, [20.0 * scale as f32; 2]) .right_from(state.ids.slot9, 0.0);