Do not count damage when out of combat
This commit is contained in:
+12
-15
@@ -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 {
|
||||
|
||||
+1
-1
@@ -55,7 +55,7 @@ impl Player {
|
||||
impl DamageDealer for Player {
|
||||
fn register_damage_dealt(&mut self, damage_dealt: f32) {
|
||||
if *self.combat_state.lock().unwrap() == CombatState::OutOfCombat {
|
||||
*self.time_elapsed.lock().unwrap() += 1000.0;
|
||||
return
|
||||
}
|
||||
|
||||
self.damage_dealt += damage_dealt
|
||||
|
||||
Reference in New Issue
Block a user