+ fame statistics
This commit is contained in:
Generated
+7
@@ -238,6 +238,11 @@ dependencies = [
|
||||
"synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fake_clock"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "fuchsia-cprng"
|
||||
version = "0.1.1"
|
||||
@@ -334,6 +339,7 @@ dependencies = [
|
||||
"bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cpython 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"fake_clock 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"packet_sniffer 0.1.0",
|
||||
@@ -890,6 +896,7 @@ dependencies = [
|
||||
"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
|
||||
"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
|
||||
"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
|
||||
"checksum fake_clock 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a121cefff0e603c3a3477370e0fc965059d848bdab6b56554c1aa2b5b75bb320"
|
||||
"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
|
||||
"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
|
||||
"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
|
||||
|
||||
@@ -22,3 +22,4 @@ timer = "0.1"
|
||||
chrono = "0.4"
|
||||
log = { version = "0.4", features = ["std"] }
|
||||
lazy_static = "1.2"
|
||||
fake_clock = "0.3.0"
|
||||
+1
-1
@@ -7,7 +7,7 @@ CFG_VERSION = '0.2'
|
||||
default = """
|
||||
[window]
|
||||
width = 300
|
||||
height = 200
|
||||
height = 230
|
||||
font-size = '10px'
|
||||
opacity = 0.5
|
||||
|
||||
|
||||
+37
-7
@@ -1,30 +1,60 @@
|
||||
import os
|
||||
|
||||
import libmeter
|
||||
from config import config
|
||||
|
||||
TESTING_ENABLED = bool(os.getenv('TESTING'))
|
||||
|
||||
|
||||
class Stat:
|
||||
def __init__(self, name, damage, time_in_combat, dps):
|
||||
class DamageStat:
|
||||
def __init__(self, name, damage, time_in_combat, dps, precentage):
|
||||
self.name = name
|
||||
self.damage = '{0:.2f}'.format(damage)
|
||||
self.time_in_combat = '{0:.2f}'.format(time_in_combat)
|
||||
self.dps = '{0:.2f}'.format(dps)
|
||||
self.precentage = '{0:.2f}'.format(precentage)
|
||||
|
||||
def __eq__(self, other):
|
||||
return self.name == other.name and self.damage == other.damage and self.time_in_combat == other.time_in_combat and self.dps == other.dps
|
||||
|
||||
|
||||
def stats(session):
|
||||
return [Stat(s['player'], s['damage'], s['time_in_combat'], s['dps']) for s in session]
|
||||
class FameStat:
|
||||
def __init__(self, fame, fame_per_minute):
|
||||
self.fame = fame
|
||||
self.fame_per_minute = fame_per_minute
|
||||
|
||||
|
||||
def stats(session):
|
||||
with_damage = [s for s in session if s['damage'] != 0.0]
|
||||
extended_session = with_precentage(with_damage)
|
||||
statistics = [DamageStat(s['player'], s['damage'], s['time_in_combat'], s['dps'], s['dmg_precentage']) for s in extended_session]
|
||||
stats_with_fame = [p for p in extended_session if 'fame' in p and p['fame'] != 0.0]
|
||||
|
||||
if len(stats_with_fame) > 0:
|
||||
stat_with_fame = stats_with_fame[0]
|
||||
fame = FameStat(stat_with_fame['fame'], stat_with_fame['fame_per_minute'])
|
||||
else:
|
||||
fame = FameStat(0.0, 0.0)
|
||||
|
||||
return statistics, fame
|
||||
|
||||
|
||||
def with_precentage(session):
|
||||
|
||||
damage_done = 0.0
|
||||
for s in session:
|
||||
damage_done += s['damage']
|
||||
|
||||
for s in session:
|
||||
s['dmg_precentage'] = s['damage'] / damage_done * 100
|
||||
|
||||
return session
|
||||
|
||||
def get_zone_session():
|
||||
if TESTING_ENABLED:
|
||||
session = [
|
||||
{'player': 'A', 'damage': 1234.02,
|
||||
'time_in_combat': 12.0, 'dps': 12.4234},
|
||||
'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30},
|
||||
{'player': 'B', 'damage': 5435.02, 'time_in_combat': 12.0, 'dps': 12},
|
||||
{'player': 'C', 'damage': 23.02, 'time_in_combat': 12.0, 'dps': 13},
|
||||
{'player': 'D', 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
|
||||
@@ -71,8 +101,8 @@ def reset_sessions():
|
||||
def initialize():
|
||||
if TESTING_ENABLED:
|
||||
return
|
||||
|
||||
cfg = config()
|
||||
try:
|
||||
libmeter.initialize()
|
||||
libmeter.initialize(cfg['app']['skip_non_party_players'])
|
||||
except:
|
||||
pass
|
||||
|
||||
+14
-7
@@ -17,9 +17,9 @@ import engine
|
||||
|
||||
|
||||
class Mode:
|
||||
CURRENT_ZONE = 'Damage: Current zone'
|
||||
OVERALL = 'Damage: Overall'
|
||||
LAST_FIGHT = 'Damage: Last fight'
|
||||
CURRENT_ZONE = 'Statistics: Current zone'
|
||||
OVERALL = 'Statistics: Overall'
|
||||
LAST_FIGHT = 'Statistics: Last fight'
|
||||
|
||||
|
||||
class BottomButtons(QWidget):
|
||||
@@ -49,8 +49,8 @@ class BottomButtons(QWidget):
|
||||
def copy(self):
|
||||
clip = "{}\n".format(self.mode())
|
||||
for i in range(self.table.rowCount()):
|
||||
clip += '{}. {} {}-{}'.format(i+1, self.table.item(i, 0).text(
|
||||
), self.table.item(i, 1).text(), self.table.item(i, 2).text())
|
||||
clip += '{}. {} {}-{}-{}%'.format(i+1, self.table.item(i, 0).text(
|
||||
), self.table.item(i, 1).text(), self.table.item(i, 2).text(), self.table.item(i, 3).text())
|
||||
clip += "\n"
|
||||
clipboard.copy(clip)
|
||||
|
||||
@@ -83,21 +83,28 @@ class MainWidget(QWidget):
|
||||
self.mouse_pos = None
|
||||
self.mode = ModeWidget()
|
||||
self.table = Table()
|
||||
self.fame_label = QLabel()
|
||||
self.bottom_buttons = BottomButtons(
|
||||
self.table, lambda: self.mode.currentText())
|
||||
|
||||
self.layout = QVBoxLayout()
|
||||
self.layout.addWidget(self.mode)
|
||||
self.layout.addWidget(self.fame_label)
|
||||
self.layout.addWidget(self.table)
|
||||
self.layout.addWidget(self.bottom_buttons)
|
||||
self.setLayout(self.layout)
|
||||
|
||||
self.table.fill(self.session())
|
||||
self.refresh()
|
||||
|
||||
timer = QTimer(self)
|
||||
timer.timeout.connect(lambda: self.table.fill(self.session()))
|
||||
timer.timeout.connect(self.refresh)
|
||||
timer.start(500)
|
||||
|
||||
def refresh(self):
|
||||
damage_session, fame_stat = self.session()
|
||||
self.table.fill(damage_session)
|
||||
self.fame_label.setText("Fame <b>{}</b>, Fame per minute <b>{}</b>".format(fame_stat.fame, fame_stat.fame_per_minute))
|
||||
|
||||
def mousePressEvent(self, event):
|
||||
self.mouse_pos = event.pos()
|
||||
|
||||
|
||||
+3
-3
@@ -8,8 +8,8 @@ class Table(QTableWidget):
|
||||
|
||||
self.session = None
|
||||
|
||||
self.setColumnCount(3)
|
||||
self.setHorizontalHeaderLabels(["Player", "Damage", "DPS"])
|
||||
self.setColumnCount(4)
|
||||
self.setHorizontalHeaderLabels(["Player", "Damage", "DPS", "%"])
|
||||
self.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
|
||||
|
||||
def fill(self, new_session):
|
||||
@@ -20,7 +20,6 @@ class Table(QTableWidget):
|
||||
|
||||
session = sorted(new_session, key=lambda s: float(
|
||||
s.damage), reverse=True)
|
||||
session = [s for s in session if float(s.damage) > 0]
|
||||
|
||||
self._align_rows(len(session))
|
||||
|
||||
@@ -28,6 +27,7 @@ class Table(QTableWidget):
|
||||
self.setItem(idx, 0, QTableWidgetItem(stats.name))
|
||||
self.setItem(idx, 1, QTableWidgetItem(stats.damage))
|
||||
self.setItem(idx, 2, QTableWidgetItem(stats.dps))
|
||||
self.setItem(idx, 3, QTableWidgetItem(stats.precentage))
|
||||
|
||||
def _align_rows(self, new_row_count):
|
||||
row_count = self.rowCount()
|
||||
|
||||
+53
-1
@@ -143,6 +143,9 @@ fn register_message(events: &mut meter::Meter, message: &game_protocol::Message)
|
||||
game_protocol::Message::PartyDisbanded(_) => {
|
||||
events.register_party_disbanded().unwrap_or(())
|
||||
}
|
||||
game_protocol::Message::FameUpdate(msg) => {
|
||||
events.register_fame_gain(msg.source, msg.fame).unwrap_or(())
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
@@ -150,6 +153,8 @@ fn register_message(events: &mut meter::Meter, message: &game_protocol::Message)
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use fake_clock::FakeClock as Instant;
|
||||
|
||||
use cpython::{PyClone, PyDict, PyFloat, PyUnicode};
|
||||
|
||||
use game_protocol::message;
|
||||
@@ -167,6 +172,11 @@ mod tests {
|
||||
Python::acquire_gil()
|
||||
}
|
||||
|
||||
pub fn sleep(time: u64) {
|
||||
use fake_clock::FakeClock;
|
||||
FakeClock::advance_time(time);
|
||||
}
|
||||
|
||||
pub fn register(message: Message) {
|
||||
let meter = &mut METER.lock().unwrap();
|
||||
r(meter, &message);
|
||||
@@ -256,6 +266,15 @@ mod tests {
|
||||
.unwrap()
|
||||
.value(py)
|
||||
}
|
||||
|
||||
pub fn get_number(py: Python, stats: &PyDict, key: &str) -> u32 {
|
||||
stats
|
||||
.get_item(py, key)
|
||||
.unwrap()
|
||||
.extract(py)
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
trait Testing {
|
||||
@@ -329,6 +348,15 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
impl Testing for message::FameUpdate {
|
||||
fn new(source: usize) -> Self {
|
||||
Self {
|
||||
source: source,
|
||||
fame: 100.0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl SwitchableTesting for message::RegenerationHealthChanged {
|
||||
fn enabled(source: usize) -> Self {
|
||||
Self {
|
||||
@@ -400,11 +428,15 @@ mod tests {
|
||||
helpers::register(Message::NewCharacter(message::NewCharacter::new(1)));
|
||||
|
||||
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||
assert_eq!(stats.len(py), 4);
|
||||
assert_eq!(stats.len(py), 8);
|
||||
assert_eq!(helpers::get_string(py, &stats, "player"), "CH1");
|
||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||
assert_eq!(helpers::get_float(py, &stats, "time_in_combat"), 0.0);
|
||||
assert_eq!(helpers::get_float(py, &stats, "dps"), 0.0);
|
||||
assert_eq!(helpers::get_float(py, &stats, "seconds_in_game"), 0.0);
|
||||
assert_eq!(helpers::get_float(py, &stats, "fame"), 0.0);
|
||||
assert_eq!(helpers::get_number(py, &stats, "fame_per_minute"), 0);
|
||||
assert_eq!(helpers::get_number(py, &stats, "fame_per_hour"), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -719,4 +751,24 @@ mod tests {
|
||||
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "other_player").is_none());
|
||||
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "yet_another_other_player").is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_fame_statistics() {
|
||||
let guard = helpers::init();
|
||||
let py = guard.python();
|
||||
|
||||
helpers::register(Message::CharacterStats(message::CharacterStats::new_named(
|
||||
"MAIN_CH1", 1,
|
||||
)));
|
||||
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap();
|
||||
assert_eq!(helpers::get_number(py, &stats, "fame_per_minute"), 0);
|
||||
|
||||
helpers::sleep(1000 * 60);
|
||||
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap();
|
||||
assert_eq!(helpers::get_number(py, &stats, "fame_per_minute"), 0);
|
||||
|
||||
helpers::register(Message::FameUpdate(message::FameUpdate::new(1)));
|
||||
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap();
|
||||
assert_eq!(helpers::get_number(py, &stats, "fame_per_minute"), 100);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -291,9 +291,26 @@ impl PartyDisbanded {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct FameUpdate {
|
||||
pub source: usize,
|
||||
pub fame: f32
|
||||
}
|
||||
|
||||
impl FameUpdate {
|
||||
fn encode(val: Parameters) -> Option<Message> {
|
||||
let source = deserialize_number!(val, 0, "FameUpdate::source")?;
|
||||
let raw_fame = deserialize_number!(val, 2, "FameUpdate::fame")?;
|
||||
let fame = raw_fame as f32 / 10000.0;
|
||||
|
||||
Some(Message::FameUpdate(FameUpdate{source, fame}))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum Message {
|
||||
FameUpdate(FameUpdate),
|
||||
Leave(Leave),
|
||||
ChatSay(ChatSay),
|
||||
NewCharacter(NewCharacter),
|
||||
@@ -318,6 +335,7 @@ impl Packet {
|
||||
210 => PartyNew::encode(self.parameters),
|
||||
112 => PartyJoin::encode(self.parameters),
|
||||
211 => PartyDisbanded::encode(self.parameters),
|
||||
71 => FameUpdate::encode(self.parameters),
|
||||
1001 => CharacterStats::encode(self.parameters),
|
||||
_ => None,
|
||||
}
|
||||
|
||||
@@ -48,6 +48,10 @@ impl Session {
|
||||
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(),
|
||||
)
|
||||
@@ -182,6 +186,18 @@ impl PlayerEvents for Meter {
|
||||
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) {
|
||||
debug!("Main player {} registerd with id {}", name, id);
|
||||
self.main_player_id = Some(id);
|
||||
|
||||
@@ -1,11 +1,18 @@
|
||||
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,
|
||||
@@ -41,6 +48,8 @@ pub struct Player {
|
||||
time_elapsed: Arc<Mutex<f32>>,
|
||||
combat_state: Arc<Mutex<CombatState>>,
|
||||
_time: Option<Time>,
|
||||
time_started: Instant,
|
||||
fame: f32
|
||||
}
|
||||
|
||||
|
||||
@@ -55,6 +64,8 @@ impl Player {
|
||||
time_elapsed,
|
||||
combat_state,
|
||||
_time: None,
|
||||
time_started: Instant::now(),
|
||||
fame: 0.0
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -97,3 +108,44 @@ impl DamageStats for Player {
|
||||
*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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+36
-1
@@ -1,3 +1,8 @@
|
||||
#[cfg(test)]
|
||||
use fake_clock::FakeClock as Instant;
|
||||
#[cfg(not(test))]
|
||||
use std::time::Instant;
|
||||
|
||||
use super::types::PlayerStatisticsVec;
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
@@ -20,6 +25,26 @@ pub trait DamageStats {
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
@@ -31,7 +56,9 @@ pub trait DamageDealer {
|
||||
}
|
||||
|
||||
pub trait PlayerEvents {
|
||||
fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut DamageDealer>>;
|
||||
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);
|
||||
|
||||
@@ -39,6 +66,14 @@ pub trait PlayerEvents {
|
||||
|
||||
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 {
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
#[cfg(test)]
|
||||
use fake_clock::FakeClock as Instant;
|
||||
#[cfg(not(test))]
|
||||
use std::time::Instant;
|
||||
|
||||
use cpython::PythonObject;
|
||||
use cpython::ToPyObject;
|
||||
use cpython::Python;
|
||||
@@ -8,6 +13,7 @@ use cpython::PyDict;
|
||||
use cpython::PyList;
|
||||
|
||||
use super::traits::DamageStats;
|
||||
use super::traits::FameStats;
|
||||
|
||||
#[derive(Debug, PartialEq, Clone)]
|
||||
pub struct Party {
|
||||
@@ -38,6 +44,10 @@ pub struct PlayerStatistics {
|
||||
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)]
|
||||
@@ -67,6 +77,10 @@ impl PlayerStatisticsVec {
|
||||
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
|
||||
@@ -88,6 +102,19 @@ impl DamageStats for PlayerStatistics {
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
impl ToPyObject for PlayerStatistics {
|
||||
type ObjectType = PyObject;
|
||||
@@ -106,6 +133,18 @@ impl ToPyObject for PlayerStatistics {
|
||||
stats
|
||||
.set_item(py, "dps", self.dps.to_py_object(py))
|
||||
.unwrap();
|
||||
stats
|
||||
.set_item(py, "seconds_in_game", self.seconds_in_game.to_py_object(py))
|
||||
.unwrap();
|
||||
stats
|
||||
.set_item(py, "fame", self.fame.to_py_object(py))
|
||||
.unwrap();
|
||||
stats
|
||||
.set_item(py, "fame_per_minute", self.fame_per_minute.to_py_object(py))
|
||||
.unwrap();
|
||||
stats
|
||||
.set_item(py, "fame_per_hour", self.fame_per_hour.to_py_object(py))
|
||||
.unwrap();
|
||||
|
||||
stats.into_object()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user