diff --git a/assets/voxygen/voxel/weapon/bow/simple-bow.vox b/assets/voxygen/voxel/weapon/bow/simple-bow.vox index 52629683ba..f73f96ec0f 100644 --- a/assets/voxygen/voxel/weapon/bow/simple-bow.vox +++ b/assets/voxygen/voxel/weapon/bow/simple-bow.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27ef3e759dd71419e05b61c5fb042fdc03a5761d40b03761c8b4065cba9dd23e -size 44367 +oid sha256:9d99f528fb54bd9a51963e111ef7dcb18ccd4c49c98e4a6e67dca66a7c16a594 +size 55743 diff --git a/voxygen/src/menu/char_selection/ui.rs b/voxygen/src/menu/char_selection/ui.rs index e604ac55dd..dfdbca7078 100644 --- a/voxygen/src/menu/char_selection/ui.rs +++ b/voxygen/src/menu/char_selection/ui.rs @@ -880,18 +880,18 @@ impl CharSelectionUi { self.imgs.icon_border }) .middle_of(self.ids.bow) - //.hover_image(self.imgs.icon_border_mo) - //.press_image(self.imgs.icon_border_press) - //.with_tooltip(tooltip_manager, "Bow", "", &tooltip_human) + .hover_image(self.imgs.icon_border_mo) + .press_image(self.imgs.icon_border_press) + .with_tooltip(tooltip_manager, "Bow", "", &tooltip_human) .set(self.ids.bow_button, ui_widgets) .was_clicked() { - //self.character_tool = Some(Tool::Bow); + self.character_tool = Some(Tool::Bow); } // REMOVE THIS AFTER IMPLEMENTATION - Rectangle::fill_with([67.0, 67.0], color::rgba(0.0, 0.0, 0.0, 0.8)) - .middle_of(self.ids.bow) - .set(self.ids.bow_grey, ui_widgets); + /*Rectangle::fill_with([67.0, 67.0], color::rgba(0.0, 0.0, 0.0, 0.8)) + .middle_of(self.ids.bow) + .set(self.ids.bow_grey, ui_widgets);*/ // Staff Image::new(self.imgs.staff) .w_h(70.0, 70.0) diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index 3e6cf3e125..296e41a643 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -357,7 +357,7 @@ pub fn mesh_main(item: Option<&Item>) -> Mesh { Tool::Hammer => ("weapon.hammer.rusty_2h", Vec3::new(-2.5, -5.5, -4.0)), Tool::Daggers => ("weapon.hammer.rusty_2h", Vec3::new(-2.5, -5.5, -4.0)), Tool::SwordShield => ("weapon.axe.rusty_2h", Vec3::new(-2.5, -6.5, -2.0)), - Tool::Bow => ("weapon.bow.simple-bow", Vec3::new(0.0, -5.5, 2.0)), + Tool::Bow => ("weapon.bow.simple-bow", Vec3::new(0.0, -2.5, 4.0)), Tool::Staff => ("weapon.axe.rusty_2h", Vec3::new(-2.5, -6.5, -2.0)), }, Item::Debug(_) => ("weapon.debug_wand", Vec3::new(-1.5, -9.5, -4.0)),