diff --git a/backend/bang/players.py b/backend/bang/players.py
index dbe378f..1e536e8 100644
--- a/backend/bang/players.py
+++ b/backend/bang/players.py
@@ -194,6 +194,9 @@ class Player:
if self.attacker:
ser['attacker'] = self.attacker.name
ser['sight'] = self.get_sight()
+ ser['can_gold_rush_discard'] = len([p for p in self.game.get_alive_players() if p != self and len([e for e in p.gold_rush_equipment if e.number <= self.gold_nuggets + 1]) > 0]) > 0
+ if self.character:
+ ser['gold_rush_discount'] = 1 if self.character.check(self.game, grch.PrettyLuzena) and self.special_use_count < 1 else 0
ser['lives'] = max(ser['lives'], 0)
if self.lives <= 0 and self.max_lives > 0 and not self.is_dead:
diff --git a/frontend/src/components/Deck.vue b/frontend/src/components/Deck.vue
index f653a15..dae3ea4 100644
--- a/frontend/src/components/Deck.vue
+++ b/frontend/src/components/Deck.vue
@@ -3,9 +3,9 @@
-
{setGoldRushDesc(goldRushCards[0])}" @pointerleave.native="goldRushDesc=''" :style="goldRushShopOpen?``:`position:absolute; top:0; right:0; transform: rotate(-15deg) translate(0, -50px) scale(0.6)`" v-if="goldRushCards.length > 0" :key="goldRushCards[0].name" :card="goldRushCards[0]" :class="{'shop-open':goldRushShopOpen, 'cant-play': pending_action !==2 || gold_nuggets < goldRushCards[0].number}" @click.native="() => {buy_gold_rush_card(0)}"/>
- {setGoldRushDesc(goldRushCards[1])}" @pointerleave.native="goldRushDesc=''" :style="goldRushShopOpen?``:`position:absolute; top:0; right:0; transform: rotate(+0deg) translate(0, -50px) scale(0.6)`" v-if="goldRushCards.length > 1" :key="goldRushCards[1].name" :card="goldRushCards[1]" :class="{'shop-open':goldRushShopOpen, 'cant-play': pending_action !==2 || gold_nuggets < goldRushCards[1].number}" @click.native="() => {buy_gold_rush_card(1)}"/>
- {setGoldRushDesc(goldRushCards[2])}" @pointerleave.native="goldRushDesc=''" :style="goldRushShopOpen?``:`position:absolute; top:0; right:0; transform: rotate(+15deg) translate(0, -50px) scale(0.6)`" v-if="goldRushCards.length > 2" :key="goldRushCards[2].name" :card="goldRushCards[2]" :class="{'shop-open':goldRushShopOpen, 'cant-play': pending_action !==2 || gold_nuggets < goldRushCards[2].number}" @click.native="() => {buy_gold_rush_card(2)}"/>
+ {setGoldRushDesc(goldRushCards[0])}" @pointerleave.native="goldRushDesc=null" :style="goldRushShopOpen?``:`position:absolute; top:0; right:0; transform: rotate(-15deg) translate(0, -50px) scale(0.6)`" v-if="goldRushCards.length > 0" :key="goldRushCards[0].name" :card="goldRushCards[0]" :class="{'shop-open':goldRushShopOpen, 'cant-play': pending_action !==2 || gold_nuggets < goldRushCards[0].number - gold_rush_discount}" @click.native="() => {buy_gold_rush_card(0)}"/>
+ {setGoldRushDesc(goldRushCards[1])}" @pointerleave.native="goldRushDesc=null" :style="goldRushShopOpen?``:`position:absolute; top:0; right:0; transform: rotate(+0deg) translate(0, -50px) scale(0.6)`" v-if="goldRushCards.length > 1" :key="goldRushCards[1].name" :card="goldRushCards[1]" :class="{'shop-open':goldRushShopOpen, 'cant-play': pending_action !==2 || gold_nuggets < goldRushCards[1].number - gold_rush_discount}" @click.native="() => {buy_gold_rush_card(1)}"/>
+ {setGoldRushDesc(goldRushCards[2])}" @pointerleave.native="goldRushDesc=null" :style="goldRushShopOpen?``:`position:absolute; top:0; right:0; transform: rotate(+15deg) translate(0, -50px) scale(0.6)`" v-if="goldRushCards.length > 2" :key="goldRushCards[2].name" :card="goldRushCards[2]" :class="{'shop-open':goldRushShopOpen, 'cant-play': pending_action !==2 || gold_nuggets < goldRushCards[2].number - gold_rush_discount}" @click.native="() => {buy_gold_rush_card(2)}"/>
@@ -33,10 +33,13 @@
{{eventDesc}}
- 🤑️ {{goldRushDesc}} 🤑️
+
+
🤑️ {{$t(`cards.${goldRushDesc.name}.desc`)}} 🤑️
+
🤑️ {{goldRushDesc.number - gold_rush_discount}} 💵️ 🤑️
+
- {{$t('gold_rush_discard')}}
+ {{$t('gold_rush_discard')}}
{{desc}}
@@ -73,7 +76,9 @@ export default {
goldRushShopOpen: true,
goldRushCards: [],
gold_nuggets: 0,
- goldRushDesc: "",
+ goldRushDesc: null,
+ can_gold_rush_discard: false,
+ gold_rush_discount: 0,
}),
sockets: {
self(self){
@@ -81,6 +86,8 @@ export default {
this.isPlaying = self.lives > 0 || self.is_ghost
this.pending_action = self.pending_action
this.gold_nuggets = self.gold_nuggets
+ this.can_gold_rush_discard = self.can_gold_rush_discard
+ this.gold_rush_discount = self.gold_rush_discount
},
scrap(card) {
this.lastScrap = card
@@ -146,7 +153,7 @@ export default {
this.desc = this.$t(`cards.${this.lastScrap.name}.desc`)
},
setGoldRushDesc(card) {
- this.goldRushDesc = this.$t(`cards.${card.name}.desc`)
+ this.goldRushDesc = card
},
},
mounted() {