Removed: party related features
This commit is contained in:
@@ -33,6 +33,7 @@ macro_rules! decode_string {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(unused_macros)]
|
||||||
macro_rules! decode_string_vec {
|
macro_rules! decode_string_vec {
|
||||||
($val:expr, $index:expr, $name:expr) => {
|
($val:expr, $index:expr, $name:expr) => {
|
||||||
if let Some(p) = $val.get(&$index) {
|
if let Some(p) = $val.get(&$index) {
|
||||||
|
|||||||
@@ -152,49 +152,6 @@
|
|||||||
"param_type": "Items"
|
"param_type": "Items"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "PartyNew",
|
|
||||||
"code": 209,
|
|
||||||
"params": [
|
|
||||||
{
|
|
||||||
"name": "source",
|
|
||||||
"id": 0,
|
|
||||||
"param_type": "Number"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "players",
|
|
||||||
"id": 5,
|
|
||||||
"param_type": "StringList"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "PartyJoin",
|
|
||||||
"code": 211,
|
|
||||||
"params": [
|
|
||||||
{
|
|
||||||
"name": "source",
|
|
||||||
"id": 0,
|
|
||||||
"param_type": "Number"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "target_name",
|
|
||||||
"id": 2,
|
|
||||||
"param_type": "String"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "PartyDisbanded",
|
|
||||||
"code": 213,
|
|
||||||
"params": [
|
|
||||||
{
|
|
||||||
"name": "source",
|
|
||||||
"id": 0,
|
|
||||||
"param_type": "Number"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"responses": [
|
"responses": [
|
||||||
|
|||||||
+1
-99
@@ -17,7 +17,6 @@ pub use meter::GameStats;
|
|||||||
pub use meter::LastFightStats;
|
pub use meter::LastFightStats;
|
||||||
pub use meter::MeterConfig;
|
pub use meter::MeterConfig;
|
||||||
pub use meter::OverallStats;
|
pub use meter::OverallStats;
|
||||||
pub use meter::PartyEvents;
|
|
||||||
pub use meter::PlayerEvents;
|
pub use meter::PlayerEvents;
|
||||||
pub use meter::PlayerStatistics;
|
pub use meter::PlayerStatistics;
|
||||||
pub use meter::PlayerStatisticsVec;
|
pub use meter::PlayerStatisticsVec;
|
||||||
@@ -67,10 +66,6 @@ pub fn reset(meter: &mut meter::Meter, stat_type: StatType) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_players_in_party(meter: &meter::Meter) -> Vec<String> {
|
|
||||||
meter.get_players_in_party().unwrap_or(vec![])
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn initialize() -> Result<Arc<Mutex<meter::Meter>>, InitializationError> {
|
pub fn initialize() -> Result<Arc<Mutex<meter::Meter>>, InitializationError> {
|
||||||
CombinedLogger::init(vec![WriteLogger::new(
|
CombinedLogger::init(vec![WriteLogger::new(
|
||||||
LevelFilter::Info,
|
LevelFilter::Info,
|
||||||
@@ -123,7 +118,7 @@ pub fn register_messages(meter: &mut meter::Meter, messages: &Vec<game_protocol:
|
|||||||
|
|
||||||
fn register_message<Events>(events: &mut Events, message: &game_protocol::Message)
|
fn register_message<Events>(events: &mut Events, message: &game_protocol::Message)
|
||||||
where
|
where
|
||||||
Events: PlayerEvents + PartyEvents,
|
Events: PlayerEvents,
|
||||||
{
|
{
|
||||||
info!("Found message {:?}", message);
|
info!("Found message {:?}", message);
|
||||||
match message {
|
match message {
|
||||||
@@ -146,15 +141,6 @@ where
|
|||||||
None => events.register_combat_enter(msg.source).unwrap_or(()),
|
None => events.register_combat_enter(msg.source).unwrap_or(()),
|
||||||
},
|
},
|
||||||
game_protocol::Message::Died(msg) => events.register_combat_leave(msg.source).unwrap_or(()),
|
game_protocol::Message::Died(msg) => events.register_combat_leave(msg.source).unwrap_or(()),
|
||||||
game_protocol::Message::PartyNew(msg) => events
|
|
||||||
.register_new_party(&msg.players, msg.source)
|
|
||||||
.unwrap_or(()),
|
|
||||||
game_protocol::Message::PartyJoin(msg) => {
|
|
||||||
events.register_new_member(&msg.target_name).unwrap_or(())
|
|
||||||
}
|
|
||||||
game_protocol::Message::PartyDisbanded(_) => {
|
|
||||||
events.register_party_disbanded().unwrap_or(())
|
|
||||||
}
|
|
||||||
game_protocol::Message::FameUpdate(msg) => events
|
game_protocol::Message::FameUpdate(msg) => events
|
||||||
.register_fame_gain(msg.source, msg.fame as f32 / 10000.0)
|
.register_fame_gain(msg.source, msg.fame as f32 / 10000.0)
|
||||||
.unwrap_or(()),
|
.unwrap_or(()),
|
||||||
@@ -283,30 +269,6 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ListNamedTesting for message::PartyNew {
|
|
||||||
fn new_list_of_named(names: &[&str], source: usize) -> Self {
|
|
||||||
Self {
|
|
||||||
source: source,
|
|
||||||
players: names.iter().map(ToString::to_string).collect(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl NamedTesting for message::PartyJoin {
|
|
||||||
fn new_named(name: &str, source: usize) -> Self {
|
|
||||||
Self {
|
|
||||||
target_name: name.to_string(),
|
|
||||||
source,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Testing for message::PartyDisbanded {
|
|
||||||
fn new(source: usize) -> Self {
|
|
||||||
Self { source }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_empty_session() {
|
fn test_empty_session() {
|
||||||
let meter = helpers::init_();
|
let meter = helpers::init_();
|
||||||
@@ -652,66 +614,6 @@ mod tests {
|
|||||||
assert_eq!(player_stats.damage, 0.0);
|
assert_eq!(player_stats.damage, 0.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
macro_rules! new_party {
|
|
||||||
($meter:expr, $members:expr, $party_id:expr) => {
|
|
||||||
register_message(
|
|
||||||
&mut $meter,
|
|
||||||
&Message::PartyNew(message::PartyNew::new_list_of_named($members, $party_id)),
|
|
||||||
);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
macro_rules! new_party_member {
|
|
||||||
($meter:expr, $player:expr, $party_id:expr) => {
|
|
||||||
register_message(
|
|
||||||
&mut $meter,
|
|
||||||
&Message::PartyJoin(message::PartyJoin::new_named($player, $party_id)),
|
|
||||||
);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_party_members() {
|
|
||||||
let mut meter = helpers::init_();
|
|
||||||
meter.configure(meter::MeterConfig {
|
|
||||||
skip_non_party_members: true,
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
|
|
||||||
main_character_enters!(meter, "MAIN_CH1", 1);
|
|
||||||
character_enters!(meter, "CH1", 2);
|
|
||||||
|
|
||||||
let zone_stats = stats(&meter, StatType::Zone);
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_none());
|
|
||||||
|
|
||||||
new_party!(meter, &["MAIN_CH1", "CH1"], 1);
|
|
||||||
let zone_stats = stats(&meter, StatType::Zone);
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_some());
|
|
||||||
|
|
||||||
character_enters!(meter, "CH2", 3);
|
|
||||||
let zone_stats = stats(&meter, StatType::Zone);
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_some());
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "CH2").is_none());
|
|
||||||
|
|
||||||
new_party_member!(meter, "CH2", 1);
|
|
||||||
let zone_stats = stats(&meter, StatType::Zone);
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_some());
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "CH2").is_some());
|
|
||||||
|
|
||||||
register_message(
|
|
||||||
&mut meter,
|
|
||||||
&Message::PartyDisbanded(message::PartyDisbanded::new(1)),
|
|
||||||
);
|
|
||||||
let zone_stats = stats(&meter, StatType::Zone);
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_none());
|
|
||||||
assert!(zone_stats.iter().find(|s| s.player == "CH2").is_none());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_fame_statistics() {
|
fn test_fame_statistics() {
|
||||||
let mut meter = helpers::init_();
|
let mut meter = helpers::init_();
|
||||||
|
|||||||
+2
-17
@@ -171,20 +171,7 @@ pub fn reset(_py: Python, stat_type: StatType) -> PyResult<u32> {
|
|||||||
Ok(1)
|
Ok(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_players_in_party(py: Python) -> PyResult<PyList> {
|
fn initialize(_py: Python) -> PyResult<u32> {
|
||||||
if let Ok(ref mut py_meter) = METER.lock() {
|
|
||||||
if let Some(m) = py_meter.get() {
|
|
||||||
if let Ok(ref mut meter) = m.lock() {
|
|
||||||
return Ok(core::get_players_in_party(&meter).into_py_object(py))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
error!("Failed to acquire locks on meter");
|
|
||||||
Ok(PyList::new(py, Vec::<PyObject>::new().as_slice()))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
|
|
||||||
if let Ok(ref mut py_meter) = METER.lock() {
|
if let Ok(ref mut py_meter) = METER.lock() {
|
||||||
match core::initialize() {
|
match core::initialize() {
|
||||||
Ok(core_meter) => py_meter.initialize(core_meter),
|
Ok(core_meter) => py_meter.initialize(core_meter),
|
||||||
@@ -194,7 +181,6 @@ fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
|
|||||||
if let Some(m) = py_meter.get() {
|
if let Some(m) = py_meter.get() {
|
||||||
if let Ok(ref mut meter) = m.lock() {
|
if let Ok(ref mut meter) = m.lock() {
|
||||||
meter.configure(core::MeterConfig {
|
meter.configure(core::MeterConfig {
|
||||||
skip_non_party_members,
|
|
||||||
..Default::default()
|
..Default::default()
|
||||||
});
|
});
|
||||||
return Ok(0);
|
return Ok(0);
|
||||||
@@ -207,9 +193,8 @@ fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
|
|||||||
|
|
||||||
py_module_initializer!(libaostats, initlibaostats, PyInit_libaostats, |py, m| {
|
py_module_initializer!(libaostats, initlibaostats, PyInit_libaostats, |py, m| {
|
||||||
m.add(py, "__doc__", "This module is implemented in Rust")?;
|
m.add(py, "__doc__", "This module is implemented in Rust")?;
|
||||||
m.add(py, "initialize", py_fn!(py, initialize(skip_non_party_members: bool)))?;
|
m.add(py, "initialize", py_fn!(py, initialize()))?;
|
||||||
m.add(py, "stats", py_fn!(py, stats(stat_type: StatType)))?;
|
m.add(py, "stats", py_fn!(py, stats(stat_type: StatType)))?;
|
||||||
m.add(py, "reset", py_fn!(py, reset(stat_type: StatType)))?;
|
m.add(py, "reset", py_fn!(py, reset(stat_type: StatType)))?;
|
||||||
m.add(py, "get_players_in_party", py_fn!(py, get_players_in_party()))?;
|
|
||||||
Ok(())
|
Ok(())
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -92,16 +92,13 @@ impl Session {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
pub struct MeterConfig {
|
pub struct MeterConfig {}
|
||||||
pub skip_non_party_members: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct Meter {
|
pub struct Meter {
|
||||||
zone_history: PlayerStatisticsVec,
|
zone_history: PlayerStatisticsVec,
|
||||||
zone_session: Option<Session>,
|
zone_session: Option<Session>,
|
||||||
last_fight_session: Session,
|
last_fight_session: Session,
|
||||||
main_player_id: Option<usize>,
|
main_player_id: Option<usize>,
|
||||||
party: Option<types::Party>,
|
|
||||||
unconsumed_items: HashMap<usize, game_protocol::Items>,
|
unconsumed_items: HashMap<usize, game_protocol::Items>,
|
||||||
config: MeterConfig,
|
config: MeterConfig,
|
||||||
}
|
}
|
||||||
@@ -113,7 +110,6 @@ impl Meter {
|
|||||||
zone_session: None,
|
zone_session: None,
|
||||||
last_fight_session: Session::new(),
|
last_fight_session: Session::new(),
|
||||||
main_player_id: None,
|
main_player_id: None,
|
||||||
party: None,
|
|
||||||
unconsumed_items: HashMap::new(),
|
unconsumed_items: HashMap::new(),
|
||||||
config: Default::default(),
|
config: Default::default(),
|
||||||
}
|
}
|
||||||
@@ -123,14 +119,7 @@ impl Meter {
|
|||||||
self.config = config;
|
self.config = config;
|
||||||
}
|
}
|
||||||
|
|
||||||
fn stats_filter(&self, player: &(&String, &Player)) -> bool {
|
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
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -329,38 +318,6 @@ impl GameStats for Meter {
|
|||||||
info!("Reset: overall");
|
info!("Reset: overall");
|
||||||
Some(())
|
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]
|
#[test]
|
||||||
|
|||||||
@@ -126,12 +126,5 @@ pub trait OverallStats {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub trait GameStats {
|
pub trait GameStats {
|
||||||
fn get_players_in_party(&self) -> Option<Vec<String>>;
|
|
||||||
fn reset_stats(&mut self) -> Option<()>;
|
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<()>;
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
use std::collections::HashSet;
|
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::iter::FromIterator;
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
use fake_clock::FakeClock as Instant;
|
use fake_clock::FakeClock as Instant;
|
||||||
@@ -11,29 +9,6 @@ use super::game_protocol::Items;
|
|||||||
use super::traits::DamageStats;
|
use super::traits::DamageStats;
|
||||||
use super::traits::FameStats;
|
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)]
|
#[derive(Debug, PartialEq, Clone)]
|
||||||
pub struct PlayerStatistics {
|
pub struct PlayerStatistics {
|
||||||
pub player: String,
|
pub player: String,
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import os
|
|||||||
import sys
|
import sys
|
||||||
import toml
|
import toml
|
||||||
|
|
||||||
CFG_VERSION = '0.4'
|
CFG_VERSION = '0.5'
|
||||||
|
|
||||||
default = """
|
default = """
|
||||||
[window]
|
[window]
|
||||||
@@ -12,7 +12,6 @@ font-size = '10px'
|
|||||||
opacity = 0.8
|
opacity = 0.8
|
||||||
|
|
||||||
[app]
|
[app]
|
||||||
skip_non_party_players = false
|
|
||||||
|
|
||||||
[config]
|
[config]
|
||||||
# do not change
|
# do not change
|
||||||
|
|||||||
+8
-18
@@ -13,9 +13,6 @@ except:
|
|||||||
'players': [],
|
'players': [],
|
||||||
'main': None
|
'main': None
|
||||||
}
|
}
|
||||||
@staticmethod
|
|
||||||
def get_players_in_party():
|
|
||||||
return []
|
|
||||||
|
|
||||||
from .config import config
|
from .config import config
|
||||||
from .number import Number
|
from .number import Number
|
||||||
@@ -166,10 +163,10 @@ def zone_stats(with_damage=False):
|
|||||||
|
|
||||||
def overall_stats(with_damage=False):
|
def overall_stats(with_damage=False):
|
||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
session = [
|
session = {'players': [
|
||||||
{'player': 'overall', 'damage': 1000.0,
|
{'player': 'overall', 'damage': 1000.0,
|
||||||
'time_in_combat': 12.0, 'dps': 12.4234},
|
'time_in_combat': 12.0, 'dps': 12.4234, 'items': {'weapon': 'T8_2H_CROSSBOWLARGE@3'}},
|
||||||
]
|
], 'main': {}}
|
||||||
else:
|
else:
|
||||||
session = aostats.stats(StatType.Overall)
|
session = aostats.stats(StatType.Overall)
|
||||||
|
|
||||||
@@ -178,22 +175,15 @@ def overall_stats(with_damage=False):
|
|||||||
|
|
||||||
def last_fight_stats(with_damage=False):
|
def last_fight_stats(with_damage=False):
|
||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
session = [
|
session = {'players': [
|
||||||
{'player': 'last fight', 'damage': 1000.0,
|
{'player': 'last', 'damage': 1000.0,
|
||||||
'time_in_combat': 12.0, 'dps': 12.4234},
|
'time_in_combat': 12.0, 'dps': 12.4234, 'items': {'weapon': 'T8_2H_CROSSBOWLARGE@3'}},
|
||||||
]
|
], 'main': {}}
|
||||||
else:
|
else:
|
||||||
session = aostats.stats(StatType.LastFight)
|
session = aostats.stats(StatType.LastFight)
|
||||||
|
|
||||||
return stats(session, with_damage)
|
return stats(session, with_damage)
|
||||||
|
|
||||||
def get_party_members():
|
|
||||||
if TESTING_ENABLED:
|
|
||||||
return ['a', 'b', 'c', 'a', 'b', 'c', 'a', 'b', 'c']
|
|
||||||
else:
|
|
||||||
return aostats.get_players_in_party()
|
|
||||||
|
|
||||||
|
|
||||||
def reset_zone_stats():
|
def reset_zone_stats():
|
||||||
aostats.reset(StatType.Zone)
|
aostats.reset(StatType.Zone)
|
||||||
|
|
||||||
@@ -208,6 +198,6 @@ def initialize():
|
|||||||
return InitializationResult.Ok
|
return InitializationResult.Ok
|
||||||
cfg = config()
|
cfg = config()
|
||||||
try:
|
try:
|
||||||
return INITIALIZATION_RESULT[aostats.initialize(cfg['app']['skip_non_party_players'])]
|
return INITIALIZATION_RESULT[aostats.initialize()]
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|||||||
@@ -136,8 +136,8 @@ class MainWidget(QWidget):
|
|||||||
damage_session, fame_stat, elapsed = self.session()
|
damage_session, fame_stat, elapsed = self.session()
|
||||||
self.table.update(damage_session)
|
self.table.update(damage_session)
|
||||||
self.bar.set_fame_per_minute(fame_stat.fame_per_minute)
|
self.bar.set_fame_per_minute(fame_stat.fame_per_minute)
|
||||||
self.fame_label.setText("<b>{}</b> | Fame <b>{}</b> | FPM <b>{}</b> | Party members <b>{}</b>".format(
|
self.fame_label.setText("<b>{}</b> | Fame <b>{}</b> | FPM <b>{}</b>".format(
|
||||||
datetime.timedelta(seconds=elapsed), fame_stat.fame, fame_stat.fame_per_minute, len(engine.get_party_members())))
|
datetime.timedelta(seconds=elapsed), fame_stat.fame, fame_stat.fame_per_minute))
|
||||||
|
|
||||||
def mousePressEvent(self, event):
|
def mousePressEvent(self, event):
|
||||||
self.mouse_pos = event.pos()
|
self.mouse_pos = event.pos()
|
||||||
|
|||||||
Reference in New Issue
Block a user