add liquore forte

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 = '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'
+        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(),

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

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

frontend/src/components/Deck.vue

@@ -5,7 +5,7 @@
 			<div v-if="eventCard" style="position:relative">
 				<div class="card fistful-of-cards" style="position:relative; bottom:-3pt;right:-3pt;"/>
 				<div class="card fistful-of-cards" style="position:absolute; bottom:-1.5pt;right:-1.5pt;"/>
-				<card :card="eventCard" :key="eventCard" :class="{'last-event':true,'fistful-of-cards':true}"/>
+				<card :card="eventCard" :key="eventCard" :class="{'last-event':true,'fistful-of-cards':true}" @click.native="event"/>
 			</div>
 			<div style="position:relative">
 				<div class="card back" style="position:absolute; bottom:-3pt;right:-3pt;"/>
@@ -79,6 +79,11 @@ export default {
 				else if (this.pending_action == 1)
 					this.$socket.emit('draw', pile)
 			}
+		},
+		event() {
+			if (this.pending_action !== false && this.pending_action < 2) {
+				this.$socket.emit('draw', 'event')
+			}
 		}
 	},
 	watch: {