Damage backward compatible with previous 0.8.1
This commit is contained in:
@@ -7,53 +7,67 @@
|
||||
# 'weapon': 'T5_MAIN_CURSEDSTAFF@2'
|
||||
# }
|
||||
|
||||
from datetime import datetime
|
||||
from dataclasses import field
|
||||
from dataclasses import dataclass
|
||||
from typing import Optional
|
||||
|
||||
from . import time_utils
|
||||
from ..event_receiver import CombatEventReceiver
|
||||
|
||||
|
||||
@dataclass
|
||||
class CombatTime:
|
||||
entered_combat: Optional[float] = None
|
||||
time_in_combat: float = 0.0
|
||||
|
||||
|
||||
class CombatState:
|
||||
InCombat = 1
|
||||
OutOfCombat = 2
|
||||
|
||||
|
||||
@dataclass
|
||||
class Player:
|
||||
class CombatTime:
|
||||
def __init__(self):
|
||||
self.entered_combat = None
|
||||
self.time_in_combat = 0.0
|
||||
|
||||
class CombatState:
|
||||
InCombat = 1
|
||||
OutOfCombat = 2
|
||||
|
||||
def __init__(self, name):
|
||||
self.name = name
|
||||
self.damage_done = 0.0
|
||||
self.items = {'weapon': None}
|
||||
self.combat_time = self.CombatTime()
|
||||
self.combat_state = self.CombatState.OutOfCombat
|
||||
name: str
|
||||
items: dict = field(default_factory=lambda: {'weapon': None})
|
||||
damage_done: float = 0.0
|
||||
combat_time: CombatTime = CombatTime()
|
||||
combat_state: CombatState = CombatState.OutOfCombat
|
||||
|
||||
@staticmethod
|
||||
def from_other(other):
|
||||
Player(other.name)
|
||||
return Player(other.name, other.items)
|
||||
|
||||
def update(self, other):
|
||||
self.name = other.name
|
||||
self.damage_done += other.damage_done
|
||||
self.combat_time.time_in_combat += other.combat_time.time_in_combat
|
||||
self.items = other.items
|
||||
|
||||
def register_items(self, value):
|
||||
self.items = value
|
||||
|
||||
def register_damage_done(self, value):
|
||||
if self.combat_state == self.CombatState.OutOfCombat:
|
||||
if self.combat_state == CombatState.OutOfCombat:
|
||||
return
|
||||
|
||||
self.damage_done += value
|
||||
|
||||
def enter_combat(self):
|
||||
self.combat_time.entered_combat = datetime.now()
|
||||
self.combat_state = self.CombatState.InCombat
|
||||
self.combat_time.entered_combat = time_utils.now()
|
||||
self.combat_state = CombatState.InCombat
|
||||
|
||||
def leave_combat(self):
|
||||
if self.combat_time.entered_combat:
|
||||
self.combat_time.time_in_combat += _time_delta(self.combat_time.entered_combat)
|
||||
self.combat_state = self.CombatState.OutOfCombat
|
||||
self.combat_time.time_in_combat += time_utils.delta(
|
||||
self.combat_time.entered_combat)
|
||||
self.combat_state = CombatState.OutOfCombat
|
||||
|
||||
@property
|
||||
def time_in_combat(self):
|
||||
if self.combat_state == self.CombatState.InCombat:
|
||||
if self.combat_state == CombatState.InCombat:
|
||||
if self.combat_time.entered_combat:
|
||||
return self.combat_time.time_in_combat + _time_delta(self.combat_time.entered_combat)
|
||||
return self.combat_time.time_in_combat + time_utils.delta(self.combat_time.entered_combat)
|
||||
|
||||
return self.combat_time.time_in_combat
|
||||
|
||||
@@ -61,9 +75,8 @@ class Player:
|
||||
def dps(self):
|
||||
if self.time_in_combat == 0.0:
|
||||
return 0.0
|
||||
|
||||
return (self.damage_done / self.time_in_combat) * 1000.0
|
||||
|
||||
return time_utils.as_seconds(self.damage_done / self.time_in_combat)
|
||||
|
||||
def stats(self):
|
||||
return {
|
||||
@@ -74,7 +87,7 @@ class Player:
|
||||
'items': self.items}
|
||||
|
||||
|
||||
class DamageStats:
|
||||
class DamageStats(CombatEventReceiver):
|
||||
def __init__(self, players=None):
|
||||
if not players:
|
||||
players = {}
|
||||
@@ -82,32 +95,51 @@ class DamageStats:
|
||||
|
||||
@staticmethod
|
||||
def from_other(other):
|
||||
DamageStats({k: Player.from_other(v)} for k, v in other.players)
|
||||
return DamageStats({k: Player.from_other(v) for (k, v) in other.players.items()})
|
||||
|
||||
def add_player(self, player_id, name):
|
||||
if player_id not in self.players:
|
||||
self.players[player_id] = Player(name)
|
||||
def update(self, other):
|
||||
for (id, player) in other.players.items():
|
||||
if id in self.players:
|
||||
self.players[id].update(player)
|
||||
else:
|
||||
self.players[id] = Player.from_other(player)
|
||||
self.players[id].update(player)
|
||||
|
||||
def add_items(self, player_id, items):
|
||||
self.players[player_id].register_items(items)
|
||||
def combined(self, other):
|
||||
stats = DamageStats()
|
||||
stats.update(self)
|
||||
stats.update(other)
|
||||
|
||||
def enter_combat(self, player_id):
|
||||
self.players[player_id].enter_combat()
|
||||
|
||||
def leave_conbat(self, player_id):
|
||||
self.players[player_id].leave_combat()
|
||||
|
||||
def register_damage_done(self, player_id, value):
|
||||
self.players[player_id].register_damage_done(value)
|
||||
return stats
|
||||
|
||||
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)
|
||||
|
||||
def on_damage_done(self, id: int, damage: float):
|
||||
self.players[id].register_damage_done(damage)
|
||||
|
||||
def on_health_received(self):
|
||||
pass
|
||||
|
||||
def on_enter_combat(self, id: int):
|
||||
self.players[id].enter_combat()
|
||||
|
||||
def on_leave_combat(self, id: int):
|
||||
self.players[id].leave_combat()
|
||||
|
||||
def on_items_update(self, id: int, items: dict):
|
||||
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']
|
||||
@@ -118,8 +150,3 @@ def combined_stats(stats_list):
|
||||
combined[stats['player']] = stats
|
||||
|
||||
return [s for s in combined.values()]
|
||||
|
||||
|
||||
def _time_delta(time):
|
||||
delta = datetime.now() - time
|
||||
return (delta.seconds * 1000.0 + delta.microseconds / 1000.0)
|
||||
Reference in New Issue
Block a user