+ skip_non_party_members

This commit is contained in:
Wiktor Mazur
2019-09-27 22:35:14 +02:00
parent 6ec8b754ac
commit 9cd00e236f
8 changed files with 1026 additions and 716 deletions
+89 -58
View File
@@ -14,12 +14,9 @@ use player::Player;
pub use traits::*;
pub use types::*;
#[derive(Hash, Eq, PartialEq, Clone, Debug)]
pub struct PlayerName(String);
#[derive(Debug)]
pub struct Session {
players: HashMap<PlayerName, Player>,
players: HashMap<String, Player>,
}
impl Session {
@@ -38,16 +35,22 @@ impl Session {
Self { players }
}
pub fn stats(&self) -> PlayerStatisticsVec {
self.players
.iter()
.map(|(name, player)| PlayerStatistics {
player: name.0.to_owned(),
damage: player.damage(),
time_in_combat: player.time_in_combat(),
dps: player.dps(),
})
.collect()
pub fn stats<F>(&self, filter: F) -> PlayerStatisticsVec
where
F: Fn(&(&String, &Player)) -> bool,
{
PlayerStatisticsVec::from(
self.players
.iter()
.filter(filter)
.map(|(name, player)| PlayerStatistics {
player: name.to_owned(),
damage: player.damage(),
time_in_combat: player.time_in_combat(),
dps: player.dps(),
})
.collect(),
)
}
pub fn cleanup_players(&mut self) {
@@ -56,7 +59,7 @@ impl Session {
.iter()
.filter(|(_, player)| player.damage() == 0.0)
.map(|(name, _)| name.clone())
.collect::<Vec<PlayerName>>();
.collect::<Vec<String>>();
for w in without_dmg {
self.players.remove_entry(&w);
}
@@ -72,27 +75,13 @@ impl Session {
fn add_player(&mut self, player_name: &str, player_id: usize) {
self.players
.insert(PlayerName(player_name.to_owned()), Player::new(player_id));
.insert(player_name.to_owned(), Player::new(player_id));
}
}
fn merge_stats(a : &PlayerStatisticsVec, b : &PlayerStatisticsVec) -> PlayerStatisticsVec {
let merged = [&a[..], &b[..]].concat().iter().fold(
HashMap::<String, PlayerStatistics>::new(),
|mut acc, stat| {
acc.entry(stat.player.clone())
.and_modify(|s| {
s.damage += stat.damage;
s.time_in_combat += stat.time_in_combat;
s.dps = s.dps();
})
.or_insert(stat.clone());
acc
},
);
return merged.iter().map(|(_, v)| v.clone()).collect()
#[derive(Default)]
pub struct MeterConfig {
pub skip_non_party_members: bool,
}
pub struct Meter {
@@ -100,36 +89,55 @@ pub struct Meter {
zone_session: Option<Session>,
last_fight_session: Session,
main_player_id: Option<usize>,
party: Option<types::Party>,
config: MeterConfig,
}
impl Meter {
pub fn new() -> Self {
Self {
zone_history: Vec::new(),
zone_history: PlayerStatisticsVec::new(),
zone_session: None,
last_fight_session: Session::new(),
main_player_id: None,
party: None,
config: Default::default(),
}
}
pub fn configure(&mut self, config: MeterConfig) {
self.config = config;
}
fn stats_filter(&self, player: &(&String, &Player)) -> bool {
if self.config.skip_non_party_members {
let is_main_player = if let Some(id) = &self.main_player_id { *id == player.1.id } else { false };
let is_in_party = if let Some(party) = &self.party { party.includes(&player.0) } else { false };
return is_main_player || is_in_party;
}
true
}
fn zone_session_mut(&mut self) -> Option<&mut Session> {
match &mut self.zone_session {
Some(s) => Some(s),
None => None
None => None,
}
}
fn zone_session(&self) -> Option<&Session> {
match &self.zone_session {
Some(s) => Some(s),
None => None
None => None,
}
}
fn sessions_mut(&mut self) -> Option<(&mut Session, &mut Session)> {
match &mut self.zone_session {
Some(s) => Some((s, &mut self.last_fight_session)),
None => None
None => None,
}
}
@@ -142,23 +150,27 @@ impl Meter {
fn new_session(&mut self) {
if let Some(zone) = self.zone_session() {
self.zone_history = merge_stats(&self.zone_history, &zone.stats());
self.zone_history = PlayerStatisticsVec::merged(
&self.zone_history,
&zone.stats(|p| self.stats_filter(p)),
);
}
self.zone_session = Some(Session::new());
self.last_fight_session = Session::new();
}
#[allow(unused)]
fn combat_state(&self) -> CombatState {
if self.last_fight_session
if self
.last_fight_session
.players()
.iter()
.any(|p| p.combat_state() == CombatState::InCombat) {
return CombatState::InCombat;
}
.any(|p| p.combat_state() == CombatState::InCombat)
{
return CombatState::InCombat;
}
CombatState::OutOfCombat
CombatState::OutOfCombat
}
}
@@ -167,10 +179,7 @@ impl PlayerEvents for Meter {
let (zone, last_fight) = self.sessions_mut()?;
let las_fight_session_player = last_fight.get_player_by_id(player_id)?;
let zone_player = zone.get_player_by_id(player_id)?;
Some(vec![
zone_player,
las_fight_session_player,
])
Some(vec![zone_player, las_fight_session_player])
}
fn register_main_player(&mut self, name: &str, id: usize) {
@@ -213,13 +222,12 @@ impl PlayerEvents for Meter {
Some(())
}
}
impl ZoneStats for Meter {
fn get_zone_session(&self) -> Option<Vec<PlayerStatistics>> {
fn get_zone_session(&self) -> Option<PlayerStatisticsVec> {
let last_session = self.zone_session()?;
Some(last_session.stats())
Some(last_session.stats(|p| self.stats_filter(p)))
}
fn new_zone_session(&mut self) -> Option<()> {
@@ -231,14 +239,17 @@ impl ZoneStats for Meter {
fn get_overall_session(&self) -> Option<PlayerStatisticsVec> {
if let Some(zone) = self.zone_session() {
return Some(merge_stats(&self.zone_history, &zone.stats()));
return Some(PlayerStatisticsVec::merged(
&self.zone_history,
&zone.stats(|p| self.stats_filter(p)),
));
}
None
}
fn reset(&mut self) {
self.zone_history = vec![];
self.zone_history = PlayerStatisticsVec::new();
self.zone_session = None;
self.last_fight_session = Session::new();
self.main_player_id = None;
@@ -246,7 +257,7 @@ impl ZoneStats for Meter {
fn get_last_fight_session(&self) -> Option<PlayerStatisticsVec> {
let last_session = &self.last_fight_session;
Some(last_session.stats())
Some(last_session.stats(|p| self.stats_filter(p)))
}
fn new_last_fight_session(&mut self) -> Option<()> {
@@ -255,6 +266,30 @@ impl ZoneStats for Meter {
}
}
impl traits::PartyEvents for Meter {
fn register_new_party(
&mut self,
player_names: &std::vec::Vec<std::string::String>,
id: usize,
) -> Option<()> {
self.party = Some(types::Party::new(id, player_names));
Some(())
}
fn register_new_member(&mut self, player_name: &str) -> Option<()> {
if let Some(party) = &mut self.party {
party.add_member(player_name);
}
Some(())
}
fn register_party_disbanded(&mut self) -> Option<()> {
self.party = None;
Some(())
}
}
#[test]
fn test_meter() {
let mut meter = Meter::new();
@@ -263,8 +298,4 @@ fn test_meter() {
meter.register_main_player("name", 0);
assert!(meter.get_zone_session().is_some());
assert_eq!(
meter.get_zone_session().unwrap()[0].player,
"name".to_owned()
);
}