Time + fame backward compatible with previous 0.8.1
This commit is contained in:
@@ -4,7 +4,7 @@ from .environment import TEST_ENV_ENABLED
|
|||||||
|
|
||||||
from . import backend_proxy
|
from . import backend_proxy
|
||||||
from .backend_proxy import InitializationResult, INITIALIZATION_RESULT
|
from .backend_proxy import InitializationResult, INITIALIZATION_RESULT
|
||||||
from .stats import damage_stats, fame_stats
|
from .stats import damage_stats, fame_stats, time_stats
|
||||||
from .consts import events as ev_consts
|
from .consts import events as ev_consts
|
||||||
|
|
||||||
|
|
||||||
@@ -20,14 +20,17 @@ class GameStats():
|
|||||||
self.zone = {
|
self.zone = {
|
||||||
'damage': damage_stats.DamageStats(),
|
'damage': damage_stats.DamageStats(),
|
||||||
'fame': fame_stats.FameStats(),
|
'fame': fame_stats.FameStats(),
|
||||||
|
'time': time_stats.TimeStats(),
|
||||||
}
|
}
|
||||||
self.last_fight = {
|
self.last_fight = {
|
||||||
'damage': damage_stats.DamageStats(),
|
'damage': damage_stats.DamageStats(),
|
||||||
'fame': fame_stats.FameStats(),
|
'fame': fame_stats.FameStats(),
|
||||||
|
'time': time_stats.TimeStats(),
|
||||||
}
|
}
|
||||||
self.history = {
|
self.history = {
|
||||||
'damage': damage_stats.DamageStats(),
|
'damage': damage_stats.DamageStats(),
|
||||||
'fame': damage_stats.DamageStats()
|
'fame': fame_stats.FameStats(),
|
||||||
|
'time': time_stats.TimeStats(),
|
||||||
}
|
}
|
||||||
|
|
||||||
def register_event(self, event):
|
def register_event(self, event):
|
||||||
@@ -37,10 +40,12 @@ class GameStats():
|
|||||||
self.zone['damage'])
|
self.zone['damage'])
|
||||||
elif event[ev_consts.EvKeyName] == ev_consts.EvNameZoneChange:
|
elif event[ev_consts.EvKeyName] == ev_consts.EvNameZoneChange:
|
||||||
self.history['damage'].update(self.zone['damage'])
|
self.history['damage'].update(self.zone['damage'])
|
||||||
# self.history['fame'].update(self.zone['fame'])
|
self.history['fame'].update(self.zone['fame'])
|
||||||
|
self.history['time'].update(self.zone['time'])
|
||||||
|
|
||||||
self.zone['damage'] = damage_stats.DamageStats()
|
self.zone['damage'] = damage_stats.DamageStats()
|
||||||
self.zone['fame'] = fame_stats.FameStats()
|
self.zone['fame'] = fame_stats.FameStats()
|
||||||
|
self.zone['time'] = time_stats.TimeStats()
|
||||||
|
|
||||||
self.zone['damage'].receive(event)
|
self.zone['damage'].receive(event)
|
||||||
self.last_fight['damage'].receive(event)
|
self.last_fight['damage'].receive(event)
|
||||||
@@ -65,6 +70,22 @@ class GameStats():
|
|||||||
elif stat_type == StatType.Overall:
|
elif stat_type == StatType.Overall:
|
||||||
return self.history['damage'].combined(self.zone['damage']).stats()
|
return self.history['damage'].combined(self.zone['damage']).stats()
|
||||||
|
|
||||||
|
def fame_stats(self, stat_type):
|
||||||
|
if stat_type == StatType.Zone:
|
||||||
|
return self.zone['fame'].stats()
|
||||||
|
elif stat_type == StatType.LastFight:
|
||||||
|
return self.last_fight['fame'].stats()
|
||||||
|
elif stat_type == StatType.Overall:
|
||||||
|
return self.history['fame'].combined(self.zone['fame']).stats()
|
||||||
|
|
||||||
|
def time_stats(self, stat_type):
|
||||||
|
if stat_type == StatType.Zone:
|
||||||
|
return self.zone['time'].stats()
|
||||||
|
elif stat_type == StatType.LastFight:
|
||||||
|
return self.last_fight['time'].stats()
|
||||||
|
elif stat_type == StatType.Overall:
|
||||||
|
return self.history['time'].combined(self.zone['time']).stats()
|
||||||
|
|
||||||
def _are_everyone_in_session_out_of_combat(self):
|
def _are_everyone_in_session_out_of_combat(self):
|
||||||
return all(player.combat_state == damage_stats.CombatState.OutOfCombat for player in self.zone['damage'].players.values())
|
return all(player.combat_state == damage_stats.CombatState.OutOfCombat for player in self.zone['damage'].players.values())
|
||||||
|
|
||||||
@@ -76,6 +97,7 @@ class GameStats():
|
|||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
game_stats = GameStats()
|
game_stats = GameStats()
|
||||||
|
|
||||||
|
|
||||||
@@ -148,23 +170,44 @@ def with_percentage(session):
|
|||||||
|
|
||||||
|
|
||||||
def zone_stats(with_damage=False):
|
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({
|
return stats({
|
||||||
'players': game_stats.damage_stats(StatType.Zone),
|
'players': game_stats.damage_stats(StatType.Zone),
|
||||||
'main': {}},
|
'main': {
|
||||||
|
**fame,
|
||||||
|
**time,
|
||||||
|
}},
|
||||||
with_damage)
|
with_damage)
|
||||||
|
|
||||||
|
|
||||||
def overall_stats(with_damage=False):
|
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({
|
return stats({
|
||||||
'players': game_stats.damage_stats(StatType.Overall),
|
'players': game_stats.damage_stats(StatType.Overall),
|
||||||
'main': {}},
|
'main': {
|
||||||
|
**fame,
|
||||||
|
**time,
|
||||||
|
}},
|
||||||
with_damage)
|
with_damage)
|
||||||
|
|
||||||
|
|
||||||
def last_fight_stats(with_damage=False):
|
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({
|
return stats({
|
||||||
'players': game_stats.damage_stats(StatType.LastFight),
|
'players': game_stats.damage_stats(StatType.LastFight),
|
||||||
'main': {}},
|
'main': {
|
||||||
|
**fame,
|
||||||
|
**time,
|
||||||
|
}},
|
||||||
with_damage)
|
with_damage)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ from typing import Optional
|
|||||||
|
|
||||||
from . import time_utils
|
from . import time_utils
|
||||||
from ..event_receiver import CombatEventReceiver
|
from ..event_receiver import CombatEventReceiver
|
||||||
|
from .statistics import Stats
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
@@ -27,13 +28,17 @@ class CombatState:
|
|||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class Player:
|
class Player(Stats):
|
||||||
name: str
|
name: str
|
||||||
items: dict = field(default_factory=lambda: {'weapon': None})
|
items: dict = field(default_factory=lambda: {'weapon': None})
|
||||||
damage_done: float = 0.0
|
damage_done: float = 0.0
|
||||||
combat_time: CombatTime = CombatTime()
|
combat_time: CombatTime = CombatTime()
|
||||||
combat_state: CombatState = CombatState.OutOfCombat
|
combat_state: CombatState = CombatState.OutOfCombat
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def new(self):
|
||||||
|
return Player()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def from_other(other):
|
def from_other(other):
|
||||||
return Player(other.name, other.items)
|
return Player(other.name, other.items)
|
||||||
@@ -76,7 +81,7 @@ class Player:
|
|||||||
if self.time_in_combat == 0.0:
|
if self.time_in_combat == 0.0:
|
||||||
return 0.0
|
return 0.0
|
||||||
|
|
||||||
return time_utils.as_seconds(self.damage_done / self.time_in_combat)
|
return time_utils.as_milliseconds(self.damage_done / self.time_in_combat)
|
||||||
|
|
||||||
def stats(self):
|
def stats(self):
|
||||||
return {
|
return {
|
||||||
@@ -87,12 +92,16 @@ class Player:
|
|||||||
'items': self.items}
|
'items': self.items}
|
||||||
|
|
||||||
|
|
||||||
class DamageStats(CombatEventReceiver):
|
class DamageStats(CombatEventReceiver, Stats):
|
||||||
def __init__(self, players=None):
|
def __init__(self, players=None):
|
||||||
if not players:
|
if not players:
|
||||||
players = {}
|
players = {}
|
||||||
self.players = players
|
self.players = players
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def new(self):
|
||||||
|
return DamageStats()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def from_other(other):
|
def from_other(other):
|
||||||
return DamageStats({k: Player.from_other(v) for (k, v) in other.players.items()})
|
return DamageStats({k: Player.from_other(v) for (k, v) in other.players.items()})
|
||||||
@@ -133,20 +142,3 @@ class DamageStats(CombatEventReceiver):
|
|||||||
|
|
||||||
def on_items_update(self, id: int, items: dict):
|
def on_items_update(self, id: int, items: dict):
|
||||||
self.players[id].register_items(items)
|
self.players[id].register_items(items)
|
||||||
|
|
||||||
|
|
||||||
def combined_stats(stats_list):
|
|
||||||
combined = {}
|
|
||||||
|
|
||||||
for stats in stats_list:
|
|
||||||
print(stats)
|
|
||||||
if stats['player'] in combined:
|
|
||||||
current = combined[stats['player']]
|
|
||||||
current['damage'] += stats['damage']
|
|
||||||
current['time_in_combat'] += stats['time_in_combat']
|
|
||||||
current['dps'] += stats['dps']
|
|
||||||
current['items'] = stats['items']
|
|
||||||
else:
|
|
||||||
combined[stats['player']] = stats
|
|
||||||
|
|
||||||
return [s for s in combined.values()]
|
|
||||||
|
|||||||
@@ -1,15 +1,29 @@
|
|||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
|
|
||||||
from ..event_receiver import FameEventReceiver
|
from ..event_receiver import FameEventReceiver
|
||||||
|
from .statistics import Stats
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class FameStats(FameEventReceiver):
|
class FameStats(FameEventReceiver, Stats):
|
||||||
fame: float = 0.0
|
fame: float = 0.0
|
||||||
|
|
||||||
def __init__(self):
|
@classmethod
|
||||||
self.fame = 0.0
|
def new(self):
|
||||||
|
return FameStats()
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_other(other: Stats):
|
||||||
|
return FameStats(fame=other.fame)
|
||||||
|
|
||||||
|
def update(self, other: Stats):
|
||||||
|
self.fame += other.fame
|
||||||
|
|
||||||
def on_fame_update(self, value: float):
|
def on_fame_update(self, value: float):
|
||||||
self.fame += value
|
self.fame += value
|
||||||
|
|
||||||
|
def stats(self):
|
||||||
|
return {
|
||||||
|
'fame': self.fame,
|
||||||
|
'fame_per_hour': 0.0 # TODO: remove, added because backward compatibility
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import abc
|
||||||
|
|
||||||
|
|
||||||
|
class Stats(abc.ABC):
|
||||||
|
@abc.abstractmethod
|
||||||
|
def new(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
@abc.abstractclassmethod
|
||||||
|
def from_other(other):
|
||||||
|
pass
|
||||||
|
|
||||||
|
@abc.abstractmethod
|
||||||
|
def update(self, other):
|
||||||
|
pass
|
||||||
|
|
||||||
|
@abc.abstractmethod
|
||||||
|
def stats(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def combined(self, other):
|
||||||
|
stats = self.new()
|
||||||
|
stats.update(self)
|
||||||
|
stats.update(other)
|
||||||
|
|
||||||
|
return stats
|
||||||
@@ -1,9 +1,26 @@
|
|||||||
|
from dataclasses import field
|
||||||
|
from dataclasses import dataclass
|
||||||
|
|
||||||
from . import time_utils
|
from . import time_utils
|
||||||
|
from .statistics import Stats
|
||||||
|
|
||||||
|
|
||||||
class TimeStats:
|
@dataclass
|
||||||
def __init__(self):
|
class TimeStats(Stats):
|
||||||
self.time = time_utils.now()
|
time : float = field(default_factory=lambda: time_utils.now())
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def new(self):
|
||||||
|
return TimeStats()
|
||||||
|
|
||||||
def stats(self):
|
def stats(self):
|
||||||
return time_utils.delta(self.time)
|
return {
|
||||||
|
'seconds_in_game': time_utils.as_seconds(time_utils.delta(self.time))
|
||||||
|
}
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_other(other):
|
||||||
|
return TimeStats(time=other.time)
|
||||||
|
|
||||||
|
def update(self, other):
|
||||||
|
self.time = other.time
|
||||||
|
|||||||
@@ -10,5 +10,8 @@ def delta(time):
|
|||||||
return (delta.seconds * 1000.0 + delta.microseconds / 1000.0)
|
return (delta.seconds * 1000.0 + delta.microseconds / 1000.0)
|
||||||
|
|
||||||
|
|
||||||
def as_seconds(time):
|
def as_milliseconds(time):
|
||||||
return time * 1000.0
|
return time * 1000.0
|
||||||
|
|
||||||
|
def as_seconds(time):
|
||||||
|
return int(time / 1000.0)
|
||||||
Reference in New Issue
Block a user