Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

made bow available in char selection

Browse Source
This commit is contained in:
Pfauenauge90 2019-09-17 09:18:59 +02:00 committed by timokoesters
parent b5180320fb
commit 39e5530d45
No known key found for this signature in database
GPG Key ID: CD80BE9AAEE78097
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/weapon/bow/simple-bow.vox (Stored with Git LFS)
View File

Binary file not shown.

14
voxygen/src/menu/char_selection/ui.rs
View File

@ -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)

2
voxygen/src/scene/figure/load.rs
View File

@ -357,7 +357,7 @@ pub fn mesh_main(item: Option<&Item>) -> Mesh<FigurePipeline> {
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)),