From 3b568c987f9c27765038021f09161a2d0d46da2f Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sun, 5 Mar 2023 18:08:01 +0000 Subject: [PATCH] add Lady Rosa del Texas --- backend/bang/expansions/wild_west_show/card_events.py | 2 +- backend/bang/players.py | 7 +++++++ backend/tests/wild_west_show_events_test.py | 8 +++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/backend/bang/expansions/wild_west_show/card_events.py b/backend/bang/expansions/wild_west_show/card_events.py index 6a72611..666f1e1 100644 --- a/backend/bang/expansions/wild_west_show/card_events.py +++ b/backend/bang/expansions/wild_west_show/card_events.py @@ -83,7 +83,7 @@ def get_all_events(rng=random): DarlingValentine(), # DorothyRage(), HelenaZontero(), - # LadyRosaDelTexas(), + LadyRosaDelTexas(), MissSusanna(), RegolamentoDiConti(), Sacagaway(), diff --git a/backend/bang/players.py b/backend/bang/players.py index 3565a86..81c483d 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -525,6 +525,13 @@ class Player: self.pending_action = PendingAction.CHOOSE self.choose_text = 'choose_play_as_bang' self.notify_self() + elif self.is_my_turn and self.pending_action == PendingAction.PLAY and pile == 'event' and self.game.check_event(cew.LadyRosaDelTexas): + nextp = self.game.next_player() + i, j = self.game.players_map[self.name], self.game.players_map[nextp.name] + self.game.players[i], self.game.players[j] = nextp, self + self.game.players_map[self.name], self.game.players_map[nextp.name] = j, i + self.game.turn = j + self.game.notify_all() elif self.is_my_turn and self.pending_action == PendingAction.PLAY and pile == 'event' and self.game.check_event(ce.Rimbalzo) and any((c.name == cs.Bang(0,0).name for c in self.hand)): self.available_cards = [{ 'name': p.name, diff --git a/backend/tests/wild_west_show_events_test.py b/backend/tests/wild_west_show_events_test.py index a8813d1..505d460 100644 --- a/backend/tests/wild_west_show_events_test.py +++ b/backend/tests/wild_west_show_events_test.py @@ -52,7 +52,13 @@ def test_helena_zontero(): assert roles != roles2 # test LadyRosaDelTexas - +def test_miss_suzanna(): + g = started_game(['wild_west_show'], 4) + set_events(g, [None, LadyRosaDelTexas()]) + p = current_player_with_cards(g, [Card(0,'card',0)]*4) + t = g.turn + p.draw('event') + assert g.turn == t+1 # test MissSusanna def test_miss_suzanna():