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

Merge branch 'dev' into main

Browse Source
This commit is contained in:
Giulio 2021-05-04 15:30:17 +02:00
commit 5746a67941
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/bang/expansions/fistful_of_cards/card_events.py
View File

@ -9,7 +9,7 @@ class CardEvent(ABC):
class Agguato(CardEvent): class Agguato(CardEvent):
def __init__(self): def __init__(self):
super().__init__("Agguato", "🛁") super().__init__("Agguato", "🛁")
self.desc = "La distanza base di tra 2 qualsiasi giocatori è 1" self.desc = "La distanza base tra 2 qualsiasi giocatori è 1"
self.desc_eng = "The base distance from any 2 players is 1" self.desc_eng = "The base distance from any 2 players is 1"
class Cecchino(CardEvent): class Cecchino(CardEvent):

4
backend/bang/game.py
View File

@ -111,8 +111,8 @@ class Game:
cr = '' cr = ''
for x in current_roles: for x in current_roles:
if (x not in cr): if (x not in cr):
cr += x + '|' + str(current_roles.count(x)) +'|' cr += '|' +x + '|' + str(current_roles.count(x))
self.sio.emit('chat_message', room=self.name, data=f'_allroles|{cr}') self.sio.emit('chat_message', room=self.name, data=f'_allroles{cr}')
self.play_turn() self.play_turn()
def choose_characters(self): def choose_characters(self):

4
backend/bang/players.py
View File

@ -423,6 +423,8 @@ class Player:
for i in range(self.max_lives-self.lives): for i in range(self.max_lives-self.lives):
self.hand.append(self.game.deck.draw()) self.hand.append(self.game.deck.draw())
else: else:
if self.character.check(self.game, chd.PixiePete):
self.hand.append(self.game.deck.draw())
for i in range(2): for i in range(2):
card: cs.Card = self.game.deck.draw() card: cs.Card = self.game.deck.draw()
self.hand.append(card) self.hand.append(card)
@ -434,8 +436,6 @@ class Player:
self.hand.append(self.game.deck.draw()) self.hand.append(self.game.deck.draw())
if self.game.check_event(ceh.Sete): if self.game.check_event(ceh.Sete):
return self.notify_self() return self.notify_self()
if self.character.check(self.game, chd.PixiePete):
self.hand.append(self.game.deck.draw())
if self.game.check_event(ceh.IlTreno) or (self.is_ghost and self.game.check_event(ceh.CittaFantasma)): if self.game.check_event(ceh.IlTreno) or (self.is_ghost and self.game.check_event(ceh.CittaFantasma)):
self.hand.append(self.game.deck.draw()) self.hand.append(self.game.deck.draw())
self.notify_self() self.notify_self()

2
frontend/src/components/Chat.vue
View File

@ -4,7 +4,7 @@
<h3>{{$t("chat.chat")}}</h3> <h3>{{$t("chat.chat")}}</h3>
<transition-group name="message" tag="div" id="chatbox"> <transition-group name="message" tag="div" id="chatbox">
<!-- <div id="chatbox"> --> <!-- <div id="chatbox"> -->
<p style="margin:1pt;" class="chat-message selectable" v-for="(msg, i) in messages" v-bind:key="`${i}-c`" :style="`color:${msg.color}`">{{msg.text}}</p> <p style="margin:1pt;" class="chat-message" v-for="(msg, i) in messages" v-bind:key="`${i}-c`" :style="`color:${msg.color}`">{{msg.text}}</p>
<p class="end" key="end" style="color:#0000">.</p> <p class="end" key="end" style="color:#0000">.</p>
<!-- </div> --> <!-- </div> -->
</transition-group> </transition-group>

2
frontend/src/components/Chooser.vue
View File

@ -47,7 +47,7 @@ export default {
methods: { methods: {
showDesc(card) { showDesc(card) {
//console.log(card) //console.log(card)
if (card.name == "PewPew!") if (card.name == null || card.name == "PewPew!")
this.desc = "" this.desc = ""
else if (card.desc) else if (card.desc)
this.desc = (this.$i18n.locale=='it'?card.desc:card.desc_eng) this.desc = (this.$i18n.locale=='it'?card.desc:card.desc_eng)