Applied autopep8
This commit is contained in:
@@ -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():
|
||||||
|
|||||||
+5
-2
@@ -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
|
||||||
@@ -173,7 +175,8 @@ def get_stats(stat_type: str, combat_stat_type: str):
|
|||||||
|
|
||||||
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
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ class VisibilityEventReceiver(EventReceiver):
|
|||||||
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):
|
||||||
|
|||||||
@@ -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)
|
||||||
@@ -26,5 +27,3 @@ class About(QMessageBox):
|
|||||||
"https://www.patreon.com/wiktormazur",
|
"https://www.patreon.com/wiktormazur",
|
||||||
))
|
))
|
||||||
self.setStandardButtons(QMessageBox.Ok)
|
self.setStandardButtons(QMessageBox.Ok)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -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,7 +67,8 @@ 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()
|
||||||
|
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -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()
|
||||||
|
|||||||
@@ -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 number
|
|
||||||
from . import config
|
from . import config
|
||||||
|
from . import number
|
||||||
|
|
||||||
|
__all__ = ['number', '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