From 7f0f8bb5c16a5cdaece5b92d31d3eff5191635cc Mon Sep 17 00:00:00 2001
From: Alberto Xamin <alberto@xamin.it>
Date: Wed, 16 Jun 2021 16:43:38 +0200
Subject: [PATCH] fix doc holyday

---
 backend/bang/players.py            | 2 +-
 frontend/src/components/Player.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/bang/players.py b/backend/bang/players.py
index 15386c3..a32b8d1 100644
--- a/backend/bang/players.py
+++ b/backend/bang/players.py
@@ -973,7 +973,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/src/components/Player.vue b/frontend/src/components/Player.vue
index 3c12388..a31fce1 100644
--- a/frontend/src/components/Player.vue
+++ b/frontend/src/components/Player.vue
@@ -24,7 +24,7 @@
 			<button class="btn" v-if="is_my_turn && character.name === 'Sid Ketchum' && lives < max_lives && hand.length > 1" @click="sidWantsScrapForHealth=true">{{$t('special_ability')}}</button>
 			<button class="btn" v-if="is_my_turn && character.name === 'Chuck Wengam' && lives > 1" @click="chuckSpecial">{{$t('special_ability')}}</button>
 			<button class="btn" v-if="is_my_turn && character.name === 'José Delgado' && special_use_count < 2 && hand.filter(x => x.is_equipment).length > 0" @click="joseScrap=true">{{$t('special_ability')}}</button>
-			<button class="btn" v-if="is_my_turn && character.name === 'Doc Holyday' && special_use_count < 1 && hand.length > 1" @click="holydayScrap=true">{{$t('special_ability')}}</button>
+			<button class="btn" v-if="is_my_turn && character.name === 'Doc Holyday' && special_use_count < 1 && hand.length > 1 && pending_action == 2" @click="holydayScrap=true">{{$t('special_ability')}}</button>
 		</div>
 		<div v-if="lives > 0 || is_ghost" style="position:relative">
 			<span id="hand_text">{{$t('hand')}}</span>
@@ -307,7 +307,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 = []