From fc4103561e3be9ddfee8d6a2725161b625e51ede Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Sat, 11 May 2019 17:36:10 +0200 Subject: [PATCH] CharWindow Former-commit-id: 1fe067505229dc78dee4a0175fcbdbb2040599bd --- assets/voxygen/element/frames/tab_bg.vox | 4 +- assets/voxygen/element/icons/back.vox | 4 +- assets/voxygen/element/icons/belt.vox | 4 +- assets/voxygen/element/icons/chest.vox | 4 +- assets/voxygen/element/icons/feet.vox | 3 + assets/voxygen/element/icons/gem.vox | 4 +- assets/voxygen/element/icons/hands.vox | 4 +- assets/voxygen/element/icons/head.vox | 4 +- assets/voxygen/element/icons/legs.vox | 3 + assets/voxygen/element/icons/mainhand.vox | 3 + assets/voxygen/element/icons/necklace.vox | 3 + assets/voxygen/element/icons/offhand.vox | 3 + assets/voxygen/element/icons/ring.vox | 3 + assets/voxygen/element/icons/shoulders.vox | 3 + assets/voxygen/element/icons/tabard.vox | 3 + assets/voxygen/element/misc_bg/charwindow.png | 4 +- assets/voxygen/element/misc_bg/crosshair.vox | 3 + assets/voxygen/voxel/Wood Training 2h.vox | 3 + assets/voxygen/voxel/hand.vox | 4 +- assets/voxygen/voxel/head.vox | 4 +- assets/voxygen/voxel/sword.vox | 4 +- voxygen/src/hud/character_window.rs | 124 +++++++++++------- voxygen/src/hud/img_ids.rs | 33 +++-- voxygen/src/hud/mod.rs | 2 +- voxygen/src/hud/skillbar.rs | 7 + 25 files changed, 158 insertions(+), 82 deletions(-) create mode 100644 assets/voxygen/element/icons/feet.vox create mode 100644 assets/voxygen/element/icons/legs.vox create mode 100644 assets/voxygen/element/icons/mainhand.vox create mode 100644 assets/voxygen/element/icons/necklace.vox create mode 100644 assets/voxygen/element/icons/offhand.vox create mode 100644 assets/voxygen/element/icons/ring.vox create mode 100644 assets/voxygen/element/icons/shoulders.vox create mode 100644 assets/voxygen/element/icons/tabard.vox create mode 100644 assets/voxygen/element/misc_bg/crosshair.vox create mode 100644 assets/voxygen/voxel/Wood Training 2h.vox diff --git a/assets/voxygen/element/frames/tab_bg.vox b/assets/voxygen/element/frames/tab_bg.vox index faa1740e6f..25ee6a6d31 100644 --- a/assets/voxygen/element/frames/tab_bg.vox +++ b/assets/voxygen/element/frames/tab_bg.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5eb4e9ed54edae5407da28e6f9ced4d762ef4697a6fc2287e0e98ccc170551a9 -size 69044 +oid sha256:472e5b6b123a61e9462b487d95608961dd5375497d505c973a5bfabd69574938 +size 70424 diff --git a/assets/voxygen/element/icons/back.vox b/assets/voxygen/element/icons/back.vox index dc2490b060..a9f8eee678 100644 --- a/assets/voxygen/element/icons/back.vox +++ b/assets/voxygen/element/icons/back.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e967f46d131f6378700b29784483f5f8eb4573c55a3d792a69b3fe8536b39fb -size 19496 +oid sha256:f0fed53b953e06948cf233f3d4f3f27bac06c12f1b9c1687e1b47a3f66d5bc35 +size 62604 diff --git a/assets/voxygen/element/icons/belt.vox b/assets/voxygen/element/icons/belt.vox index 93a83c77c5..49d0bff7cb 100644 --- a/assets/voxygen/element/icons/belt.vox +++ b/assets/voxygen/element/icons/belt.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4c5fa3de317fc9d8ad32d1cae28488bf4b74687dad95bc7ae83333ba29570af -size 18160 +oid sha256:aa92f8ffc54d7838fa7bb90ff76df7a9e67d95bcbf1c339b7563f5e7b57befe1 +size 61268 diff --git a/assets/voxygen/element/icons/chest.vox b/assets/voxygen/element/icons/chest.vox index cc1bc574dc..e7593a2382 100644 --- a/assets/voxygen/element/icons/chest.vox +++ b/assets/voxygen/element/icons/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5002a9da3b28f251c7b0b2f6982077c46c1b8418999ba191d3e1cfc86c7259b3 -size 18504 +oid sha256:3446d88d65fd7bdbb5b195dbe45809a56c27e527c59360a4be32795c4f034f0d +size 61612 diff --git a/assets/voxygen/element/icons/feet.vox b/assets/voxygen/element/icons/feet.vox new file mode 100644 index 0000000000..20127bc7e0 --- /dev/null +++ b/assets/voxygen/element/icons/feet.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a20ba6cc66e585069fddeacdafd89746504ee6ac81e57fcfa2a34293b81cc24 +size 61212 diff --git a/assets/voxygen/element/icons/gem.vox b/assets/voxygen/element/icons/gem.vox index 95a6e1f84b..4a346ed2bf 100644 --- a/assets/voxygen/element/icons/gem.vox +++ b/assets/voxygen/element/icons/gem.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efa2acbc925f6223070b96a1d02fbeedf1898cac4445432ae1edeb7f04ae8e8f -size 19128 +oid sha256:0eeda19e2850ef3b521cb6a4d7d2ea9c85bc7c141ef01abf589880cc3738b234 +size 62236 diff --git a/assets/voxygen/element/icons/hands.vox b/assets/voxygen/element/icons/hands.vox index 823e28436d..3f47c0c3a3 100644 --- a/assets/voxygen/element/icons/hands.vox +++ b/assets/voxygen/element/icons/hands.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfb8d609198a1ef53353248372e9d9a5e479793e13b9c486ba7a9763b7a3e189 -size 18536 +oid sha256:0cc139fac19e456c4ed91df21fd41f5c8ef868bfd968055ff66d4ff8acb7c3b5 +size 61644 diff --git a/assets/voxygen/element/icons/head.vox b/assets/voxygen/element/icons/head.vox index fc5bfc7078..de41bf0327 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:12c1ec53fd540a6fc20f1dcad46665741d8c2d9fd978964a490000e056424f5b -size 63732 +oid sha256:5beedc43d289152ecbe622f36bb203fa0b39ff51cf1c77e7ef59fddfa075b4ee +size 63728 diff --git a/assets/voxygen/element/icons/legs.vox b/assets/voxygen/element/icons/legs.vox new file mode 100644 index 0000000000..85375ee204 --- /dev/null +++ b/assets/voxygen/element/icons/legs.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62817a15ea83e0af343bce8eac4260cd0a1c5386cea227ad1ca1b7ae488b1439 +size 60140 diff --git a/assets/voxygen/element/icons/mainhand.vox b/assets/voxygen/element/icons/mainhand.vox new file mode 100644 index 0000000000..68d68bf9d7 --- /dev/null +++ b/assets/voxygen/element/icons/mainhand.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b29577ae26134a468e767001ac69929e1ad656af694bda38b75e4bee83da673d +size 15844 diff --git a/assets/voxygen/element/icons/necklace.vox b/assets/voxygen/element/icons/necklace.vox new file mode 100644 index 0000000000..7712027800 --- /dev/null +++ b/assets/voxygen/element/icons/necklace.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f6c06b002a1d836fe8921dbe2888232c47040a120efb8617f26846cd9a1af21 +size 59564 diff --git a/assets/voxygen/element/icons/offhand.vox b/assets/voxygen/element/icons/offhand.vox new file mode 100644 index 0000000000..4e65802558 --- /dev/null +++ b/assets/voxygen/element/icons/offhand.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fc29c53975102582cf938181311f0ada6a2c7c9e044f9a4d0883ab9c899fc4e +size 19088 diff --git a/assets/voxygen/element/icons/ring.vox b/assets/voxygen/element/icons/ring.vox new file mode 100644 index 0000000000..cddf5b7483 --- /dev/null +++ b/assets/voxygen/element/icons/ring.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c73f9198c986bce203d62afaeeb5690a4009cb9b0b731eb99775a36b3932466 +size 19496 diff --git a/assets/voxygen/element/icons/shoulders.vox b/assets/voxygen/element/icons/shoulders.vox new file mode 100644 index 0000000000..bc260ac9f8 --- /dev/null +++ b/assets/voxygen/element/icons/shoulders.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b277676fd12242532f0002c074df50066da54accf6e2b54d94c65ca3ac0b2107 +size 60428 diff --git a/assets/voxygen/element/icons/tabard.vox b/assets/voxygen/element/icons/tabard.vox new file mode 100644 index 0000000000..69999e3228 --- /dev/null +++ b/assets/voxygen/element/icons/tabard.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fae087fbbddc39faf126b7a7ae80301f331c048677fbd047d790918043c29e9 +size 62188 diff --git a/assets/voxygen/element/misc_bg/charwindow.png b/assets/voxygen/element/misc_bg/charwindow.png index de990cdea6..41d47b209c 100644 --- a/assets/voxygen/element/misc_bg/charwindow.png +++ b/assets/voxygen/element/misc_bg/charwindow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88b682a60928a48fc38bd9e0f83bf9ac2d5976c40d2750583167cc1461e8c27c -size 120638 +oid sha256:312e8e5ce70dff58ab12b91bf695071aee35890ddf9881d6c42db121df2c5d9f +size 2484 diff --git a/assets/voxygen/element/misc_bg/crosshair.vox b/assets/voxygen/element/misc_bg/crosshair.vox new file mode 100644 index 0000000000..37f0d80d5b --- /dev/null +++ b/assets/voxygen/element/misc_bg/crosshair.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ebf4d14b5deaf1e4a5645ebe143024522d66991026328400245f7d4f3e07580 +size 5352 diff --git a/assets/voxygen/voxel/Wood Training 2h.vox b/assets/voxygen/voxel/Wood Training 2h.vox new file mode 100644 index 0000000000..5394e57cac --- /dev/null +++ b/assets/voxygen/voxel/Wood Training 2h.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65b30ab854142755ca70727b42c32deff7a0dfd5e619c8bf73a2cd4685ecc079 +size 44628 diff --git a/assets/voxygen/voxel/hand.vox b/assets/voxygen/voxel/hand.vox index 24c3057396..2f29596b3c 100644 --- a/assets/voxygen/voxel/hand.vox +++ b/assets/voxygen/voxel/hand.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dded9ffed6bbf593fdd9d8c807e06f0383e951476531ffedfe06849f7159686 -size 1272 +oid sha256:f8ae37d1c1ef381836261690bc60bcfd15aaa9b536b7f738db0d82f9033735b3 +size 44379 diff --git a/assets/voxygen/voxel/head.vox b/assets/voxygen/voxel/head.vox index 0ebfea4bf0..bc3e4f3949 100644 --- a/assets/voxygen/voxel/head.vox +++ b/assets/voxygen/voxel/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57c31358507b87f7c88e18a54466f97e4f2603427dcd4892e14bfa38a4fa3dda -size 4608 +oid sha256:adb056231cc8f1cda9e9f2047acdff88182a50e724b5c56733963d0544641ba6 +size 47807 diff --git a/assets/voxygen/voxel/sword.vox b/assets/voxygen/voxel/sword.vox index 3cc01d1cbc..be6c69ae07 100644 --- a/assets/voxygen/voxel/sword.vox +++ b/assets/voxygen/voxel/sword.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e458a391915d1381c5c8f995da96310e521a441d0e14e67bcacad423ffc68857 -size 1568 +oid sha256:f76c933f8a40237cbca3db5dea9baf11f2a23282f981fdada49318a62b3da3c9 +size 1520 diff --git a/voxygen/src/hud/character_window.rs b/voxygen/src/hud/character_window.rs index fdc8e89413..e760988d1f 100644 --- a/voxygen/src/hud/character_window.rs +++ b/voxygen/src/hud/character_window.rs @@ -8,13 +8,12 @@ use conrod_core::{ widget_ids! { pub struct Ids { charwindow, - charwindow_bg, + charwindow_gradient, charwindow_close, charwindow_exp_progress_rectangle, charwindow_exp_rectangle, charwindow_frame, content_align, - // charwindow_icon, charwindow_rectangle, charwindow_tab1, charwindow_tab1_exp, @@ -43,6 +42,9 @@ widget_ids! { back_bg, gem_bg, necklace_bg, + mainhand_bg, + offhand_bg, + charwindow_bg, head_grid, shoulders_grid, hands_grid, @@ -56,6 +58,8 @@ widget_ids! { back_grid, gem_grid, necklace_grid, + mainhand_grid, + offhand_grid, } @@ -141,131 +145,157 @@ impl<'a> Widget for CharacterWindow<'a> { .mid_top_with_margin_on(state.charwindow_frame, 40.0) .set(state.content_align, ui); + // Gradient BG + Image::new(self.imgs.charwindow_gradient) + .w_h(95.0 * 4.0, 108.0 * 4.0) + .middle_of(state.content_align) + .set(state.charwindow_gradient, ui); + // Contents //Head Image::new(self.imgs.head_bg) - .w_h(28.0 * 2.0, 28.0 * 2.0) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + .w_h(28.0 * 1.8, 28.0 * 1.8) .middle_of(state.head_bg) - .set(state.head_grid, ui); - + .set(state.head_grid, ui); + // Ring R - Image::new(self.imgs.head_bg) - .w_h(28.0 * 2.0, 28.0 * 2.0) + Image::new(self.imgs.ring_r_bg) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + .w_h(28.0 * 1.8, 28.0 * 1.8) .middle_of(state.ring_r_bg) .set(state.ring_r_grid, ui); - // Feet - Image::new(self.imgs.head_bg) - .w_h(28.0 * 2.0, 28.0 * 2.0) + // Feet + Image::new(self.imgs.feet_bg) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + .w_h(28.0 * 1.8, 28.0 * 1.8) .middle_of(state.feet_bg) .set(state.feet_grid, ui); // Legs - Image::new(self.imgs.head_bg) - .w_h(28.0 * 2.0, 28.0 * 2.0) + Image::new(self.imgs.legs_bg) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + .w_h(28.0 * 1.8, 28.0 * 1.8) .middle_of(state.legs_bg) .set(state.legs_grid, ui); // Belt - Image::new(self.imgs.head_bg) - .w_h(28.0 * 2.0, 28.0 * 2.0) + Image::new(self.imgs.belt_bg) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + .w_h(28.0 * 1.8, 28.0 * 1.8) .middle_of(state.belt_bg) .set(state.belt_grid, ui); // Hands - Image::new(self.imgs.head_bg) - .w_h(28.0 * 2.0, 28.0 * 2.0) + Image::new(self.imgs.hands_bg) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + .w_h(28.0 * 1.8, 28.0 * 1.8) .middle_of(state.hands_bg) .set(state.hands_grid, ui); // Shoulders - Image::new(self.imgs.head_bg) - .w_h(28.0 * 2.0, 28.0 * 2.0) + Image::new(self.imgs.shoulders_bg) + .w_h(28.0 * 1.8, 28.0 * 1.8) .up_from(state.hands_bg, 10.0) .set(state.shoulders_bg, ui); Button::image(self.imgs.grid) - .w_h(28.0 * 2.0, 28.0 * 2.0) + .w_h(28.0 * 1.8, 28.0 * 1.8) .middle_of(state.shoulders_bg) - .set(state.shoulders_grid, ui); + .set(state.shoulders_grid, ui); // Ring L - Image::new(self.imgs.head_bg) - .w_h(28.0 * 2.0, 28.0 * 2.0) + Image::new(self.imgs.ring_l_bg) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + Image::new(self.imgs.tabard_bg) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + Image::new(self.imgs.chest_bg) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + Image::new(self.imgs.back_bg) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + Image::new(self.imgs.gem_bg) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + .w_h(28.0 * 1.8, 28.0 * 1.8) .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) + // Necklace + Image::new(self.imgs.necklace_bg) + .w_h(28.0 * 1.8, 28.0 * 1.8) .up_from(state.gem_bg, 10.0) .set(state.necklace_bg, ui); Button::image(self.imgs.grid) - .w_h(28.0 * 2.0, 28.0 * 2.0) + .w_h(28.0 * 1.8, 28.0 * 1.8) .middle_of(state.necklace_bg) .set(state.necklace_grid, ui); + + // Weapon Main Hand + Image::new(self.imgs.mainhand_bg) + .w_h(28.0 * 2.2, 28.0 * 2.2) + .bottom_right_with_margins_on(state.ring_l_bg, 0.0, -115.0) + .set(state.mainhand_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 1.8, 28.0 * 1.8) + .middle_of(state.gem_bg) + .set(state.mainhand_grid, ui); + // Weapon Off-Hand + Image::new(self.imgs.offhand_bg) + .w_h(28.0 * 2.2, 28.0 * 2.2) + .bottom_left_with_margins_on(state.ring_r_bg, 0.0, -115.0) + .set(state.offhand_bg, ui); + Button::image(self.imgs.grid) + .w_h(28.0 * 1.8, 28.0 * 1.8) + .middle_of(state.gem_bg) + .set(state.offhand_grid, ui); + // Stats Tab // Tab BG Image::new(self.imgs.tab_bg) - .w_h(50.0 * 4.0, 115.0 * 4.0) + .w_h(51.0 * 4.0, 115.0 * 4.0) .top_left_with_margins_on(state.charwindow_frame, 28.0, -200.0) .set(state.charwindow_tab_bg, ui); @@ -277,7 +307,7 @@ impl<'a> Widget for CharacterWindow<'a> { // Tab Button -> Add that back in when we have multiple tabs // Button::image(self.imgs.charwindow_tab) //.w_h(65.0, 23.0) - //.top_left_with_margins_on(state.charwindow_tab_bg, -18.0, 2.0) + //.top_left_with_margins_on(state.charwindow_tab_bg, -18.0, 1.8) //.label("Stats") //.label_color(TEXT_COLOR) //.label_font_size(14) diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 0456d1f28d..c695a2a7f9 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -16,18 +16,20 @@ image_ids! { // Char Window BG head_bg: "/voxygen/element/icons/head.vox", - shoulders_bg: "/voxygen/element/icons/head.vox", - hands_bg: "/voxygen/element/icons/head.vox", - belt_bg: "/voxygen/element/icons/head.vox", - legs_bg: "/voxygen/element/icons/head.vox", - feet_bg: "/voxygen/element/icons/head.vox", - ring_r_bg: "/voxygen/element/icons/head.vox", - ring_l_bg: "/voxygen/element/icons/head.vox", - tabard_bg: "/voxygen/element/icons/head.vox", - chest_bg: "/voxygen/element/icons/head.vox", - back_bg: "/voxygen/element/icons/head.vox", - gem_bg: "/voxygen/element/icons/head.vox", - necklace_bg: "/voxygen/element/icons/head.vox", + shoulders_bg: "/voxygen/element/icons/shoulders.vox", + hands_bg: "/voxygen/element/icons/hands.vox", + belt_bg: "/voxygen/element/icons/belt.vox", + legs_bg: "/voxygen/element/icons/legs.vox", + feet_bg: "/voxygen/element/icons/feet.vox", + ring_r_bg: "/voxygen/element/icons/ring.vox", + ring_l_bg: "/voxygen/element/icons/ring.vox", + tabard_bg: "/voxygen/element/icons/tabard.vox", + chest_bg: "/voxygen/element/icons/chest.vox", + back_bg: "/voxygen/element/icons/back.vox", + gem_bg: "/voxygen/element/icons/gem.vox", + necklace_bg: "/voxygen/element/icons/necklace.vox", + mainhand_bg: "/voxygen/element/icons/mainhand.vox", + offhand_bg: "/voxygen/element/icons/offhand.vox", @@ -123,8 +125,15 @@ image_ids! { chat_arrow_mo: "/voxygen/element/buttons/arrow_down_hover.vox", chat_arrow_press: "/voxygen/element/buttons/arrow_down_press.vox", + // Crosshair + crosshair: "/voxygen/element/misc_bg/crosshair.vox", + + + charwindow_gradient:"/voxygen/element/misc_bg/charwindow.png", + + // Spell Book Window spellbook_bg: "/voxygen/element/misc_bg/small_bg.png", spellbook_icon: "/voxygen/element/icons/spellbook.png", diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 9a9ce47aca..84a02613cd 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -306,7 +306,7 @@ impl Hud { .w_h(100.0 * 0.2, 100.0 * 0.2) .hover_image(self.imgs.close_button_hover) .press_image(self.imgs.close_button_press) - .top_right_with_margins_on(self.ids.help_bg, 8.0, 3.0) + .top_right_with_margins_on(self.ids.help_bg, 4.0, 4.0) .set(self.ids.button_help2, ui_widgets) .was_clicked() { diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index a9b660fa64..3eed2c9172 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -21,6 +21,7 @@ widget_ids! { test, xp_bar, xp_bar_progress, + crosshair, } } @@ -72,6 +73,12 @@ impl<'a> Widget for Skillbar<'a> { let hp_percentage = 1.0; let mana_percentage = 1.0; + // Crosshair TODO: Only show while aiming with a bow or when casting a spell + // Image::new(self.imgs.crosshair) + // .w_h(101.0 * 0.5, 101.0 * 0.5) + // .mid_top_with_margin_on(ui.window, 500.0) + // .set(state.ids.crosshair, ui); + // Experience-Bar Image::new(self.imgs.xp_bar) .w_h(2688.0 / 6.0, 116.0 / 6.0)