fix miniera abbandonata

This commit is contained in:
Giulio 2021-12-11 19:02:41 +01:00
parent d1fe45095b
commit 190d872e29
7 changed files with 13 additions and 13 deletions

View File

@ -242,7 +242,7 @@ class Birra(Card):
import bang.expansions.gold_rush.characters as grch 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] 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: for p in madamYto:
p.hand.append(player.game.deck.draw()) p.hand.append(player.game.deck.draw(True))
p.notify_self() p.notify_self()
if 'gold_rush' in player.game.expansions and self.number != 42: if 'gold_rush' in player.game.expansions and self.number != 42:
from bang.players import PendingAction from bang.players import PendingAction
@ -304,7 +304,7 @@ class Diligenza(Card):
player.sio.emit('chat_message', room=player.game.name, player.sio.emit('chat_message', room=player.game.name,
data=f'_diligenza|{player.name}|{self.name}') data=f'_diligenza|{player.name}|{self.name}')
for i in range(2): for i in range(2):
player.hand.append(player.game.deck.draw()) player.hand.append(player.game.deck.draw(True))
return True return True
@ -439,7 +439,7 @@ class WellsFargo(Card):
player.sio.emit('chat_message', room=player.game.name, player.sio.emit('chat_message', room=player.game.name,
data=f'_wellsfargo|{player.name}|{self.name}') data=f'_wellsfargo|{player.name}|{self.name}')
for i in range(3): for i in range(3):
player.hand.append(player.game.deck.draw()) player.hand.append(player.game.deck.draw(True))
return True return True

View File

@ -41,7 +41,7 @@ class Schivata(Mancato):
return False return False
def use_card(self, player): def use_card(self, player):
player.hand.append(player.game.deck.draw()) player.hand.append(player.game.deck.draw(True))
player.notify_self() player.notify_self()
class RagTime(Panico): class RagTime(Panico):
@ -225,7 +225,7 @@ class Derringer(Pugnale):
def play_card(self, player, against, _with=None): def play_card(self, player, against, _with=None):
if self.can_be_used_now: 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) return super().play_card(player, against=against)
else: else:
if not self.is_duplicate_card(player): if not self.is_duplicate_card(player):
@ -236,7 +236,7 @@ class Derringer(Pugnale):
return False return False
def use_card(self, player): def use_card(self, player):
player.hand.append(player.game.deck.draw()) player.hand.append(player.game.deck.draw(True))
player.notify_self() player.notify_self()
class Borraccia(Card): class Borraccia(Card):

View File

@ -93,7 +93,7 @@ class ChuckWengam(Character):
if len([c for c in player.gold_rush_equipment if isinstance(c, grc.Talismano)]) > 0: if len([c for c in player.gold_rush_equipment if isinstance(c, grc.Talismano)]) > 0:
player.gold_nuggets += 1 player.gold_nuggets += 1
if len([c for c in player.gold_rush_equipment if isinstance(c, grc.Stivali)]) > 0: 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.hand.append(player.game.deck.draw(True)) player.hand.append(player.game.deck.draw(True))
player.notify_self() player.notify_self()

View File

@ -115,7 +115,7 @@ class UnionPacific(ShopCard):
player.sio.emit('chat_message', room=player.game.name, player.sio.emit('chat_message', room=player.game.name,
data=f'_UnionPacific|{player.name}|{self.name}') data=f'_UnionPacific|{player.name}|{self.name}')
for i in range(4): 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) return super().play_card(player, against, _with)
class Calumet(ShopCard): class Calumet(ShopCard):
@ -188,7 +188,7 @@ class Setaccio(ShopCard):
if player.gold_nuggets >= 1: if player.gold_nuggets >= 1:
player.sio.emit('chat_message', room=player.game.name, data=f'_play_card|{player.name}|{self.name}') player.sio.emit('chat_message', room=player.game.name, data=f'_play_card|{player.name}|{self.name}')
player.gold_nuggets -= 1 player.gold_nuggets -= 1
player.hand.append(player.game.deck.draw()) player.hand.append(player.game.deck.draw(True))
player.notify_self() player.notify_self()
return True return True
return False return False

View File

@ -399,7 +399,7 @@ class Game:
if target_pl.character.check(self, grch.SimeonPicos): if target_pl.character.check(self, grch.SimeonPicos):
target_pl.gold_nuggets += 1 target_pl.gold_nuggets += 1
if len([c for c in target_pl.equipment if isinstance(c, grc.Stivali)]) > 0: 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() target_pl.notify_self()
self.is_russian_roulette_on = False self.is_russian_roulette_on = False
self.players[self.turn].play_turn() self.players[self.turn].play_turn()

View File

@ -378,7 +378,7 @@ class Player:
if self.character.check(self.game, grch.SimeonPicos): if self.character.check(self.game, grch.SimeonPicos):
self.gold_nuggets += 1 self.gold_nuggets += 1
if len([c for c in self.gold_rush_equipment if isinstance(c, grc.Stivali)]) > 0: 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: if self.character.check(self.game, chars.BartCassidy) and self.lives > 0:
self.hand.append(self.game.deck.draw(True)) self.hand.append(self.game.deck.draw(True))
self.sio.emit('chat_message', room=self.game.name, data=f'_special_bart_cassidy|{self.name}') 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): if self.character.check(self.game, grch.SimeonPicos):
self.gold_nuggets += 1 self.gold_nuggets += 1
if len([c for c in self.gold_rush_equipment if isinstance(c, grc.Stivali)]) > 0: 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.heal_if_needed()
self.mancato_needed = 0 self.mancato_needed = 0
self.expected_response = [] self.expected_response = []

View File

@ -14,7 +14,7 @@ def test_draw():
g = Game('test', DummySocket()) g = Game('test', DummySocket())
g.deck = Deck(g) g.deck = Deck(g)
l = len(g.deck.cards) 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.cards) == l - 1
assert len(g.deck.scrap_pile) == 0 assert len(g.deck.scrap_pile) == 0