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

enable draw animation from other players

Browse Source
This commit is contained in:
Alberto Xamin 2023-01-25 17:46:16 +00:00
parent e5072d7db9
commit a7ef721f1b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/bang/deck.py
View File

@ -113,7 +113,10 @@ class Deck:
if self.game.check_event(ce.MinieraAbbandonata) and not ignore_event: if self.game.check_event(ce.MinieraAbbandonata) and not ignore_event:
self.put_on_top(card) self.put_on_top(card)
else: else:
self.scrap_pile.append(card)
if player is not None and self.game.replay_speed > 0: if player is not None and self.game.replay_speed > 0:
G.sio.emit('card_scrapped', room=self.game.name, data={'player': player.name, 'card':card.__dict__, 'pile': 'scrap'}) G.sio.emit('card_scrapped', room=self.game.name, data={'player': player.name, 'card':card.__dict__, 'pile': 'scrap'})
self.scrap_pile.append(card) G.sio.sleep(0.6)
self.game.notify_scrap_pile() self.game.notify_scrap_pile()
else:
self.game.notify_scrap_pile()

3
backend/bang/players.py
View File

@ -767,6 +767,7 @@ class Player:
card = target.hand.pop(card_index) card = target.hand.pop(card_index)
target.notify_self() target.notify_self()
if self.choose_action == 'steal': if self.choose_action == 'steal':
G.sio.emit('card_drawn', room=self.game.name, data={'player': self.name, 'pile': target.name})
card.reset_card() card.reset_card()
if card.name != "Fantasma" or self.name != target.name: #se si uccide facendo panico su fantasma la carta non gli viene messa in mano if card.name != "Fantasma" or self.name != target.name: #se si uccide facendo panico su fantasma la carta non gli viene messa in mano
self.hand.append(card) self.hand.append(card)
@ -1038,6 +1039,7 @@ class Player:
card.reset_card() card.reset_card()
self.hand.append(card) self.hand.append(card)
self.available_cards = [] self.available_cards = []
G.sio.emit('card_drawn', room=self.game.name, data={'player': self.name, 'pile': self.pat_target})
self.game.get_player_named(self.pat_target).notify_self() self.game.get_player_named(self.pat_target).notify_self()
self.pending_action = PendingAction.PLAY self.pending_action = PendingAction.PLAY
self.manette() self.manette()
@ -1232,6 +1234,7 @@ class Player:
elif self.character.check(self.game, chars.ElGringo) and self.attacker and self.attacker in self.game.get_alive_players() and len(self.attacker.hand) > 0: elif self.character.check(self.game, chars.ElGringo) and self.attacker and self.attacker in self.game.get_alive_players() and len(self.attacker.hand) > 0:
self.hand.append(self.attacker.hand.pop(randrange(0, len(self.attacker.hand)))) self.hand.append(self.attacker.hand.pop(randrange(0, len(self.attacker.hand))))
self.hand[-1].reset_card() self.hand[-1].reset_card()
G.sio.emit('card_drawn', room=self.game.name, data={'player': self.name, 'pile': self.attacker.name})
G.sio.emit('chat_message', room=self.game.name, G.sio.emit('chat_message', room=self.game.name,
data=f'_special_el_gringo|{self.name}|{self.attacker.name}') data=f'_special_el_gringo|{self.name}|{self.attacker.name}')
self.attacker.notify_self() self.attacker.notify_self()

3
frontend/src/components/Lobby.vue
View File

@ -222,7 +222,8 @@ export default {
this.username = username this.username = username
}, },
card_drawn(data) { card_drawn(data) {
let decel = document.getElementById('actual-deck') let from = data.pile === 'deck' ? 'actual-deck' : `${data.pile}-hand`;
let decel = document.getElementById(from)
if (!decel) if (!decel)
return return
let decelOffset = cumulativeOffset(decel) let decelOffset = cumulativeOffset(decel)