From c05c79ee5bd3c201b122e0e341ac72d4b42aa0d8 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sat, 28 Nov 2020 21:33:45 +0100 Subject: [PATCH 01/27] implemented new characters --- backend/bang/cards.py | 3 ++ backend/bang/characters.py | 14 ++++-- backend/bang/deck.py | 4 ++ backend/bang/expansions/__init__.py | 4 +- backend/bang/expansions/dodge_city/cards.py | 10 ++-- .../bang/expansions/dodge_city/characters.py | 48 +++++++++++++++++++ backend/bang/game.py | 13 ++++- backend/bang/players.py | 15 +++++- frontend/src/components/Player.vue | 2 +- 9 files changed, 99 insertions(+), 14 deletions(-) create mode 100644 backend/bang/expansions/dodge_city/characters.py diff --git a/backend/bang/cards.py b/backend/bang/cards.py index ce84677..f7a9a08 100644 --- a/backend/bang/cards.py +++ b/backend/bang/cards.py @@ -188,6 +188,9 @@ class Birra(Card): if len(player.game.players) != 2: super().play_card(player, against=against) player.lives = min(player.lives+1, player.max_lives) + import bang.expansions.dodge_city.characters as chd + if isinstance(player.character, chd.TequilaJoe): + player.lives = min(player.lives+1, player.max_lives) return True elif len(player.game.players) == 2: player.sio.emit('chat_message', room=player.game.name, diff --git a/backend/bang/characters.py b/backend/bang/characters.py index 23d4728..97b6c3b 100644 --- a/backend/bang/characters.py +++ b/backend/bang/characters.py @@ -1,4 +1,5 @@ -from abc import ABC, abstractmethod +from abc import ABC, abstractmethod +from typing import List class Character(ABC): def __init__(self, name: str, max_lives: int, sight_mod: int = 0, visibility_mod: int = 0, pick_mod: int = 0, desc: str = ''): @@ -33,7 +34,6 @@ class BartCassidy(Character): super().__init__("Bart Cassidy", max_lives=4) self.desc = "Ogni volta che viene ferito, pesca una carta" self.icon = '💔' - #una sola carta per ogni gruppo di danni. es: dinamite -> 1 carta def on_hurt(self, dmg): pass @@ -133,8 +133,9 @@ class WillyTheKid(Character): self.desc = "Questo personaggio può giocare quanti bang vuole nel suo turno" self.icon = '🎉' -def all_characters(): - return [ +def all_characters(expansions: List[str]): + from bang.expansions import DodgeCity + base_chars = [ BartCassidy(), BlackJack(), CalamityJanet(), @@ -151,4 +152,7 @@ def all_characters(): SuzyLafayette(), VultureSam(), WillyTheKid(), - ] \ No newline at end of file + ] + if 'dodge_city' in expansions: + base_chars.extend(DodgeCity.get_characters()) + return base_chars \ No newline at end of file diff --git a/backend/bang/deck.py b/backend/bang/deck.py index e8aaf33..f3924f6 100644 --- a/backend/bang/deck.py +++ b/backend/bang/deck.py @@ -10,6 +10,10 @@ class Deck: for c in self.cards: if isinstance(c, cs.Mancato) and c.name not in self.mancato_cards: self.mancato_cards.append(c.name) + self.all_cards_str: List[str] = [] + for c in self.cards: + if c.name not in self.all_cards_str: + self.all_cards_str.append(c.name) self.game = game random.shuffle(self.cards) self.scrap_pile: List[cs.Card] = [] diff --git a/backend/bang/expansions/__init__.py b/backend/bang/expansions/__init__.py index aebf978..4409025 100644 --- a/backend/bang/expansions/__init__.py +++ b/backend/bang/expansions/__init__.py @@ -1,5 +1,7 @@ -from bang.expansions.dodge_city import cards +from bang.expansions.dodge_city import cards, characters class DodgeCity(): + def get_characters(): + return characters.all_characters() def get_cards(): return cards.get_starting_deck() \ No newline at end of file diff --git a/backend/bang/expansions/dodge_city/cards.py b/backend/bang/expansions/dodge_city/cards.py index a821ce5..2d75e39 100644 --- a/backend/bang/expansions/dodge_city/cards.py +++ b/backend/bang/expansions/dodge_city/cards.py @@ -211,17 +211,19 @@ class Derringer(Pugnale): player.equipment.append(self) return True -class Borraccia(Birra): +class Borraccia(Card): def __init__(self, suit, number): - super().__init__(suit, number) - self.name = 'Borraccia' + super().__init__(suit, 'Borraccia', number) self.icon = '🍼' self.usable_next_turn = True self.can_be_used_now = False def play_card(self, player, against, _with=None): if self.can_be_used_now: - return super().play_card(player, against) + super().play_card(player, against) + player.lives = min(player.lives+1, player.max_lives) + player.notify_self() + return True else: player.equipment.append(self) return True diff --git a/backend/bang/expansions/dodge_city/characters.py b/backend/bang/expansions/dodge_city/characters.py new file mode 100644 index 0000000..f45a2a7 --- /dev/null +++ b/backend/bang/expansions/dodge_city/characters.py @@ -0,0 +1,48 @@ +from typing import List +from bang.characters import * + +class PixiePete(Character): + def __init__(self): + super().__init__("Pixie Pete", max_lives=3) + self.desc = "Pesca 3 carte invece che 2" + self.icon = '☘️' + +class TequilaJoe(Character): + def __init__(self): + super().__init__("Tequila Joe", max_lives=4) + self.desc = "Le birre gli fanno recuperare 2 vite" + self.icon = '🍻' + +class GregDigger(Character): + def __init__(self): + super().__init__("Greg Digger", max_lives=4) + self.desc = "Quando un giocatore muore, recupera 2 vite" + self.icon = '🦴' + +class HerbHunter(Character): + def __init__(self): + super().__init__("HerbHunter", max_lives=4) + self.desc = "Quando un giocatore muore, ottiene 2 carte" + self.icon = '⚰️' + +class ElenaFuente(Character): + def __init__(self): + super().__init__("Elena Fuente", max_lives=3) + self.desc = "Può usare una carta qualsiasi come mancato" + self.icon = '🧘‍♀️' + +class BillNoface(Character): + def __init__(self): + super().__init__("Bill Noface", max_lives=4) + self.desc = "Pesca 1 carta + 1 carta per ogni ferita" + self.icon = '🙈' + +def all_characters() -> List[Character]: + return [ + PixiePete(), + TequilaJoe(), + GregDigger(), + HerbHunter(), + ElenaFuente(), + BillNoface(), + ] \ No newline at end of file diff --git a/backend/bang/game.py b/backend/bang/game.py index b0679bb..5fd896c 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -74,7 +74,7 @@ class Game: self.players[self.turn].play_turn() def choose_characters(self): - char_cards = random.sample(characters.all_characters(), len(self.players)*2) + char_cards = random.sample(characters.all_characters(self.expansions), len(self.players)*2) for i in range(len(self.players)): self.players[i].set_available_character(char_cards[i * 2 : i * 2 + 2]) @@ -209,6 +209,7 @@ class Game: else: return False def player_death(self, player: players.Player): + import bang.expansions.dodge_city.characters as chd print(player.attacker) if player.attacker and isinstance(player.attacker, roles.Sheriff) and isinstance(player.role, roles.Vice): for i in range(len(player.attacker.hand)): @@ -223,6 +224,7 @@ class Game: print(f'player {player.name} died') if (self.waiting_for > 0): self.responders_did_respond_resume_turn() + vulture = [p for p in self.players if isinstance(p.character, characters.VultureSam)] if len(vulture) == 0: for i in range(len(player.hand)): @@ -234,6 +236,15 @@ class Game: vulture[0].hand.append(player.hand.pop()) for i in range(len(player.equipment)): vulture[0].hand.append(player.equipment.pop()) + vulture[0].notify_self() + greg = [p for p in self.players if isinstance(p.character, chd.GregDigger)] + if len(greg) > 0: + greg[0].lives = min(greg[0].lives+2, greg[0].max_lives) + herb = [p for p in self.players if isinstance(p.character, chd.HerbHunter)] + if len(herb) > 0: + herb[0].hand.append(self.deck.draw()) + herb[0].hand.append(self.deck.draw()) + index = self.players.index(player) died_in_his_turn = self.started and index == self.turn if self.started and index <= self.turn: diff --git a/backend/bang/players.py b/backend/bang/players.py index 6b316e5..df78d28 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -7,6 +7,7 @@ import bang.roles as r import bang.cards as cs import bang.expansions.dodge_city.cards as csd import bang.characters as chars +import bang.expansions.dodge_city.characters as chd class PendingAction(IntEnum): PICK = 0 @@ -164,6 +165,10 @@ class Player: self.sio.emit('chat_message', room=self.game.name, data=f'{self.name} ha pescato la prima carta dalla mano di {pile}.') self.hand.append(self.game.deck.draw()) + elif isinstance(self.character, chd.BillNoface): + self.hand.append(self.game.deck.draw()) + for i in range(self.max_lives-self.lives): + self.hand.append(self.game.deck.draw()) else: for i in range(2): card: cs.Card = self.game.deck.draw() @@ -174,6 +179,8 @@ class Player: p.notify_card(self, card) if card.suit == cs.Suit.HEARTS or card.suit == cs.Suit.DIAMONDS: self.hand.append(self.game.deck.draw()) + if isinstance(self.character, chd.PixiePete): + self.hand.append(self.game.deck.draw()) self.notify_self() def pick(self): @@ -327,13 +334,15 @@ class Player: if self.mancato_needed <= 0: self.game.responders_did_respond_resume_turn() return - if len([c for c in self.hand if isinstance(c, cs.Mancato) or (isinstance(self.character, chars.CalamityJanet) and isinstance(c, cs.Bang))]) == 0\ + if len([c for c in self.hand if isinstance(c, cs.Mancato) or (isinstance(self.character, chars.CalamityJanet) and isinstance(c, cs.Bang)) or isinstance(self.character, chd.ElenaFuente)]) == 0\ and len([c for c in self.equipment if c.can_be_used_now and isinstance(c, cs.Mancato)]) == 0: self.take_damage_response() self.game.responders_did_respond_resume_turn() else: self.pending_action = PendingAction.RESPOND self.expected_response = self.game.deck.mancato_cards + if isinstance(self.character, chd.ElenaFuente): + self.expected_response = self.game.deck.all_cards_str self.on_failed_response_cb = self.take_damage_response self.notify_self() @@ -344,7 +353,7 @@ class Player: if self.equipment[i].can_be_used_now: print('usable', self.equipment[i]) if len([c for c in self.equipment if isinstance(c, cs.Barile)]) == 0 and not isinstance(self.character, chars.Jourdonnais)\ - and len([c for c in self.hand if isinstance(c, cs.Mancato) or (isinstance(self.character, chars.CalamityJanet) and isinstance(c, cs.Bang))]) == 0\ + and len([c for c in self.hand if isinstance(c, cs.Mancato) or (isinstance(self.character, chars.CalamityJanet) and isinstance(c, cs.Bang)) or isinstance(self.character, chd.ElenaFuente)]) == 0\ and len([c for c in self.equipment if c.can_be_used_now and isinstance(c, cs.Mancato)]) == 0: print('Cant defend') self.take_damage_response() @@ -358,6 +367,8 @@ class Player: print('has mancato') self.pending_action = PendingAction.RESPOND self.expected_response = self.game.deck.mancato_cards + if isinstance(self.character, chd.ElenaFuente): + self.expected_response = self.game.deck.all_cards_str self.on_failed_response_cb = self.take_damage_response self.notify_self() return True diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue index 6a59c50..57532d8 100644 --- a/frontend/src/components/Player.vue +++ b/frontend/src/components/Player.vue @@ -197,7 +197,7 @@ export default { this.hand.filter(x => x.can_be_used_now && this.expected_response.indexOf(x.name) !== -1).forEach(x=>{ cc.push(x) }) - this.equipment.filter(x => x.can_be_used_now && this.expected_response.indexOf(x.name) !== -1).forEach(x=>{ + this.equipment.filter(x => x.usable_next_turn && x.can_be_used_now && this.expected_response.indexOf(x.name) !== -1).forEach(x=>{ cc.push(x) }) return cc From ce77bfef22079f37001044dd0acdfaf00387f5de Mon Sep 17 00:00:00 2001 From: Giulio Date: Sat, 28 Nov 2020 22:15:32 +0100 Subject: [PATCH 02/27] clarifications --- backend/bang/cards.py | 2 +- backend/bang/expansions/dodge_city/cards.py | 11 ++++++----- backend/bang/expansions/dodge_city/characters.py | 12 ++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/backend/bang/cards.py b/backend/bang/cards.py index f7a9a08..cccbf03 100644 --- a/backend/bang/cards.py +++ b/backend/bang/cards.py @@ -289,7 +289,7 @@ class Mancato(Card): def __init__(self, suit, number): super().__init__(suit, 'Mancato!', number) self.icon = '😅' - self.desc = "Usa questa carta per annullare un Bang!" + self.desc = "Usa questa carta per annullare un bang" def play_card(self, player, against, _with=None): import bang.characters as chars diff --git a/backend/bang/expansions/dodge_city/cards.py b/backend/bang/expansions/dodge_city/cards.py index 2d75e39..6b917ea 100644 --- a/backend/bang/expansions/dodge_city/cards.py +++ b/backend/bang/expansions/dodge_city/cards.py @@ -31,7 +31,7 @@ class Schivata(Mancato): super().__init__(suit, number) self.name = 'Schivata' self.icon = '🙅‍♂️' - self.desc = "Usa questa carta per annullare un Bang! e poi pesca una carta" + self.desc += " e poi pesca una carta" self.alt_text = '☝️🆓' def play_card(self, player, against, _with=None): @@ -149,10 +149,6 @@ class Bibbia(Schivata): player.equipment.append(self) return True - def use_card(self, player): - player.hand.append(player.game.deck.draw()) - player.notify_self() - class Cappello(Mancato): def __init__(self, suit, number): super().__init__(suit, number) @@ -202,6 +198,7 @@ class Derringer(Pugnale): self.name = 'Derringer' self.icon = '🚬' self.alt_text += ' ☝️🆓' + self.desc += ' e poi pesca una carta' def play_card(self, player, against, _with=None): if self.can_be_used_now: @@ -211,6 +208,10 @@ class Derringer(Pugnale): player.equipment.append(self) return True + def use_card(self, player): + player.hand.append(player.game.deck.draw()) + player.notify_self() + class Borraccia(Card): def __init__(self, suit, number): super().__init__(suit, 'Borraccia', number) diff --git a/backend/bang/expansions/dodge_city/characters.py b/backend/bang/expansions/dodge_city/characters.py index f45a2a7..c7177b7 100644 --- a/backend/bang/expansions/dodge_city/characters.py +++ b/backend/bang/expansions/dodge_city/characters.py @@ -4,37 +4,37 @@ from bang.characters import * class PixiePete(Character): def __init__(self): super().__init__("Pixie Pete", max_lives=3) - self.desc = "Pesca 3 carte invece che 2" + self.desc = "All'inizio del turno pesca 3 carte invece che 2" self.icon = '☘️' class TequilaJoe(Character): def __init__(self): super().__init__("Tequila Joe", max_lives=4) - self.desc = "Le birre gli fanno recuperare 2 vite" + self.desc = "Se gioca la carta Birra recupera 2 vite invece che una sola" self.icon = '🍻' class GregDigger(Character): def __init__(self): super().__init__("Greg Digger", max_lives=4) - self.desc = "Quando un giocatore muore, recupera 2 vite" + self.desc = "Quando un giocatore muore, recupera fino a 2 vite" self.icon = '🦴' class HerbHunter(Character): def __init__(self): super().__init__("HerbHunter", max_lives=4) - self.desc = "Quando un giocatore muore, ottiene 2 carte" + self.desc = "Quando un giocatore muore, pesca 2 carte" self.icon = '⚰️' class ElenaFuente(Character): def __init__(self): super().__init__("Elena Fuente", max_lives=3) - self.desc = "Può usare una carta qualsiasi come mancato" + self.desc = "Può usare una carta qualsiasi nella sua mano come mancato" self.icon = '🧘‍♀️' class BillNoface(Character): def __init__(self): super().__init__("Bill Noface", max_lives=4) - self.desc = "Pesca 1 carta + 1 carta per ogni ferita" + self.desc = "Pesca 1 carta + 1 carta per ogni ferita che ha" self.icon = '🙈' def all_characters() -> List[Character]: From fd3334b012e1f250827254b46545087d11ecf68e Mon Sep 17 00:00:00 2001 From: Giulio Date: Sat, 28 Nov 2020 22:51:06 +0100 Subject: [PATCH 03/27] little help --- backend/bang/cards.py | 1 - backend/bang/expansions/dodge_city/cards.py | 2 +- backend/bang/expansions/dodge_city/characters.py | 16 +++++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/backend/bang/cards.py b/backend/bang/cards.py index cccbf03..bbf60ac 100644 --- a/backend/bang/cards.py +++ b/backend/bang/cards.py @@ -226,7 +226,6 @@ class Diligenza(Card): self.desc = "Pesca 2 carte dalla cima del mazzo" def play_card(self, player, against, _with=None): - super().play_card(player, against=against) player.sio.emit('chat_message', room=player.game.name, data=f'{player.name} ha giocato {self.name} e ha pescato 2 carte.') for i in range(2): diff --git a/backend/bang/expansions/dodge_city/cards.py b/backend/bang/expansions/dodge_city/cards.py index 6b917ea..da98e71 100644 --- a/backend/bang/expansions/dodge_city/cards.py +++ b/backend/bang/expansions/dodge_city/cards.py @@ -75,7 +75,7 @@ class Rissa(CatBalou): player.game.deck.scrap(_with) player.event_type = 'rissa' super().play_card(player, against=players_with_cards[0]) - player.sio.emit('chat_message', room=player.game.name, data=f'{player.name} ha giocato {self.name}') + player.sio.emit('chat_message', room=player.game.name, data=f'{player.name} ha giocato {self.name}.') return True return False diff --git a/backend/bang/expansions/dodge_city/characters.py b/backend/bang/expansions/dodge_city/characters.py index c7177b7..e0a9bd0 100644 --- a/backend/bang/expansions/dodge_city/characters.py +++ b/backend/bang/expansions/dodge_city/characters.py @@ -45,4 +45,18 @@ def all_characters() -> List[Character]: HerbHunter(), ElenaFuente(), BillNoface(), - ] \ No newline at end of file + ] + +#Apache Kid: il suo effetto non conta nei duelli +#belle star: vale solo per le carte blu e verdi +#chuck wengam: può usarlo più volte in un turno, ma non può suicidarsi +#doc holiday: il suo effetto non conta nel limite di un bang per turno, +# se deve sparare a Apache Kid una delle due carte scartate non deve essere di quadri +#molly stark: le carte scartate che valgono sono solo quelle scartate volontariamente, +# carte scartate per colpa di can can, cat balou, rissa, panico non valgono, +# invece carte scartata per indiani, birra(in caso di morte), o un mancato valgono, +# in un duello pesca solo quando il duello è finito (una carta x ogni bang scartato) +#pat brennan: quando pesca con il suo effetto, pesca solo la carta del giocatore non anche dal mazzo +#vera custer: la scelta può essere fatta solo appena prima di pescare, +# quando inizia la partita serve farle scegliere, poi può rimanere quello finchè non decide di cambiarlo +# eventualmente fare una schermata dove vede tutti i personaggi \ No newline at end of file From 795dcf82a78495ce380ad9b76554dccbaa8848ae Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sun, 29 Nov 2020 15:42:29 +0100 Subject: [PATCH 04/27] molly stark --- backend/bang/expansions/dodge_city/characters.py | 7 +++++++ backend/bang/players.py | 2 ++ 2 files changed, 9 insertions(+) diff --git a/backend/bang/expansions/dodge_city/characters.py b/backend/bang/expansions/dodge_city/characters.py index e0a9bd0..b33ee4d 100644 --- a/backend/bang/expansions/dodge_city/characters.py +++ b/backend/bang/expansions/dodge_city/characters.py @@ -37,6 +37,12 @@ class BillNoface(Character): self.desc = "Pesca 1 carta + 1 carta per ogni ferita che ha" self.icon = '🙈' +class MollyStark(Character): + def __init__(self): + super().__init__("Molly Stark", max_lives=4) + self.desc = "Quando usa una carta che ha in mano, fuori dal suo turno, ne ottiene un'altra dal mazzo" + self.icon = '🙅‍♀️' + def all_characters() -> List[Character]: return [ PixiePete(), @@ -45,6 +51,7 @@ def all_characters() -> List[Character]: HerbHunter(), ElenaFuente(), BillNoface(), + MollyStark(), ] #Apache Kid: il suo effetto non conta nei duelli diff --git a/backend/bang/players.py b/backend/bang/players.py index df78d28..080ab9b 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -435,6 +435,8 @@ class Player: ((hand_index < len(self.hand) and self.hand[hand_index].name in self.expected_response)) or self.equipment[hand_index-len(self.hand)].name in self.expected_response): card = self.hand.pop(hand_index) if hand_index < len(self.hand) else self.equipment.pop(hand_index-len(self.hand)) + if isinstance(self.character, chd.MollyStark) and hand_index < len(self.hand): + self.hand.append(self.game.deck.draw()) card.use_card(self) self.game.deck.scrap(card) self.notify_self() From 174f4d7f86595a4a58012d832aa85cf135f5f91e Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sun, 29 Nov 2020 15:50:19 +0100 Subject: [PATCH 05/27] apache kid --- backend/bang/expansions/dodge_city/characters.py | 7 +++++++ backend/bang/players.py | 2 ++ 2 files changed, 9 insertions(+) diff --git a/backend/bang/expansions/dodge_city/characters.py b/backend/bang/expansions/dodge_city/characters.py index b33ee4d..57d4fb0 100644 --- a/backend/bang/expansions/dodge_city/characters.py +++ b/backend/bang/expansions/dodge_city/characters.py @@ -43,6 +43,12 @@ class MollyStark(Character): self.desc = "Quando usa una carta che ha in mano, fuori dal suo turno, ne ottiene un'altra dal mazzo" self.icon = '🙅‍♀️' +class ApacheKid(Character): + def __init__(self): + super().__init__("Molly Stark", max_lives=3) + self.desc = "Le carte di quadri ♦️ giocate contro di lui non hanno effetto (non vale durante i duelli)" + self.icon = '♦️' + def all_characters() -> List[Character]: return [ PixiePete(), @@ -52,6 +58,7 @@ def all_characters() -> List[Character]: ElenaFuente(), BillNoface(), MollyStark(), + ApacheKid(), ] #Apache Kid: il suo effetto non conta nei duelli diff --git a/backend/bang/players.py b/backend/bang/players.py index 080ab9b..cafc05c 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -266,6 +266,8 @@ class Player: 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 if not card.is_equipment and not card.usable_next_turn: if did_play_card: self.game.deck.scrap(card) From 5eacffeb5cc2b5e7dd9a413a8ee00b6dabeb991c Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sun, 29 Nov 2020 15:56:50 +0100 Subject: [PATCH 06/27] fix slab the killer --- backend/bang/cards.py | 2 +- backend/bang/game.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/bang/cards.py b/backend/bang/cards.py index bbf60ac..31629f5 100644 --- a/backend/bang/cards.py +++ b/backend/bang/cards.py @@ -173,7 +173,7 @@ class Bang(Card): super().play_card(player, against=against) player.has_played_bang = not isinstance( player.character, chars.WillyTheKid) - player.game.attack(player, against) + player.game.attack(player, against, double=isinstance(player.character, chars.SlabTheKiller)) return True return False diff --git a/backend/bang/game.py b/backend/bang/game.py index 5fd896c..db79c77 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -137,8 +137,8 @@ class Game: attacker.pending_action = players.PendingAction.PLAY attacker.notify_self() - def attack(self, attacker: players.Player, target_username:str): - if self.players[self.players_map[target_username]].get_banged(attacker=attacker, double=isinstance(attacker.character, characters.SlabTheKiller)): + def attack(self, attacker: players.Player, target_username:str, double:bool=False): + if self.players[self.players_map[target_username]].get_banged(attacker=attacker, double=double): self.readyCount = 0 self.waiting_for = 1 attacker.pending_action = players.PendingAction.WAIT From a069dcbcaf5f24643e7f4127982011e019e4f67a Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sun, 29 Nov 2020 16:08:46 +0100 Subject: [PATCH 07/27] 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) From d866cf13b8d070deab0679697c825239d0f78fc4 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sun, 29 Nov 2020 16:55:14 +0100 Subject: [PATCH 08/27] add desc_eng --- backend/bang/cards.py | 24 ++++++++++++++++++- backend/bang/characters.py | 19 ++++++++++++--- backend/bang/expansions/dodge_city/cards.py | 9 +++++++ .../bang/expansions/dodge_city/characters.py | 8 +++++++ backend/bang/roles.py | 4 ++++ frontend/src/components/Chooser.vue | 2 +- frontend/src/components/Deck.vue | 13 +++++----- frontend/src/components/Player.vue | 10 ++++---- 8 files changed, 73 insertions(+), 16 deletions(-) diff --git a/backend/bang/cards.py b/backend/bang/cards.py index 31629f5..cc1af41 100644 --- a/backend/bang/cards.py +++ b/backend/bang/cards.py @@ -80,6 +80,7 @@ class Barile(Card): super().__init__(suit, 'Barile', number, is_equipment=True) self.icon = '🛢' self.desc = "Quando sei bersagliato da un Bang puoi estrarre la prima carta dalla cima del mazzo, se la carta estratta è del seme Cuori allora vale come un Mancato" + self.desc_eng = "When someone plays a Bang against you. You can flip the first card from the deck, if the suit is Hearts then it counts as a Missed card" class Dinamite(Card): @@ -87,6 +88,7 @@ class Dinamite(Card): super().__init__(suit, 'Dinamite', number, is_equipment=True) self.icon = '🧨' self.desc = "Giocando la Dinamite, posizionala davanti a te, resterà innocua per un intero giro. All'inizio del prossimo turno prima di pescare e prima di una eventuale estrazione (es. Prigione), estrai una carta dalla cima del mazzo. Se esce una carta tra il 2 il 9 di picche (compresi) allora la dinamite esplode: perdi 3 vite e scarta la carta, altrimenti passa la dinamite al giocatore successivo, il quale estrarà a sua volta dopo che tu avrai passato il tuo turno" + self.desc_eng = "When playing Dynamite, place it in front of you, it will remain harmless for a whole round. At the beginning of the next turn before drawing and before any card flip (eg Prison), flip a card from the top of the deck. If a card is between 2 and 9 of spades (inclusive) then the dynamite explodes: you lose 3 lives and discard the card, otherwise pass the dynamite to the next player, who will draw in turn after you have ended your turn" class Mirino(Card): @@ -94,6 +96,7 @@ class Mirino(Card): super().__init__(suit, 'Mirino', number, is_equipment=True, sight_mod=1) self.icon = '🔎' self.desc = "Tu vedi gli altri giocatori a distanza -1" + self.desc_eng = "You see the other players at distance -1" class Mustang(Card): @@ -101,6 +104,7 @@ class Mustang(Card): super().__init__(suit, 'Mustang', number, is_equipment=True, vis_mod=1) self.icon = '🐎' self.desc = "Gli altri giocatori ti vedono a distanza +1" + self.desc_eng = "The other players see you at distance +1" class Prigione(Card): @@ -108,6 +112,7 @@ class Prigione(Card): super().__init__(suit, 'Prigione', number, is_equipment=True) self.icon = '⛓' self.desc = "Equipaggia questa carta a un altro giocatore, tranne lo Sceriffo. Il giocatore scelto all'inizio del suo turno, prima di pescare dovrà estrarre: se esce Cuori scarta questa carta e gioca normalmente il turno, altrimenti scarta questa carta e salta il turno" + self.desc_eng = "Equip this card to another player, except the Sheriff. The player chosen at the beginning of his turn, must flip a card before drawing: if it's Hearts, discard this card and play the turn normally, otherwise discard this card and skip the turn" self.need_target = True def play_card(self, player, against, _with=None): @@ -124,6 +129,7 @@ class Remington(Card): is_equipment=True, is_weapon=True, range=3) self.icon = '🔫' self.desc = "Puoi sparare a un giocatore che sia distante 3 o meno" + self.desc_eng = "You can shoot another player at distance 3 or less" class RevCarabine(Card): @@ -132,6 +138,7 @@ class RevCarabine(Card): is_equipment=True, is_weapon=True, range=4) self.icon = '🔫' self.desc = "Puoi sparare a un giocatore che sia distante 4 o meno" + self.desc_eng = "You can shoot another player at distance 4 or less" class Schofield(Card): @@ -140,6 +147,7 @@ class Schofield(Card): is_equipment=True, is_weapon=True, range=2) self.icon = '🔫' self.desc = "Puoi sparare a un giocatore che sia distante 2 o meno" + self.desc_eng = "You can shoot another player at distance 2 or less" class Volcanic(Card): @@ -148,6 +156,7 @@ class Volcanic(Card): is_equipment=True, is_weapon=True, range=1) self.icon = '🔫' self.desc = "Puoi sparare a un giocatore che sia distante 1 o meno, tuttavia puoi giocare quanti bang vuoi" + self.desc_eng = "You can shoot another player at distance 1 or less, however you no longer have the limit of 1 Bang" class Winchester(Card): @@ -156,6 +165,7 @@ class Winchester(Card): is_equipment=True, is_weapon=True, range=5) self.icon = '🔫' self.desc = "Puoi sparare a un giocatore che sia distante 5 o meno" + self.desc_eng = "You can shoot another player at distance 5 or less" class Bang(Card): @@ -163,6 +173,7 @@ class Bang(Card): super().__init__(suit, 'Bang!', number) self.icon = '💥' self.desc = "Spara a un giocatore a distanza raggiungibile. Se non hai armi la distanza di default è 1" + self.desc_eng = "Shoot a player in sight. If you do not have weapons, your is sight is 1" self.need_target = True def play_card(self, player, against, _with=None): @@ -183,6 +194,7 @@ class Birra(Card): super().__init__(suit, 'Birra', number) self.icon = '🍺' self.desc = "Gioca questa carta per recuperare un punto vita. Non puoi andare oltre al limite massimo del tuo personaggio. Se stai per perdere l'ultimo punto vita puoi giocare questa carta anche nel turno dell'avversario. La birra non ha più effetto se ci sono solo due giocatori" + self.desc_eng = "Play this card to regain a life point. You cannot heal more than your character's maximum limit. If you are about to lose your last life point, you can also play this card on your opponent's turn. Beer no longer takes effect if there are only two players" def play_card(self, player, against, _with=None): if len(player.game.players) != 2: @@ -204,6 +216,7 @@ class CatBalou(Card): super().__init__(suit, 'Cat Balou', number) self.icon = '💃' self.desc = "Fai scartare una carta a un qualsiasi giocatore, scegli a caso dalla mano, oppure fra quelle che ha in gioco" + self.desc_eng = "Choose and discard a card from any other player." self.need_target = True def play_card(self, player, against, _with=None): @@ -224,6 +237,7 @@ class Diligenza(Card): super().__init__(suit, 'Diligenza', number) self.icon = '🚡' self.desc = "Pesca 2 carte dalla cima del mazzo" + self.desc_eng = "Draw 2 cards from the deck." def play_card(self, player, against, _with=None): player.sio.emit('chat_message', room=player.game.name, @@ -239,6 +253,7 @@ class Duello(Card): self.need_target = True self.icon = '⚔️' self.desc = "Gioca questa carta contro un qualsiasi giocatore. A turno, cominciando dal tuo avversario, potete scartare una carta Bang!, il primo giocatore che non lo fa perde 1 vita" + self.desc_eng = "Play this card against any player. In turn, starting with your opponent, you can discard a Bang! Card, the first player who does not do so loses 1 life." def play_card(self, player, against, _with=None): if against != None: @@ -252,7 +267,8 @@ class Emporio(Card): def __init__(self, suit, number): super().__init__(suit, 'Emporio', number) self.icon = '🏪' - self.desc = "Scopri dal mazzo tante carte quanto il numero di giocatori, a turno, partendo da te, scegliete una carta e aggiungetela alla vostra mano" + self.desc = "Scopri dal mazzo tante carte quanto il numero di giocatori vivi, a turno, partendo da te, scegliete una carta e aggiungetela alla vostra mano" + self.desc_eng = "Put on the table N cards from the deck, where N is the number of alive players, in turn, starting with you, choose a card and add it to your hand" def play_card(self, player, against, _with=None): super().play_card(player, against=against) @@ -265,6 +281,7 @@ class Gatling(Card): super().__init__(suit, 'Gatling', number) self.icon = '🛰' self.desc = "Spara a tutti gli altri giocatori" + self.desc_eng = "Shoot all the other players" def play_card(self, player, against, _with=None): super().play_card(player, against=against) @@ -277,6 +294,7 @@ class Indiani(Card): super().__init__(suit, 'Indiani!', number) self.icon = '🏹' self.desc = "Tutti gli altri giocatori devono scartare un Bang! o perdere una vita" + self.desc_eng = "All the other players must discard a Bang! or lose 1 Health Point" def play_card(self, player, against, _with=None): super().play_card(player, against=against) @@ -289,6 +307,7 @@ class Mancato(Card): super().__init__(suit, 'Mancato!', number) self.icon = '😅' self.desc = "Usa questa carta per annullare un bang" + self.desc_eng = "Use this card to cancel the effect of a bang" def play_card(self, player, against, _with=None): import bang.characters as chars @@ -307,6 +326,7 @@ class Panico(Card): self.icon = '😱' self.need_target = True self.desc = "Pesca una carta da un giocatore a distanza 1, scegli a caso dalla mano, oppure fra quelle che ha in gioco" + self.desc_eng = "Steal a card from a player at distance 1" def play_card(self, player, against, _with=None): if against != None and (len(player.game.get_player_named(against).hand) + len(player.game.get_player_named(against).equipment)) > 0: @@ -324,6 +344,7 @@ class Saloon(Card): def __init__(self, suit, number): super().__init__(suit, 'Saloon', number) self.desc = "Tutti i giocatori recuperano un punto vita compreso chi gioca la carta" + self.desc_eng = "Everyone heals 1 Health point" self.icon = '🍻' def play_card(self, player, against, _with=None): @@ -339,6 +360,7 @@ class WellsFargo(Card): def __init__(self, suit, number): super().__init__(suit, 'WellsFargo', number) self.desc = "Pesca 3 carte dalla cima del mazzo" + self.desc_eng = "Draw 3 cards from the deck" self.icon = '💸' def play_card(self, player, against, _with=None): diff --git a/backend/bang/characters.py b/backend/bang/characters.py index 97b6c3b..3356c31 100644 --- a/backend/bang/characters.py +++ b/backend/bang/characters.py @@ -33,6 +33,7 @@ class BartCassidy(Character): def __init__(self): super().__init__("Bart Cassidy", max_lives=4) self.desc = "Ogni volta che viene ferito, pesca una carta" + self.desc_eng = "Each time he is hurt, he draws a card" self.icon = '💔' def on_hurt(self, dmg): @@ -42,6 +43,7 @@ class BlackJack(Character): def __init__(self): super().__init__("Black Jack", max_lives=4) self.desc = "All'inizio del suo turno, quando deve pescare, mostra a tutti la seconda carta, se è Cuori o Quadri pesca una terza carta senza farla vedere" + self.desc_eng = "At the beginning of his turn, when he has to draw, he shows everyone the second card, if it is Hearts or Diamonds he draws a third card without showing it" self.icon = '🎰' class CalamityJanet(Character): @@ -49,14 +51,13 @@ class CalamityJanet(Character): super().__init__("Calamity Janet", max_lives=4) self.icon = '🔀' self.desc = "Può usare i Mancato! come Bang! e viceversa" - #TODO: gestire bene la scelta multipla in ogni iterazione con la carta bang e mancato - # vale anche per le carte indiani e duello - # se usa un mancato come bang ovviamente non ne può usare altri lo stesso turno se non ha una volcanic + self.desc_eng = "She can use the Missed! as Bang! and the other way around" class ElGringo(Character): def __init__(self): super().__init__("El Gringo", max_lives=3) self.desc = "Ogni volta che perde un punto vita pesca una carta dalla mano del giocatore responsabile ma solo se il giocatore in questione ha carte in mano (una carta per ogni punto vita)" + self.desc_eng = "Each time he is hurt, he draws a card from the hand of the attacking player" self.icon = '🤕' # ovviamente la dinamite non è considerata danno inferto da un giocatore @@ -64,36 +65,42 @@ class JesseJones(Character): def __init__(self): super().__init__("Jesse Jones", max_lives=4) self.desc = "All'inizio del suo turno, quando deve pescare, può prendere la prima carta a caso dalla mano di un giocatore e la seconda dal mazzo" + self.desc_eng = "When he has to draw his cards, he may draw the first card from the hand of another player" self.icon = '😜' class Jourdonnais(Character): def __init__(self): super().__init__("Jourdonnais", max_lives=4) self.desc = "Gioca come se avesse un Barile sempre attivo, nel caso in cui metta in gioco un Barile 'Reale' può estrarre due volte" + self.desc_eng = "He plays as he had a Barrel always active, if he equips another Barrel, he can flip 2 cards" self.icon = '🛢' class KitCarlson(Character): def __init__(self): super().__init__("Kit Carlson", max_lives=4) self.desc = "All'inizio del suo turno, quando deve pescare, pesca tre carte, ne sceglie due da tenere in mano e la rimanente la rimette in cima la mazzo" + self.desc_eng = "When he has to draw, he peeks 3 cards and chooses 2, putting the other card on the top of the deck" self.icon = '🤔' class LuckyDuke(Character): def __init__(self): super().__init__("Lucky Duke", max_lives=4, pick_mod=1) self.desc = "Ogni volta che deve estrarre, prende due carte dal mazzo, sceglie una delle due carte per l'estrazione, infine le scarta entrambe" + self.desc_eng = "Every time he has to flip a card, he can flip 2 times" self.icon = '🍀' class PaulRegret(Character): def __init__(self): super().__init__("Paul Regret", max_lives=3, visibility_mod=1) self.desc = "Gioca come se avesse una Mustang sempre attiva, nel caso in cui metta in gioco una Mustang 'Reale' l'effetto si somma tranquillamente" + self.desc_eng = "The other players see him at distance +1" self.icon = '🏇' class PedroRamirez(Character): def __init__(self): super().__init__("Pedro Ramirez", max_lives=4) self.desc = "All'inizio del suo turno, quando deve pescare, può prendere la prima carta dalla cima degli scarti e la seconda dal mazzo" + self.desc_eng = "When he has to draw, he may pick the first card from the discarded cards" self.icon = '🚮' class RoseDoolan(Character): @@ -101,17 +108,20 @@ class RoseDoolan(Character): super().__init__("Rose Doolan", max_lives=4, sight_mod=1) self.icon = '🕵️‍♀️' self.desc = "Gioca come se avesse un Mirino sempre attivo, nel caso in cui metta in gioco una Mirino 'Reale' l'effetto si somma tranquillamente" + self.desc_eng = "She sees the other players at distance -1" class SidKetchum(Character): def __init__(self): super().__init__("Sid Ketchum", max_lives=4) self.desc = "Può scartare due carte per recuperare un punto vita anche più volte di seguito a patto di avere carte da scartare, può farlo anche nel turno dell'avversario se starebbe per morire" + self.desc_eng = "He can discard 2 cards to regain 1HP" self.icon = '🤤' class SlabTheKiller(Character): def __init__(self): super().__init__("Slab The Killer", max_lives=4) self.desc = "Per evitare i suoi Bang servono due Mancato, un eventuale barile vale solo come un Mancato" + self.desc_eng = "To dodge his Bang! cards other players need 2 Missed!" self.icon = '🔪' #vale per tutte le carte bang non solo per la carta che si chiama Bang! @@ -119,18 +129,21 @@ class SuzyLafayette(Character): def __init__(self): super().__init__("Suzy Lafayette", max_lives=4) self.desc = "Appena rimane senza carte in mano pesca immediatamente una carta dal mazzo" + self.desc_eng = "Whenever she has an empty hand, she draws a card" self.icon = '🔂' class VultureSam(Character): def __init__(self): super().__init__("Vulture Sam", max_lives=4) self.desc = "Quando un personaggio viene eliminato prendi tutte le carte di quel giocatore e aggiungile alla tua mano, sia le carte in mano che quelle in gioco" + self.desc_eng = "When a player dies, he gets all the cards in the dead's hand and equipments" self.icon = '💰' class WillyTheKid(Character): def __init__(self): super().__init__("Willy The Kid", max_lives=4) self.desc = "Questo personaggio può giocare quanti bang vuole nel suo turno" + self.desc_eng = "He doesn't have limits to the amounts of bang he can use" self.icon = '🎉' def all_characters(expansions: List[str]): diff --git a/backend/bang/expansions/dodge_city/cards.py b/backend/bang/expansions/dodge_city/cards.py index 12d8df0..6f962ce 100644 --- a/backend/bang/expansions/dodge_city/cards.py +++ b/backend/bang/expansions/dodge_city/cards.py @@ -17,6 +17,7 @@ class Pugno(Card): super().__init__(suit, 'Pugno!', number, range=1) self.icon = '👊' self.desc = "Spara a un giocatore a distanza 1" + self.desc_eng = "Shoot a player at distance 1" self.need_target = True def play_card(self, player, against, _with=None): @@ -32,6 +33,7 @@ class Schivata(Mancato): self.name = 'Schivata' self.icon = '🙅‍♂️' self.desc += " e poi pesca una carta" + self.desc_eng += " and then draw a card." self.alt_text = '☝️🆓' def play_card(self, player, against, _with=None): @@ -46,6 +48,7 @@ class RagTime(Panico): Card.__init__(self, suit, 'Rag Time', number) self.icon = '🎹' self.desc = "Ruba 1 carta dalla mano di un giocatore a prescindere dalla distanza" + self.desc_eng = "Steal a card from another player at any distance" self.need_target = True self.need_with = True self.alt_text = '2🃏' @@ -63,6 +66,7 @@ class Rissa(CatBalou): self.name = 'Rissa' self.icon = '🥊' self.desc = "Fai scartare una carta a tutti gli altri giocatori, scegli a caso dalla mano, oppure fra quelle che hanno in gioco" + self.desc_eng = "Choose a card to discard from the hand/equipment ofc all the other players" self.need_with = True self.need_target = False self.alt_text = '2🃏' @@ -84,6 +88,7 @@ class SpringField(Card): super().__init__(suit, 'Springfield', number) self.icon = '🌵' self.desc = "Spara a un giocatore a prescindere dalla distanza" + self.desc_eng = "Shoot a player at any distance" self.need_target = True self.need_with = True self.alt_text = '2🃏' @@ -101,6 +106,7 @@ class Tequila(Card): super().__init__(suit, 'Tequila', number) self.icon = '🍹' self.desc = "Fai recuperare 1 vita a un giocatore a tua scelta, anche te stesso" + self.desc_eng = "Heal 1 HP to a player of your choice (can be you)" self.need_target = True self.can_target_self = True self.need_with = True @@ -121,6 +127,7 @@ class Whisky(Card): super().__init__(suit, 'Whisky', number) self.icon = '🥃' self.desc = "Gioca questa carta per recuperare fino a 2 punti vita" + self.desc_eng = "Heal 2 HP" self.need_with = True self.alt_text = '2🃏' @@ -199,6 +206,7 @@ class Derringer(Pugnale): self.icon = '🚬' self.alt_text += ' ☝️🆓' self.desc += ' e poi pesca una carta' + self.desc_eng += ' and then draw a card.' def play_card(self, player, against, _with=None): if self.can_be_used_now: @@ -217,6 +225,7 @@ class Borraccia(Card): super().__init__(suit, 'Borraccia', number) self.icon = '🍼' self.desc = 'Recupera 1 vita' + self.desc_eng = 'Regain 1 HP' 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 b02a326..f918af3 100644 --- a/backend/bang/expansions/dodge_city/characters.py +++ b/backend/bang/expansions/dodge_city/characters.py @@ -5,48 +5,56 @@ class PixiePete(Character): def __init__(self): super().__init__("Pixie Pete", max_lives=3) self.desc = "All'inizio del turno pesca 3 carte invece che 2" + self.desc_eng = "He draws 3 cards instead of 2" self.icon = '☘️' class TequilaJoe(Character): def __init__(self): super().__init__("Tequila Joe", max_lives=4) self.desc = "Se gioca la carta Birra recupera 2 vite invece che una sola" + self.desc_eng = "When he plays Beer, he regains 2 Health Points" self.icon = '🍻' class GregDigger(Character): def __init__(self): super().__init__("Greg Digger", max_lives=4) self.desc = "Quando un giocatore muore, recupera fino a 2 vite" + self.desc_eng = "Whenever a player dies, he regains up to 2 lives" self.icon = '🦴' class HerbHunter(Character): def __init__(self): super().__init__("HerbHunter", max_lives=4) self.desc = "Quando un giocatore muore, pesca 2 carte" + self.desc_eng = "Whenever a player dies, he draws 2 cards" self.icon = '⚰️' class ElenaFuente(Character): def __init__(self): super().__init__("Elena Fuente", max_lives=3) self.desc = "Può usare una carta qualsiasi nella sua mano come mancato" + self.desc_eng = "She can use any card of her hand as missed" self.icon = '🧘‍♀️' class BillNoface(Character): def __init__(self): super().__init__("Bill Noface", max_lives=4) self.desc = "Pesca 1 carta + 1 carta per ogni ferita che ha" + self.desc_eng = "She can use any card of her hand as missed" self.icon = '🙈' class MollyStark(Character): def __init__(self): super().__init__("Molly Stark", max_lives=4) self.desc = "Quando usa una carta che ha in mano, fuori dal suo turno, ne ottiene un'altra dal mazzo" + self.desc_eng = "When she uses a card from her hand outside her turn, he draws a card." self.icon = '🙅‍♀️' class ApacheKid(Character): def __init__(self): 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.desc_eng = "Cards of diamonds ♦️ played against him, do no have effect (doesn't work in duels)." self.icon = '♦️' def all_characters() -> List[Character]: diff --git a/backend/bang/roles.py b/backend/bang/roles.py index e311a43..66c9204 100644 --- a/backend/bang/roles.py +++ b/backend/bang/roles.py @@ -14,6 +14,7 @@ class Role(ABC): class Sheriff(Role): def __init__(self): super().__init__("Sceriffo", "Elimina tutti i Fuorilegge e il Rinnegato!", health_mod=+1) + self.goal_eng = "Kill the Outlaws and the Renegade!" self.max_players = 1 self.icon = '⭐️' @@ -29,6 +30,7 @@ class Sheriff(Role): class Vice(Role): def __init__(self, alternative_goal=None): super().__init__("Vice", "Proteggi lo Sceriffo! Elimina tutti i Fuorilegge e il Rinnegato!") + self.goal_eng = "Protect the Sheriff! Kill the Outlaws and the Renegade!" if alternative_goal: self.goal = alternative_goal self.max_players = 2 @@ -47,6 +49,7 @@ class Vice(Role): class Outlaw(Role): def __init__(self, alternative_goal=None): super().__init__("Fuorilegge", "Elimina lo Sceriffo!") + self.goal_eng = "Kill the Sheriff!" if alternative_goal: self.goal = alternative_goal self.max_players = 3 @@ -65,6 +68,7 @@ class Outlaw(Role): class Renegade(Role): def __init__(self, alternative_goal=None): super().__init__("Rinnegato", "Rimani l'ultimo personaggio in gioco!") + self.goal_eng = "Be the last man standing!" if alternative_goal: self.goal = alternative_goal self.max_players = 1 diff --git a/frontend/src/components/Chooser.vue b/frontend/src/components/Chooser.vue index c8de680..34ac420 100644 --- a/frontend/src/components/Chooser.vue +++ b/frontend/src/components/Chooser.vue @@ -42,7 +42,7 @@ export default { }, methods: { showDesc(card) { - this.desc = card.desc + this.desc = (this.$i18n.locale=='it'?card.desc:card.desc_eng) } }, mounted() { diff --git a/frontend/src/components/Deck.vue b/frontend/src/components/Deck.vue index dec366f..9ce7062 100644 --- a/frontend/src/components/Deck.vue +++ b/frontend/src/components/Deck.vue @@ -11,7 +11,7 @@ + @pointerenter.native="desc=($i18n.locale=='it'?lastScrap.desc:lastScrap.desc_eng)" @pointerleave.native="desc=''" /> @@ -36,7 +36,6 @@ export default { name: 'PewPew!', icon: '💥', }, - endTurnCard: null, lastScrap: null, previousScrap: null, pending_action: false, @@ -53,10 +52,12 @@ export default { this.lastScrap = card } }, - mounted() { - this.endTurnCard = { - name: this.$t('end_turn'), - icon: '⛔️' + computed: { + endTurnCard() { + return { + name: this.$t('end_turn'), + icon: '⛔️' + } } }, methods: { diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue index 57532d8..5f115a5 100644 --- a/frontend/src/components/Player.vue +++ b/frontend/src/components/Player.vue @@ -4,16 +4,16 @@
+ @pointerenter.native="desc=($i18n.locale=='it'?my_role.goal:my_role.goal_eng)" @pointerleave.native="desc=''"/> + @pointerenter.native="desc=($i18n.locale=='it'?character.desc:character.desc_eng)" @pointerleave.native="desc=''"/> ❤️ 💀
@@ -25,7 +25,7 @@ + @pointerenter.native="hint=($i18n.locale=='it'?card.desc:card.desc_eng)" @pointerleave.native="hint=''"/> @@ -36,7 +36,7 @@ - + From b0ac3149f14e4b287d8451fb82ecfac0b2231444 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sun, 29 Nov 2020 17:06:10 +0100 Subject: [PATCH 09/27] add meta tags --- frontend/public/index.html | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/frontend/public/index.html b/frontend/public/index.html index 30509ce..bbad001 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -5,7 +5,18 @@ - <%= htmlWebpackPlugin.options.title %> + + PewPew! + + + + + + + + + +