GUI: natural reset stats
This commit is contained in:
@@ -0,0 +1,3 @@
|
||||
class CombatState:
|
||||
InCombat = 1
|
||||
OutOfCombat = 2
|
||||
@@ -16,6 +16,7 @@ from ..event_receiver import CombatEventReceiver, VisibilityEventReceiver
|
||||
from .statistics import Stats
|
||||
from .list_item import PlayerListItem, StandalonePlayerListItem, to_player_list_items
|
||||
from .visibility import Visibility
|
||||
from .combat_state import CombatState
|
||||
|
||||
@dataclass
|
||||
class CombatTime:
|
||||
@@ -23,11 +24,6 @@ class CombatTime:
|
||||
time_in_combat: float = 0.0
|
||||
|
||||
|
||||
class CombatState:
|
||||
InCombat = 1
|
||||
OutOfCombat = 2
|
||||
|
||||
|
||||
@dataclass
|
||||
class Player(Stats):
|
||||
name: str
|
||||
@@ -127,13 +123,10 @@ class DamageStats(CombatEventReceiver, Stats):
|
||||
def player_list(self, visibility: Visibility) -> List[PlayerListItem]:
|
||||
return to_player_list_items([
|
||||
StandalonePlayerListItem(
|
||||
player.name, player.items, player.damage_done, player.dps)
|
||||
player.name, player.items, player.damage_done, player.dps, player.combat_state)
|
||||
for player in self.players.values() if visibility.test(player.name)
|
||||
])
|
||||
|
||||
def stats(self):
|
||||
return [player.stats() for player in self.players.values()]
|
||||
|
||||
def on_player_appeared(self, id: int, name: str):
|
||||
if id not in self.players:
|
||||
self.players[id] = Player(name)
|
||||
|
||||
@@ -2,7 +2,7 @@ from dataclasses import dataclass
|
||||
from typing import List
|
||||
|
||||
from ..utils.number import Number
|
||||
|
||||
from .combat_state import CombatState
|
||||
|
||||
@dataclass
|
||||
class StandalonePlayerListItem:
|
||||
@@ -10,6 +10,7 @@ class StandalonePlayerListItem:
|
||||
items: dict
|
||||
value: float
|
||||
value_per_second: float
|
||||
combat_state: CombatState
|
||||
|
||||
|
||||
@dataclass
|
||||
@@ -20,6 +21,7 @@ class PlayerListItem:
|
||||
value_per_second: Number
|
||||
best_value: Number
|
||||
percentage: Number
|
||||
combat_state: CombatState
|
||||
|
||||
|
||||
def to_player_list_items(standalone_list: List[StandalonePlayerListItem]) -> List[PlayerListItem]:
|
||||
@@ -42,6 +44,7 @@ def to_player_list_items(standalone_list: List[StandalonePlayerListItem]) -> Lis
|
||||
Number(item.value_per_second),
|
||||
Number(best),
|
||||
Number(percentage),
|
||||
item.combat_state
|
||||
))
|
||||
|
||||
return combined_list
|
||||
|
||||
@@ -14,10 +14,6 @@ class Stats(abc.ABC):
|
||||
def update(self, other):
|
||||
pass
|
||||
|
||||
@abc.abstractmethod
|
||||
def stats(self):
|
||||
pass
|
||||
|
||||
def combined(self, other):
|
||||
stats = self.new()
|
||||
stats.update(self)
|
||||
|
||||
Reference in New Issue
Block a user