From 2b3928cffaa8085f68cc1a7a95f647342fa3df06 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sun, 13 Dec 2020 21:27:11 +0100 Subject: [PATCH] fix reshuflle --- backend/bang/deck.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/backend/bang/deck.py b/backend/bang/deck.py index b15806b..88bb6ab 100644 --- a/backend/bang/deck.py +++ b/backend/bang/deck.py @@ -34,6 +34,8 @@ class Deck: def pick_and_scrap(self) -> cs.Card: card = self.cards.pop(0) self.scrap_pile.append(card) + if len(self.cards) == 0: + self.reshuffle() self.game.notify_scrap_pile() return card @@ -43,11 +45,14 @@ class Deck: def draw(self) -> cs.Card: card = self.cards.pop(0) if len(self.cards) == 0: - self.cards = self.scrap_pile[:-1].copy() - random.shuffle(self.cards) - self.scrap_pile = self.scrap_pile[-1:] + self.reshuffle() return card + def reshuffle(self): + self.cards = self.scrap_pile[:-1].copy() + random.shuffle(self.cards) + self.scrap_pile = self.scrap_pile[-1:] + def draw_from_scrap_pile(self) -> cs.Card: if len(self.scrap_pile) > 0: card = self.scrap_pile.pop(-1)