techwire/bang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into main

Browse Source
This commit is contained in:
Giulio 2021-05-23 15:53:30 +02:00
commit b7195004f0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/bang/expansions/high_noon/card_events.py
View File

@ -57,7 +57,7 @@ class Sparatoria(CardEvent):
class CorsaAllOro(CardEvent): class CorsaAllOro(CardEvent):
def __init__(self): 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 = "Si gioca per un intero giro in senso antiorario, tuttavia gli effetti delle carte rimangono invariati"
#self.desc_eng = "Turns are played counter clockwise" #self.desc_eng = "Turns are played counter clockwise"

2
backend/bang/players.py
View File

@ -780,7 +780,7 @@ class Player:
print('has mancato') print('has mancato')
self.pending_action = PendingAction.RESPOND self.pending_action = PendingAction.RESPOND
self.expected_response = self.game.deck.mancato_cards.copy() 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() 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: 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) self.expected_response.append(cs.Bang(0, 0).name)

2
frontend/src/i18n/en.json
View File

@ -511,7 +511,7 @@
"name": "The Doctor", "name": "The Doctor",
"desc": "The player with the least amount of HP gets healed 1" "desc": "The player with the least amount of HP gets healed 1"
}, },
"Corsa All'Oro": { "Corsa All Oro": {
"name": "Gold Rush", "name": "Gold Rush",
"desc": "Turns are played counter clockwise" "desc": "Turns are played counter clockwise"
}, },

4
frontend/src/i18n/it.json
View File

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