From a069dcbcaf5f24643e7f4127982011e019e4f67a Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sun, 29 Nov 2020 16:08:46 +0100 Subject: [PATCH] add desc on borraccia, fix apache logic --- backend/bang/expansions/dodge_city/cards.py | 1 + backend/bang/expansions/dodge_city/characters.py | 2 +- backend/bang/players.py | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/backend/bang/expansions/dodge_city/cards.py b/backend/bang/expansions/dodge_city/cards.py index da98e71..12d8df0 100644 --- a/backend/bang/expansions/dodge_city/cards.py +++ b/backend/bang/expansions/dodge_city/cards.py @@ -216,6 +216,7 @@ class Borraccia(Card): def __init__(self, suit, number): super().__init__(suit, 'Borraccia', number) self.icon = '🍼' + self.desc = 'Recupera 1 vita' self.usable_next_turn = True self.can_be_used_now = False diff --git a/backend/bang/expansions/dodge_city/characters.py b/backend/bang/expansions/dodge_city/characters.py index 57d4fb0..b02a326 100644 --- a/backend/bang/expansions/dodge_city/characters.py +++ b/backend/bang/expansions/dodge_city/characters.py @@ -45,7 +45,7 @@ class MollyStark(Character): class ApacheKid(Character): def __init__(self): - super().__init__("Molly Stark", max_lives=3) + super().__init__("Apache Kid", max_lives=3) self.desc = "Le carte di quadri ♦️ giocate contro di lui non hanno effetto (non vale durante i duelli)" self.icon = '♦️' diff --git a/backend/bang/players.py b/backend/bang/players.py index cafc05c..49040ee 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -265,9 +265,9 @@ class Player: if _with != None: withCard = self.hand.pop(_with) if hand_index > _with else self.hand.pop(_with - 1) print(self.name, 'is playing ', card, ' against:', against, ' with:', _with) - did_play_card = card.play_card(self, against, withCard) - if against != None and isinstance(self.game.get_player_named(against).character, chd.ApacheKid) and card.suit == cs.Suit.DIAMONDS: - did_play_card = False + did_play_card = False + if not(against != None and isinstance(self.game.get_player_named(against).character, chd.ApacheKid) and card.suit == cs.Suit.DIAMONDS): + did_play_card = card.play_card(self, against, withCard) if not card.is_equipment and not card.usable_next_turn: if did_play_card: self.game.deck.scrap(card)