diff --git a/backend/bang/game.py b/backend/bang/game.py
index 8202d22..ba42cff 100644
--- a/backend/bang/game.py
+++ b/backend/bang/game.py
@@ -43,7 +43,7 @@ class Game:
self.someone_won = False
self.attack_in_progress = False
self.characters_to_distribute = 2 # personaggi da dare a inizio partita
- self.debug = False
+ self.debug = self.name == 'debug'
def reset(self):
print('resetting lobby')
@@ -603,6 +603,7 @@ class Game:
'is_ghost': pls[j].is_ghost,
'is_bot': pls[j].is_bot,
'icon': pls[j].role.icon if (pls[j].role is not None) else '🤠',
+ 'role': pls[j].role,
} for j in range(len(pls)) if i != j]
def get_alive_players(self):
diff --git a/backend/bang/players.py b/backend/bang/players.py
index c4eec35..8dae8d8 100644
--- a/backend/bang/players.py
+++ b/backend/bang/players.py
@@ -366,8 +366,9 @@ class Player:
self.is_using_checchino = True
self.available_cards = [{
'name': p['name'],
- 'icon': p.role.icon if(self.game.initial_players == 3) else '⭐️' if p['is_sheriff'] else '🤠',
- 'alt_text': ''.join(['❤️']*p['lives'])+''.join(['💀']*(p['max_lives']-p['lives']))
+ 'icon': p['role'].icon if(self.game.initial_players == 3) else '⭐️' if p['is_sheriff'] else '🤠',
+ 'alt_text': ''.join(['❤️']*p['lives'])+''.join(['💀']*(p['max_lives']-p['lives'])),
+ 'desc': p['name']
} for p in self.game.get_visible_players(self) if p['dist'] <= self.get_sight()]
self.available_cards.append({'icon': '❌', 'noDesc': True})
self.choose_text = 'choose_cecchino'
@@ -1009,7 +1010,7 @@ class Player:
self.notify_self()
def holyday_special(self, data):
- if self.character.check(self.game, chd.DocHolyday) and self.special_use_count < 1:
+ if self.character.check(self.game, chd.DocHolyday) and self.special_use_count < 1 and self.pending_action == PendingAction.PLAY:
self.special_use_count += 1
cards = sorted(data['cards'], reverse=True)
for c in cards:
diff --git a/frontend/public/index.html b/frontend/public/index.html
index bc4dd0c..61a29af 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -1,6 +1,7 @@
-
+
+
diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue
index 3626de7..1cea7d0 100644
--- a/frontend/src/components/Player.vue
+++ b/frontend/src/components/Player.vue
@@ -24,7 +24,7 @@
-
+
{{$t('hand')}}
@@ -310,7 +310,7 @@ export default {
},
holydayScrapBang(other) {
this.$socket.emit('holyday_special', {
- cards : [this.hand.indexOf(this.scrapHand[0]), this.hand.indexOf(this.scrapHand[1])],
+ cards : [this.scrapHand[0], this.scrapHand[1]],
against: other.name
})
this.scrapHand = []