Applied autopep8
This commit is contained in:
@@ -1,3 +1,3 @@
|
|||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
from src import run
|
from src import run
|
||||||
run()
|
run()
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
from .gui.app import run
|
from .gui.app import run
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
run()
|
run()
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
try:
|
try:
|
||||||
import pyaoaddons # type: ignore
|
import pyaoaddons # type: ignore
|
||||||
except:
|
except:
|
||||||
class pyaoaddons: # type: ignore
|
class pyaoaddons: # type: ignore
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@@ -129,9 +129,12 @@ def _testing_call_sequence(callback):
|
|||||||
*add_player(1, 'Fire', 'T5_MAIN_FIRESTAFF@1'),
|
*add_player(1, 'Fire', 'T5_MAIN_FIRESTAFF@1'),
|
||||||
{'name': 'EnterCombat', 'value': {'id': 0, 'name': 'Arcane'}},
|
{'name': 'EnterCombat', 'value': {'id': 0, 'name': 'Arcane'}},
|
||||||
{'name': 'UpdateParty', 'value': {'player_names': ['Arcane', 'Fire']}},
|
{'name': 'UpdateParty', 'value': {'player_names': ['Arcane', 'Fire']}},
|
||||||
{'name': 'HealthReceived', 'value': {'source': 0, 'target': 1, 'value': 100.0}},
|
{'name': 'HealthReceived', 'value': {
|
||||||
{'name': 'HealthReceived', 'value': {'source': 0, 'target': 0, 'value': 100.0}},
|
'source': 0, 'target': 1, 'value': 100.0}},
|
||||||
{'name': 'HealthReceived', 'value': {'source': 1, 'target': 0, 'value': 100.0}},
|
{'name': 'HealthReceived', 'value': {
|
||||||
|
'source': 0, 'target': 0, 'value': 100.0}},
|
||||||
|
{'name': 'HealthReceived', 'value': {
|
||||||
|
'source': 1, 'target': 0, 'value': 100.0}},
|
||||||
]
|
]
|
||||||
|
|
||||||
def run_sequence():
|
def run_sequence():
|
||||||
|
|||||||
+16
-16
@@ -1,17 +1,17 @@
|
|||||||
EvNameMainPlayerAppeared : str = 'MainPlayerAppeared'
|
EvNameMainPlayerAppeared: str = 'MainPlayerAppeared'
|
||||||
EvNamePlayerAppeared : str = 'PlayerAppeared'
|
EvNamePlayerAppeared: str = 'PlayerAppeared'
|
||||||
EvNameDamageDone : str = 'DamageDone'
|
EvNameDamageDone: str = 'DamageDone'
|
||||||
EvNameHealthReceived : str = 'HealthReceived'
|
EvNameHealthReceived: str = 'HealthReceived'
|
||||||
EvNameZoneChange : str = 'ZoneChange'
|
EvNameZoneChange: str = 'ZoneChange'
|
||||||
EvNameEnterCombat : str = 'EnterCombat'
|
EvNameEnterCombat: str = 'EnterCombat'
|
||||||
EvNameLeaveCombat : str = 'LeaveCombat'
|
EvNameLeaveCombat: str = 'LeaveCombat'
|
||||||
EvNameUpdateFame : str = 'UpdateFame'
|
EvNameUpdateFame: str = 'UpdateFame'
|
||||||
EvNameUpdateItems : str = 'UpdateItems'
|
EvNameUpdateItems: str = 'UpdateItems'
|
||||||
EvNameUpdateParty : str = 'UpdateParty'
|
EvNameUpdateParty: str = 'UpdateParty'
|
||||||
|
|
||||||
EvKeyName : str = 'name'
|
EvKeyName: str = 'name'
|
||||||
EvKeyValue : str = 'value'
|
EvKeyValue: str = 'value'
|
||||||
EvKeySource : str = 'source'
|
EvKeySource: str = 'source'
|
||||||
EvKeyTarget : str = 'target'
|
EvKeyTarget: str = 'target'
|
||||||
EvKeyId : str = 'id'
|
EvKeyId: str = 'id'
|
||||||
EvKeyPlayerNames : str = 'player_names'
|
EvKeyPlayerNames: str = 'player_names'
|
||||||
|
|||||||
+6
-3
@@ -60,7 +60,8 @@ class GameStats():
|
|||||||
self._construct_new_stats([VisibilityType.LastFight])
|
self._construct_new_stats([VisibilityType.LastFight])
|
||||||
|
|
||||||
elif event[ev_consts.EvKeyName] == ev_consts.EvNameZoneChange:
|
elif event[ev_consts.EvKeyName] == ev_consts.EvNameZoneChange:
|
||||||
self.history[StatType.Combat].update_non_idle(self.zone[StatType.Combat])
|
self.history[StatType.Combat].update_non_idle(
|
||||||
|
self.zone[StatType.Combat])
|
||||||
self.history[StatType.Fame].update(self.zone[StatType.Fame])
|
self.history[StatType.Fame].update(self.zone[StatType.Fame])
|
||||||
self.history[StatType.Time].update(self.zone[StatType.Time])
|
self.history[StatType.Time].update(self.zone[StatType.Time])
|
||||||
|
|
||||||
@@ -155,6 +156,7 @@ cached_players = () # do not compute values if there is nothing in queue
|
|||||||
cached_stat_type = None
|
cached_stat_type = None
|
||||||
cached_combat_stat_type = None
|
cached_combat_stat_type = None
|
||||||
|
|
||||||
|
|
||||||
def get_stats(stat_type: str, combat_stat_type: str):
|
def get_stats(stat_type: str, combat_stat_type: str):
|
||||||
global cached_players, cached_stat_type, cached_combat_stat_type
|
global cached_players, cached_stat_type, cached_combat_stat_type
|
||||||
new_events = False
|
new_events = False
|
||||||
@@ -172,8 +174,9 @@ def get_stats(stat_type: str, combat_stat_type: str):
|
|||||||
return (cached_players, fame, time)
|
return (cached_players, fame, time)
|
||||||
|
|
||||||
cached_players = {
|
cached_players = {
|
||||||
CombatStatType.Damage: lambda stat_type : game_stats.get_damage_stats(stat_type),
|
CombatStatType.Damage: lambda stat_type: game_stats.get_damage_stats(stat_type),
|
||||||
CombatStatType.Healing: lambda stat_type : game_stats.get_healing_stats(stat_type)
|
CombatStatType.Healing: lambda stat_type: game_stats.get_healing_stats(
|
||||||
|
stat_type)
|
||||||
}[combat_stat_type](stat_type)
|
}[combat_stat_type](stat_type)
|
||||||
|
|
||||||
cached_stat_type = stat_type
|
cached_stat_type = stat_type
|
||||||
|
|||||||
@@ -23,15 +23,16 @@ class VisibilityEventReceiver(EventReceiver):
|
|||||||
self.on_player_appeared(value[consts.EvKeyName])
|
self.on_player_appeared(value[consts.EvKeyName])
|
||||||
elif event_name == consts.EvNameUpdateParty:
|
elif event_name == consts.EvNameUpdateParty:
|
||||||
self.on_visible_players_changed(value[consts.EvKeyPlayerNames])
|
self.on_visible_players_changed(value[consts.EvKeyPlayerNames])
|
||||||
|
|
||||||
@abc.abstractmethod
|
@abc.abstractmethod
|
||||||
def on_player_appeared(self, main_player_name: str):
|
def on_player_appeared(self, main_player_name: str):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@abc.abstractmethod
|
@abc.abstractmethod
|
||||||
def on_visible_players_changed(self, visible_players : List[str]):
|
def on_visible_players_changed(self, visible_players: List[str]):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class FameEventReceiver(EventReceiver):
|
class FameEventReceiver(EventReceiver):
|
||||||
|
|
||||||
def on_event(self, event_name: str, value: dict):
|
def on_event(self, event_name: str, value: dict):
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
from PySide2.QtWidgets import QMessageBox # type: ignore
|
from PySide2.QtWidgets import QMessageBox # type: ignore
|
||||||
|
|
||||||
|
|
||||||
text = """
|
text = """
|
||||||
@@ -13,6 +13,7 @@ Quick contact - catch me on discord JaWiktor#1717
|
|||||||
See you in game, WedrowyczJakub
|
See you in game, WedrowyczJakub
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
class About(QMessageBox):
|
class About(QMessageBox):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
QMessageBox.__init__(self)
|
QMessageBox.__init__(self)
|
||||||
@@ -24,7 +25,5 @@ class About(QMessageBox):
|
|||||||
"https://github.com/mazurwiktor/albion-online-stats",
|
"https://github.com/mazurwiktor/albion-online-stats",
|
||||||
"https://github.com/mazurwiktor/albion-online-stats/releases/latest",
|
"https://github.com/mazurwiktor/albion-online-stats/releases/latest",
|
||||||
"https://www.patreon.com/wiktormazur",
|
"https://www.patreon.com/wiktormazur",
|
||||||
))
|
))
|
||||||
self.setStandardButtons(QMessageBox.Ok)
|
self.setStandardButtons(QMessageBox.Ok)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
from .list import ListItemView
|
from .list import ListItemView
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ from .....utils import weapon
|
|||||||
|
|
||||||
from .icon import get_weapon_icon as player_icon
|
from .icon import get_weapon_icon as player_icon
|
||||||
|
|
||||||
Style = collections.namedtuple('Style', ['bg','fg'])
|
Style = collections.namedtuple('Style', ['bg', 'fg'])
|
||||||
|
|
||||||
enchant_re = re.compile(r"(.*)@(\d+)")
|
enchant_re = re.compile(r"(.*)@(\d+)")
|
||||||
|
|
||||||
@@ -110,10 +110,10 @@ class ListItemView(QListView):
|
|||||||
|
|
||||||
self.setBackground(brush)
|
self.setBackground(brush)
|
||||||
|
|
||||||
brush_fg = QtGui.QBrush(QtGui.QColor(player_style(self.player.items).fg))
|
brush_fg = QtGui.QBrush(QtGui.QColor(
|
||||||
|
player_style(self.player.items).fg))
|
||||||
self.setForeground(brush_fg)
|
self.setForeground(brush_fg)
|
||||||
|
|
||||||
|
|
||||||
icon = player_icon(self.player.items['weapon'])
|
icon = player_icon(self.player.items['weapon'])
|
||||||
self.setToolTip('\n'.join(
|
self.setToolTip('\n'.join(
|
||||||
[f'{k}: {map_name(v)}' for (k, v) in self.player.items.items() if v]))
|
[f'{k}: {map_name(v)}' for (k, v) in self.player.items.items() if v]))
|
||||||
@@ -137,7 +137,6 @@ class ListItemView(QListView):
|
|||||||
self.proxy = self.SortProxyModel()
|
self.proxy = self.SortProxyModel()
|
||||||
self.proxy.setSourceModel(self.model)
|
self.proxy.setSourceModel(self.model)
|
||||||
|
|
||||||
|
|
||||||
self.setModel(self.proxy)
|
self.setModel(self.proxy)
|
||||||
|
|
||||||
def update(self, players: List[PlayerListItem]):
|
def update(self, players: List[PlayerListItem]):
|
||||||
|
|||||||
@@ -67,9 +67,10 @@ class ModeBasedListView(QWidget):
|
|||||||
|
|
||||||
def update(self, prefix, elapsed, fame, fame_per_hour, players: PlayerListItem):
|
def update(self, prefix, elapsed, fame, fame_per_hour, players: PlayerListItem):
|
||||||
self.session_bar.player_stats.update(elapsed, fame, fame_per_hour)
|
self.session_bar.player_stats.update(elapsed, fame, fame_per_hour)
|
||||||
self.session_bar.copy_button.update(prefix, self.list_view.get_player_list_items(), self.session_bar.mode.get_mode(), fame)
|
self.session_bar.copy_button.update(
|
||||||
|
prefix, self.list_view.get_player_list_items(), self.session_bar.mode.get_mode(), fame)
|
||||||
self.list_view.update(players)
|
self.list_view.update(players)
|
||||||
self.session_bar.update()
|
self.session_bar.update()
|
||||||
|
|
||||||
def get_mode(self) -> str:
|
def get_mode(self) -> str:
|
||||||
return self.session_bar.mode.get_mode()
|
return self.session_bar.mode.get_mode()
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ from .... import engine
|
|||||||
|
|
||||||
from .stats_type import StatsType
|
from .stats_type import StatsType
|
||||||
|
|
||||||
|
|
||||||
class ResetButton(QPushButton):
|
class ResetButton(QPushButton):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
QPushButton.__init__(self)
|
QPushButton.__init__(self)
|
||||||
@@ -28,6 +29,6 @@ class ResetButton(QPushButton):
|
|||||||
}
|
}
|
||||||
|
|
||||||
reset[self.stat_type]()
|
reset[self.stat_type]()
|
||||||
|
|
||||||
def update(self, stat_type: str):
|
def update(self, stat_type: str):
|
||||||
self.stat_type = stat_type
|
self.stat_type = stat_type
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
class CombatState:
|
class CombatState:
|
||||||
InCombat = 1
|
InCombat = 1
|
||||||
OutOfCombat = 2
|
OutOfCombat = 2
|
||||||
|
|||||||
@@ -52,11 +52,11 @@ class Player(Stats):
|
|||||||
healing_done: float = 0.0
|
healing_done: float = 0.0
|
||||||
combat_time: CombatTime = field(default_factory=lambda: CombatTime())
|
combat_time: CombatTime = field(default_factory=lambda: CombatTime())
|
||||||
combat_state: int = CombatState.OutOfCombat
|
combat_state: int = CombatState.OutOfCombat
|
||||||
active: bool = False
|
active: bool = False
|
||||||
|
|
||||||
def activate(self):
|
def activate(self):
|
||||||
self.active = True
|
self.active = True
|
||||||
|
|
||||||
def is_active(self) -> bool:
|
def is_active(self) -> bool:
|
||||||
return self.active
|
return self.active
|
||||||
|
|
||||||
@@ -167,7 +167,8 @@ class CombatStats(CombatEventReceiver, Stats):
|
|||||||
|
|
||||||
def update_non_idle(self, other):
|
def update_non_idle(self, other):
|
||||||
self.update(other)
|
self.update(other)
|
||||||
self.players = dict(filter(lambda elem: elem[1].has_stats(), self.players.items()))
|
self.players = dict(
|
||||||
|
filter(lambda elem: elem[1].has_stats(), self.players.items()))
|
||||||
|
|
||||||
for player in self.players.values():
|
for player in self.players.values():
|
||||||
player.activate()
|
player.activate()
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ class FameStats(FameEventReceiver, Stats):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def from_other(other: Stats): # type: ignore
|
def from_other(other: Stats): # type: ignore
|
||||||
return FameStats(fame=other.fame) # type: ignore
|
return FameStats(fame=other.fame) # type: ignore
|
||||||
|
|
||||||
def update(self, other: Stats): # type: ignore
|
def update(self, other: Stats): # type: ignore
|
||||||
self.fame += other.fame # type: ignore
|
self.fame += other.fame # type: ignore
|
||||||
|
|
||||||
def on_fame_update(self, value: float):
|
def on_fame_update(self, value: float):
|
||||||
self.fame += value
|
self.fame += value
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ from typing import List
|
|||||||
from ..utils.number import Number
|
from ..utils.number import Number
|
||||||
from .combat_state import CombatState
|
from .combat_state import CombatState
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class StandalonePlayerListItem:
|
class StandalonePlayerListItem:
|
||||||
name: str
|
name: str
|
||||||
|
|||||||
@@ -1,2 +1,4 @@
|
|||||||
|
from . import config
|
||||||
from . import number
|
from . import number
|
||||||
from . import config
|
|
||||||
|
__all__ = ['number', 'config']
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ import collections
|
|||||||
Item = collections.namedtuple('Item', 'key value')
|
Item = collections.namedtuple('Item', 'key value')
|
||||||
|
|
||||||
|
|
||||||
_queue : queue.Queue = queue.Queue()
|
_queue: queue.Queue = queue.Queue()
|
||||||
_requests = {}
|
_requests = {}
|
||||||
_requests_threads : dict = {}
|
_requests_threads: dict = {}
|
||||||
|
|
||||||
|
|
||||||
def update_loop():
|
def update_loop():
|
||||||
|
|||||||
+1
-1
@@ -59,4 +59,4 @@ def config():
|
|||||||
cfg_file.write(default)
|
cfg_file.write(default)
|
||||||
_config = toml.loads(default)
|
_config = toml.loads(default)
|
||||||
|
|
||||||
return _config
|
return _config
|
||||||
|
|||||||
@@ -8,5 +8,6 @@ except:
|
|||||||
|
|
||||||
from . import assets
|
from . import assets
|
||||||
|
|
||||||
|
|
||||||
def map_name(name):
|
def map_name(name):
|
||||||
return localization_mapping[name] if name in localization_mapping else name
|
return localization_mapping[name] if name in localization_mapping else name
|
||||||
|
|||||||
Reference in New Issue
Block a user