+ last fight impl (lib)

This commit is contained in:
Wiktor Mazur
2019-09-18 22:14:49 +02:00
parent eaa727e785
commit e9d60c60ed
2 changed files with 25 additions and 4 deletions
+12 -3
View File
@@ -580,7 +580,7 @@ mod tests {
)); ));
} }
// #[test] #[test]
fn test_last_fight_management() { fn test_last_fight_management() {
// session should be started when first player attacks // session should be started when first player attacks
// damage should be 0 when all players were out of combat and some player attacks // damage should be 0 when all players were out of combat and some player attacks
@@ -591,6 +591,9 @@ mod tests {
helpers::register(Message::CharacterStats(message::CharacterStats::new_named( helpers::register(Message::CharacterStats(message::CharacterStats::new_named(
"1", 1, "1", 1,
))); )));
helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(1),
));
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1))); helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
helpers::register(Message::RegenerationHealthChanged( helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(1), message::RegenerationHealthChanged::disabled(1),
@@ -601,6 +604,9 @@ mod tests {
helpers::register(Message::NewCharacter(message::NewCharacter::new_named( helpers::register(Message::NewCharacter(message::NewCharacter::new_named(
"2", 2, "2", 2,
))); )));
helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(2),
));
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(2))); helpers::register(Message::HealthUpdate(message::HealthUpdate::new(2)));
helpers::register(Message::RegenerationHealthChanged( helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(2), message::RegenerationHealthChanged::disabled(2),
@@ -609,6 +615,9 @@ mod tests {
helpers::register(Message::NewCharacter(message::NewCharacter::new_named( helpers::register(Message::NewCharacter(message::NewCharacter::new_named(
"3", 3, "3", 3,
))); )));
helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(3),
));
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(3))); helpers::register(Message::HealthUpdate(message::HealthUpdate::new(3)));
helpers::register(Message::RegenerationHealthChanged( helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(3), message::RegenerationHealthChanged::disabled(3),
@@ -650,10 +659,10 @@ mod tests {
assert_named_player_dmg!("2", 10.0); assert_named_player_dmg!("2", 10.0);
assert_named_player_dmg!("3", 10.0); assert_named_player_dmg!("3", 10.0);
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
helpers::register(Message::RegenerationHealthChanged( helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(3), message::RegenerationHealthChanged::disabled(1),
)); ));
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
assert_named_player_dmg!("1", 10.0); assert_named_player_dmg!("1", 10.0);
assert_named_player_dmg!("2", 0.0); assert_named_player_dmg!("2", 0.0);
assert_named_player_dmg!("3", 0.0); assert_named_player_dmg!("3", 0.0);
+13 -1
View File
@@ -105,7 +105,7 @@ impl Meter {
self.zone_sessions.push_back(Session::new()); self.zone_sessions.push_back(Session::new());
self.last_fight_session = Session::new(); self.last_fight_session = Session::new();
} }
#[allow(unused)] #[allow(unused)]
fn combat_state(&self) -> CombatState { fn combat_state(&self) -> CombatState {
if self.last_fight_session if self.last_fight_session
@@ -158,6 +158,18 @@ impl PlayerEvents for Meter {
self.add_player(name, id); self.add_player(name, id);
} }
fn register_combat_enter(&mut self, player_id: usize) -> Option<()> {
if self.combat_state() == CombatState::OutOfCombat {
self.last_fight_session = Session::from(&self.last_fight_session);
}
for player in self.get_damage_dealers_in_zone(player_id)? {
player.enter_combat();
}
Some(())
}
} }
impl ZoneStats for Meter { impl ZoneStats for Meter {