jesse jones

This commit is contained in:
Alberto Xamin 2020-11-23 17:08:25 +01:00
parent d4149f46bf
commit e9529b0b19
No known key found for this signature in database
GPG Key ID: 4F026F48309500A2
2 changed files with 8 additions and 1 deletions

View File

@ -127,6 +127,9 @@ 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:
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())
else: else:
for i in range(2): for i in range(2):
card: cards.Card = self.game.deck.draw() card: cards.Card = self.game.deck.draw()

View File

@ -12,7 +12,7 @@
<span v-for="(n, i) in (p.max_lives-p.lives)" v-bind:key="n" :alt="i">💀</span> <span v-for="(n, i) in (p.max_lives-p.lives)" v-bind:key="n" :alt="i">💀</span>
</transition-group> </transition-group>
<Card :card="p.card" :class="{is_my_turn:p.is_my_turn}"/> <Card :card="p.card" :class="{is_my_turn:p.is_my_turn}"/>
<tiny-hand :ncards="p.ncards"/> <tiny-hand :ncards="p.ncards" @click.native="drawFromPlayer(p.name)"/>
<span style="position:absolute;top:0;">{{getActionEmoji(p)}}</span> <span style="position:absolute;top:0;">{{getActionEmoji(p)}}</span>
<div class="tiny-equipment"> <div class="tiny-equipment">
<Card v-for="card in p.equipment" v-bind:key="card.name+card.number" :card="card" /> <Card v-for="card in p.equipment" v-bind:key="card.name+card.number" :card="card" />
@ -171,6 +171,10 @@ export default {
this.chooseCards = [] this.chooseCards = []
this.hasToChoose = false this.hasToChoose = false
}, },
drawFromPlayer(name) {
console.log(name)
this.$socket.emit('draw', name)
},
}, },
} }
</script> </script>