+traits for player and meter

This commit is contained in:
Wiktor Mazur
2019-09-13 13:40:30 +02:00
parent b625d7b847
commit 74503083a0
8 changed files with 166 additions and 177 deletions
+38 -77
View File
@@ -7,41 +7,21 @@ use std::collections::VecDeque;
use log::*;
mod player;
mod traits;
mod types;
use player::Player;
#[derive(Debug, Copy, Clone, PartialEq)]
pub struct DPS(f32);
impl DPS {
fn new(damage: f32, time: f32) -> Self {
if time == 0.0 {
return Self(0.0)
}
Self(damage / time * 1000.0)
}
pub fn value(&self) -> f32 {
self.0
}
}
pub use traits::*;
pub use types::*;
#[derive(Hash, Eq, PartialEq, Clone)]
struct PlayerName(String);
pub struct PlayerName(String);
pub struct Session {
players: HashMap<PlayerName, Player>,
}
#[derive(Debug, PartialEq)]
pub struct PlayerStatistics {
pub player: String,
pub damage: f32,
pub time_in_combat: f32,
pub dps: DPS
}
impl Session {
fn new() -> Self {
Self {
@@ -65,9 +45,9 @@ impl Session {
.iter()
.map(|(name, player)| PlayerStatistics {
player: name.0.to_owned(),
damage: player.get_damage_dealt(),
time_in_combat: player.get_time_elapsed(),
dps: DPS::new(player.get_damage_dealt(), player.get_time_elapsed())
damage: player.damage(),
time_in_combat: player.time_in_combat(),
dps: player.dps()
})
.collect()
}
@@ -85,102 +65,83 @@ impl Session {
}
pub struct Meter {
instance_sessions: VecDeque<Session>,
zone_sessions: VecDeque<Session>,
main_player_id: Option<usize>,
}
impl Meter {
pub fn new() -> Self {
Self {
instance_sessions: VecDeque::new(),
zone_sessions: VecDeque::new(),
main_player_id: None,
}
}
}
pub fn register_main_player(&mut self, name: &str, id: usize) {
impl PlayerEvents for Meter {
fn get_player_in_zone(&mut self, player_id: usize) -> Option<&mut Player> {
let session = self.zone_sessions.back_mut()?;
session.get_player_by_id(player_id)
}
fn register_main_player(&mut self, name: &str, id: usize) {
debug!("Main player {} registerd with id {}", name, id);
self.main_player_id = Some(id);
match self.instance_sessions.back_mut() {
match self.zone_sessions.back_mut() {
Some(session) => session.add_player(name, id),
None => {
let mut session = Session::new();
session.add_player(name, id);
self.instance_sessions.push_back(session);
self.zone_sessions.push_back(session);
}
}
}
pub fn register_leave(&mut self, id: usize) -> Option<()> {
fn register_leave(&mut self, id: usize) -> Option<()> {
let main_player_id = self.main_player_id?;
if id == main_player_id {
debug!("New session, main player left the instance");
self.instance_sessions.push_back(Session::new());
debug!("New session, main player left the zone");
self.zone_sessions.push_back(Session::new());
}
Some(())
}
pub fn register_player(&mut self, name: &str, id: usize) {
if self.instance_sessions.is_empty() {
fn register_player(&mut self, name: &str, id: usize) {
if self.zone_sessions.is_empty() {
debug!("New session");
self.instance_sessions.push_back(Session::new());
self.zone_sessions.push_back(Session::new());
}
let session = self.instance_sessions.back_mut().unwrap();
let session = self.zone_sessions.back_mut().unwrap();
session.add_player(name, id);
}
}
pub fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> {
let session = self.instance_sessions.back_mut()?;
let player = session.get_player_by_id(player_id)?;
if damage < 0.0 {
player.register_damage_dealt(f32::abs(damage));
}
Some(())
}
pub fn register_combat_enter(&mut self, player_id: usize) -> Option<()> {
let session = self.instance_sessions.back_mut()?;
let player = session.get_player_by_id(player_id)?;
player.enter_combat();
Some(())
}
pub fn register_combat_leave(&mut self, player_id: usize) -> Option<()> {
let session = self.instance_sessions.back_mut()?;
let player = session.get_player_by_id(player_id)?;
player.leave_combat();
Some(())
}
pub fn get_instance_session(&self) -> Option<Vec<PlayerStatistics>> {
let last_session = self.instance_sessions.back()?;
impl ZoneStats for Meter {
fn get_zone_session(&self) -> Option<Vec<PlayerStatistics>> {
let last_session = self.zone_sessions.back()?;
Some(last_session.stats())
}
pub fn reset_instance_session(&mut self) -> Option<()> {
let last_session = self.instance_sessions.back()?;
fn new_zone_session(&mut self) -> Option<()> {
let last_session = self.zone_sessions.back()?;
let new_session = Session::from(&last_session);
self.instance_sessions.push_back(new_session);
self.zone_sessions.push_back(new_session);
Some(())
}
}
#[test]
fn test_meter() {
let mut meter = Meter::new();
assert_eq!(meter.get_instance_session(), None);
assert_eq!(meter.get_zone_session(), None);
meter.register_main_player("name", 0);
assert!(meter.get_instance_session().is_some());
assert_eq!(meter.get_instance_session().unwrap()[0].player, "name".to_owned());
assert!(meter.get_zone_session().is_some());
assert_eq!(meter.get_zone_session().unwrap()[0].player, "name".to_owned());
}