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

fix stuff

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

2
backend/bang/cards.py
View File

@ -160,7 +160,7 @@ class Bang(Card):
def __init__(self, suit, number): def __init__(self, suit, number):
super().__init__(suit, 'Bang!', number) super().__init__(suit, 'Bang!', number)
self.icon = '💥' self.icon = '💥'
self.desc = "Spara a un giocatore a distanta raggiungibile. Se non hai armi la distanza di default è 1" self.desc = "Spara a un giocatore a distanza raggiungibile. Se non hai armi la distanza di default è 1"
self.need_target = True self.need_target = True
def play_card(self, player, against, _with=None): def play_card(self, player, against, _with=None):

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

@ -16,7 +16,7 @@ class Pugno(Card):
def __init__(self, suit, number): def __init__(self, suit, number):
super().__init__(suit, 'Pugno!', number, range=1) super().__init__(suit, 'Pugno!', number, range=1)
self.icon = '👊' self.icon = '👊'
self.desc = "Spara a un giocatore a distanta 1" self.desc = "Spara a un giocatore a distanza 1"
self.need_target = True self.need_target = True
def play_card(self, player, against, _with=None): def play_card(self, player, against, _with=None):
@ -71,7 +71,7 @@ class Rissa(CatBalou):
if _with != None: if _with != None:
player.game.deck.scrap(_with) player.game.deck.scrap(_with)
player.event_type = 'rissa' player.event_type = 'rissa'
super().play_card(player, against=[p.name for p in player.game.players if p != player][0]) super().play_card(player, against=[p.name for p in player.game.players if p != player and (len(p.hand)+len(p.equipment)) > 0][0])
return True return True
return False return False

7
backend/bang/players.py
View File

@ -283,15 +283,16 @@ class Player:
self.hand.append(card) self.hand.append(card)
else: else:
self.game.deck.scrap(card) self.game.deck.scrap(card)
if self.event_type != 'rissa' or (self.event_type == 'rissa' and self.target_p == [p.name for p in self.game.players if p != self][-1]): if self.event_type != 'rissa' or (self.event_type == 'rissa' and self.target_p == [p.name for p in self.game.players if p != self and (len(p.hand)+len(p.equipment)) > 0][-1]):
self.event_type = '' self.event_type = ''
self.target_p = '' self.target_p = ''
self.choose_action = '' self.choose_action = ''
self.pending_action = PendingAction.PLAY self.pending_action = PendingAction.PLAY
else: else:
self.target_p = self.game.players[self.game.players_map[self.target_p]+1].name while len(self.game.players[self.game.players_map[self.target_p]+1].hand) + len(self.game.players[self.game.players_map[self.target_p]+1].equipment) == 0:
if self.target_p == self.name:
self.target_p = self.game.players[self.game.players_map[self.target_p]+1].name self.target_p = self.game.players[self.game.players_map[self.target_p]+1].name
if self.target_p == self.name:
self.target_p = self.game.players[self.game.players_map[self.target_p]+1].name
self.notify_self() self.notify_self()
# specifico per personaggio # specifico per personaggio
elif self.is_drawing and isinstance(self.character, chars.KitCarlson): elif self.is_drawing and isinstance(self.character, chars.KitCarlson):