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

Inventory changes that modify the loadout now go through a control action instead of a control event.

Browse Source
This commit is contained in:
Sam
2021-02-06 21:15:29 -05:00
parent bcc9c2058c
commit 8eebcdfcd2
8 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ use crate::{
item::{Hands, ItemKind, Tool, ToolKind},
quadruped_low, quadruped_medium,
skills::{AxeSkill, BowSkill, HammerSkill, Skill, StaffSkill, SwordSkill},
theropod, Body, CharacterState, StateUpdate,
theropod, Body, CharacterState, InventoryManip, StateUpdate,
},
consts::{FRIC_GROUND, GRAVITY},
event::LocalEvent,
@ -359,6 +359,11 @@ pub fn attempt_swap_loadout(data: &JoinData, update: &mut StateUpdate) {
}
}
/// Handles inventory manipulations that affect the loadout
pub fn handle_modify_loadout(update: &mut StateUpdate, inv_manip: InventoryManip) {
update.modify_loadout = Some(inv_manip);
}
/// Checks that player can wield the glider and updates `CharacterState` if so
pub fn attempt_glide_wield(data: &JoinData, update: &mut StateUpdate) {
if data.inventory.equipped(EquipSlot::Glider).is_some()