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

Small changes to hud

Browse Source
This commit is contained in:
socksonme 2022-05-17 16:21:47 +03:00 committed by Socksonme
parent 0e84794217
commit 29ce64b4f5
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
voxygen/src/hud/mod.rs
View File

@ -4569,11 +4569,9 @@ impl Hud {
== info.crit_mult.is_some()) == info.crit_mult.is_some())
{ {
floater.info.amount += info.amount; floater.info.amount += info.amount;
floater.info.crit_mult = if info.crit_mult.is_some() { if info.crit_mult.is_some() {
info.crit_mult floater.info.crit_mult = info.crit_mult
} else { }
floater.info.crit_mult
};
return; return;
} }
} }
@ -4585,35 +4583,25 @@ impl Hud {
f.info.amount < 0.0 f.info.amount < 0.0
} else { } else {
f.info.amount > 0.0 f.info.amount > 0.0
}) && if !hit_me { }) && (hit_me
// Ignore crit floaters if damage isn't incoming // Ignore crit floaters if damage isn't incoming
f.info.crit_mult.is_none() || f.info.crit_mult.is_none())
} else {
true
}
}); });
match last_floater { match last_floater {
Some(f) Some(f)
// If the batch option is enabled, group floaters together for a // If the batch option is enabled, group floaters together for a
// default time // default time
if (if hit_me { if (f.timer < if interface.sct_damage_batch {
// Group up crits and regular attacks for incoming damage 1.0
f.timer } else if hit_me {
< if !interface.sct_player_batch { interface.sct_inc_dmg_accum_duration
interface.sct_inc_dmg_accum_duration
} else {
1.0
}
} else { } else {
f.timer interface.sct_dmg_accum_duration
< if !interface.sct_damage_batch { }
interface.sct_dmg_accum_duration // To avoid grouping up crits with non-crits
} else { && (info.crit_mult.is_none() || hit_me)
1.0 ) =>
// To avoid grouping up crits with non-crits
} && info.crit_mult.is_none()
}) =>
{ {
f.jump_timer = 0.0; f.jump_timer = 0.0;
f.info.amount += info.amount; f.info.amount += info.amount;