diff --git a/backend/players.py b/backend/players.py index 63cbd1f..ecbe34e 100644 --- a/backend/players.py +++ b/backend/players.py @@ -8,6 +8,7 @@ import roles as r import cards as cs import characters as chars + class PendingAction(IntEnum): PICK = 0 DRAW = 1 @@ -154,12 +155,14 @@ class Player: if pile == 'scrap' and isinstance(self.character, chars.PedroRamirez): self.hand.append(self.game.deck.draw_from_scrap_pile()) self.hand.append(self.game.deck.draw()) - self.sio.emit('chat_message', room=self.game.name, data=f'{self.name} ha ha pescato la prima carta dall pila delle carte scartate.') + self.sio.emit('chat_message', room=self.game.name, + data=f'{self.name} ha ha pescato la prima carta dall pila delle carte scartate.') elif type(pile) == str and pile != self.name and pile in self.game.players_map and isinstance(self.character, chars.JesseJones) and len(self.game.get_player_named(pile).hand) > 0: self.hand.append(self.game.get_player_named(pile).hand.pop( randrange(0, len(self.game.get_player_named(pile).hand)))) self.game.get_player_named(pile).notify_self() - self.sio.emit('chat_message', room=self.game.name, data=f'{self.name} ha pescato la prima carta dalla mano di {self.attacker.name}.') + self.sio.emit('chat_message', room=self.game.name, + data=f'{self.name} ha pescato la prima carta dalla mano di {self.attacker.name}.') self.hand.append(self.game.deck.draw()) else: for i in range(2): @@ -191,6 +194,8 @@ class Player: self.game.deck.scrap(self.equipment.pop(i)) if isinstance(self.character, chars.BartCassidy): self.hand.append(self.game.deck.draw()) + self.sio.emit('chat_message', room=self.game.name, + data=f'{self.name} ha pescato perchè é stato ferito.') self.sio.emit('chat_message', room=self.game.name, data=f'{self.name} ha fatto esplodere la dinamite.') print(f'{self.name} Boom, -3 hp') @@ -389,11 +394,14 @@ class Player: self.lives -= 1 if self.lives > 0: if isinstance(self.character, chars.BartCassidy): + self.sio.emit('chat_message', room=self.game.name, + data=f'{self.name} ha pescato perchè é stato ferito.') self.hand.append(self.game.deck.draw()) elif isinstance(self.character, chars.ElGringo) and self.attacker and len(self.attacker.hand) > 0: self.hand.append(self.attacker.hand.pop( randrange(0, len(self.attacker.hand)))) - self.sio.emit('chat_message', room=self.game.name, data=f'{self.name} ha rubato una carta a {self.attacker.name} mentre veniva colpito.') + self.sio.emit('chat_message', room=self.game.name, + data=f'{self.name} ha rubato una carta a {self.attacker.name} mentre veniva colpito.') self.attacker.notify_self() while self.lives <= 0 and len(self.game.players) > 2 and len([c for c in self.hand if isinstance(c, cs.Birra)]) > 0: for i in range(len(self.hand)):