From e9529b0b19a3eac9b0d14d5b841335130973880b Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Mon, 23 Nov 2020 17:08:25 +0100 Subject: [PATCH] jesse jones --- backend/players.py | 3 +++ frontend/src/components/Lobby.vue | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/backend/players.py b/backend/players.py index e399194..9a837f1 100644 --- a/backend/players.py +++ b/backend/players.py @@ -127,6 +127,9 @@ class Player: if pile == 'scrap' and isinstance(self.character, characters.PedroRamirez): self.hand.append(self.game.deck.draw_from_scrap_pile()) self.hand.append(self.game.deck.draw()) + if type(pile) == str and pile != self.name and pile in self.game.players_map and isinstance(self.character, characters.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.hand.append(self.game.deck.draw()) else: for i in range(2): card: cards.Card = self.game.deck.draw() diff --git a/frontend/src/components/Lobby.vue b/frontend/src/components/Lobby.vue index 4f8fcca..fd351b2 100644 --- a/frontend/src/components/Lobby.vue +++ b/frontend/src/components/Lobby.vue @@ -12,7 +12,7 @@ 💀 - + {{getActionEmoji(p)}}
@@ -171,6 +171,10 @@ export default { this.chooseCards = [] this.hasToChoose = false }, + drawFromPlayer(name) { + console.log(name) + this.$socket.emit('draw', name) + }, }, }