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

fix: more succinct checked_tick_attack

Browse Source
This commit is contained in:
Adam Whitehurst 2021-05-30 13:36:18 -07:00
parent 6dc1c05089
commit 98fdf5c3e1
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -771,13 +771,9 @@ pub fn checked_tick_attack(
timer: Duration, timer: Duration,
other_modifier: Option<f32>, other_modifier: Option<f32>,
) -> Option<Duration> { ) -> Option<Duration> {
let tick_dur = if let Some(other_mod) = other_modifier { timer.checked_add(Duration::from_secs_f32(
data.dt.0 * data.stats.attack_speed_modifier * other_mod data.dt.0 * data.stats.attack_speed_modifier * other_modifier.unwrap_or(1.0),
} else { ))
data.dt.0 * data.stats.attack_speed_modifier
};
timer.checked_add(Duration::from_secs_f32(tick_dur))
} }
/// Ticks `timer` by `dt`, applying relevant stat attack modifiers and /// Ticks `timer` by `dt`, applying relevant stat attack modifiers and
/// `other_modifier`. Returns `Duration::default()` if overflow occurs /// `other_modifier`. Returns `Duration::default()` if overflow occurs