diff --git a/backend/bang/expansions/dodge_city/cards.py b/backend/bang/expansions/dodge_city/cards.py index 3645abe..aff7359 100644 --- a/backend/bang/expansions/dodge_city/cards.py +++ b/backend/bang/expansions/dodge_city/cards.py @@ -69,9 +69,12 @@ class Rissa(CatBalou): def play_card(self, player, against, _with): if _with != None: + players_with_cards = [p.name for p in player.game.players if p != player and (len(p.hand)+len(p.equipment)) > 0] + if len(players_with_cards) == 0: + return False player.game.deck.scrap(_with) player.event_type = 'rissa' - super().play_card(player, against=[p.name for p in player.game.players if p != player and (len(p.hand)+len(p.equipment)) > 0][0]) + super().play_card(player, against=players_with_cards[0]) player.sio.emit('chat_message', room=player.game.name, data=f'{player.name} ha giocato {self.name}') return True return False diff --git a/backend/bang/players.py b/backend/bang/players.py index da2fedc..0db4d72 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -295,10 +295,9 @@ class Player: self.choose_action = '' self.pending_action = PendingAction.PLAY else: - while len(self.game.players[self.game.players_map[self.target_p]+1].hand) + len(self.game.players[self.game.players_map[self.target_p]+1].equipment) == 0: + self.target_p = self.game.players[self.game.players_map[self.target_p]+1].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 - if self.target_p == self.name: - self.target_p = self.game.players[self.game.players_map[self.target_p]+1].name self.notify_self() # specifico per personaggio elif self.is_drawing and isinstance(self.character, chars.KitCarlson): diff --git a/frontend/src/components/Card.vue b/frontend/src/components/Card.vue index f6d6956..6a48773 100644 --- a/frontend/src/components/Card.vue +++ b/frontend/src/components/Card.vue @@ -131,5 +131,9 @@ export default { 0 0 0 6pt #181a1b, 0 0 5pt 6pt #aaa; } + .card.usable-next-turn { + box-shadow: + 0 0 0 3pt rgb(192,192,117), 0 0 0 6pt #181a1b, 0 0 5pt 6pt #aaa + } } \ No newline at end of file