diff --git a/backend/__init__.py b/backend/__init__.py index 6a919e5..4ebbc57 100644 --- a/backend/__init__.py +++ b/backend/__init__.py @@ -426,6 +426,11 @@ def holyday_special(sid, data): ses: Player = sio.get_session(sid) ses.holyday_special(data) +@sio.event +def murieta_special(sid): + ses: Player = sio.get_session(sid) + ses.murieta_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 e0ec47d..abce933 100644 --- a/backend/bang/expansions/gold_rush/characters.py +++ b/backend/bang/expansions/gold_rush/characters.py @@ -18,7 +18,6 @@ class JackyMurieta(Character): super().__init__("Jacky Murieta", max_lives=4) # puo pagare 2 pepite per sparare 1 bang extra self.icon = '💆♂️️' - #TODO class JoshMcCloud(Character): def __init__(self): @@ -41,7 +40,7 @@ class PrettyLuzena(Character): class RaddieSnake(Character): def __init__(self): - super().__init__("Pretty Luzena", max_lives=4) + super().__init__("Raddie Snake", max_lives=4) # può scartare 1 pepita per pescare 1 carta (2 volte per turno) self.icon = '🐍️' diff --git a/backend/bang/players.py b/backend/bang/players.py index 463953a..6122d49 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -1086,6 +1086,13 @@ class Player: self.hand.append(self.game.deck.draw(True)) self.notify_self() + def murieta_special(self): + if self.character.check(self.game, grch.JackyMurieta) and self.gold_nuggets >= 2 and self.is_my_turn: + self.gold_nuggets -= 2 + self.has_played_bang = False + self.bang_used -= 1 + 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] diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue index d67a86d..3914310 100644 --- a/frontend/src/components/Player.vue +++ b/frontend/src/components/Player.vue @@ -25,6 +25,7 @@ +