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

Changing main tool while in wield state moves character back to idle state.

Browse Source
This commit is contained in:
Sam 2021-02-08 17:25:40 -05:00
parent e033fe6bee
commit 398fcf7bdd
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,9 @@
use super::utils::*;
use crate::{
comp::{CharacterState, LoadoutManip, StateUpdate},
comp::{
slot::{EquipSlot, Slot},
CharacterState, LoadoutManip, StateUpdate,
},
states::behavior::{CharacterBehavior, JoinData},
};
@ -59,6 +62,14 @@ impl CharacterBehavior for Data {
fn manipulate_loadout(&self, data: &JoinData, loadout_manip: LoadoutManip) -> StateUpdate {
let mut update = StateUpdate::from(data);
match loadout_manip {
LoadoutManip::Drop(EquipSlot::Mainhand)
| LoadoutManip::Swap(EquipSlot::Mainhand, _)
| LoadoutManip::Swap(_, Slot::Equip(EquipSlot::Mainhand)) => {
update.character = CharacterState::Idle;
},
_ => (),
}
handle_manipulate_loadout(&data, &mut update, loadout_manip);
update
}