From 8b33aeaf1cf09435933082cfb0a54eb748a96369 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Thu, 12 Jan 2023 20:43:26 +0000 Subject: [PATCH] fix valley cards interfering with card events damage --- backend/bang/players.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/backend/bang/players.py b/backend/bang/players.py index f7c501a..c290d3c 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -1209,15 +1209,16 @@ class Player: self.sio.emit('chat_message', room=self.game.name, data=f'_special_el_gringo|{self.name}|{self.attacker.name}') 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)): - self.attacker.hand.append(self.game.deck.draw(True)) - self.sio.emit('chat_message', room=self.game.name, - data=f'_taglia_reward|{self.name}|{self.attacker.name}') - self.attacker.notify_self() - 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)): - c = self.hand.pop(randrange(0, len(self.hand))) - self.game.deck.scrap(c, True) - self.sio.emit('chat_message', room=self.game.name, data=f'_shotgun_scrap|{self.name}|{c.name}') + if isinstance(self.attacker, Player): + if self.attacker and any((isinstance(c, tvosc.Taglia) for c in self.equipment)): + self.attacker.hand.append(self.game.deck.draw(True)) + self.sio.emit('chat_message', room=self.game.name, + data=f'_taglia_reward|{self.name}|{self.attacker.name}') + self.attacker.notify_self() + if self.attacker and len(self.hand) > 0 and any((isinstance(c, tvosc.Shotgun) for c in self.attacker.equipment)): + c = self.hand.pop(randrange(0, len(self.hand))) + 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 (isinstance(self.attacker, Player)): self.attacker.gold_nuggets += 1