From 75238241e63415a2d9579b2ff3dca1ac5463c514 Mon Sep 17 00:00:00 2001 From: Wiktor Mazur Date: Wed, 25 Dec 2019 14:14:58 +0100 Subject: [PATCH] Encapsulate player --- backend/src/meter/mod.rs | 10 +++++----- backend/src/meter/player.rs | 12 ++++++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/backend/src/meter/mod.rs b/backend/src/meter/mod.rs index 71b3f29..fc5da33 100644 --- a/backend/src/meter/mod.rs +++ b/backend/src/meter/mod.rs @@ -30,7 +30,7 @@ impl Session { fn from(session: &Self) -> Self { let mut players = HashMap::new(); for (player_name, player) in &session.players { - let mut new_player = Player::new(player.id, player.main); + let mut new_player = Player::new(player.id(), player.main()); if let CombatState::InCombat = player.combat_state() { new_player.enter_combat(); } @@ -59,7 +59,7 @@ impl Session { fame_per_hour: player.fame_per_hour(), items: player.items(), idle: player.idle(), - main_player_stats: player.main, + main_player_stats: player.main(), }) .collect(), ) @@ -69,7 +69,7 @@ impl Session { let without_dmg = self .players .iter() - .filter(|(_, player)| !player.main && player.damage() == 0.0 && player.fame() == 0.0) + .filter(|(_, player)| !player.main() && player.damage() == 0.0 && player.fame() == 0.0) .map(|(name, _)| name.clone()) .collect::>(); for w in without_dmg { @@ -82,7 +82,7 @@ impl Session { } fn get_player_by_id(&mut self, player_id: usize) -> Option<&mut Player> { - self.players.values_mut().find(|p| p.id == player_id) + self.players.values_mut().find(|p| p.id() == player_id) } fn add_player(&mut self, player_name: &str, player_id: usize, main: bool) { @@ -125,7 +125,7 @@ impl Meter { 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_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; diff --git a/backend/src/meter/player.rs b/backend/src/meter/player.rs index 53ab855..c07846e 100644 --- a/backend/src/meter/player.rs +++ b/backend/src/meter/player.rs @@ -30,7 +30,7 @@ impl CombatTime { #[derive(Debug)] pub struct Player { - pub id: usize, + id: usize, damage_dealt: f32, combat_time: CombatTime, combat_state: CombatState, @@ -38,7 +38,7 @@ pub struct Player { fame: f32, items: Items, idle: bool, - pub main: bool + main: bool } @@ -60,6 +60,14 @@ impl Player { pub fn idle(&self) -> bool { self.idle } + + pub fn id(&self) -> usize { + self.id + } + + pub fn main(&self) -> bool { + self.main + } } impl DamageDealer for Player {