Merge branch 'dev' into main

albertoxamin · May 23, 2021 · b719500 · b719500
2 parents 4f8b5ea + 63db5d6
commit b719500
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/backend/bang/expansions/high_noon/card_events.py b/backend/bang/expansions/high_noon/card_events.py
@@ -57,7 +57,7 @@ def __init__(self):
 
 class CorsaAllOro(CardEvent):
     def __init__(self):
-        super().__init__("Corsa All'Oro", "🌟")
+        super().__init__("Corsa All Oro", "🌟")
         #self.desc = "Si gioca per un intero giro in senso antiorario, tuttavia gli effetti delle carte rimangono invariati"
         #self.desc_eng = "Turns are played counter clockwise"
 

diff --git a/backend/bang/players.py b/backend/bang/players.py
@@ -780,7 +780,7 @@ def get_banged(self, attacker, double=False, no_dmg=False, card_index=None):
                 print('has mancato')
                 self.pending_action = PendingAction.RESPOND
                 self.expected_response = self.game.deck.mancato_cards.copy()
-                if self.attacker and self.attacker in self.game.get_alive_players() and self.character.check(self.game, chd.BelleStar) or self.game.check_event(ce.Lazo):
+                if self.attacker and self.attacker in self.game.get_alive_players() and attacker.character.check(self.game, chd.BelleStar) or self.game.check_event(ce.Lazo):
                     self.expected_response = self.game.deck.mancato_cards_not_green_or_blue.copy()
                 if self.character.check(self.game, chars.CalamityJanet) and cs.Bang(0, 0).name not in self.expected_response:
                     self.expected_response.append(cs.Bang(0, 0).name)

diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json
@@ -511,7 +511,7 @@
       "name": "The Doctor",
       "desc": "The player with the least amount of HP gets healed 1"
     },
-    "Corsa All'Oro": {
+    "Corsa All Oro": {
       "name": "Gold Rush",
       "desc": "Turns are played counter clockwise"
     },

diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json
@@ -491,8 +491,8 @@
       "name": "Maledizione",
       "desc": "Tutte le carte sono considerate di picche \u2660"
     },
-    "Corsa All'Oro": {
-      "name": "Corsa All'Oro",
+    "Corsa All Oro": {
+      "name": "Corsa All\u0027Oro",
       "desc": "Si gioca per un intero giro in senso antiorario, tuttavia gli effetti delle carte rimangono invariati"
     },
     "Il Reverendo": {