diff --git a/backend/bang/expansions/dodge_city/cards.py b/backend/bang/expansions/dodge_city/cards.py index f9a9278..3add899 100644 --- a/backend/bang/expansions/dodge_city/cards.py +++ b/backend/bang/expansions/dodge_city/cards.py @@ -47,7 +47,7 @@ class RagTime(Panico): def __init__(self, suit, number): Card.__init__(self, suit, 'Rag Time', number) self.icon = '🎹' - self.desc = "Ruba 1 carta dalla mano di un giocatore a prescindere dalla distanza" + self.desc = "Ruba 1 carta da un giocatore a prescindere dalla distanza" self.desc_eng = "Steal a card from another player at any distance" self.need_target = True self.need_with = True @@ -287,7 +287,8 @@ class Conestoga(Panico): def __init__(self, suit, number): Card.__init__(self, suit, 'Conestoga', number) self.icon = '🏕' - self.desc = "Ruba 1 carta dalla mano di un giocatore a prescindere dalla distanza" + self.desc = "Ruba 1 carta da un giocatore a prescindere dalla distanza" + self.desc_eng = "Steal a card from another player at any distance" self.need_target = True self.usable_next_turn = True self.can_be_used_now = False diff --git a/backend/bang/players.py b/backend/bang/players.py index 3de739c..055959b 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -139,10 +139,7 @@ class Player: ser['attacker'] = self.attacker.name ser['sight'] = self.get_sight() ser['lives'] = max(ser['lives'], 0) - self.sio.emit('self', room=self.sid, data=json.dumps( - ser, default=lambda o: o.__dict__)) - self.sio.emit('self_vis', room=self.sid, data=json.dumps( - self.game.get_visible_players(self), default=lambda o: o.__dict__)) + if self.lives <= 0 and self.max_lives > 0: print('dying, attacker', self.attacker) if isinstance(self.character, chars.SidKetchum) and len(self.hand) > 1: @@ -151,7 +148,14 @@ class Player: randrange(0, len(self.hand)))) self.game.deck.scrap(self.hand.pop( randrange(0, len(self.hand)))) + if self.lives <= 0 and self.max_lives > 0: + self.pending_action = PendingAction.WAIT self.game.player_death(self) + else: + self.sio.emit('self_vis', room=self.sid, data=json.dumps( + self.game.get_visible_players(self), default=lambda o: o.__dict__)) + self.sio.emit('self', room=self.sid, data=json.dumps( + ser, default=lambda o: o.__dict__)) self.game.notify_all() def play_turn(self):