Added 'damage taken' section to the UI
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
EvNameMainPlayerAppeared: str = 'MainPlayerAppeared'
|
EvNameMainPlayerAppeared: str = 'MainPlayerAppeared'
|
||||||
EvNamePlayerAppeared: str = 'PlayerAppeared'
|
EvNamePlayerAppeared: str = 'PlayerAppeared'
|
||||||
EvNameDamageDone: str = 'DamageDone'
|
EvNameDamageDone: str = 'DamageDone'
|
||||||
|
EvNameDamageTaken: str = 'DamageTaken'
|
||||||
EvNameHealthReceived: str = 'HealthReceived'
|
EvNameHealthReceived: str = 'HealthReceived'
|
||||||
EvNameZoneChange: str = 'ZoneChange'
|
EvNameZoneChange: str = 'ZoneChange'
|
||||||
EvNameEnterCombat: str = 'EnterCombat'
|
EvNameEnterCombat: str = 'EnterCombat'
|
||||||
|
|||||||
+13
-5
@@ -287,15 +287,23 @@ class World:
|
|||||||
actor_id = _dyn(translate.msg_target(msg)) # param 6
|
actor_id = _dyn(translate.msg_target(msg)) # param 6
|
||||||
victim_id = _dyn(translate.msg_source(msg)) # param 0
|
victim_id = _dyn(translate.msg_source(msg)) # param 0
|
||||||
actor_static = self.cache.get_static_id(actor_id)
|
actor_static = self.cache.get_static_id(actor_id)
|
||||||
if actor_static is None:
|
victim_static = self.cache.get_static_id(victim_id)
|
||||||
return []
|
events = []
|
||||||
|
if actor_static is not None:
|
||||||
event_name = 'DamageDone' if value < 0.0 else 'HealthReceived'
|
event_name = 'DamageDone' if value < 0.0 else 'HealthReceived'
|
||||||
return [{
|
events.append({
|
||||||
'name': event_name,
|
'name': event_name,
|
||||||
'value': {'source': actor_static,
|
'value': {'source': actor_static,
|
||||||
'target': self.cache.get_static_id(victim_id),
|
'target': victim_static,
|
||||||
'value': float(abs(value))},
|
'value': float(abs(value))},
|
||||||
}]
|
})
|
||||||
|
if value < 0.0 and victim_static is not None:
|
||||||
|
events.append({
|
||||||
|
'name': 'DamageTaken',
|
||||||
|
'value': {'source': victim_static,
|
||||||
|
'value': float(abs(value))},
|
||||||
|
})
|
||||||
|
return events
|
||||||
|
|
||||||
def _on_regeneration(self, msg: GameMessage) -> List[dict]:
|
def _on_regeneration(self, msg: GameMessage) -> List[dict]:
|
||||||
dynamic_id = _dyn(translate.msg_source(msg))
|
dynamic_id = _dyn(translate.msg_source(msg))
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ class StatType:
|
|||||||
@dataclass(frozen=True)
|
@dataclass(frozen=True)
|
||||||
class CombatStatType:
|
class CombatStatType:
|
||||||
Damage: str = 'Damage'
|
Damage: str = 'Damage'
|
||||||
|
DamageTaken: str = 'DamageTaken'
|
||||||
Healing: str = 'Healing'
|
Healing: str = 'Healing'
|
||||||
|
|
||||||
|
|
||||||
@@ -104,6 +105,14 @@ class GameStats():
|
|||||||
elif stat_type == VisibilityType.Overall:
|
elif stat_type == VisibilityType.Overall:
|
||||||
return self.history[StatType.Combat].combined(self.zone[StatType.Combat]).players_damage()
|
return self.history[StatType.Combat].combined(self.zone[StatType.Combat]).players_damage()
|
||||||
|
|
||||||
|
def get_damage_taken_stats(self, stat_type):
|
||||||
|
if stat_type == VisibilityType.Zone:
|
||||||
|
return self.zone[StatType.Combat].players_damage_taken()
|
||||||
|
elif stat_type == VisibilityType.LastFight:
|
||||||
|
return self.last_fight[StatType.Combat].players_damage_taken()
|
||||||
|
elif stat_type == VisibilityType.Overall:
|
||||||
|
return self.history[StatType.Combat].combined(self.zone[StatType.Combat]).players_damage_taken()
|
||||||
|
|
||||||
def get_healing_stats(self, stat_type):
|
def get_healing_stats(self, stat_type):
|
||||||
if stat_type == VisibilityType.Zone:
|
if stat_type == VisibilityType.Zone:
|
||||||
return self.zone[StatType.Combat].players_healing()
|
return self.zone[StatType.Combat].players_healing()
|
||||||
@@ -236,6 +245,7 @@ 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.DamageTaken: lambda stat_type: game_stats.get_damage_taken_stats(stat_type),
|
||||||
CombatStatType.Healing: lambda stat_type: game_stats.get_healing_stats(
|
CombatStatType.Healing: lambda stat_type: game_stats.get_healing_stats(
|
||||||
stat_type)
|
stat_type)
|
||||||
}[combat_stat_type](stat_type)
|
}[combat_stat_type](stat_type)
|
||||||
|
|||||||
@@ -76,6 +76,9 @@ class CombatEventReceiver(EventReceiver):
|
|||||||
elif event_name == consts.EvNameDamageDone:
|
elif event_name == consts.EvNameDamageDone:
|
||||||
self.on_damage_done(
|
self.on_damage_done(
|
||||||
value[consts.EvKeySource], value[consts.EvKeyValue])
|
value[consts.EvKeySource], value[consts.EvKeyValue])
|
||||||
|
elif event_name == consts.EvNameDamageTaken:
|
||||||
|
self.on_damage_taken(
|
||||||
|
value[consts.EvKeySource], value[consts.EvKeyValue])
|
||||||
elif event_name == consts.EvNameHealthReceived:
|
elif event_name == consts.EvNameHealthReceived:
|
||||||
self.on_health_received(
|
self.on_health_received(
|
||||||
value[consts.EvKeySource], value[consts.EvKeyTarget], value[consts.EvKeyValue])
|
value[consts.EvKeySource], value[consts.EvKeyTarget], value[consts.EvKeyValue])
|
||||||
@@ -95,6 +98,10 @@ class CombatEventReceiver(EventReceiver):
|
|||||||
def on_damage_done(self, id: int, damage: float):
|
def on_damage_done(self, id: int, damage: float):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@abc.abstractmethod
|
||||||
|
def on_damage_taken(self, id: int, damage: float):
|
||||||
|
pass
|
||||||
|
|
||||||
@abc.abstractmethod
|
@abc.abstractmethod
|
||||||
def on_health_received(self, id: int, target_id: int, health: float):
|
def on_health_received(self, id: int, target_id: int, health: float):
|
||||||
pass
|
pass
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ from .views.list_view import ListItemView
|
|||||||
class Page:
|
class Page:
|
||||||
Overview = 'overview'
|
Overview = 'overview'
|
||||||
Damage = 'damage'
|
Damage = 'damage'
|
||||||
|
DamageTaken = 'damage_taken'
|
||||||
Healing = 'healing'
|
Healing = 'healing'
|
||||||
Economy = 'economy'
|
Economy = 'economy'
|
||||||
Items = 'items'
|
Items = 'items'
|
||||||
@@ -36,6 +37,7 @@ class Page:
|
|||||||
PAGE_LABELS = {
|
PAGE_LABELS = {
|
||||||
Page.Overview: ('O', 'Overview'),
|
Page.Overview: ('O', 'Overview'),
|
||||||
Page.Damage: ('D', 'Damage Done'),
|
Page.Damage: ('D', 'Damage Done'),
|
||||||
|
Page.DamageTaken: ('T', 'Damage Taken'),
|
||||||
Page.Healing: ('H', 'Healing Done'),
|
Page.Healing: ('H', 'Healing Done'),
|
||||||
Page.Economy: ('$', 'Economy'),
|
Page.Economy: ('$', 'Economy'),
|
||||||
Page.Items: ('I', 'Items Collected'),
|
Page.Items: ('I', 'Items Collected'),
|
||||||
@@ -306,6 +308,13 @@ class MainWidget(QWidget):
|
|||||||
self.main_layout.addWidget(self.total_healing_label)
|
self.main_layout.addWidget(self.total_healing_label)
|
||||||
self.main_layout.addWidget(self.total_healing_list, 1)
|
self.main_layout.addWidget(self.total_healing_list, 1)
|
||||||
|
|
||||||
|
self.damage_taken_list = ListItemView(show_per_second=False)
|
||||||
|
self.main_layout.addWidget(self.damage_taken_list, 1)
|
||||||
|
|
||||||
|
self.damage_taken_total_label = QLabel('')
|
||||||
|
self.damage_taken_total_label.setObjectName('PanelTitle')
|
||||||
|
self.main_layout.addWidget(self.damage_taken_total_label)
|
||||||
|
|
||||||
self.placeholder = QLabel('')
|
self.placeholder = QLabel('')
|
||||||
self.placeholder.setObjectName('MutedText')
|
self.placeholder.setObjectName('MutedText')
|
||||||
self.placeholder.setWordWrap(True)
|
self.placeholder.setWordWrap(True)
|
||||||
@@ -372,6 +381,7 @@ class MainWidget(QWidget):
|
|||||||
stat_kind = {
|
stat_kind = {
|
||||||
Page.Overview: engine.CombatStatType.Damage,
|
Page.Overview: engine.CombatStatType.Damage,
|
||||||
Page.Damage: engine.CombatStatType.Damage,
|
Page.Damage: engine.CombatStatType.Damage,
|
||||||
|
Page.DamageTaken: engine.CombatStatType.DamageTaken,
|
||||||
Page.Healing: engine.CombatStatType.Healing,
|
Page.Healing: engine.CombatStatType.Healing,
|
||||||
Page.Economy: engine.CombatStatType.Damage,
|
Page.Economy: engine.CombatStatType.Damage,
|
||||||
Page.Items: engine.CombatStatType.Damage,
|
Page.Items: engine.CombatStatType.Damage,
|
||||||
@@ -419,6 +429,8 @@ class MainWidget(QWidget):
|
|||||||
_set_visible(self.primary_label, False)
|
_set_visible(self.primary_label, False)
|
||||||
_set_visible(self.total_healing_label, False)
|
_set_visible(self.total_healing_label, False)
|
||||||
_set_visible(self.total_healing_list, False)
|
_set_visible(self.total_healing_list, False)
|
||||||
|
_set_visible(self.damage_taken_list, False)
|
||||||
|
_set_visible(self.damage_taken_total_label, False)
|
||||||
_set_visible(self.placeholder, False)
|
_set_visible(self.placeholder, False)
|
||||||
_set_visible(self.settings_panel, False)
|
_set_visible(self.settings_panel, False)
|
||||||
|
|
||||||
@@ -440,6 +452,16 @@ class MainWidget(QWidget):
|
|||||||
_set_visible(self.primary_list, True)
|
_set_visible(self.primary_list, True)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if self.current_page == Page.DamageTaken:
|
||||||
|
_set_text(self.page_title, 'Damage Taken')
|
||||||
|
_set_text(self.page_description,
|
||||||
|
'Damage taken by each visible tracked player during the selected scope. Includes damage from mobs and other players.')
|
||||||
|
_set_text(self.primary_label, 'Damage Taken by Player')
|
||||||
|
_set_visible(self.primary_label, True)
|
||||||
|
_set_visible(self.damage_taken_list, True)
|
||||||
|
_set_visible(self.damage_taken_total_label, True)
|
||||||
|
return
|
||||||
|
|
||||||
if self.current_page == Page.Healing:
|
if self.current_page == Page.Healing:
|
||||||
_set_text(self.page_title, 'Healing Done')
|
_set_text(self.page_title, 'Healing Done')
|
||||||
_set_text(self.page_description,
|
_set_text(self.page_description,
|
||||||
@@ -477,6 +499,11 @@ class MainWidget(QWidget):
|
|||||||
def _update_page_data(self, players, total_healing, silver, items):
|
def _update_page_data(self, players, total_healing, silver, items):
|
||||||
if self.current_page in (Page.Overview, Page.Damage):
|
if self.current_page in (Page.Overview, Page.Damage):
|
||||||
self.primary_list.update(players)
|
self.primary_list.update(players)
|
||||||
|
elif self.current_page == Page.DamageTaken:
|
||||||
|
self.damage_taken_list.update(players)
|
||||||
|
total = sum(player.value.number for player in players)
|
||||||
|
self.damage_taken_total_label.setText(
|
||||||
|
'Party Total: {}'.format(Number(total)))
|
||||||
elif self.current_page == Page.Healing:
|
elif self.current_page == Page.Healing:
|
||||||
self.primary_list.update(players)
|
self.primary_list.update(players)
|
||||||
self.total_healing_list.update(total_healing)
|
self.total_healing_list.update(total_healing)
|
||||||
|
|||||||
@@ -7,8 +7,9 @@ from .....stats.list_item import PlayerListItem
|
|||||||
|
|
||||||
|
|
||||||
class ListItemView(QLabel):
|
class ListItemView(QLabel):
|
||||||
def __init__(self):
|
def __init__(self, show_per_second: bool = True):
|
||||||
QLabel.__init__(self)
|
QLabel.__init__(self)
|
||||||
|
self._show_per_second = show_per_second
|
||||||
self._last_signature = None
|
self._last_signature = None
|
||||||
self._players: List[PlayerListItem] = []
|
self._players: List[PlayerListItem] = []
|
||||||
self.setAlignment(Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignLeft)
|
self.setAlignment(Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignLeft)
|
||||||
@@ -26,7 +27,7 @@ class ListItemView(QLabel):
|
|||||||
if not sorted_players:
|
if not sorted_players:
|
||||||
self.setText('No entries yet.')
|
self.setText('No entries yet.')
|
||||||
return
|
return
|
||||||
self.setText('\n'.join(_player_line(p) for p in sorted_players))
|
self.setText('\n'.join(_player_line(p, self._show_per_second) for p in sorted_players))
|
||||||
|
|
||||||
def get_player_list_items(self) -> List[PlayerListItem]:
|
def get_player_list_items(self) -> List[PlayerListItem]:
|
||||||
return list(self._players)
|
return list(self._players)
|
||||||
@@ -42,6 +43,9 @@ def _player_signature(player: PlayerListItem):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def _player_line(player: PlayerListItem):
|
def _player_line(player: PlayerListItem, show_per_second: bool = True):
|
||||||
|
if show_per_second:
|
||||||
return "{} {} ({}, {}%)".format(
|
return "{} {} ({}, {}%)".format(
|
||||||
player.name, player.value, player.value_per_second, player.percentage)
|
player.name, player.value, player.value_per_second, player.percentage)
|
||||||
|
return "{} {} ({}%)".format(
|
||||||
|
player.name, player.value, player.percentage)
|
||||||
|
|||||||
@@ -29,6 +29,9 @@ def summarize(events: List[dict], path: Optional[str] = None,
|
|||||||
damage = sum(_event_value(e).get('value', 0.0)
|
damage = sum(_event_value(e).get('value', 0.0)
|
||||||
for e in events
|
for e in events
|
||||||
if e[consts.EvKeyName] == consts.EvNameDamageDone)
|
if e[consts.EvKeyName] == consts.EvNameDamageDone)
|
||||||
|
damage_taken = sum(_event_value(e).get('value', 0.0)
|
||||||
|
for e in events
|
||||||
|
if e[consts.EvKeyName] == consts.EvNameDamageTaken)
|
||||||
|
|
||||||
main_player = None
|
main_player = None
|
||||||
for event in events:
|
for event in events:
|
||||||
@@ -47,6 +50,7 @@ def summarize(events: List[dict], path: Optional[str] = None,
|
|||||||
lines.append(f' fame gained: {_fmt(fame)}')
|
lines.append(f' fame gained: {_fmt(fame)}')
|
||||||
lines.append(f' silver looted: {_fmt(silver)}')
|
lines.append(f' silver looted: {_fmt(silver)}')
|
||||||
lines.append(f' damage done: {_fmt(damage)}')
|
lines.append(f' damage done: {_fmt(damage)}')
|
||||||
|
lines.append(f' damage taken: {_fmt(damage_taken)}')
|
||||||
|
|
||||||
top = counts.most_common(8)
|
top = counts.most_common(8)
|
||||||
if top:
|
if top:
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ class Player(Stats):
|
|||||||
party: Party
|
party: Party
|
||||||
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
|
||||||
|
damage_taken: float = 0.0
|
||||||
healing_done: float = 0.0
|
healing_done: float = 0.0
|
||||||
total_healing_done: float = 0.0
|
total_healing_done: float = 0.0
|
||||||
combat_time: CombatTime = field(default_factory=lambda: CombatTime())
|
combat_time: CombatTime = field(default_factory=lambda: CombatTime())
|
||||||
@@ -62,7 +63,7 @@ class Player(Stats):
|
|||||||
return self.active
|
return self.active
|
||||||
|
|
||||||
def has_stats(self) -> bool:
|
def has_stats(self) -> bool:
|
||||||
return bool(self.damage_done or self.healing_done or self.total_healing_done)
|
return bool(self.damage_done or self.damage_taken or self.healing_done or self.total_healing_done)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def new(self):
|
def new(self):
|
||||||
@@ -75,6 +76,7 @@ class Player(Stats):
|
|||||||
def update(self, other):
|
def update(self, other):
|
||||||
self.name = other.name
|
self.name = other.name
|
||||||
self.damage_done += other.damage_done
|
self.damage_done += other.damage_done
|
||||||
|
self.damage_taken += other.damage_taken
|
||||||
self.healing_done += other.healing_done
|
self.healing_done += other.healing_done
|
||||||
self.total_healing_done += other.total_healing_done
|
self.total_healing_done += other.total_healing_done
|
||||||
self.combat_state = other.combat_state
|
self.combat_state = other.combat_state
|
||||||
@@ -102,6 +104,10 @@ class Player(Stats):
|
|||||||
|
|
||||||
self.healing_done += value
|
self.healing_done += value
|
||||||
|
|
||||||
|
def register_damage_taken(self, value):
|
||||||
|
self.damage_taken += value
|
||||||
|
self.activate()
|
||||||
|
|
||||||
def enter_combat(self):
|
def enter_combat(self):
|
||||||
self.combat_time.entered_combat = time_utils.now()
|
self.combat_time.entered_combat = time_utils.now()
|
||||||
self.combat_state = CombatState.InCombat
|
self.combat_state = CombatState.InCombat
|
||||||
@@ -116,6 +122,10 @@ class Player(Stats):
|
|||||||
return StandalonePlayerListItem(
|
return StandalonePlayerListItem(
|
||||||
self.name, self.items, self.damage_done, self.dps, self.combat_state)
|
self.name, self.items, self.damage_done, self.dps, self.combat_state)
|
||||||
|
|
||||||
|
def into_damage_taken_list_item(self) -> StandalonePlayerListItem:
|
||||||
|
return StandalonePlayerListItem(
|
||||||
|
self.name, self.items, self.damage_taken, 0.0, self.combat_state)
|
||||||
|
|
||||||
def into_healing_list_item(self) -> StandalonePlayerListItem:
|
def into_healing_list_item(self) -> StandalonePlayerListItem:
|
||||||
return StandalonePlayerListItem(
|
return StandalonePlayerListItem(
|
||||||
self.name, self.items, self.healing_done, self.hps, self.combat_state)
|
self.name, self.items, self.healing_done, self.hps, self.combat_state)
|
||||||
@@ -204,6 +214,11 @@ class CombatStats(CombatEventReceiver, Stats):
|
|||||||
for player in self.visible_players()
|
for player in self.visible_players()
|
||||||
])
|
])
|
||||||
|
|
||||||
|
def players_damage_taken(self) -> List[PlayerListItem]:
|
||||||
|
return to_player_list_items([player.into_damage_taken_list_item()
|
||||||
|
for player in self.visible_players()
|
||||||
|
])
|
||||||
|
|
||||||
def players_healing(self) -> List[PlayerListItem]:
|
def players_healing(self) -> List[PlayerListItem]:
|
||||||
return to_player_list_items([player.into_healing_list_item()
|
return to_player_list_items([player.into_healing_list_item()
|
||||||
for player in self.visible_players()
|
for player in self.visible_players()
|
||||||
@@ -230,6 +245,9 @@ class CombatStats(CombatEventReceiver, Stats):
|
|||||||
def on_damage_done(self, id: int, damage: float):
|
def on_damage_done(self, id: int, damage: float):
|
||||||
self.players[id].register_damage_done(damage)
|
self.players[id].register_damage_done(damage)
|
||||||
|
|
||||||
|
def on_damage_taken(self, id: int, damage: float):
|
||||||
|
self.players[id].register_damage_taken(damage)
|
||||||
|
|
||||||
def on_health_received(self, id: int, target_id: int, health: float):
|
def on_health_received(self, id: int, target_id: int, health: float):
|
||||||
self.players[id].register_healing_done(health)
|
self.players[id].register_healing_done(health)
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,11 @@ class VisibleAll:
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
class VisibleNone:
|
||||||
|
def test(self, _name):
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
def test_self_healing_counts_while_in_combat():
|
def test_self_healing_counts_while_in_combat():
|
||||||
stats = CombatStats(VisibleAll())
|
stats = CombatStats(VisibleAll())
|
||||||
stats.on_player_appeared(0, 'Healer')
|
stats.on_player_appeared(0, 'Healer')
|
||||||
@@ -35,3 +40,35 @@ def test_total_healing_includes_post_combat_healing():
|
|||||||
|
|
||||||
assert combat_healing[0].value == 100.0
|
assert combat_healing[0].value == 100.0
|
||||||
assert total_healing[0].value == 150.0
|
assert total_healing[0].value == 150.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_damage_taken_accumulates_per_player():
|
||||||
|
stats = CombatStats(VisibleAll())
|
||||||
|
stats.on_player_appeared(0, 'Tank')
|
||||||
|
|
||||||
|
stats.on_damage_taken(0, 250.0)
|
||||||
|
stats.on_damage_taken(0, 150.0)
|
||||||
|
|
||||||
|
damage_taken = stats.players_damage_taken()
|
||||||
|
|
||||||
|
assert damage_taken[0].name == 'Tank'
|
||||||
|
assert damage_taken[0].value == 400.0
|
||||||
|
assert damage_taken[0].value_per_second == 0.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_damage_taken_counts_out_of_combat():
|
||||||
|
stats = CombatStats(VisibleAll())
|
||||||
|
stats.on_player_appeared(0, 'Tank')
|
||||||
|
|
||||||
|
stats.on_damage_taken(0, 75.0)
|
||||||
|
|
||||||
|
assert stats.players_damage_taken()[0].value == 75.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_damage_taken_excludes_non_visible_players():
|
||||||
|
stats = CombatStats(VisibleNone())
|
||||||
|
stats.on_player_appeared(0, 'Enemy')
|
||||||
|
|
||||||
|
stats.on_damage_taken(0, 300.0)
|
||||||
|
|
||||||
|
assert stats.players_damage_taken() == []
|
||||||
|
|||||||
+27
-2
@@ -271,16 +271,41 @@ def test_world_health_update_damage_and_heal():
|
|||||||
assert damage[0]['value']['target'] == 0 # victim
|
assert damage[0]['value']['target'] == 0 # victim
|
||||||
assert damage[0]['value']['value'] == 80.0
|
assert damage[0]['value']['value'] == 80.0
|
||||||
|
|
||||||
|
assert damage[1]['name'] == 'DamageTaken'
|
||||||
|
assert damage[1]['value']['source'] == 0 # victim
|
||||||
|
assert damage[1]['value']['value'] == 80.0
|
||||||
|
|
||||||
heal = world.transform(game('HealthUpdate', {0: 10, 6: 20, 2: 40.0}))
|
heal = world.transform(game('HealthUpdate', {0: 10, 6: 20, 2: 40.0}))
|
||||||
assert heal[0]['name'] == 'HealthReceived'
|
assert heal[0]['name'] == 'HealthReceived'
|
||||||
assert heal[0]['value']['source'] == 1
|
assert heal[0]['value']['source'] == 1
|
||||||
assert heal[0]['value']['value'] == 40.0
|
assert heal[0]['value']['value'] == 40.0
|
||||||
|
assert len(heal) == 1 # healing is not damage taken
|
||||||
|
|
||||||
|
|
||||||
def test_world_health_update_unknown_actor_dropped():
|
def test_world_health_update_unknown_actor_emits_damage_taken():
|
||||||
world = World()
|
world = World()
|
||||||
world.transform(game('NewCharacter', {0: 10, 1: 'Victim'}))
|
world.transform(game('NewCharacter', {0: 10, 1: 'Victim'}))
|
||||||
assert world.transform(game('HealthUpdate', {0: 10, 6: 999, 2: -50.0})) == []
|
events = world.transform(game('HealthUpdate', {0: 10, 6: 999, 2: -50.0}))
|
||||||
|
assert len(events) == 1
|
||||||
|
assert events[0]['name'] == 'DamageTaken'
|
||||||
|
assert events[0]['value']['source'] == 0
|
||||||
|
assert events[0]['value']['value'] == 50.0
|
||||||
|
|
||||||
|
|
||||||
|
def test_world_health_update_unknown_victim_and_actor_dropped():
|
||||||
|
world = World()
|
||||||
|
# neither the attacker nor the victim has a known static id
|
||||||
|
assert world.transform(game('HealthUpdate', {0: 999, 6: 888, 2: -50.0})) == []
|
||||||
|
|
||||||
|
|
||||||
|
def test_world_health_update_known_actor_unknown_target_emits_damage_done():
|
||||||
|
world = World()
|
||||||
|
world.transform(game('NewCharacter', {0: 20, 1: 'Attacker'}))
|
||||||
|
events = world.transform(game('HealthUpdate', {0: 999, 6: 20, 2: -50.0}))
|
||||||
|
assert len(events) == 1
|
||||||
|
assert events[0]['name'] == 'DamageDone'
|
||||||
|
assert events[0]['value']['source'] == 0
|
||||||
|
assert events[0]['value']['target'] is None
|
||||||
|
|
||||||
|
|
||||||
def test_world_regeneration_combat_states():
|
def test_world_regeneration_combat_states():
|
||||||
|
|||||||
Reference in New Issue
Block a user