diff --git a/backend/src/meter/mod.rs b/backend/src/meter/mod.rs index 2da8cf8..43fa43e 100644 --- a/backend/src/meter/mod.rs +++ b/backend/src/meter/mod.rs @@ -11,9 +11,9 @@ mod types; use player::Player; +pub use super::game_protocol; pub use traits::*; pub use types::*; -pub use super::game_protocol; #[derive(Debug)] pub struct Session { @@ -30,7 +30,7 @@ impl Session { fn from(session: &Self) -> Self { let mut players = HashMap::new(); for (player_name, player) in &session.players { - let mut new_player = Player::new(player.id(), player.main()); + let mut new_player = Player::from(player); if let CombatState::InCombat = player.combat_state() { new_player.enter_combat(); } @@ -179,7 +179,10 @@ impl Meter { } impl PlayerEvents for Meter { - fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option> { + fn get_damage_dealers_in_zone( + &mut self, + player_id: usize, + ) -> Option> { 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)?; @@ -193,7 +196,10 @@ impl PlayerEvents for Meter { Some(vec![zone_player, las_fight_session_player]) } - fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option> { + fn get_fame_gatherers_in_zone( + &mut self, + player_id: usize, + ) -> Option> { let main_player_id = self.main_player_id?; let (zone, last_fight) = self.sessions_mut()?; if player_id != main_player_id { @@ -205,7 +211,11 @@ impl PlayerEvents for Meter { Some(vec![zone_player, las_fight_session_player]) } - fn register_item_update(&mut self, player_id: usize, items: &game_protocol::Items) -> Option<()> { + fn register_item_update( + &mut self, + player_id: usize, + items: &game_protocol::Items, + ) -> Option<()> { let mut consumed = false; for player in self.get_item_carriers_in_zone(player_id).unwrap_or(vec![]) { player.items_update(items); @@ -238,7 +248,10 @@ impl PlayerEvents for Meter { 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); + info!( + "Main player ({}) left the zone, Creating new zone session.", + id + ); self.zone_session_mut()?.cleanup_players(); self.new_session(); } @@ -248,11 +261,18 @@ impl PlayerEvents for Meter { 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); + info!( + "New player ({}) registered without session, creating new session", + name + ); self.new_session(); } - - if self.get_damage_dealers_in_zone(id).unwrap_or(vec![]).is_empty() { + + if self + .get_damage_dealers_in_zone(id) + .unwrap_or(vec![]) + .is_empty() + { self.add_player(name, id, false); } } diff --git a/backend/src/meter/player.rs b/backend/src/meter/player.rs index 23b3127..b524fc5 100644 --- a/backend/src/meter/player.rs +++ b/backend/src/meter/player.rs @@ -8,31 +8,29 @@ use super::game_protocol::Items; use super::traits::CombatState; use super::traits::DamageDealer; use super::traits::DamageStats; -use super::traits::FameStats; use super::traits::FameGatherer; +use super::traits::FameStats; use super::traits::ItemCarrier; #[derive(Debug)] -struct CombatTime -{ +struct CombatTime { entered_combat: Option, - time_in_combat: std::time::Duration + time_in_combat: std::time::Duration, } impl CombatTime { fn new() -> Self { Self { entered_combat: None, - time_in_combat: std::time::Duration::from_millis(0) + time_in_combat: std::time::Duration::from_millis(0), } } } #[derive(Debug)] -struct Flags -{ +struct Flags { idle: bool, - main: bool + main: bool, } #[derive(Debug)] @@ -44,10 +42,9 @@ pub struct Player { time_started: Instant, fame: f32, items: Items, - flags: Flags + flags: Flags, } - impl Player { pub fn new(id: usize, main: bool) -> Self { Self { @@ -58,7 +55,23 @@ impl Player { time_started: Instant::now(), fame: 0.0, items: Default::default(), - flags: Flags{idle: true, main}, + flags: Flags { idle: true, main }, + } + } + + pub fn from(other: &Self) -> Self { + Self { + id: other.id, + damage_dealt: 0.0, + combat_time: CombatTime::new(), + combat_state: other.combat_state(), + time_started: Instant::now(), + fame: 0.0, + items: other.items.clone(), + flags: Flags { + idle: true, + main: other.main(), + }, } } @@ -78,7 +91,7 @@ impl Player { impl DamageDealer for Player { fn register_damage_dealt(&mut self, damage_dealt: f32) { if self.combat_state == CombatState::OutOfCombat { - return + return; } self.flags.idle = false; self.damage_dealt += damage_dealt @@ -112,7 +125,8 @@ impl DamageStats for Player { fn time_in_combat(&self) -> f32 { if self.combat_state == CombatState::InCombat { if let Some(entered_combat) = self.combat_time.entered_combat { - let time_in_combat = self.combat_time.time_in_combat + (Instant::now() - entered_combat); + let time_in_combat = + self.combat_time.time_in_combat + (Instant::now() - entered_combat); return time_in_combat.as_millis() as f32; } } else { @@ -140,7 +154,6 @@ impl ItemCarrier for Player { } } - impl FameStats for Player { fn fame(&self) -> f32 { self.fame @@ -174,4 +187,3 @@ mod test { assert_eq!(player.fame_per_hour(), 100); } } - diff --git a/backend/src/meter/types.rs b/backend/src/meter/types.rs index d2ca6a5..d282335 100644 --- a/backend/src/meter/types.rs +++ b/backend/src/meter/types.rs @@ -26,7 +26,7 @@ pub struct PlayerStatistics { #[derive(Debug, PartialEq, Clone)] pub struct PlayerStatisticsVec { - _vec: Vec + _vec: Vec, } #[derive(Debug, PartialEq, Copy, Clone)] @@ -34,19 +34,17 @@ pub enum StatType { LastFight, Zone, Overall, - Unknown + Unknown, } impl PlayerStatisticsVec { pub fn new() -> Self { - Self { - _vec: vec![] - } + Self { _vec: vec![] } } pub fn from(player_statistics_vec: Vec) -> Self { Self { - _vec: player_statistics_vec + _vec: player_statistics_vec, } } @@ -68,6 +66,7 @@ impl PlayerStatisticsVec { s.fame_per_minute = s.fame_per_minute(); s.fame_per_hour = s.fame_per_hour(); s.main_player_stats = stat.main_player_stats; + s.items = stat.items.clone(); }) .or_insert(stat.clone()); acc @@ -75,7 +74,7 @@ impl PlayerStatisticsVec { ); Self { - _vec: merged.iter().map(|(_, v)| v.clone()).collect() + _vec: merged.iter().map(|(_, v)| v.clone()).collect(), } } } @@ -102,4 +101,3 @@ impl FameStats for PlayerStatistics { std::time::Duration::from_secs(self.seconds_in_game as u64) } } - diff --git a/frontend/src/dmg_list.py b/frontend/src/dmg_list.py index 2210d00..77980f8 100644 --- a/frontend/src/dmg_list.py +++ b/frontend/src/dmg_list.py @@ -29,53 +29,56 @@ from . import async_request Style = collections.namedtuple('Style', 'bg') enchant_re = re.compile(r"(.*)@(\d+)") + + def map_name(name): - + match = enchant_re.match(name) if match: return names.map_name(match[1]) return names.map_name(name) - # T8_MAIN_NATURESTAFF@3 - # T8_MAIN_NATURESTAF + def player_style(items): weapon_type = weapon.get_weapon_type(items) if weapon_type == weapon.WeaponType.Arcane: - return Style(bg = '#f032e6') + return Style(bg='#f032e6') elif weapon_type == weapon.WeaponType.Axe: - return Style(bg = '#800000') + return Style(bg='#800000') elif weapon_type == weapon.WeaponType.Bow: - return Style(bg = '#469990') + return Style(bg='#469990') elif weapon_type == weapon.WeaponType.Crossbow: - return Style(bg = '#000075') + return Style(bg='#000075') elif weapon_type == weapon.WeaponType.Curse: - return Style(bg = '#911eb4') + return Style(bg='#911eb4') elif weapon_type == weapon.WeaponType.Dagger: - return Style(bg = '#4d5f20') + return Style(bg='#4d5f20') elif weapon_type == weapon.WeaponType.Fire: - return Style(bg = '#e6194B') + return Style(bg='#e6194B') elif weapon_type == weapon.WeaponType.Frost: - return Style(bg = '#4363d8') + return Style(bg='#4363d8') elif weapon_type == weapon.WeaponType.Hammer: - return Style(bg = '#9A6324') + return Style(bg='#9A6324') elif weapon_type == weapon.WeaponType.Holy: - return Style(bg = '#42d4f4') + return Style(bg='#42d4f4') elif weapon_type == weapon.WeaponType.Mace: - return Style(bg = '#808000') + return Style(bg='#808000') elif weapon_type == weapon.WeaponType.Nature: - return Style(bg = '#3cb44b') + return Style(bg='#3cb44b') elif weapon_type == weapon.WeaponType.Quarterstaff: - return Style(bg = '#f58231') + return Style(bg='#f58231') elif weapon_type == weapon.WeaponType.Spear: - return Style(bg = '#a9a9a9') + return Style(bg='#a9a9a9') elif weapon_type == weapon.WeaponType.Sword: - return Style(bg = '#b59d00') + return Style(bg='#b59d00') else: - return Style(bg = '#42413c') + return Style(bg='#42413c') # @functools.lru_cache(maxsize=None) + + def player_icon(weapon): url = f'https://albiononline2d.ams3.cdn.digitaloceanspaces.com/thumbnails/orig/{weapon}' try: @@ -89,6 +92,7 @@ def player_icon(weapon): except Exception: return None + class DmgList(QListView): class DmgItem(QtGui.QStandardItem): def __init__(self, player, parent): @@ -96,8 +100,9 @@ class DmgList(QListView): self.parent = parent self.player = player self.update(player) - - self.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter | QtCore.Qt.AlignmentFlag.AlignVCenter) + + self.setTextAlignment( + QtCore.Qt.AlignmentFlag.AlignHCenter | QtCore.Qt.AlignmentFlag.AlignVCenter) def update(self, player): self.player = player @@ -107,21 +112,24 @@ class DmgList(QListView): self.refresh() def refresh(self): - value = round(self.player.damage / self.player.best_damage, 2) + value = round(self.player.damage / self.player.best_damage, 2) QRectF = QtCore.QRectF(self.parent.rect()) - gradient = QtGui.QLinearGradient(QRectF.topLeft(), QRectF.topRight()) - gradient.setColorAt(value-0.001 if value > 0 else 0, QtGui.QColor(player_style(self.player.items).bg)) + gradient = QtGui.QLinearGradient( + QRectF.topLeft(), QRectF.topRight()) + gradient.setColorAt(value-0.001 if value > 0 else 0, + QtGui.QColor(player_style(self.player.items).bg)) gradient.setColorAt(value, QtGui.QColor('#000000')) - gradient.setColorAt(value+0.001 if value < 1 else 1, QtGui.QColor('#000000')) + gradient.setColorAt(value+0.001 if value < + 1 else 1, QtGui.QColor('#000000')) brush = QtGui.QBrush(gradient) self.setBackground(brush) icon = player_icon(self.player.items['weapon']) - self.setToolTip('\n'.join([f'{k}: {map_name(v)}' for (k,v) in self.player.items.items() if v])) + self.setToolTip('\n'.join( + [f'{k}: {map_name(v)}' for (k, v) in self.player.items.items() if v])) if icon: self.setIcon(icon) - class SortProxyModel(QtCore.QSortFilterProxyModel): def lessThan(self, left, right): @@ -150,7 +158,8 @@ class DmgList(QListView): visible_names = [] for player in players: items = (self.model.item(i) for i in range(self.model.rowCount())) - found = next((i for i in items if i.player.name == player.name), None) + found = next( + (i for i in items if i.player.name == player.name), None) if found: found.update(player) else: @@ -160,5 +169,5 @@ class DmgList(QListView): item = self.model.item(i) if hasattr(item, 'player') and hasattr(item.player, 'name') and item.player.name not in visible_names: self.model.removeRow(i) - + self.proxy.sort(0, QtCore.Qt.DescendingOrder) diff --git a/frontend/src/engine.py b/frontend/src/engine.py index 77655b9..044dc90 100644 --- a/frontend/src/engine.py +++ b/frontend/src/engine.py @@ -7,6 +7,7 @@ except: @staticmethod def initialize(_): return InitializationResult.NetworkInterfaceListMissing + @staticmethod def stats(_): return { @@ -26,17 +27,20 @@ class StatType: Zone = 2 Overall = 3 + class InitializationResult: Ok = 0 UnknownFailure = 1 NetworkInterfaceListMissing = 2 + INITIALIZATION_RESULT = { 0: InitializationResult.Ok, 1: InitializationResult.UnknownFailure, 2: InitializationResult.NetworkInterfaceListMissing } + class DamageStat: def __init__(self, name, items, damage, time_in_combat, dps, percentage, best_damage): self.name = name @@ -48,7 +52,7 @@ class DamageStat: self.best_damage = Number(best_damage) def __str__(self): - return "Name {} Damage {} DPS {} percentage {}".format(self.name, self.damage, self.dps, self.percentage) + return "Name {} Damage {} DPS {} percentage {} items {}".format(self.name, self.damage, self.dps, self.percentage, self.items) 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 @@ -64,22 +68,24 @@ def stats(session, with_dmg=False): players = session['players'] main_player = session['main'] - with_damage = [s for s in players if s['damage'] != 0.0] if with_dmg else players + with_damage = [s for s in players if s['damage'] + != 0.0] if with_dmg else players extended_session = with_percentage(with_damage) statistics = [DamageStat( s['player'], s['items'], - s['damage'], - s['time_in_combat'], - s['dps'], - s['dmg_percentage'], + s['damage'], + s['time_in_combat'], + s['dps'], + s['dmg_percentage'], s['best_damage']) for s in extended_session] elapsed = 0 fame = FameStat(Number(0.0), Number(0.0)) if main_player: if 'fame' in main_player: - fame = FameStat(Number(main_player['fame']), Number(main_player['fame_per_minute'])) + fame = FameStat(Number(main_player['fame']), Number( + main_player['fame_per_minute'])) if 'seconds_in_game' in main_player: elapsed = main_player['seconds_in_game'] @@ -96,64 +102,66 @@ def with_percentage(session): damage_done += damage for s in session: - s['dmg_percentage'] = s['damage'] / damage_done * 100 if s['damage'] else 0.0 + s['dmg_percentage'] = s['damage'] / \ + damage_done * 100 if s['damage'] else 0.0 s['best_damage'] = best_damage return session + def zone_stats(with_damage=False): if TESTING_ENABLED: session = { 'players': [ - {'player': 'Arcane', 'damage': 200.0, 'time_in_combat': 12.0, 'dps': 142.4234, 'fame': 20.0, 'fame_per_minute': 30, 'items': { - 'weapon': 'T4_MAIN_ARCANESTAFF@3' - }}, - {'player': 'Cursed', 'damage': 1100.0, 'time_in_combat': 12.0, 'dps': 222, 'items': { - 'weapon': 'T5_MAIN_CURSEDSTAFF@2' - }}, - {'player': 'Fire', 'damage': 775.0, 'time_in_combat': 12.0, 'dps': 132, 'items': { - 'weapon': 'T5_MAIN_FIRESTAFF@1' - }}, - {'player': 'Frost', 'damage': 2800.0, 'time_in_combat': 12.0, 'dps': 743, 'items': { - 'weapon': 'T5_MAIN_FROSTSTAFF@1' - }}, - {'player': 'Holy', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 99, 'items': { - 'weapon': 'T6_MAIN_HOLYSTAFF' - }}, - {'player': 'Nature', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 123, 'items': { - 'weapon': 'T8_MAIN_NATURESTAFF@3' - }}, - {'player': 'Axe', 'damage': 2430.0, 'time_in_combat': 120.0, 'dps': 631, 'items': { - 'weapon': 'T8_MAIN_AXE' - }}, - {'player': 'Dagger', 'damage': 1900.0, 'time_in_combat': 12.0, 'dps': 551, 'items': { - 'weapon': 'T8_MAIN_DAGGER@2' - }}, - {'player': 'Hammer', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { - 'weapon': 'T7_MAIN_HAMMER@2' - }}, - {'player': 'Mace', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { - 'weapon': 'T6_MAIN_MACE@2' - }}, - {'player': 'Quarterstaff', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { - 'weapon': 'T5_2H_IRONCLADEDSTAFF' - }}, - {'player': 'Spear', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { - 'weapon': 'T8_MAIN_SPEAR@2' - }}, - {'player': 'Sword', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { - 'weapon': 'T7_2H_CLAYMORE@1' - }}, - {'player': 'Bow', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { - 'weapon': 'T8_2H_BOW' - }}, - {'player': 'Crossbow', 'damage': 1800.0, 'time_in_combat': 450.0, 'dps': 450, 'items': { + {'player': 'Arcane', 'damage': 200.0, 'time_in_combat': 12.0, 'dps': 142.4234, 'fame': 20.0, 'fame_per_minute': 30, 'items': { + 'weapon': 'T4_MAIN_ARCANESTAFF@3' + }}, + {'player': 'Cursed', 'damage': 1100.0, 'time_in_combat': 12.0, 'dps': 222, 'items': { + 'weapon': 'T5_MAIN_CURSEDSTAFF@2' + }}, + {'player': 'Fire', 'damage': 775.0, 'time_in_combat': 12.0, 'dps': 132, 'items': { + 'weapon': 'T5_MAIN_FIRESTAFF@1' + }}, + {'player': 'Frost', 'damage': 2800.0, 'time_in_combat': 12.0, 'dps': 743, 'items': { + 'weapon': 'T5_MAIN_FROSTSTAFF@1' + }}, + {'player': 'Holy', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 99, 'items': { + 'weapon': 'T6_MAIN_HOLYSTAFF' + }}, + {'player': 'Nature', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 123, 'items': { + 'weapon': 'T8_MAIN_NATURESTAFF@3' + }}, + {'player': 'Axe', 'damage': 2430.0, 'time_in_combat': 120.0, 'dps': 631, 'items': { + 'weapon': 'T8_MAIN_AXE' + }}, + {'player': 'Dagger', 'damage': 1900.0, 'time_in_combat': 12.0, 'dps': 551, 'items': { + 'weapon': 'T8_MAIN_DAGGER@2' + }}, + {'player': 'Hammer', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { + 'weapon': 'T7_MAIN_HAMMER@2' + }}, + {'player': 'Mace', 'damage': 500.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { + 'weapon': 'T6_MAIN_MACE@2' + }}, + {'player': 'Quarterstaff', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { + 'weapon': 'T5_2H_IRONCLADEDSTAFF' + }}, + {'player': 'Spear', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { + 'weapon': 'T8_MAIN_SPEAR@2' + }}, + {'player': 'Sword', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { + 'weapon': 'T7_2H_CLAYMORE@1' + }}, + {'player': 'Bow', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { + 'weapon': 'T8_2H_BOW' + }}, + {'player': 'Crossbow', 'damage': 1800.0, 'time_in_combat': 450.0, 'dps': 450, 'items': { + 'weapon': 'T8_2H_CROSSBOWLARGE@3' + }}, + ], + 'main': {'player': 'Crossbow', 'damage': 250.0, 'time_in_combat': 120000.0, 'dps': 13, 'items': { 'weapon': 'T8_2H_CROSSBOWLARGE@3' - }}, - ], - 'main': {'player': 'Crossbow', 'damage': 250.0, 'time_in_combat': 120000.0, 'dps': 13, 'items': { - 'weapon': 'T8_2H_CROSSBOWLARGE@3' - }, 'fame': 2300000, 'fame_per_minute': 46000.0, 'seconds_in_game': 3000 } + }, 'fame': 2300000, 'fame_per_minute': 46000.0, 'seconds_in_game': 3000} } else: session = aostats.stats(StatType.Zone) @@ -184,15 +192,19 @@ def last_fight_stats(with_damage=False): return stats(session, with_damage) + def reset_zone_stats(): aostats.reset(StatType.Zone) + def reset_last_fight_stats(): aostats.reset(StatType.LastFight) + def reset_stats(): aostats.reset(StatType.Overall) + def initialize(): if TESTING_ENABLED: return InitializationResult.Ok