diff --git a/backend/bang/expansions/fistful_of_cards/card_events.py b/backend/bang/expansions/fistful_of_cards/card_events.py index 528d3b3..59d3ec8 100644 --- a/backend/bang/expansions/fistful_of_cards/card_events.py +++ b/backend/bang/expansions/fistful_of_cards/card_events.py @@ -48,10 +48,10 @@ class LeggeDelWest(CardEvent): self.desc_eng = 'Every player shows the second card that they draw and must use it in that round' class LiquoreForte(CardEvent): - def __init__(self):#TODO + def __init__(self): super().__init__('Liquore Forte', '🥃') - self.desc = 'I giocatori possono evitare di pescare per recuperare 1 vita' - self.desc_eng = 'Players can skip drawing to regain 1 HP' + self.desc = 'I giocatori possono evitare di pescare per recuperare 1 vita (clicca sulla carta evento per farlo)' + self.desc_eng = 'Players can skip drawing to regain 1 HP (click on the event card to use)' class MinieraAbbandonata(CardEvent): def __init__(self):#TODO @@ -104,7 +104,7 @@ def get_all_events(): IlGiudice(), Lazo(), LeggeDelWest(), - # LiquoreForte(), + LiquoreForte(), # MinieraAbbandonata(), # PerUnPugnoDiCarte(), # Peyote(), diff --git a/backend/bang/game.py b/backend/bang/game.py index 6057456..cfad973 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -24,7 +24,7 @@ class Game: self.initial_players = 0 self.password = '' self.expansions = [] - self.available_expansions = ['dodge_city'] + self.available_expansions = ['dodge_city', 'fistful_of_cards'] self.shutting_down = False self.is_competitive = False self.disconnect_bot = True diff --git a/backend/bang/players.py b/backend/bang/players.py index 2cea122..bfdea52 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -308,7 +308,11 @@ class Player: def draw(self, pile): if self.pending_action != PendingAction.DRAW: return - if isinstance(self.character, chars.KitCarlson): + if pile == 'event' and self.lives < self.max_lives and self.game.check_event(ce.LiquoreForte): + self.lives += 1 + self.pending_action = PendingAction.PLAY + self.notify_self() + elif isinstance(self.character, chars.KitCarlson): self.is_drawing = True self.available_cards = [self.game.deck.draw() for i in range(3)] self.pending_action = PendingAction.CHOOSE diff --git a/frontend/src/components/Deck.vue b/frontend/src/components/Deck.vue index 16766a3..f2e68c0 100644 --- a/frontend/src/components/Deck.vue +++ b/frontend/src/components/Deck.vue @@ -5,7 +5,7 @@