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 'Lerg/Accumulate_Damage_Floaters' into 'master'

Browse Source 
Issue #836 - Declutter the scrolling combat text

See merge request veloren/veloren!1823
This commit is contained in:
Samuel Keiffer 2021-02-27 16:18:18 +00:00
commit fa809fc292
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
voxygen/src/ecs/sys/floater.rs
View File

@ -12,6 +12,7 @@ use specs::{Entities, Join, Read, ReadExpect, ReadStorage, System, WriteStorage}
// How long floaters last (in seconds)
pub const HP_SHOWTIME: f32 = 3.0;
pub const MY_HP_SHOWTIME: f32 = 2.5;
pub const HP_ACCUMULATETIME: f32 = 1.0;
pub struct Sys;
impl<'a> System<'a> for Sys {
@ -84,11 +85,20 @@ impl<'a> System<'a> for Sys {
HealthSource::Item => true,
_ => false,
} {
hp_floater_list.floaters.push(HpFloater {
timer: 0.0,
hp_change: health.last_change.1.amount,
rand: rand::random(),
});
let last_floater = hp_floater_list.floaters.last_mut();
match last_floater {
Some(f) if f.timer < HP_ACCUMULATETIME => {
//TODO: Add "jumping" animation on floater when it changes its value
f.hp_change += health.last_change.1.amount;
},
_ => {
hp_floater_list.floaters.push(HpFloater {
timer: 0.0,
hp_change: health.last_change.1.amount,
rand: rand::random(),
});
},
}
}
}
}