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

Healing staff

Browse Source
This commit is contained in:
timokoesters
2020-03-24 22:03:11 +01:00
parent f0ce088810
commit 2117bb05d0
9 changed files with 63 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/comp/ability.rs
View File

@ -12,9 +12,10 @@ use std::time::Duration;
#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
pub enum CharacterAbility {
BasicMelee {
energy_cost: u32,
buildup_duration: Duration,
recover_duration: Duration,
base_damage: u32,
base_healthchange: i32,
range: f32,
max_angle: f32,
},
@ -69,6 +70,13 @@ impl CharacterAbility {
.try_change_by(-300, EnergySource::Ability)
.is_ok()
},
CharacterAbility::BasicMelee { energy_cost, .. } => {
!data.physics.in_fluid
&& update
.energy
.try_change_by(-(*energy_cost as i32), EnergySource::Ability)
.is_ok()
},
CharacterAbility::BasicRanged { energy_cost, .. } => {
!data.physics.in_fluid
&& update
@ -110,14 +118,15 @@ impl From<&CharacterAbility> for CharacterState {
CharacterAbility::BasicMelee {
buildup_duration,
recover_duration,
base_damage,
base_healthchange,
range,
max_angle,
energy_cost: _,
} => CharacterState::BasicMelee(basic_melee::Data {
exhausted: false,
buildup_duration: *buildup_duration,
recover_duration: *recover_duration,
base_damage: *base_damage,
base_healthchange: *base_healthchange,
range: *range,
max_angle: *max_angle,
}),