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 sword skill tree

Browse Source
This commit is contained in:
Sam
2020-12-06 21:35:29 -06:00
parent 0e84ba18c2
commit cc60ca58be
29 changed files with 317 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,8 +3,8 @@ use specs::{Entities, Join, LazyUpdate, Read, ReadExpect, ReadStorage, System, W
use common::{
comp::{
inventory::slot::{EquipSlot, Slot},
Attacking, Beam, Body, CharacterState, Controller, Energy, Health, Inventory, Mounting,
Ori, PhysicsState, Pos, StateUpdate, Vel,
Attacking, Beam, Body, CharacterState, Controller, Energy, Health, Inventory, Mounting, Ori,
PhysicsState, Pos, StateUpdate, Stats, Vel,
},
event::{EventBus, LocalEvent, ServerEvent},
metrics::SysMetrics,
@ -71,6 +71,7 @@ impl<'a> System<'a> for Sys {
ReadStorage<'a, Beam>,
ReadStorage<'a, Uid>,
ReadStorage<'a, Mounting>,
ReadStorage<'a, Stats>,
);
#[allow(clippy::while_let_on_iterator)] // TODO: Pending review in #587
@ -98,6 +99,7 @@ impl<'a> System<'a> for Sys {
beam_storage,
uids,
mountings,
stats,
): Self::SystemData,
) {
let start_time = std::time::Instant::now();
@ -120,6 +122,7 @@ impl<'a> System<'a> for Sys {
&physics_states,
attacking_storage.maybe(),
beam_storage.maybe(),
&stats,
)
.join()
{