techwire/bang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix pedro bug

Browse Source
This commit is contained in:
Alberto Xamin 2020-11-23 19:44:04 +01:00
parent d2a67b7350
commit a8e728c966
No known key found for this signature in database
GPG Key ID: 4F026F48309500A2
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/deck.py
View File

@ -39,7 +39,7 @@ class Deck:
def draw_from_scrap_pile(self) -> Card: def draw_from_scrap_pile(self) -> Card:
if len(self.scrap_pile) > 0: if len(self.scrap_pile) > 0:
card = self.scrap_pile.pop(0) card = self.scrap_pile.pop(-1)
self.game.notify_scrap_pile() self.game.notify_scrap_pile()
return card return card
else: else:

5
backend/game.py
View File

@ -157,7 +157,10 @@ class Game:
def notify_scrap_pile(self): def notify_scrap_pile(self):
print('scrap') print('scrap')
self.sio.emit('scrap', room=self.name, data=self.deck.peek_scrap_pile().__dict__) if self.deck.peek_scrap_pile():
self.sio.emit('scrap', room=self.name, data=self.deck.peek_scrap_pile().__dict__)
else:
self.sio.emit('scrap', room=self.name, data=None)
def handle_disconnect(self, player: players.Player): def handle_disconnect(self, player: players.Player):
print(f'player {player.name} left the game {self.name}') print(f'player {player.name} left the game {self.name}')

2
backend/players.py
View File

@ -135,7 +135,7 @@ class Player:
if pile == 'scrap' and isinstance(self.character, characters.PedroRamirez): if pile == 'scrap' and isinstance(self.character, characters.PedroRamirez):
self.hand.append(self.game.deck.draw_from_scrap_pile()) self.hand.append(self.game.deck.draw_from_scrap_pile())
self.hand.append(self.game.deck.draw()) self.hand.append(self.game.deck.draw())
if type(pile) == str and pile != self.name and pile in self.game.players_map and isinstance(self.character, characters.JesseJones) and len(self.game.get_player_named(pile).hand) > 0: elif type(pile) == str and pile != self.name and pile in self.game.players_map and isinstance(self.character, characters.JesseJones) and len(self.game.get_player_named(pile).hand) > 0:
self.hand.append(self.game.get_player_named(pile).hand.pop(randrange(0, len(self.game.get_player_named(pile).hand)))) self.hand.append(self.game.get_player_named(pile).hand.pop(randrange(0, len(self.game.get_player_named(pile).hand))))
self.hand.append(self.game.deck.draw()) self.hand.append(self.game.deck.draw())
else: else: