+PlayerListItem

This commit is contained in:
Wiktor Mazur
2020-03-07 15:28:11 +01:00
parent 5c1b50ea51
commit 43c1494698
16 changed files with 127 additions and 141 deletions
+16 -98
View File
@@ -64,11 +64,11 @@ class GameStats():
def damage_stats(self, stat_type):
if stat_type == StatType.Zone:
return self.zone['damage'].stats()
return self.zone['damage'].player_list()
elif stat_type == StatType.LastFight:
return self.last_fight['damage'].stats()
return self.last_fight['damage'].player_list()
elif stat_type == StatType.Overall:
return self.history['damage'].combined(self.zone['damage']).stats()
return self.history['damage'].combined(self.zone['damage']).player_list()
def fame_stats(self, stat_type):
if stat_type == StatType.Zone:
@@ -101,114 +101,32 @@ class GameStats():
game_stats = GameStats()
class DamageStat:
def __init__(self, name, items, damage, time_in_combat, dps, percentage, best_damage):
self.name = name
self.items = items
self.damage = Number(damage)
self.time_in_combat = Number(time_in_combat)
self.dps = Number(dps)
self.percentage = Number(percentage)
self.best_damage = Number(best_damage)
def __str__(self):
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
class FameStat:
def __init__(self, fame, fame_per_hour):
self.fame = fame
self.fame_per_hour = fame_per_hour
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
extended_session = with_percentage(with_damage)
statistics = [DamageStat(
s['player'],
s['items'],
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_hour']))
if 'seconds_in_game' in main_player:
elapsed = main_player['seconds_in_game']
return statistics, fame, elapsed
def with_percentage(session):
best_damage = 0.0
damage_done = 0.0
for s in session:
damage = s['damage']
if damage > best_damage:
best_damage = damage
damage_done += damage
for s in session:
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):
fame = game_stats.fame_stats(StatType.Zone)
time = game_stats.time_stats(StatType.Zone)
fame['fame_per_hour'] = fame['fame'] / \
time['seconds_in_game'] if time['seconds_in_game'] > 0 else 0.0
return stats({
'players': game_stats.damage_stats(StatType.Zone),
'main': {
**fame,
**time,
}},
with_damage)
return get_stats(StatType.Zone, with_damage)
def overall_stats(with_damage=False):
fame = game_stats.fame_stats(StatType.Overall)
time = game_stats.time_stats(StatType.Overall)
fame['fame_per_hour'] = fame['fame'] / \
time['seconds_in_game'] if time['seconds_in_game'] > 0 else 0.0
return stats({
'players': game_stats.damage_stats(StatType.Overall),
'main': {
**fame,
**time,
}},
with_damage)
return get_stats(StatType.Overall, with_damage)
def last_fight_stats(with_damage=False):
fame = game_stats.fame_stats(StatType.LastFight)
time = game_stats.time_stats(StatType.LastFight)
fame['fame_per_hour'] = fame['fame'] / \
time['seconds_in_game'] if time['seconds_in_game'] > 0 else 0.0
return stats({
'players': game_stats.damage_stats(StatType.LastFight),
'main': {
**fame,
**time,
}},
with_damage)
return get_stats(StatType.LastFight, with_damage)
def get_stats(stat_type: StatType, with_damage: bool):
fame = game_stats.fame_stats(stat_type)
time = game_stats.time_stats(stat_type)['seconds_in_game']
fame = FameStat(Number(fame['fame']), Number(
fame['fame'] / time if time > 0.0 else 0.0))
players = game_stats.damage_stats(stat_type)
return players, fame, time
def reset_zone_stats():
+12 -3
View File
@@ -23,6 +23,9 @@ from io import BytesIO
import collections
import functools
import re
from typing import List
from ....stats.list_item import PlayerListItem
Style = collections.namedtuple('Style', 'bg')
@@ -103,12 +106,12 @@ class List(QListView):
def update(self, player):
self.player = player
self.setText("{} {} ({}, {}%)".format(
self.player.name, self.player.damage, self.player.dps, self.player.percentage
self.player.name, self.player.value, self.player.value_per_second, self.player.percentage
))
self.refresh()
def refresh(self):
value = round(self.player.damage / self.player.best_damage, 2)
value = round(self.player.value / self.player.best_value, 2)
QRectF = QtCore.QRectF(self.parent.rect())
gradient = QtGui.QLinearGradient(
QRectF.topLeft(), QRectF.topRight())
@@ -146,7 +149,7 @@ class List(QListView):
self.setModel(self.proxy)
def update(self, players):
def update(self, players: List[PlayerListItem]):
if not players:
self.model.clear()
return
@@ -167,3 +170,9 @@ class List(QListView):
self.model.removeRow(i)
self.proxy.sort(0, QtCore.Qt.DescendingOrder)
def get_player_list_items(self) -> List[PlayerListItem]:
return sorted(
[self.model.item(i).player for i in range(self.model.rowCount())],
key=lambda i: i.value,
reverse=True)
+14 -21
View File
@@ -20,7 +20,7 @@ from . import about
from ... import engine
from ...utils import assets
from ...utils.config import config
from ...stats.list_item import PlayerListItem
class Mode:
DMG_CURRENT_ZONE = 'Stats (dmg): Current zone'
@@ -32,10 +32,10 @@ class Mode:
class CopyButton(QPushButton):
def __init__(self, clipboard, players, mode, fame):
def __init__(self, clipboard, players : PlayerListItem, mode, fame):
QPushButton.__init__(self)
self.clipboard = clipboard
self.players = players
self.players : PlayerListItem = players
self.mode = mode
self.fame = fame
@@ -48,7 +48,7 @@ class CopyButton(QPushButton):
self.mode(), self.fame())
for index, i in enumerate(self.players()[:3]):
clip += '{}. {}-{}/{}-{}%'.format(index+1,
i.name, i.damage, i.dps, i.percentage)
i.name, i.value, i.value_per_second, i.percentage)
clip += "\n"
clip += "(AOStats https://git.io/JeBD1)"
@@ -90,12 +90,14 @@ class AboutButton(QPushButton):
class CloseButton(QPushButton):
def __init__(self):
def __init__(self, is_visible):
QPushButton.__init__(self)
self.setIcon(QtGui.QIcon(assets.path('close.png')))
self.setToolTip("Close")
self.clicked.connect(self.close)
if not is_visible:
self.hide()
def close(self):
sys.exit(0)
@@ -112,34 +114,23 @@ class InteractiveBar(QWidget):
self.layout.addWidget(self.mode)
self.copy_button = CopyButton(
clipboard, self.get_players, self.get_mode, self.get_fame_per_hour)
clipboard, self.table.get_player_list_items, self.mode.get_mode, self.get_fame_per_hour)
self.layout.addWidget(self.copy_button)
self.reset_button = ResetButton(self.get_mode)
self.reset_button = ResetButton(self.mode.get_mode)
self.layout.addWidget(self.reset_button)
self.about_button = AboutButton()
self.layout.addWidget(self.about_button)
if config()['window']['frameless']:
self.close_button = CloseButton()
self.close_button = CloseButton(config()['window']['frameless'])
self.layout.addWidget(self.close_button)
self.setLayout(self.layout)
def get_mode(self):
return self.mode.currentText()
def get_fame_per_hour(self):
return self.fame_per_hour
def get_players(self):
model = self.table.model
return sorted(
[model.item(i).player for i in range(model.rowCount())],
key=lambda i: i.damage,
reverse=True)
def set_fame_per_hour(self, fpm):
self.fame_per_hour = fpm
@@ -157,6 +148,8 @@ class ModeWidget(QComboBox):
self.addItem(Mode.OVERALL)
self.addItem(Mode.LAST_FIGHT)
def get_mode(self):
return self.currentText()
class MainWidget(QWidget):
def __init__(self, clipboard):
@@ -181,8 +174,8 @@ class MainWidget(QWidget):
timer.start(500)
def refresh(self):
damage_session, fame_stat, elapsed = self.session()
self.table.update(damage_session)
player_list_items, fame_stat, elapsed = self.session()
self.table.update(player_list_items)
self.bar.set_fame_per_hour(fame_stat.fame_per_hour)
self.fame_label.setText("<b>{}</b> | Fame <b>{}</b> | FPH <b>{}</b>".format(
datetime.timedelta(seconds=elapsed), fame_stat.fame, fame_stat.fame_per_hour))
+9 -1
View File
@@ -9,11 +9,12 @@
from dataclasses import field
from dataclasses import dataclass
from typing import Optional
from typing import Optional, List
from . import time_utils
from ..event_receiver import CombatEventReceiver
from .statistics import Stats
from .list_item import PlayerListItem, StandalonePlayerListItem, to_player_list_items
@dataclass
@@ -121,6 +122,13 @@ class DamageStats(CombatEventReceiver, Stats):
return stats
def player_list(self) -> List[PlayerListItem]:
return to_player_list_items([
StandalonePlayerListItem(
player.name, player.items, player.damage_done, player.dps)
for player in self.players.values()
])
def stats(self):
return [player.stats() for player in self.players.values()]
+47
View File
@@ -0,0 +1,47 @@
from dataclasses import dataclass
from typing import List
from ..utils.number import Number
@dataclass
class StandalonePlayerListItem:
name: str
items: dict
value: float
value_per_second: float
@dataclass
class PlayerListItem:
name: str
items: dict
value: Number
value_per_second: Number
best_value: Number
percentage: Number
def to_player_list_items(standalone_list: List[StandalonePlayerListItem]) -> List[PlayerListItem]:
best = 0.0
combined = 0.0
for item in standalone_list:
if item.value > best:
best = item.value
combined += item.value
combined_list: List[PlayerListItem] = []
for item in standalone_list:
percentage = item.value / combined * 100 if item.value else 0.0
combined_list.append(PlayerListItem(
item.name,
item.items,
Number(item.value),
Number(item.value_per_second),
Number(best),
Number(percentage),
))
return combined_list
+1 -1
View File
@@ -7,7 +7,7 @@ from .statistics import Stats
@dataclass
class TimeStats(Stats):
time : float = field(default_factory=lambda: time_utils.now())
time: float = field(default_factory=lambda: time_utils.now())
@classmethod
def new(self):
+1
View File
@@ -13,5 +13,6 @@ def delta(time):
def as_milliseconds(time):
return time * 1000.0
def as_seconds(time):
return int(time / 1000.0)
+3 -1
View File
@@ -1,6 +1,8 @@
import os
assets_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'assets')
assets_path = os.path.join(os.path.dirname(
os.path.abspath(__file__)), '..', 'assets')
def path(file):
return os.path.join(assets_path, file)
+3
View File
@@ -20,14 +20,17 @@ def update_loop():
_requests_threads[item.key].join()
del _requests_threads[item.key]
_update_thread = threading.Thread(target=update_loop, daemon=True)
_update_thread.start()
def _async_req(url):
req = requests.get(url)
_queue.put(Item(key=url, value=req))
def get(url):
if url in _requests:
+3 -1
View File
@@ -21,9 +21,11 @@ version = '%s'
""" % (CFG_VERSION)
_script_path = sys.argv[0] # pyinstaller creates tmpdir for python files, thus this is the way to get executable path
# pyinstaller creates tmpdir for python files, thus this is the way to get executable path
_script_path = sys.argv[0]
_config = None
def config():
global _script_path
global _config
+1 -1
View File
@@ -4,6 +4,7 @@ from . import assets
_mappings = None
def map_name(name):
global _mappings
@@ -12,4 +13,3 @@ def map_name(name):
_mappings = json.loads(m.read())
return _mappings[name] if name in _mappings else name
+4 -1
View File
@@ -2,6 +2,7 @@ import json
from . import assets
class WeaponType:
Arcane = 'arcanestaff'
Axe = 'axe'
@@ -19,8 +20,10 @@ class WeaponType:
Spear = 'spear'
Sword = 'sword'
_mappings = None
def map_weapon(weapon):
global _mappings
@@ -30,6 +33,7 @@ def map_weapon(weapon):
return _mappings[weapon] if weapon in _mappings else None
def get_weapon_type(items):
weapon = map_weapon(items['weapon'])
@@ -65,4 +69,3 @@ def get_weapon_type(items):
return WeaponType.Sword
else:
return None