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

fix rissa and dark mode

Browse Source
This commit is contained in:
Alberto Xamin 2020-11-28 17:03:33 +01:00
parent b2a0c108d0
commit 674d284ab1
No known key found for this signature in database
GPG Key ID: 4F026F48309500A2
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,9 +69,12 @@ class Rissa(CatBalou):
def play_card(self, player, against, _with): def play_card(self, player, against, _with):
if _with != None: if _with != None:
players_with_cards = [p.name for p in player.game.players if p != player and (len(p.hand)+len(p.equipment)) > 0]
if len(players_with_cards) == 0:
return False
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 and (len(p.hand)+len(p.equipment)) > 0][0]) super().play_card(player, against=players_with_cards[0])
player.sio.emit('chat_message', room=player.game.name, data=f'{player.name} ha giocato {self.name}') player.sio.emit('chat_message', room=player.game.name, data=f'{player.name} ha giocato {self.name}')
return True return True
return False return False

5
backend/bang/players.py
View File

@ -295,10 +295,9 @@ class Player:
self.choose_action = '' self.choose_action = ''
self.pending_action = PendingAction.PLAY self.pending_action = PendingAction.PLAY
else: else:
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: self.target_p = self.game.players[self.game.players_map[self.target_p]+1].name
while self.target_p == self.name or len(self.game.players[self.game.players_map[self.target_p]].hand) + len(self.game.players[self.game.players_map[self.target_p]].equipment) == 0:
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):

4
frontend/src/components/Card.vue
View File

@ -131,5 +131,9 @@ export default {
0 0 0 6pt #181a1b, 0 0 0 6pt #181a1b,
0 0 5pt 6pt #aaa; 0 0 5pt 6pt #aaa;
} }
.card.usable-next-turn {
box-shadow:
0 0 0 3pt rgb(192,192,117), 0 0 0 6pt #181a1b, 0 0 5pt 6pt #aaa
}
} }
</style> </style>