fix valley cards interfering with card events damage

This commit is contained in:
Alberto Xamin 2023-01-12 20:43:26 +00:00 committed by GitHub
parent 4ca6bda07a
commit 8b33aeaf1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1209,15 +1209,16 @@ class Player:
self.sio.emit('chat_message', room=self.game.name, self.sio.emit('chat_message', room=self.game.name,
data=f'_special_el_gringo|{self.name}|{self.attacker.name}') data=f'_special_el_gringo|{self.name}|{self.attacker.name}')
self.attacker.notify_self() self.attacker.notify_self()
if self.attacker and not self.game.check_event(ce.Lazo) and any((isinstance(c, tvosc.Taglia) for c in self.equipment)): if isinstance(self.attacker, Player):
self.attacker.hand.append(self.game.deck.draw(True)) if self.attacker and any((isinstance(c, tvosc.Taglia) for c in self.equipment)):
self.sio.emit('chat_message', room=self.game.name, self.attacker.hand.append(self.game.deck.draw(True))
data=f'_taglia_reward|{self.name}|{self.attacker.name}') self.sio.emit('chat_message', room=self.game.name,
self.attacker.notify_self() data=f'_taglia_reward|{self.name}|{self.attacker.name}')
if self.attacker and not self.game.check_event(ce.Lazo) and len(self.hand) > 0 and any((isinstance(cd, tvosc.Shotgun) for cd in self.attacker.equipment)): self.attacker.notify_self()
c = self.hand.pop(randrange(0, len(self.hand))) if self.attacker and len(self.hand) > 0 and any((isinstance(c, tvosc.Shotgun) for c in self.attacker.equipment)):
self.game.deck.scrap(c, True) c = self.hand.pop(randrange(0, len(self.hand)))
self.sio.emit('chat_message', room=self.game.name, data=f'_shotgun_scrap|{self.name}|{c.name}') self.game.deck.scrap(c, True)
self.sio.emit('chat_message', room=self.game.name, data=f'_shotgun_scrap|{self.name}|{c.name}')
if self.attacker and 'gold_rush' in self.game.expansions: if self.attacker and 'gold_rush' in self.game.expansions:
if (isinstance(self.attacker, Player)): if (isinstance(self.attacker, Player)):
self.attacker.gold_nuggets += 1 self.attacker.gold_nuggets += 1