From 2978da9e94e163e10ee08e63c4a247f4c287de3b Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Thu, 17 Jun 2021 17:41:34 +0200 Subject: [PATCH] cloud special --- backend/__init__.py | 5 +++++ backend/bang/expansions/gold_rush/characters.py | 1 - backend/bang/players.py | 12 ++++++++++-- frontend/src/components/Player.vue | 1 + 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/backend/__init__.py b/backend/__init__.py index 4ebbc57..3cd4af3 100644 --- a/backend/__init__.py +++ b/backend/__init__.py @@ -431,6 +431,11 @@ def murieta_special(sid): ses: Player = sio.get_session(sid) ses.murieta_special() +@sio.event +def cloud_special(sid): + ses: Player = sio.get_session(sid) + ses.cloud_special() + @sio.event def buy_gold_rush_card(sid, data:int): ses: Player = sio.get_session(sid) diff --git a/backend/bang/expansions/gold_rush/characters.py b/backend/bang/expansions/gold_rush/characters.py index abce933..edd9ade 100644 --- a/backend/bang/expansions/gold_rush/characters.py +++ b/backend/bang/expansions/gold_rush/characters.py @@ -24,7 +24,6 @@ class JoshMcCloud(Character): super().__init__("Josh McCloud", max_lives=4) # puo pagare 2 pepite per pescare il primo equipaggiamento dalla pila gold rush self.icon = '⛅️' - #TODO class MadamYto(Character): def __init__(self): diff --git a/backend/bang/players.py b/backend/bang/players.py index 6122d49..f5ca0b6 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -1093,13 +1093,21 @@ class Player: self.bang_used -= 1 self.notify_self() + def cloud_special(self): + if self.character.check(self.game, grch.JoshMcCloud) and self.gold_nuggets >= 2 and self.is_my_turn: + self.gold_nuggets -= 2 + card = self.game.deck.shop_deck.pop(0) + if card.play_card(self): + self.game.deck.shop_deck.append(card) + self.notify_self() + def buy_gold_rush_card(self, index): print(f'{self.name} wants to buy gr-card index {index} in room {self.game.name}') card: cs.Card = self.game.deck.shop_cards[index] if self.pending_action == PendingAction.PLAY and self.gold_nuggets >= card.number: self.gold_nuggets -= card.number - card.play_card(self) - self.game.deck.shop_deck.append(card) + if card.play_card(self): + self.game.deck.shop_deck.append(card) self.game.deck.shop_cards[index] = None self.game.deck.fill_gold_rush_shop() self.notify_self() diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue index 3914310..2631144 100644 --- a/frontend/src/components/Player.vue +++ b/frontend/src/components/Player.vue @@ -26,6 +26,7 @@ +
{{$t('hand')}}