Do not count damage when out of combat

This commit is contained in:
Wiktor Mazur
2019-09-18 22:09:52 +02:00
parent bd07f0a970
commit eaa727e785
3 changed files with 48 additions and 26 deletions
+12 -15
View File
@@ -105,6 +105,18 @@ impl Meter {
self.zone_sessions.push_back(Session::new());
self.last_fight_session = Session::new();
}
#[allow(unused)]
fn combat_state(&self) -> CombatState {
if self.last_fight_session
.players()
.iter()
.any(|p| p.combat_state() == CombatState::InCombat) {
return CombatState::InCombat;
}
CombatState::OutOfCombat
}
}
impl PlayerEvents for Meter {
@@ -146,21 +158,6 @@ impl PlayerEvents for Meter {
self.add_player(name, id);
}
fn register_combat_leave(&mut self, player_id: usize) -> Option<()> {
for player in self.get_damage_dealers_in_zone(player_id)? {
player.leave_combat();
}
if self
.last_fight_session
.players()
.iter()
.all(|p| p.combat_state() == CombatState::OutOfCombat)
{
self.last_fight_session = Session::from(&self.last_fight_session);
}
Some(())
}
}
impl ZoneStats for Meter {