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

Merge branch 'expandedreality/energy-regen' into 'master'

Browse Source 
Energy now does not regen when climbing,gliding,and swimming

Closes #483

See merge request veloren/veloren!800
This commit is contained in:
Ben Simpson 2020-02-14 01:15:47 +00:00
commit 636bf7d343
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/src/sys/stats.rs
View File

@ -1,5 +1,5 @@
use crate::{
comp::{ActionState, CharacterState, Energy, EnergySource, HealthSource, Stats},
comp::{ActionState, CharacterState, Energy, EnergySource, HealthSource, MovementState, Stats},
event::{EventBus, ServerEvent},
state::DeltaTime,
};
@ -97,6 +97,27 @@ impl<'a> System<'a> for Sys {
}
},
}
match character_state.movement {
MovementState::Climb => {
if energy.get_unchecked().regen_rate != 0.0 {
energy.get_mut_unchecked().regen_rate = 0.0
}
},
MovementState::Glide => {
if energy.get_unchecked().regen_rate != 0.0 {
energy.get_mut_unchecked().regen_rate = 0.0
}
},
MovementState::Swim => {
if energy.get_unchecked().regen_rate != 0.0 {
energy.get_mut_unchecked().regen_rate = 0.0
}
},
_ => {
continue;
},
}
}
}
}