Repository cleanup

This commit is contained in:
Wiktor Mazur
2019-10-20 14:59:45 +02:00
parent a15f7ae92c
commit e14dbf66dc
36 changed files with 180 additions and 102 deletions
+333
View File
@@ -0,0 +1,333 @@
extern crate chrono;
extern crate timer;
use std::collections::HashMap;
use log::*;
mod player;
mod traits;
mod types;
use player::Player;
pub use traits::*;
pub use types::*;
#[derive(Debug)]
pub struct Session {
players: HashMap<String, Player>,
}
impl Session {
fn new() -> Self {
Self {
players: HashMap::new(),
}
}
fn from(session: &Self) -> Self {
let mut players = HashMap::new();
for (player_name, player) in &session.players {
players.insert(player_name.clone(), Player::new(player.id));
}
Self { players }
}
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(),
seconds_in_game: player.time_in_game().as_secs() as f32,
fame: player.fame(),
fame_per_minute: player.fame_per_minute(),
fame_per_hour: player.fame_per_hour(),
})
.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<String>>();
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(player_name.to_owned(), Player::new(player_id));
}
}
#[derive(Default)]
pub struct MeterConfig {
pub skip_non_party_members: bool,
}
pub struct Meter {
zone_history: PlayerStatisticsVec,
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: 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,
}
}
fn zone_session(&self) -> Option<&Session> {
match &self.zone_session {
Some(s) => Some(s),
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,
}
}
fn add_player(&mut self, name: &str, id: usize) -> Option<()> {
let session = self.zone_session_mut()?;
session.add_player(name, id);
self.last_fight_session.add_player(name, id);
Some(())
}
fn new_session(&mut self) {
if let Some(zone) = self.zone_session() {
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
.players()
.iter()
.any(|p| p.combat_state() == CombatState::InCombat)
{
return CombatState::InCombat;
}
CombatState::OutOfCombat
}
}
impl PlayerEvents for Meter {
fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn DamageDealer>> {
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])
}
fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>> {
let main_player_id = self.main_player_id?;
let (zone, last_fight) = self.sessions_mut()?;
if player_id != main_player_id {
return None;
}
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])
}
fn register_main_player(&mut self, name: &str, id: usize) {
info!("Main player {} registered with id {}", name, id);
self.main_player_id = Some(id);
if self.zone_session.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 {
info!("Main player ({}) left the zone, Creating new zone session.", id);
self.zone_session_mut()?.cleanup_players();
self.new_session();
}
Some(())
}
fn register_player(&mut self, name: &str, id: usize) {
if self.zone_session.is_none() {
info!("New player ({}) registered without session, creating new session", name);
self.new_session();
}
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 LastFightStats for Meter {
fn last_fight_stats(&self) -> Option<PlayerStatisticsVec> {
let last_session = &self.last_fight_session;
Some(last_session.stats(|p| self.stats_filter(p)))
}
fn reset_last_fight_stats(&mut self) -> Option<()> {
self.last_fight_session = Session::from(&self.last_fight_session);
Some(())
}
}
impl ZoneStats for Meter {
fn zone_stats(&self) -> Option<PlayerStatisticsVec> {
let last_session = self.zone_session()?;
Some(last_session.stats(|p| self.stats_filter(p)))
}
fn reset_zone_stats(&mut self) -> Option<()> {
let last_session = self.zone_session_mut()?;
self.zone_session = Some(Session::from(&last_session));
Some(())
}
}
impl OverallStats for Meter {
fn overall_stats(&self) -> Option<PlayerStatisticsVec> {
if let Some(zone) = self.zone_session() {
return Some(PlayerStatisticsVec::merged(
&self.zone_history,
&zone.stats(|p| self.stats_filter(p)),
));
}
None
}
}
impl GameStats for Meter {
fn reset_stats(&mut self) -> Option<()> {
self.zone_history = PlayerStatisticsVec::new();
self.zone_session = None;
self.last_fight_session = Session::new();
self.main_player_id = None;
Some(())
}
fn get_players_in_party(&self) -> Option<Vec<String>> {
if let Some(party) = &self.party {
let members = party.clone().members;
return Some(members.into_iter().collect())
}
None
}
}
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();
assert_eq!(meter.zone_stats(), None);
meter.register_main_player("name", 0);
assert!(meter.zone_stats().is_some());
}
+151
View File
@@ -0,0 +1,151 @@
use std::fmt;
use std::sync::{Arc, Mutex};
#[cfg(test)]
use fake_clock::FakeClock as Instant;
#[cfg(not(test))]
use std::time::Instant;
use timer;
use super::traits::CombatState;
use super::traits::DamageDealer;
use super::traits::DamageStats;
use super::traits::FameStats;
use super::traits::FameGatherer;
struct Time {
_guard: timer::Guard,
_timer: timer::Timer,
}
impl Time {
fn with(time_elapsed: Arc<Mutex<f32>>, combat_state: Arc<Mutex<CombatState>>) -> Time {
let _timer = timer::Timer::new();
let _guard = {
_timer.schedule_repeating(chrono::Duration::milliseconds(10), move || {
if *combat_state.lock().unwrap() == CombatState::InCombat {
*time_elapsed.lock().unwrap() += 10.0;
}
})
};
Self { _timer, _guard }
}
}
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: Option<Time>,
time_started: Instant,
fame: f32
}
impl Player {
pub fn new(id: usize) -> Self {
let time_elapsed = Arc::new(Mutex::new(0.0));
let combat_state = Arc::new(Mutex::new(CombatState::OutOfCombat));
Self {
id,
damage_dealt: 0.0,
time_elapsed,
combat_state,
_time: None,
time_started: Instant::now(),
fame: 0.0
}
}
}
impl DamageDealer for Player {
fn register_damage_dealt(&mut self, damage_dealt: f32) {
if self._time.is_none() {
let elapsed = self.time_elapsed.clone();
let state = self.combat_state.clone();
self._time = Some(Time::with(elapsed, state));
}
if *self.combat_state.lock().unwrap() == CombatState::OutOfCombat {
return
}
self.damage_dealt += damage_dealt
}
fn enter_combat(&mut self) {
*self.combat_state.lock().unwrap() = CombatState::InCombat;
}
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()
}
}
impl FameGatherer for Player {
fn register_fame_gain(&mut self, fame: f32) {
self.fame += fame;
}
}
impl FameStats for Player {
fn fame(&self) -> f32 {
self.fame
}
fn time_started(&self) -> Instant {
self.time_started
}
}
#[cfg(test)]
mod test {
use super::*;
fn sleep(time: u64) {
use fake_clock::FakeClock;
FakeClock::advance_time(time);
}
#[test]
fn test_player_fame_stats() {
let mut player = Player::new(1);
sleep(1000 * 60);
player.register_fame_gain(100.0);
assert_eq!(player.fame_per_minute(), 100);
assert_eq!(player.fame_per_hour(), 5999);
sleep(1000 * 60 * 60 - 1000 * 60);
assert_eq!(player.fame_per_hour(), 100);
}
}
+127
View File
@@ -0,0 +1,127 @@
#[cfg(test)]
use fake_clock::FakeClock as Instant;
#[cfg(not(test))]
use std::time::Instant;
use super::types::PlayerStatisticsVec;
#[derive(Debug, PartialEq)]
pub enum CombatState {
InCombat,
OutOfCombat,
}
pub trait DamageStats {
fn damage(&self) -> f32;
fn time_in_combat(&self) -> f32;
fn dps(&self) -> f32 {
if self.time_in_combat() == 0.0 {
0.0
} else {
self.damage() / self.time_in_combat() * 1000.0
}
}
}
pub trait FameStats {
fn fame(&self) -> f32;
fn time_started(&self) -> Instant;
fn time_in_game(&self) -> std::time::Duration {
Instant::now() - self.time_started()
}
fn fame_per_minute(&self) -> u32 {
let minutes_in_game = self.time_in_game().as_secs() as f32 / 60.0;
(self.fame() / minutes_in_game) as u32
}
fn fame_per_hour(&self) -> u32 {
let hours_in_game = self.time_in_game().as_secs() as f32 / 60.0 / 60.0;
(self.fame() / hours_in_game) as u32
}
}
pub trait FameGatherer {
fn register_fame_gain(&mut self, fame: f32);
}
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_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn DamageDealer>>;
fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>>;
fn register_main_player(&mut self, name: &str, id: usize);
fn register_leave(&mut self, id: usize) -> Option<()>;
fn register_player(&mut self, name: &str, id: usize);
fn register_fame_gain(&mut self, player_id: usize, fame: f32) -> Option<()> {
for player in self.get_fame_gatherers_in_zone(player_id)? {
player.register_fame_gain(fame);
}
Some(())
}
fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> {
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<()> {
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<()> {
for player in self.get_damage_dealers_in_zone(player_id)? {
player.leave_combat();
}
Some(())
}
}
pub trait LastFightStats {
fn last_fight_stats(&self) -> Option<PlayerStatisticsVec>;
fn reset_last_fight_stats(&mut self) -> Option<()>;
}
pub trait ZoneStats {
fn zone_stats(&self) -> Option<PlayerStatisticsVec>;
fn reset_zone_stats(&mut self) -> Option<()>;
}
pub trait OverallStats {
fn overall_stats(&self) -> Option<PlayerStatisticsVec>;
}
pub trait GameStats {
fn get_players_in_party(&self) -> Option<Vec<String>>;
fn reset_stats(&mut self) -> Option<()>;
}
pub trait PartyEvents {
fn register_new_party(&mut self, player_names: &std::vec::Vec<std::string::String>, id: usize) -> Option<()>;
fn register_new_member(&mut self, player_name: &str) -> Option<()>;
fn register_party_disbanded(&mut self) -> Option<()>;
}
+125
View File
@@ -0,0 +1,125 @@
use std::collections::HashSet;
use std::collections::HashMap;
use std::iter::FromIterator;
#[cfg(test)]
use fake_clock::FakeClock as Instant;
#[cfg(not(test))]
use std::time::Instant;
use super::traits::DamageStats;
use super::traits::FameStats;
#[derive(Debug, PartialEq, Clone)]
pub struct Party {
pub id: usize,
pub members: HashSet<String>
}
impl Party {
pub fn new(id: usize, members: &std::vec::Vec<std::string::String>) -> Self {
Self {
id,
members: HashSet::from_iter(members.iter().cloned()),
}
}
pub fn add_member(&mut self, member_name: &str) {
self.members.insert(member_name.to_string());
}
pub fn includes(&self, other: &str) -> bool {
return self.members.contains(other);
}
}
#[derive(Debug, PartialEq, Clone)]
pub struct PlayerStatistics {
pub player: String,
pub damage: f32,
pub time_in_combat: f32,
pub dps: f32,
pub seconds_in_game: f32,
pub fame: f32,
pub fame_per_minute: u32,
pub fame_per_hour: u32
}
#[derive(Debug, PartialEq, Clone)]
pub struct PlayerStatisticsVec {
_vec: Vec<PlayerStatistics>
}
#[derive(Debug, PartialEq, Copy, Clone)]
pub enum StatType {
LastFight,
Zone,
Overall,
Unknown
}
impl PlayerStatisticsVec {
pub fn new() -> Self {
Self {
_vec: vec![]
}
}
pub fn from(player_statistics_vec: Vec<PlayerStatistics>) -> Self {
Self {
_vec: player_statistics_vec
}
}
pub fn value(&self) -> Vec<PlayerStatistics> {
self._vec.clone()
}
pub fn merged(a: &Self, b: &Self) -> Self {
let merged = [&a._vec[..], &b._vec[..]].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();
s.seconds_in_game += stat.seconds_in_game;
s.fame += stat.fame;
s.fame_per_minute = s.fame_per_minute();
s.fame_per_hour = s.fame_per_hour();
})
.or_insert(stat.clone());
acc
},
);
Self {
_vec: merged.iter().map(|(_, v)| v.clone()).collect()
}
}
}
impl DamageStats for PlayerStatistics {
fn damage(&self) -> f32 {
self.damage
}
fn time_in_combat(&self) -> f32 {
self.time_in_combat
}
}
impl FameStats for PlayerStatistics {
fn fame(&self) -> f32 {
self.fame
}
fn time_started(&self) -> Instant {
Instant::now()
}
fn time_in_game(&self) -> std::time::Duration {
std::time::Duration::from_secs(self.seconds_in_game as u64)
}
}