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

Address review - addendum

Browse Source 
- `BlockFloater`s and `ComboFloater`s don't store the owner anymore,
  `ExpFloater` still does, however the field is used to prevent
  accumulating old floaters with new ones. This change also makes it so
  that if the client changes entity, they keep the old entity's
  floaters.
- The `combo_floaters` field is now `combo_floater` plus it now uses an
  Option<ExpFloater>.
- Changed `handle_health_change` to change the health even if the entity
  does not have a `Pos` or `Uid`, now uses `emit_now`combo_floater` plus
  it now uses an Option<ExpFloater>.
- Changed `handle_health_change` to change the health even if the entity
  does not have a `Pos` or `Uid`, now uses `emit_now`
- Changed some comments
This commit is contained in:
Socksonme 2022-06-15 17:14:50 +03:00
parent 2c5fd06d0b
commit f6189a61f2
3 changed files with 190 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/events/entity_manipulation.rs
View File

@ -66,16 +66,16 @@ pub fn handle_poise(server: &Server, entity: EcsEntity, change: comp::PoiseChang
pub fn handle_health_change(server: &Server, entity: EcsEntity, change: HealthChange) {
let ecs = &server.state.ecs();
if let (Some(pos), Some(uid), Some(mut health)) = (
if let Some(mut health) = ecs.write_storage::<Health>().get_mut(entity) {
// If the change amount was not zero
let changed = health.change_by(change);
if let (Some(pos), Some(uid)) = (
ecs.read_storage::<Pos>().get(entity),
ecs.read_storage::<Uid>().get(entity),
ecs.write_storage::<Health>().get_mut(entity),
) {
if changed {
let outcomes = ecs.write_resource::<EventBus<Outcome>>();
let mut outcomes_emitter = outcomes.emitter();
// If the change amount was not zero
if health.change_by(change) {
outcomes_emitter.emit(Outcome::HealthChange {
outcomes.emit_now(Outcome::HealthChange {
pos: pos.0,
info: HealthChangeInfo {
amount: change.amount,
@ -87,6 +87,7 @@ pub fn handle_health_change(server: &Server, entity: EcsEntity, change: HealthCh
});
}
}
}
// This if statement filters out anything under 5 damage, for DOT ticks
// TODO: Find a better way to separate direct damage from DOT here
let damage = -change.amount;

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

@ -451,6 +451,7 @@ pub struct BuffInfo {
}
pub struct ExpFloater {
pub owner: Uid,
pub exp_change: u32,
pub timer: f32,
pub jump_timer: f32,
@ -459,7 +460,6 @@ pub struct ExpFloater {
}
pub struct SkillPointGain {
pub owner: Uid,
pub skill_tree: SkillGroupKind,
pub total_points: u16,
pub timer: f32,
@ -467,13 +467,11 @@ pub struct SkillPointGain {
#[derive(Debug, Clone, Copy)]
pub struct ComboFloater {
pub owner: Uid,
pub combo: u32,
pub timer: f64,
}
pub struct BlockFloater {
pub owner: Uid,
pub timer: f32,
}
@ -1001,7 +999,7 @@ impl PromptDialogSettings {
pub struct Floaters {
pub exp_floaters: Vec<ExpFloater>,
pub skill_point_displays: Vec<SkillPointGain>,
pub combo_floaters: VecDeque<ComboFloater>,
pub combo_floater: Option<ComboFloater>,
pub block_floaters: Vec<BlockFloater>,
}
@ -1213,7 +1211,7 @@ impl Hud {
floaters: Floaters {
exp_floaters: Vec::new(),
skill_point_displays: Vec::new(),
combo_floaters: VecDeque::new(),
combo_floater: None,
block_floaters: Vec::new(),
},
map_drag: Vec2::zero(),
@ -1520,7 +1518,6 @@ impl Hud {
f.timer -= dt.as_secs_f32();
f.jump_timer += dt.as_secs_f32();
});
// TODO:Change the other floaters as well if this is the right method
self.floaters.exp_floaters.retain(|f| f.timer > 0.0);
for floater in self.floaters.exp_floaters.iter_mut() {
let number_speed = 50.0; // Number Speed for Single EXP
@ -1598,13 +1595,7 @@ impl Hud {
self.floaters
.skill_point_displays
.retain(|d| d.timer > 0_f32);
if let Some(uid) = uids.get(me) {
if let Some(display) = self
.floaters
.skill_point_displays
.iter_mut()
.find(|d| d.owner == *uid)
{
if let Some(display) = self.floaters.skill_point_displays.iter_mut().next() {
let fade = if display.timer < 3.0 {
display.timer * 0.33
} else if display.timer < 2.0 {
@ -1693,20 +1684,14 @@ impl Hud {
.color(Some(Color::Rgba(1.0, 1.0, 1.0, fade)))
.set(self.ids.player_rank_up_icon, ui_widgets);
}
}
// Scrolling Combat Text for Parrying an attack
self.floaters
.block_floaters
.iter_mut()
.for_each(|f| f.timer -= dt.as_secs_f32());
self.floaters.block_floaters.retain(|f| f.timer > 0_f32);
if let Some(uid) = uids.get(me) {
for floater in self
.floaters
.block_floaters
.iter_mut()
.filter(|f| f.owner == *uid)
{
for floater in self.floaters.block_floaters.iter_mut() {
let number_speed = 50.0;
let player_sct_bg_id = player_sct_bg_id_walker.next(
&mut self.ids.player_sct_bgs,
@ -1742,7 +1727,6 @@ impl Hud {
.set(player_sct_id, ui_widgets);
}
}
}
// Pop speech bubbles
let now = Instant::now();
@ -2699,20 +2683,12 @@ impl Hud {
let bodies = ecs.read_storage::<comp::Body>();
let poises = ecs.read_storage::<comp::Poise>();
// Combo floater stuffs
self.floaters
.combo_floaters
.iter_mut()
.for_each(|f| f.timer -= dt.as_secs_f64());
self.floaters.combo_floaters.retain(|f| f.timer > 0_f64);
let combo = if let Some(uid) = ecs.read_storage::<Uid>().get(entity) {
self.floaters
.combo_floaters
.iter()
.find(|c| c.owner == *uid)
.copied()
} else {
None
};
self.floaters.combo_floater = self.floaters.combo_floater.map(|mut f| {
f.timer -= dt.as_secs_f64();
f
});
self.floaters.combo_floater.filter(|f| f.timer > 0_f64);
let combo = self.floaters.combo_floater;
if let (
Some(health),
@ -4353,12 +4329,15 @@ impl Hud {
Some(floater)
if floater.timer
> (EXP_FLOATER_LIFETIME - EXP_ACCUMULATION_DURATION)
&& global_state.settings.interface.accum_experience =>
&& global_state.settings.interface.accum_experience
&& floater.owner == *uid =>
{
floater.jump_timer = 0.0;
floater.exp_change += *exp;
},
_ => self.floaters.exp_floaters.push(ExpFloater {
// Store the owner as to not accumulate old experience floaters
owner: *uid,
exp_change: *exp,
timer: EXP_FLOATER_LIFETIME,
jump_timer: 0.0,
@ -4373,24 +4352,41 @@ impl Hud {
skill_tree,
total_points,
..
} => self.floaters.skill_point_displays.push(SkillPointGain {
owner: *uid,
} => {
let ecs = client.state().ecs();
let uids = ecs.read_storage::<Uid>();
let me = client.entity();
if uids.get(me).map_or(false, |me| *me == *uid) {
self.floaters.skill_point_displays.push(SkillPointGain {
skill_tree: *skill_tree,
total_points: *total_points,
timer: 5.0,
}),
});
}
},
Outcome::ComboChange { uid, combo } => {
self.floaters.combo_floaters.push_front(ComboFloater {
owner: *uid,
let ecs = client.state().ecs();
let uids = ecs.read_storage::<Uid>();
let me = client.entity();
if uids.get(me).map_or(false, |me| *me == *uid) {
self.floaters.combo_floater = Some(ComboFloater {
combo: *combo,
timer: comp::combo::COMBO_DECAY_START,
})
});
}
},
Outcome::Block { uid, parry, .. } if *parry => {
self.floaters.block_floaters.push(BlockFloater {
owner: *uid,
timer: 1.0,
})
let ecs = client.state().ecs();
let uids = ecs.read_storage::<Uid>();
let me = client.entity();
if uids.get(me).map_or(false, |me| *me == *uid) {
self.floaters
.block_floaters
.push(BlockFloater { timer: 1.0 });
}
},
Outcome::HealthChange { info, .. } => {
let ecs = client.state().ecs();

8
voxygen/src/hud/settings_window/interface.rs
View File

@ -716,9 +716,11 @@ impl<'a> Widget for Interface<'a> {
/*Scrolling Combat text
O Show Damage Numbers
O Damage Accumulation Duration: 0s ----I----2s
O Show incoming Damage -- //TODO: add this back
O Incoming Damage Accumulation Duration: 0s ----I----2s
Damage Accumulation Duration:
[0s ----I----2s]
O Show incoming Damage
Incoming Damage Accumulation Duration:
[0s ----I----2s]
O Round Damage Numbers
*/
// SCT/ Scrolling Combat Text