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

Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts

Browse Source
This commit is contained in:
Ben Wallis
2021-01-08 19:12:09 +00:00
parent 9deeefbd1e
commit aef2637288
167 changed files with 4233 additions and 2277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
common/sys/src/character_behavior.rs
View File

@ -1,7 +1,10 @@
use specs::{Entities, Join, LazyUpdate, Read, ReadExpect, ReadStorage, System, WriteStorage};
use common::{
comp::{
Attacking, Beam, Body, CharacterState, Controller, Energy, Health, Loadout, Mounting, Ori,
PhysicsState, Pos, StateUpdate, Vel,
inventory::slot::{EquipSlot, Slot},
Attacking, Beam, Body, CharacterState, Controller, Energy, Health, Inventory, Mounting,
Ori, PhysicsState, Pos, StateUpdate, Vel,
},
event::{EventBus, LocalEvent, ServerEvent},
metrics::SysMetrics,
@ -14,8 +17,6 @@ use common::{
uid::{Uid, UidAllocator},
};
use specs::{Entities, Join, LazyUpdate, Read, ReadExpect, ReadStorage, System, WriteStorage};
fn incorporate_update(tuple: &mut JoinTuple, state_update: StateUpdate) {
// TODO: if checking equality is expensive use optional field in StateUpdate
if tuple.2.get_unchecked() != &state_update.character {
@ -29,9 +30,14 @@ fn incorporate_update(tuple: &mut JoinTuple, state_update: StateUpdate) {
*tuple.6.get_mut_unchecked() = state_update.energy
};
if state_update.swap_loadout {
let mut loadout = tuple.7.get_mut_unchecked();
let loadout = &mut *loadout;
std::mem::swap(&mut loadout.active_item, &mut loadout.second_item);
let mut inventory = tuple.7.get_mut_unchecked();
let inventory = &mut *inventory;
inventory
.swap(
Slot::Equip(EquipSlot::Mainhand),
Slot::Equip(EquipSlot::Offhand),
)
.unwrap_none(); // Swapping main and offhand never results in leftover items
}
}
@ -55,7 +61,7 @@ impl<'a> System<'a> for Sys {
WriteStorage<'a, Vel>,
WriteStorage<'a, Ori>,
WriteStorage<'a, Energy>,
WriteStorage<'a, Loadout>,
WriteStorage<'a, Inventory>,
WriteStorage<'a, Controller>,
ReadStorage<'a, Health>,
ReadStorage<'a, Body>,
@ -82,7 +88,7 @@ impl<'a> System<'a> for Sys {
mut velocities,
mut orientations,
mut energies,
mut loadouts,
mut inventories,
mut controllers,
healths,
bodies,
@ -106,7 +112,7 @@ impl<'a> System<'a> for Sys {
&mut velocities,
&mut orientations,
&mut energies.restrict_mut(),
&mut loadouts.restrict_mut(),
&mut inventories.restrict_mut(),
&mut controllers,
&healths,
&bodies,