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

Added hands field onto weapons.

Browse Source
This commit is contained in:
Sam
2021-02-12 00:15:10 -05:00
parent b4adc5369a
commit d4f509b3d0
14 changed files with 134 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/states/utils.rs
View File

@ -424,28 +424,25 @@ pub fn handle_ability1_input(data: &JoinData, update: &mut StateUpdate) {
pub fn handle_ability2_input(data: &JoinData, update: &mut StateUpdate) {
if data.inputs.secondary.is_pressed() {
let active_tool_kind = match data
let active_tool_hands = match data
.inventory
.equipped(EquipSlot::Mainhand)
.map(|i| i.kind())
{
Some(ItemKind::Tool(Tool { kind, .. })) => Some(kind),
Some(ItemKind::Tool(tool)) => Some(tool.hands),
_ => None,
};
let second_tool_kind = match data
let second_tool_hands = match data
.inventory
.equipped(EquipSlot::Offhand)
.map(|i| i.kind())
{
Some(ItemKind::Tool(Tool { kind, .. })) => Some(kind),
Some(ItemKind::Tool(tool)) => Some(tool.hands),
_ => None,
};
match (
active_tool_kind.map(|tk| tk.hands()),
second_tool_kind.map(|tk| tk.hands()),
) {
match (active_tool_hands, second_tool_hands) {
(Some(Hands::TwoHand), _) => {
if let Some(ability) = data
.inventory