diff --git a/application/src/consts/events.py b/application/src/consts/events.py index a07a384..2b5d036 100644 --- a/application/src/consts/events.py +++ b/application/src/consts/events.py @@ -7,8 +7,10 @@ EvNameEnterCombat : str = 'EnterCombat' EvNameLeaveCombat : str = 'LeaveCombat' EvNameUpdateFame : str = 'UpdateFame' EvNameUpdateItems : str = 'UpdateItems' +EvNameUpdateParty : str = 'UpdateParty' EvKeyName : str = 'name' EvKeyValue : str = 'value' EvKeySource : str = 'source' -EvKeyId : str = 'id' \ No newline at end of file +EvKeyId : str = 'id' +EvKeyPlayerNames : str = 'player_names' \ No newline at end of file diff --git a/application/src/engine.py b/application/src/engine.py index beb3733..84f156d 100644 --- a/application/src/engine.py +++ b/application/src/engine.py @@ -6,7 +6,8 @@ from . import backend_proxy from .backend_proxy import InitializationResult, INITIALIZATION_RESULT from .stats import damage_stats, fame_stats, time_stats from .consts import events as ev_consts - +from .event_receiver import VisibilityEventReceiver +from .stats.visibility import Visibility class StatType: Unknown = 0 @@ -33,6 +34,8 @@ class GameStats(): 'time': time_stats.TimeStats(), } + self.visibility = Visibility() + def register_event(self, event): if event[ev_consts.EvKeyName] == ev_consts.EvNameEnterCombat: if self._are_everyone_in_session_out_of_combat(): @@ -51,6 +54,7 @@ class GameStats(): self.last_fight['damage'].receive(event) self.zone['fame'].receive(event) self.last_fight['fame'].receive(event) + self.visibility.receive(event) def reset(self, stat_type): if stat_type == StatType.Zone: @@ -64,11 +68,11 @@ class GameStats(): def damage_stats(self, stat_type): if stat_type == StatType.Zone: - return self.zone['damage'].player_list() + return self.zone['damage'].player_list(self.visibility) elif stat_type == StatType.LastFight: - return self.last_fight['damage'].player_list() + return self.last_fight['damage'].player_list(self.visibility) elif stat_type == StatType.Overall: - return self.history['damage'].combined(self.zone['damage']).player_list() + return self.history['damage'].combined(self.zone['damage']).player_list(self.visibility) def fame_stats(self, stat_type): if stat_type == StatType.Zone: diff --git a/application/src/event_receiver.py b/application/src/event_receiver.py index ae157eb..4baf435 100644 --- a/application/src/event_receiver.py +++ b/application/src/event_receiver.py @@ -1,15 +1,51 @@ import abc -from typing import Dict +from typing import Dict, List from .consts import events as consts class EventReceiver(abc.ABC): def receive(self, event): - event_name: Dict[str, str] = event[consts.EvKeyName] + event_name: str = event[consts.EvKeyName] value: dict = event[consts.EvKeyValue] if consts.EvKeyValue in event else None + self.on_event(event_name, value) + + @abc.abstractmethod + def on_event(self, name: str, value: dict): + pass + + +class VisibilityEventReceiver(EventReceiver): + def on_event(self, event_name: str, value: dict): + if event_name == consts.EvNameMainPlayerAppeared: + self.on_player_appeared(value[consts.EvKeyName]) + elif event_name == consts.EvNameUpdateParty: + self.on_visible_players_changed(value[consts.EvKeyPlayerNames]) + + @abc.abstractmethod + def on_player_appeared(self, main_player_name: str): + pass + + @abc.abstractmethod + def on_visible_players_changed(self, visible_players : List[str]): + pass + +class FameEventReceiver(EventReceiver): + + def on_event(self, event_name: str, value: dict): + if event_name == consts.EvNameUpdateFame: + self.on_fame_update(value[consts.EvKeyValue]) + + @abc.abstractmethod + def on_fame_update(self, value: float): + pass + + +class CombatEventReceiver(EventReceiver): + + def on_event(self, event_name: str, value: dict): if event_name == consts.EvNameMainPlayerAppeared: self.on_player_appeared( value[consts.EvKeyId], value[consts.EvKeyName]) @@ -22,14 +58,10 @@ class EventReceiver(abc.ABC): elif event_name == consts.EvNameHealthReceived: self.on_health_received( value[consts.EvKeySource], value[consts.EvKeyValue]) - elif event_name == consts.EvNameZoneChange: - self.on_zone_change() elif event_name == consts.EvNameEnterCombat: self.on_enter_combat(value[consts.EvKeyId]) elif event_name == consts.EvNameLeaveCombat: self.on_leave_combat(value[consts.EvKeyId]) - elif event_name == consts.EvNameUpdateFame: - self.on_fame_update(value[consts.EvKeyValue]) elif event_name == consts.EvNameUpdateItems: self.on_items_update( value[consts.EvKeySource], value[consts.EvKeyValue]) @@ -46,72 +78,6 @@ class EventReceiver(abc.ABC): def on_health_received(self, id: int, health: float): pass - @abc.abstractmethod - def on_zone_change(self): - pass - - @abc.abstractmethod - def on_enter_combat(self, id: int): - pass - - @abc.abstractmethod - def on_leave_combat(self, id: int): - pass - - @abc.abstractmethod - def on_fame_update(self, value: float): - pass - - @abc.abstractmethod - def on_items_update(self, id: int, items: Dict[str, str]): - pass - - -class PassiveEventReceiver(EventReceiver): - def on_player_appeared(self, id: int, name: str): - pass - - def on_damage_done(self, id: int, damage: float): - pass - - def on_health_received(self, id: int, health: float): - pass - - def on_zone_change(self): - pass - - def on_enter_combat(self, id: int): - pass - - def on_leave_combat(self, id: int): - pass - - def on_fame_update(self, value: float): - pass - - def on_items_update(self, id: int, items: Dict[str, str]): - pass - - -class FameEventReceiver(PassiveEventReceiver): - @abc.abstractmethod - def on_fame_update(self, value: float): - pass - - -class CombatEventReceiver(PassiveEventReceiver): - @abc.abstractmethod - def on_player_appeared(self, id: int, name: str): - pass - - @abc.abstractmethod - def on_damage_done(self, id: int, damage: float): - pass - - @abc.abstractmethod - def on_health_received(self, id: int, health: float): - pass - @abc.abstractmethod def on_enter_combat(self, id: int): pass diff --git a/application/src/stats/damage_stats.py b/application/src/stats/damage_stats.py index b3db33f..e6535c9 100644 --- a/application/src/stats/damage_stats.py +++ b/application/src/stats/damage_stats.py @@ -12,10 +12,10 @@ from dataclasses import dataclass from typing import Optional, List from . import time_utils -from ..event_receiver import CombatEventReceiver +from ..event_receiver import CombatEventReceiver, VisibilityEventReceiver from .statistics import Stats from .list_item import PlayerListItem, StandalonePlayerListItem, to_player_list_items - +from .visibility import Visibility @dataclass class CombatTime: @@ -124,11 +124,11 @@ class DamageStats(CombatEventReceiver, Stats): return stats - def player_list(self) -> List[PlayerListItem]: + def player_list(self, visibility: Visibility) -> List[PlayerListItem]: return to_player_list_items([ StandalonePlayerListItem( player.name, player.items, player.damage_done, player.dps) - for player in self.players.values() + for player in self.players.values() if visibility.test(player.name) ]) def stats(self): diff --git a/application/src/stats/visibility.py b/application/src/stats/visibility.py new file mode 100644 index 0000000..471badb --- /dev/null +++ b/application/src/stats/visibility.py @@ -0,0 +1,23 @@ +from dataclasses import dataclass, field +from typing import List +import re + + +from ..event_receiver import VisibilityEventReceiver + + +@dataclass +class Visibility(VisibilityEventReceiver): + main_player_name: str = "" + visible_players: List[str] = field(default_factory=lambda: []) + + def on_player_appeared(self, main_player_name: str): + self.main_player_name = main_player_name + + def on_visible_players_changed(self, visible_players: List[str]): + self.visible_players = visible_players + + def test(self, name): + pattern = re.compile('|'.join(self.visible_players) + '|{}'.format( + self.main_player_name) if self.visible_players else self.main_player_name) + return self.main_player_name and bool(pattern.match(name))