From 6cf24fcff771dbab5d2b09b9b1188661c4f42a69 Mon Sep 17 00:00:00 2001 From: Giulio Date: Mon, 10 May 2021 15:08:52 +0200 Subject: [PATCH 1/2] fix sbornia and Sean Mallory --- backend/bang/players.py | 10 +++++----- frontend/src/components/Player.vue | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/bang/players.py b/backend/bang/players.py index dab6f92..544705f 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -109,7 +109,7 @@ class Player: def set_role(self, role: r.Role): self.role = role - print(f'I {self.name} am a {role.name}, my goal is "{role.goal}"') + print(f'{self.name}: I am a {role.name}, my goal is "{role.goal}"') self.sio.emit('role', room=self.sid, data=json.dumps( role, default=lambda o: o.__dict__)) @@ -120,7 +120,7 @@ class Player: x for x in self.available_characters if x.name == character) self.real_character = self.character self.available_characters = [] - print(f'I {self.name} chose character {self.character.name}') + print(f'{self.name}: I chose character {self.character.name}') self.sio.emit('chat_message', room=self.game.name, data=f'_did_choose_character|{self.name}') self.game.notify_character_selection() @@ -143,7 +143,7 @@ class Player: def set_available_character(self, available): self.available_characters = available - print(f'I {self.name} have to choose between {available}') + print(f'{self.name}: I have to choose between {available}') if not self.is_bot: self.sio.emit('characters', room=self.sid, data=json.dumps( available, default=lambda o: o.__dict__)) @@ -322,7 +322,7 @@ class Player: self.can_play_vendetta = can_play_vendetta self.sio.emit('chat_message', room=self.game.name, data=f'_turn|{self.name}') - print(f'I {self.name} was notified that it is my turn') + print(f'{self.name}: I was notified that it is my turn') self.was_shot = False self.is_my_turn = True self.is_waiting_for_action = True @@ -973,7 +973,7 @@ class Player: maxcards = self.lives if not self.character.check(self.game, chd.SeanMallory) else 10 if len(self.hand) > maxcards and not forced: print( - f"I {self.name} have to many cards in my hand and I can't end the turn") + f"{self.name}: I have to many cards in my hand and I can't end the turn") elif self.pending_action == PendingAction.PLAY or forced: if not forced and self.game.check_event(ce.Vendetta) and self.can_play_vendetta: picked: cs.Card = self.game.deck.pick_and_scrap() diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue index 156d50b..8f78a88 100644 --- a/frontend/src/components/Player.vue +++ b/frontend/src/components/Player.vue @@ -232,7 +232,7 @@ export default { return x[this.pending_action] }, canEndTurn() { - return (this.pending_action == 2 && this.hand.length <= (this.character.name === "Sean Mallory"?10:this.lives)) + return (this.pending_action == 2 && this.hand.length <= (this.character.name === "Sean Mallory" && !(this.eventCard && this.eventCard.name == "Sbornia")?10:this.lives)) }, respondCards() { let cc = [{ From 259b4e92b37192e36fb370207326e913b5c95563 Mon Sep 17 00:00:00 2001 From: Giulio Date: Thu, 13 May 2021 11:23:06 +0200 Subject: [PATCH 2/2] fix noStar 2 if vice dead --- backend/bang/game.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang/game.py b/backend/bang/game.py index 1aae79d..1a0c3dd 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -321,7 +321,7 @@ class Game: print(f'{self.players[self.turn]} is dead, next turn') return self.next_turn() self.player_bangs = 0 - if isinstance(self.players[self.turn].role, roles.Sheriff) or (self.noStar and isinstance(self.players[self.turn].role, roles.Vice)): + if isinstance(self.players[self.turn].role, roles.Sheriff) or (self.noStar and isinstance(self.players[self.turn].role, roles.Vice) or (self.noStar and any([p for p in self.players if p.is_dead and p.role == roles.Vice]) and isinstance(self.players[self.turn].role, roles.Renegade))): self.deck.flip_event() 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}')