From 190d872e298d1478304acafb517663c099de6ab4 Mon Sep 17 00:00:00 2001 From: Giulio Date: Sat, 11 Dec 2021 19:02:41 +0100 Subject: [PATCH] fix miniera abbandonata --- backend/bang/cards.py | 6 +++--- backend/bang/expansions/dodge_city/cards.py | 6 +++--- backend/bang/expansions/dodge_city/characters.py | 2 +- backend/bang/expansions/gold_rush/shop_cards.py | 4 ++-- backend/bang/game.py | 2 +- backend/bang/players.py | 4 ++-- backend/tests/deck_test.py | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/bang/cards.py b/backend/bang/cards.py index 89aa1b6..5fd5701 100644 --- a/backend/bang/cards.py +++ b/backend/bang/cards.py @@ -242,7 +242,7 @@ class Birra(Card): import bang.expansions.gold_rush.characters as grch madamYto = [p for p in player.game.get_alive_players() if p.character.check(player.game, grch.MadamYto) and self.number != 42] for p in madamYto: - p.hand.append(player.game.deck.draw()) + p.hand.append(player.game.deck.draw(True)) p.notify_self() if 'gold_rush' in player.game.expansions and self.number != 42: from bang.players import PendingAction @@ -304,7 +304,7 @@ class Diligenza(Card): player.sio.emit('chat_message', room=player.game.name, data=f'_diligenza|{player.name}|{self.name}') for i in range(2): - player.hand.append(player.game.deck.draw()) + player.hand.append(player.game.deck.draw(True)) return True @@ -439,7 +439,7 @@ class WellsFargo(Card): player.sio.emit('chat_message', room=player.game.name, data=f'_wellsfargo|{player.name}|{self.name}') for i in range(3): - player.hand.append(player.game.deck.draw()) + player.hand.append(player.game.deck.draw(True)) return True diff --git a/backend/bang/expansions/dodge_city/cards.py b/backend/bang/expansions/dodge_city/cards.py index 21a9bba..f503bb3 100644 --- a/backend/bang/expansions/dodge_city/cards.py +++ b/backend/bang/expansions/dodge_city/cards.py @@ -41,7 +41,7 @@ class Schivata(Mancato): return False def use_card(self, player): - player.hand.append(player.game.deck.draw()) + player.hand.append(player.game.deck.draw(True)) player.notify_self() class RagTime(Panico): @@ -225,7 +225,7 @@ class Derringer(Pugnale): def play_card(self, player, against, _with=None): if self.can_be_used_now: - player.hand.append(player.game.deck.draw()) + player.hand.append(player.game.deck.draw(True)) return super().play_card(player, against=against) else: if not self.is_duplicate_card(player): @@ -236,7 +236,7 @@ class Derringer(Pugnale): return False def use_card(self, player): - player.hand.append(player.game.deck.draw()) + player.hand.append(player.game.deck.draw(True)) player.notify_self() class Borraccia(Card): diff --git a/backend/bang/expansions/dodge_city/characters.py b/backend/bang/expansions/dodge_city/characters.py index 120bb2b..0cf8545 100644 --- a/backend/bang/expansions/dodge_city/characters.py +++ b/backend/bang/expansions/dodge_city/characters.py @@ -93,7 +93,7 @@ class ChuckWengam(Character): if len([c for c in player.gold_rush_equipment if isinstance(c, grc.Talismano)]) > 0: player.gold_nuggets += 1 if len([c for c in player.gold_rush_equipment if isinstance(c, grc.Stivali)]) > 0: - player.hand.append(player.game.deck.draw()) + player.hand.append(player.game.deck.draw(True)) player.hand.append(player.game.deck.draw(True)) player.hand.append(player.game.deck.draw(True)) player.notify_self() diff --git a/backend/bang/expansions/gold_rush/shop_cards.py b/backend/bang/expansions/gold_rush/shop_cards.py index b44500b..eb5d9c0 100644 --- a/backend/bang/expansions/gold_rush/shop_cards.py +++ b/backend/bang/expansions/gold_rush/shop_cards.py @@ -115,7 +115,7 @@ class UnionPacific(ShopCard): player.sio.emit('chat_message', room=player.game.name, data=f'_UnionPacific|{player.name}|{self.name}') for i in range(4): - player.hand.append(player.game.deck.draw()) + player.hand.append(player.game.deck.draw(True)) return super().play_card(player, against, _with) class Calumet(ShopCard): @@ -188,7 +188,7 @@ class Setaccio(ShopCard): if player.gold_nuggets >= 1: player.sio.emit('chat_message', room=player.game.name, data=f'_play_card|{player.name}|{self.name}') player.gold_nuggets -= 1 - player.hand.append(player.game.deck.draw()) + player.hand.append(player.game.deck.draw(True)) player.notify_self() return True return False diff --git a/backend/bang/game.py b/backend/bang/game.py index 00577da..2f67dc1 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -399,7 +399,7 @@ class Game: if target_pl.character.check(self, grch.SimeonPicos): target_pl.gold_nuggets += 1 if len([c for c in target_pl.equipment if isinstance(c, grc.Stivali)]) > 0: - target_pl.hand.append(self.deck.draw()) + target_pl.hand.append(self.deck.draw(True)) target_pl.notify_self() self.is_russian_roulette_on = False self.players[self.turn].play_turn() diff --git a/backend/bang/players.py b/backend/bang/players.py index a80c142..d0b762f 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -378,7 +378,7 @@ class Player: if self.character.check(self.game, grch.SimeonPicos): self.gold_nuggets += 1 if len([c for c in self.gold_rush_equipment if isinstance(c, grc.Stivali)]) > 0: - self.hand.append(self.game.deck.draw()) + self.hand.append(self.game.deck.draw(True)) if self.character.check(self.game, chars.BartCassidy) and self.lives > 0: self.hand.append(self.game.deck.draw(True)) self.sio.emit('chat_message', room=self.game.name, data=f'_special_bart_cassidy|{self.name}') @@ -1069,7 +1069,7 @@ class Player: if self.character.check(self.game, grch.SimeonPicos): self.gold_nuggets += 1 if len([c for c in self.gold_rush_equipment if isinstance(c, grc.Stivali)]) > 0: - self.hand.append(self.game.deck.draw()) + self.hand.append(self.game.deck.draw(True)) self.heal_if_needed() self.mancato_needed = 0 self.expected_response = [] diff --git a/backend/tests/deck_test.py b/backend/tests/deck_test.py index 86333b2..0f7bf2d 100644 --- a/backend/tests/deck_test.py +++ b/backend/tests/deck_test.py @@ -14,7 +14,7 @@ def test_draw(): g = Game('test', DummySocket()) g.deck = Deck(g) l = len(g.deck.cards) - assert g.deck.draw() != None + assert g.deck.draw(True) != None assert len(g.deck.cards) == l - 1 assert len(g.deck.scrap_pile) == 0