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

fix rissa 2

Browse Source
This commit is contained in:
Giulio 2022-03-30 12:45:47 +02:00
parent 0818bfbf22
commit b90c5553e3
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/bang/expansions/dodge_city/cards.py
View File

@ -75,18 +75,19 @@ class Rissa(CatBalou):
def play_card(self, player, against, _with): def play_card(self, player, against, _with):
if _with != None: if _with != None:
if len([p.name for p in player.game.players if p != player and (len(p.hand)+len(p.equipment)) > 0]) == 0: if len([p for p in player.game.players if p != player and (len(p.hand)+len(p.equipment)) > 0]) == 0:
return False return False
#se sono qui vuol dire che ci sono giocatori con carte in mano oltre a me #se sono qui vuol dire che ci sono giocatori con carte in mano oltre a me
self.rissa_targets = [] player.rissa_targets = []
target = player.game.get_player(player.name, next=True) target = player.game.get_player_named(player.name, next=True)
while target != player: while target != player:
if len(target.hand) + len(target.equipment) > 0: if len(target.hand) + len(target.equipment) > 0:
self.rissa_target.append(target) player.rissa_targets.append(target)
target = player.game.get_player(target.name, next=True) target = player.game.get_player_named(target.name, next=True)
player.game.deck.scrap(_with) player.game.deck.scrap(_with)
player.event_type = 'rissa' player.event_type = 'rissa'
super().play_card(player, against=self.rissa_targets.pop(0)) print(f'rissa targets: {player.rissa_targets}')
super().play_card(player, against=player.rissa_targets.pop(0).name)
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}')
return True return True
return False return False

2
backend/bang/players.py
View File

@ -208,6 +208,7 @@ class Player:
ser.pop('on_pick_cb') ser.pop('on_pick_cb')
ser.pop('on_failed_response_cb') ser.pop('on_failed_response_cb')
ser.pop('attacker') ser.pop('attacker')
ser.pop('rissa_targets')
if self.attacker: if self.attacker:
ser['attacker'] = self.attacker.name ser['attacker'] = self.attacker.name
ser['sight'] = self.get_sight() ser['sight'] = self.get_sight()
@ -680,6 +681,7 @@ class Player:
self.pending_action = PendingAction.PLAY self.pending_action = PendingAction.PLAY
else: else:
self.target_p = self.rissa_targets.pop(0).name self.target_p = self.rissa_targets.pop(0).name
print(f'rissa targets: {self.rissa_targets}')
self.notify_self() self.notify_self()
elif self.choose_text == 'choose_ricercato': elif self.choose_text == 'choose_ricercato':
player = self.game.get_player_named(self.available_cards[card_index]['name']) player = self.game.get_player_named(self.available_cards[card_index]['name'])