From 07f4f5b92df7fbbde39e0153da7b6da11d99930a Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Fri, 27 Nov 2020 19:59:18 +0100 Subject: [PATCH] fix dinamite, prigione lucky duke --- backend/bang/players.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/bang/players.py b/backend/bang/players.py index c6c8907..6e274fb 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -74,7 +74,7 @@ class Player: self.max_lives = self.character.max_lives + self.role.health_mod self.lives = self.max_lives self.hand = [] - self.equipment = [] + self.equipment = [cs.Dinamite(1,1), cs.Prigione(1,1)] self.pending_action = PendingAction.WAIT def set_available_character(self, available): @@ -203,6 +203,7 @@ class Player: else: self.game.next_player().equipment.append(self.equipment.pop(i)) self.game.next_player().notify_self() + break if any([isinstance(c, cs.Dinamite) or isinstance(c, cs.Prigione) for c in self.equipment]): self.notify_self() return @@ -218,7 +219,7 @@ class Player: self.game.deck.scrap(self.equipment.pop(i)) self.end_turn(forced=True) return - else: + elif pickable_cards == 0: self.game.deck.scrap(self.equipment.pop(i)) break break