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

make apply_attack() return if attack was actually applied

Browse Source
This commit is contained in:
Swrup 2021-07-08 21:05:32 +02:00
parent 8bb5fb6c14
commit a8579670cf
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/combat.rs
View File

@ -171,7 +171,8 @@ impl Attack {
attack_source: AttackSource,
mut emit: impl FnMut(ServerEvent),
mut emit_outcome: impl FnMut(Outcome),
) {
) -> bool {
let mut is_applied = false;
let is_crit = thread_rng().gen::<f32>() < self.crit_chance;
let mut accumulated_damage = 0.0;
for damage in self
@ -180,6 +181,7 @@ impl Attack {
.filter(|d| d.target.map_or(true, |t| t == target_group))
.filter(|d| !(matches!(d.target, Some(GroupTarget::OutOfGroup)) && target_dodging))
{
is_applied = true;
let damage_reduction = Attack::compute_damage_reduction(
&target,
attack_source,
@ -340,6 +342,7 @@ impl Attack {
}
},
}) {
is_applied = true;
match effect.effect {
CombatEffect::Knockback(kb) => {
let impulse = kb.calculate_impulse(dir);
@ -423,6 +426,7 @@ impl Attack {
}
}
}
is_applied
}
}