Two players in the zone, overall & last fight interface
This commit is contained in:
+105
-31
@@ -15,13 +15,16 @@ use player::Player;
|
||||
pub use traits::*;
|
||||
pub use types::*;
|
||||
|
||||
#[derive(Hash, Eq, PartialEq, Clone)]
|
||||
#[derive(Hash, Eq, PartialEq, Clone, Debug)]
|
||||
pub struct PlayerName(String);
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Session {
|
||||
players: HashMap<PlayerName, Player>,
|
||||
}
|
||||
|
||||
type PlayerStatisticsVec = Vec<PlayerStatistics>;
|
||||
|
||||
impl Session {
|
||||
fn new() -> Self {
|
||||
Self {
|
||||
@@ -35,37 +38,50 @@ impl Session {
|
||||
players.insert(player_name.clone(), Player::new(player.id));
|
||||
}
|
||||
|
||||
Self {
|
||||
players
|
||||
}
|
||||
Self { players }
|
||||
}
|
||||
|
||||
pub fn stats(&self) -> Vec<PlayerStatistics> {
|
||||
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()
|
||||
dps: player.dps(),
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
pub fn cleanup_players(&mut self) {
|
||||
let without_dmg = self
|
||||
.players
|
||||
.iter()
|
||||
.filter(|(_, player)| player.damage() == 0.0)
|
||||
.map(|(name, _)| name.clone())
|
||||
.collect::<Vec<PlayerName>>();
|
||||
for w in without_dmg {
|
||||
self.players.remove_entry(&w);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn players(&self) -> Vec<&Player> {
|
||||
self.players.iter().map(|(_, p)| p).collect()
|
||||
}
|
||||
|
||||
fn get_player_by_id(&mut self, player_id: usize) -> Option<&mut Player> {
|
||||
self.players.values_mut().find(|p| p.id == player_id)
|
||||
}
|
||||
|
||||
fn add_player(&mut self, player_name: &str, player_id: usize) {
|
||||
self.players.insert(
|
||||
PlayerName(player_name.to_owned()),
|
||||
Player::new(player_id),
|
||||
);
|
||||
self.players
|
||||
.insert(PlayerName(player_name.to_owned()), Player::new(player_id));
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Meter {
|
||||
zone_sessions: VecDeque<Session>,
|
||||
last_fight_session: Session,
|
||||
main_player_id: Option<usize>,
|
||||
}
|
||||
|
||||
@@ -73,42 +89,50 @@ impl Meter {
|
||||
pub fn new() -> Self {
|
||||
Self {
|
||||
zone_sessions: VecDeque::new(),
|
||||
last_fight_session: Session::new(),
|
||||
main_player_id: None,
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub fn reset(&mut self) {
|
||||
self.zone_sessions = VecDeque::new();
|
||||
self.main_player_id = None;
|
||||
fn add_player(&mut self, name: &str, id: usize) -> Option<()> {
|
||||
let session = self.zone_sessions.back_mut()?;
|
||||
session.add_player(name, id);
|
||||
self.last_fight_session.add_player(name, id);
|
||||
Some(())
|
||||
}
|
||||
|
||||
fn new_session(&mut self) {
|
||||
self.zone_sessions.push_back(Session::new());
|
||||
self.last_fight_session = Session::new();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
impl PlayerEvents for Meter {
|
||||
fn get_player_in_zone(&mut self, player_id: usize) -> Option<&mut Player> {
|
||||
fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut DamageDealer>> {
|
||||
let session = self.zone_sessions.back_mut()?;
|
||||
session.get_player_by_id(player_id)
|
||||
let zone_player = session.get_player_by_id(player_id)?;
|
||||
Some(vec![
|
||||
zone_player,
|
||||
self.last_fight_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.zone_sessions.back_mut() {
|
||||
Some(session) => session.add_player(name, id),
|
||||
None => {
|
||||
let mut session = Session::new();
|
||||
session.add_player(name, id);
|
||||
self.zone_sessions.push_back(session);
|
||||
}
|
||||
|
||||
if self.zone_sessions.back().is_none() {
|
||||
self.new_session();
|
||||
}
|
||||
self.add_player(name, id);
|
||||
}
|
||||
|
||||
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 zone");
|
||||
self.zone_sessions.push_back(Session::new());
|
||||
self.zone_sessions.back_mut()?.cleanup_players();
|
||||
self.new_session();
|
||||
}
|
||||
|
||||
Some(())
|
||||
@@ -117,11 +141,25 @@ impl PlayerEvents for Meter {
|
||||
fn register_player(&mut self, name: &str, id: usize) {
|
||||
if self.zone_sessions.is_empty() {
|
||||
debug!("New session");
|
||||
self.zone_sessions.push_back(Session::new());
|
||||
self.new_session();
|
||||
}
|
||||
|
||||
let session = self.zone_sessions.back_mut().unwrap();
|
||||
session.add_player(name, id);
|
||||
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(())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -138,6 +176,40 @@ impl ZoneStats for Meter {
|
||||
|
||||
Some(())
|
||||
}
|
||||
|
||||
fn get_overall_session(&self) -> Option<PlayerStatisticsVec> {
|
||||
let all_stats = self.zone_sessions.iter().flat_map(|s| s.stats()).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);
|
||||
acc
|
||||
},
|
||||
);
|
||||
|
||||
Some(all_stats.iter().map(|(_, v)| v.clone()).collect())
|
||||
}
|
||||
|
||||
fn reset(&mut self) {
|
||||
self.zone_sessions = VecDeque::new();
|
||||
self.last_fight_session = Session::new();
|
||||
self.main_player_id = None;
|
||||
}
|
||||
|
||||
fn get_last_fight_session(&self) -> Option<PlayerStatisticsVec> {
|
||||
let last_session = &self.last_fight_session;
|
||||
Some(last_session.stats())
|
||||
}
|
||||
|
||||
fn new_last_fight_session(&mut self) -> Option<()> {
|
||||
self.last_fight_session = Session::from(&self.last_fight_session);
|
||||
Some(())
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -147,7 +219,9 @@ fn test_meter() {
|
||||
assert_eq!(meter.get_zone_session(), None);
|
||||
|
||||
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());
|
||||
}
|
||||
assert_eq!(
|
||||
meter.get_zone_session().unwrap()[0].player,
|
||||
"name".to_owned()
|
||||
);
|
||||
}
|
||||
|
||||
+33
-26
@@ -1,33 +1,33 @@
|
||||
use std::fmt;
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use timer;
|
||||
|
||||
use super::traits::CombatState;
|
||||
use super::traits::DamageDealer;
|
||||
use super::traits::DamageStats;
|
||||
|
||||
#[derive(PartialEq)]
|
||||
enum CombatState
|
||||
{
|
||||
InCombat,
|
||||
OutOfCombat
|
||||
}
|
||||
|
||||
struct Time
|
||||
{
|
||||
struct Time {
|
||||
_guard: timer::Guard,
|
||||
_timer: timer::Timer
|
||||
_timer: timer::Timer,
|
||||
}
|
||||
|
||||
pub struct Player
|
||||
{
|
||||
impl fmt::Debug for Time {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(f, "")
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Player {
|
||||
pub id: usize,
|
||||
damage_dealt: f32,
|
||||
time_elapsed: Arc<Mutex<f32>>,
|
||||
combat_state: Arc<Mutex<CombatState>>,
|
||||
_time: Time
|
||||
_time: Time,
|
||||
}
|
||||
|
||||
impl Player
|
||||
{
|
||||
impl Player {
|
||||
pub fn new(id: usize) -> Self {
|
||||
let _timer = timer::Timer::new();
|
||||
let time_elapsed = Arc::new(Mutex::new(0.0));
|
||||
@@ -39,20 +39,21 @@ impl Player
|
||||
if *combat_state.lock().unwrap() == CombatState::InCombat {
|
||||
*time_elapsed.lock().unwrap() += 10.0;
|
||||
}
|
||||
|
||||
})
|
||||
};
|
||||
|
||||
Self {
|
||||
id,
|
||||
damage_dealt: 0.0,
|
||||
time_elapsed,
|
||||
id,
|
||||
damage_dealt: 0.0,
|
||||
time_elapsed,
|
||||
combat_state,
|
||||
_time: Time{_timer, _guard}
|
||||
_time: Time { _timer, _guard },
|
||||
}
|
||||
}
|
||||
|
||||
pub fn register_damage_dealt(&mut self, damage_dealt: f32) {
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -60,21 +61,27 @@ impl Player
|
||||
self.damage_dealt += damage_dealt
|
||||
}
|
||||
|
||||
pub fn enter_combat(&mut self) {
|
||||
fn enter_combat(&mut self) {
|
||||
*self.combat_state.lock().unwrap() = CombatState::InCombat;
|
||||
}
|
||||
|
||||
pub fn leave_combat(&mut self) {
|
||||
fn leave_combat(&mut self) {
|
||||
*self.combat_state.lock().unwrap() = CombatState::OutOfCombat;
|
||||
}
|
||||
|
||||
fn combat_state(&self) -> CombatState {
|
||||
match *self.combat_state.lock().unwrap() {
|
||||
CombatState::InCombat => CombatState::InCombat,
|
||||
CombatState::OutOfCombat => CombatState::OutOfCombat,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl DamageStats for Player {
|
||||
fn damage(&self) -> f32 {
|
||||
self.damage_dealt
|
||||
}
|
||||
|
||||
fn time_in_combat(&self) -> f32 {
|
||||
*self.time_elapsed.lock().unwrap()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+34
-11
@@ -1,5 +1,10 @@
|
||||
use super::types::PlayerStatistics;
|
||||
use super::Player;
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum CombatState {
|
||||
InCombat,
|
||||
OutOfCombat,
|
||||
}
|
||||
|
||||
pub trait DamageStats {
|
||||
fn damage(&self) -> f32;
|
||||
@@ -15,8 +20,18 @@ pub trait DamageStats {
|
||||
}
|
||||
}
|
||||
|
||||
pub trait DamageDealer {
|
||||
fn register_damage_dealt(&mut self, damage_dealt: f32);
|
||||
|
||||
fn enter_combat(&mut self);
|
||||
|
||||
fn leave_combat(&mut self);
|
||||
|
||||
fn combat_state(&self) -> CombatState;
|
||||
}
|
||||
|
||||
pub trait PlayerEvents {
|
||||
fn get_player_in_zone(&mut self, player_id: usize) -> Option<&mut Player>;
|
||||
fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut DamageDealer>>;
|
||||
|
||||
fn register_main_player(&mut self, name: &str, id: usize);
|
||||
|
||||
@@ -25,32 +40,40 @@ pub trait PlayerEvents {
|
||||
fn register_player(&mut self, name: &str, id: usize);
|
||||
|
||||
fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> {
|
||||
let player = self.get_player_in_zone(player_id)?;
|
||||
if damage < 0.0 {
|
||||
player.register_damage_dealt(f32::abs(damage));
|
||||
for player in self.get_damage_dealers_in_zone(player_id)? {
|
||||
if damage < 0.0 {
|
||||
player.register_damage_dealt(f32::abs(damage));
|
||||
}
|
||||
}
|
||||
|
||||
Some(())
|
||||
}
|
||||
|
||||
fn register_combat_enter(&mut self, player_id: usize) -> Option<()> {
|
||||
let player = self.get_player_in_zone(player_id)?;
|
||||
|
||||
player.enter_combat();
|
||||
for player in self.get_damage_dealers_in_zone(player_id)? {
|
||||
player.enter_combat();
|
||||
}
|
||||
|
||||
Some(())
|
||||
}
|
||||
|
||||
fn register_combat_leave(&mut self, player_id: usize) -> Option<()> {
|
||||
let player = self.get_player_in_zone(player_id)?;
|
||||
|
||||
player.leave_combat();
|
||||
for player in self.get_damage_dealers_in_zone(player_id)? {
|
||||
player.leave_combat();
|
||||
}
|
||||
|
||||
Some(())
|
||||
}
|
||||
}
|
||||
|
||||
pub trait ZoneStats {
|
||||
fn reset(&mut self);
|
||||
|
||||
fn get_zone_session(&self) -> Option<Vec<PlayerStatistics>>;
|
||||
fn new_zone_session(&mut self) -> Option<()>;
|
||||
|
||||
fn get_overall_session(&self) -> Option<Vec<PlayerStatistics>>;
|
||||
|
||||
fn get_last_fight_session(&self) -> Option<Vec<PlayerStatistics>>;
|
||||
fn new_last_fight_session(&mut self) -> Option<()>;
|
||||
}
|
||||
|
||||
+14
-3
@@ -1,7 +1,18 @@
|
||||
#[derive(Debug, PartialEq)]
|
||||
use super::traits::DamageStats;
|
||||
|
||||
#[derive(Debug, PartialEq, Clone)]
|
||||
pub struct PlayerStatistics {
|
||||
pub player: String,
|
||||
pub damage: f32,
|
||||
pub time_in_combat: f32,
|
||||
pub dps: f32
|
||||
}
|
||||
pub dps: f32,
|
||||
}
|
||||
|
||||
impl DamageStats for PlayerStatistics {
|
||||
fn damage(&self) -> f32 {
|
||||
self.damage
|
||||
}
|
||||
fn time_in_combat(&self) -> f32 {
|
||||
self.time_in_combat
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user