From 64da96a0db9cabfe03eb0507906a959bb75a6015 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Thu, 24 Dec 2020 14:13:06 +0100 Subject: [PATCH] =?UTF-8?q?fix=20citt=C3=A0=20fantasma?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang/game.py | 2 +- backend/bang/players.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/bang/game.py b/backend/bang/game.py index cc6a223..2fff52a 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -289,7 +289,7 @@ class Game: self.player_bangs = 0 if isinstance(self.players[self.turn].role, roles.Sheriff): self.deck.flip_event() - if len(self.deck.event_cards) > 0: + if len(self.deck.event_cards) > 0 and self.deck.event_cards[0] != None: print(f'flip new event {self.deck.event_cards[0].name}') if self.check_event(ce.DeadMan): self.did_resuscitate_deadman = False diff --git a/backend/bang/players.py b/backend/bang/players.py index 8660038..dd7d9be 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -981,9 +981,9 @@ class Player: if self.is_dead and self.is_ghost and self.game.check_event(ceh.CittaFantasma): self.is_ghost = False for i in range(len(self.hand)): - self.deck.scrap(self.hand.pop(), True) + self.game.deck.scrap(self.hand.pop(), True) for i in range(len(self.equipment)): - self.deck.scrap(self.equipment.pop(), True) + self.game.deck.scrap(self.equipment.pop(), True) self.pending_action = PendingAction.WAIT self.notify_self() self.game.next_turn()