diff --git a/backend/bang/deck.py b/backend/bang/deck.py
index cf6aedf..547d55c 100644
--- a/backend/bang/deck.py
+++ b/backend/bang/deck.py
@@ -1,4 +1,4 @@
-from typing import List, Set, Dict, Tuple, Optional
+from typing import List, Set, Dict, Tuple, Optional, TYPE_CHECKING
import random
import bang.cards as cs
import bang.expansions.fistful_of_cards.card_events as ce
@@ -7,8 +7,10 @@ import bang.expansions.wild_west_show.card_events as cew
import bang.expansions.gold_rush.shop_cards as grc
from globals import G
+if TYPE_CHECKING:
+ from bang.game import Game
class Deck:
- def __init__(self, game):
+ def __init__(self, game: 'Game'):
super().__init__()
self.cards: List[cs.Card] = cs.get_starting_deck(game.expansions)
self.mancato_cards: List[str] = []
@@ -58,6 +60,7 @@ class Deck:
if len(self.event_cards) > 0 and not (isinstance(self.event_cards[0], ce.PerUnPugnoDiCarte) or isinstance(self.event_cards[0], ceh.MezzogiornoDiFuoco)):
self.event_cards.append(self.event_cards.pop(0))
self.game.notify_event_card()
+ self.game.notify_all()
def fill_gold_rush_shop(self):
if not any((c is None for c in self.shop_cards)):
diff --git a/backend/bang/expansions/wild_west_show/card_events.py b/backend/bang/expansions/wild_west_show/card_events.py
index 016bdba..678bf08 100644
--- a/backend/bang/expansions/wild_west_show/card_events.py
+++ b/backend/bang/expansions/wild_west_show/card_events.py
@@ -81,11 +81,11 @@ def get_all_events(rng=random):
cards = [
Camposanto(),
DarlingValentine(),
- DorothyRage(),
+ # DorothyRage(),
HelenaZontero(),
- LadyRosaDelTexas(),
- MissSusanna(),
- RegolamentoDiConti(),
+ # LadyRosaDelTexas(),
+ # MissSusanna(),
+ # RegolamentoDiConti(),
Sacagaway(),
]
rng.shuffle(cards)
diff --git a/backend/bang/game.py b/backend/bang/game.py
index 452aa50..a317370 100644
--- a/backend/bang/game.py
+++ b/backend/bang/game.py
@@ -895,9 +895,11 @@ class Game:
def notify_all(self):
if self.started and self.replay_speed > 0:
+ show_cards = self.check_event(cew.Sacagaway)
data = [{
'name': p.name,
'ncards': len(p.hand),
+ 'hand_cards': [c.__dict__ for c in p.hand] if show_cards else [],
'equipment': [e.__dict__ for e in p.equipment],
'gold_rush_equipment': [e.__dict__ for e in p.gold_rush_equipment],
'lives': p.lives,
diff --git a/frontend/src/components/Lobby.vue b/frontend/src/components/Lobby.vue
index 15fd7a7..230f7fb 100644
--- a/frontend/src/components/Lobby.vue
+++ b/frontend/src/components/Lobby.vue
@@ -38,7 +38,7 @@