fix miniera abbandonata
This commit is contained in:
		
							parent
							
								
									d1fe45095b
								
							
						
					
					
						commit
						190d872e29
					
				| @ -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 | ||||
| 
 | ||||
| 
 | ||||
|  | ||||
| @ -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): | ||||
|  | ||||
| @ -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() | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -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() | ||||
|  | ||||
| @ -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 = [] | ||||
|  | ||||
| @ -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 | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Giulio
						Giulio