From d20223ecc852317a33d632c8aceba2c3c41718b5 Mon Sep 17 00:00:00 2001 From: Wiktor Mazur Date: Sun, 15 Dec 2019 21:23:56 +0100 Subject: [PATCH] Invisible player should not be added again --- backend/src/core.rs | 2 +- backend/src/meter/mod.rs | 7 +++++-- frontend/src/dmg_list.py | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/backend/src/core.rs b/backend/src/core.rs index b98f50f..ad89108 100644 --- a/backend/src/core.rs +++ b/backend/src/core.rs @@ -563,7 +563,7 @@ mod tests { let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap(); assert_eq!(player_stats.damage, 0.0); - character_enters!(meter, "CH1", 1); + character_enters!(meter, "CH1", 2); let zone_stats = stats(&meter, StatType::Zone); let player_stats = zone_stats.iter().find(|s| s.player == "CH1").unwrap(); assert_eq!(player_stats.damage, 0.0); diff --git a/backend/src/meter/mod.rs b/backend/src/meter/mod.rs index f625a7f..5f962c8 100644 --- a/backend/src/meter/mod.rs +++ b/backend/src/meter/mod.rs @@ -158,6 +158,7 @@ impl Meter { let session = self.zone_session_mut()?; session.add_player(name, id); self.last_fight_session.add_player(name, id); + Some(()) } @@ -260,8 +261,10 @@ impl PlayerEvents for Meter { info!("New player ({}) registered without session, creating new session", name); self.new_session(); } - - self.add_player(name, id); + + if self.get_damage_dealers_in_zone(id).unwrap_or(vec![]).is_empty() { + self.add_player(name, id); + } } fn register_combat_enter(&mut self, player_id: usize) -> Option<()> { diff --git a/frontend/src/dmg_list.py b/frontend/src/dmg_list.py index 83e8751..bc1a358 100644 --- a/frontend/src/dmg_list.py +++ b/frontend/src/dmg_list.py @@ -58,7 +58,7 @@ def player_style(items): elif weapon_type == weapon.WeaponType.Spear: return Style(bg = '#a9a9a9') elif weapon_type == weapon.WeaponType.Sword: - return Style(bg = '#ffe119') + return Style(bg = '#b59d00') else: return Style(bg = '#42413c')