fix prigioni multiple e jesse jones

albertoxamin · Nov 25, 2020 · 292200e · 292200e
1 parent 3c3180d
commit 292200e
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/backend/players.py b/backend/players.py
@@ -154,9 +154,12 @@ def draw(self, pile):
             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.')
             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.hand.append(self.game.deck.draw())
             else:
                 for i in range(2):
@@ -213,6 +216,9 @@ def pick(self):
                             self.game.deck.scrap(self.equipment.pop(i))
                             break
                     break
+            if any([isinstance(c, cs.Prigione) for c in self.equipment]):
+                self.notify_self()
+                return
             self.pending_action = PendingAction.DRAW
             self.notify_self()
         else: