From 6de8c8e84d2d7e3fde1d444bc1873c2f9d73dbab Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Thu, 24 Dec 2020 10:23:27 +0100 Subject: [PATCH] fix rissa --- backend/bang/players.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/bang/players.py b/backend/bang/players.py index cb0297a..c939afc 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -541,15 +541,15 @@ class Player: self.hand.append(card) else: self.game.deck.scrap(card, True) - if self.event_type != 'rissa' or (self.event_type == 'rissa' and self.target_p == [p.name for p in self.game.players if p != self and (len(p.hand)+len(p.equipment)) > 0][-1]): + if self.event_type != 'rissa' or (self.event_type == 'rissa' and (len([p.name for p in self.game.players if p != self and (len(p.hand)+len(p.equipment)) > 0]) == 0 or self.target_p == [p.name for p in self.game.players if p != self and (len(p.hand)+len(p.equipment)) > 0][-1])): self.event_type = '' self.target_p = '' self.choose_action = '' self.pending_action = PendingAction.PLAY else: - self.target_p = self.game.players[self.game.players_map[self.target_p]+1].name + self.target_p = self.game.players[(self.game.players_map[self.target_p]+1)%len(self.game.players)].name while self.target_p == self.name or len(self.game.players[self.game.players_map[self.target_p]].hand) + len(self.game.players[self.game.players_map[self.target_p]].equipment) == 0: - self.target_p = self.game.players[self.game.players_map[self.target_p]+1].name + self.target_p = self.game.players[(self.game.players_map[self.target_p]+1)%len(self.game.players)].name self.notify_self() elif self.is_giving_life and self.game.check_event(ce.FratelliDiSangue): try: