diff --git a/backend/__init__.py b/backend/__init__.py index db07c6e..6737c95 100644 --- a/backend/__init__.py +++ b/backend/__init__.py @@ -10,7 +10,10 @@ from bang.players import Player sio = socketio.Server(cors_allowed_origins="*") app = socketio.WSGIApp(sio, static_files={ '/': {'content_type': 'text/html', 'filename': 'index.html'}, + '/game': {'content_type': 'text/html', 'filename': 'index.html'}, '/favicon.ico': {'filename': 'favicon.ico'}, + '/img/icons': './img/icons', + '/manifest.json': {'filename': 'manifest.json'}, '/css': './css', '/js': './js', }) @@ -23,27 +26,51 @@ def advertise_lobbies(): @sio.event def connect(sid, environ): + global online_players + online_players += 1 print('connect ', sid) sio.enter_room(sid, 'lobby') sio.emit('players', room='lobby', data=online_players) @sio.event def set_username(sid, username): - global online_players - online_players += 1 - sio.save_session(sid, Player(username, sid, sio)) - print(f'{sid} is now {username}') - advertise_lobbies() + if not isinstance(sio.get_session(sid), Player): + sio.save_session(sid, Player(username, sid, sio)) + print(f'{sid} is now {username}') + advertise_lobbies() + elif sio.get_session(sid).game == None or not sio.get_session(sid).game.started: + print(f'{sid} changed username to {username}') + if len([p for p in sio.get_session(sid).game.players if p.name == username]) > 0: + sio.get_session(sid).name = f'{username}_{random.randint(0,100)}' + else: + sio.get_session(sid).name = username + sio.emit('me', data=sio.get_session(sid).name, room=sid) + sio.get_session(sid).game.notify_room() @sio.event -def my_message(sid, data): - print('message ', data) +def get_me(sid, room): + if isinstance(sio.get_session(sid), Player): + sio.emit('me', data=sio.get_session(sid).name, room=sid) + if sio.get_session(sid).game: + sio.get_session(sid).game.notify_room() + else: + sio.save_session(sid, Player('player', sid, sio)) + de_games = [g for g in games if g.name == room['name']] + if len(de_games) == 1 and not de_games[0].started: + join_room(sid, room) + else: + create_room(sid, room['name']) + if sio.get_session(sid).game == None: + sio.emit('me', data={'error':'Wrong password/Cannot connect'}, room=sid) + else: + sio.emit('me', data=sio.get_session(sid).name, room=sid) + sio.emit('change_username', room=sid) @sio.event def disconnect(sid): global online_players + online_players -= 1 if sio.get_session(sid): - online_players -= 1 sio.emit('players', room='lobby', data=online_players) if sio.get_session(sid).game and sio.get_session(sid).disconnect(): sio.close_room(sio.get_session(sid).game.name) @@ -85,6 +112,7 @@ def join_room(sid, room): sio.enter_room(sid, room_name) while len([p for p in games[i].players if p.name == sio.get_session(sid).name]): sio.get_session(sid).name += f'_{random.randint(0,100)}' + sio.emit('me', data=sio.get_session(sid).name, room=sid) games[i].add_player(sio.get_session(sid)) advertise_lobbies() diff --git a/backend/bang/cards.py b/backend/bang/cards.py index ce84677..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): @@ -173,7 +184,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 @@ -183,11 +194,15 @@ 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: 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, @@ -201,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): @@ -221,9 +237,9 @@ 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): - 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): @@ -237,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: @@ -250,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) @@ -263,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) @@ -275,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) @@ -286,7 +306,8 @@ 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" + 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 @@ -305,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: @@ -322,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): @@ -337,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 23d4728..3356c31 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 = ''): @@ -32,8 +33,8 @@ 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 = '💔' - #una sola carta per ogni gruppo di danni. es: dinamite -> 1 carta def on_hurt(self, dmg): pass @@ -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,22 +129,26 @@ 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(): - return [ +def all_characters(expansions: List[str]): + from bang.expansions import DodgeCity + base_chars = [ BartCassidy(), BlackJack(), CalamityJanet(), @@ -151,4 +165,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..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): @@ -31,7 +32,8 @@ 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.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🃏' @@ -75,7 +79,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 @@ -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🃏' @@ -149,10 +156,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 +205,8 @@ class Derringer(Pugnale): self.name = 'Derringer' 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: @@ -211,17 +216,25 @@ class Derringer(Pugnale): player.equipment.append(self) return True -class Borraccia(Birra): + 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, number) - self.name = 'Borraccia' + 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 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..e9c3362 --- /dev/null +++ b/backend/bang/expansions/dodge_city/characters.py @@ -0,0 +1,84 @@ +from typing import List +from bang.characters import * + +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 = "All'inizio del turno pesca 1 carta + 1 carta per ogni ferita che ha" + self.desc_eng = "Draw 1 card + 1 card for each wound he has" + self.icon = '🙈' + +class MollyStark(Character): + def __init__(self): + super().__init__("Molly Stark", max_lives=4) + self.desc = "Quando usa volontariamente 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]: + return [ + PixiePete(), + TequilaJoe(), + GregDigger(), + HerbHunter(), + ElenaFuente(), + BillNoface(), + MollyStark(), + ApacheKid(), + ] + +#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 diff --git a/backend/bang/game.py b/backend/bang/game.py index b0679bb..292e1cc 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -6,6 +6,7 @@ import bang.players as players import bang.characters as characters from bang.deck import Deck import bang.roles as roles +import eventlet class Game: def __init__(self, name, sio:socketio): @@ -13,6 +14,7 @@ class Game: self.sio = sio self.name = name self.players: List[players.Player] = [] + self.dead_players: List[players.Player] = [] self.deck: Deck = None self.started = False self.turn = 0 @@ -62,10 +64,12 @@ class Game: self.notify_room() def notify_character_selection(self): - self.readyCount += 1 self.notify_room() - if self.readyCount == len(self.players): + if len([p for p in self.players if p.character == None]) == 0: for i in range(len(self.players)): + print(self.name) + print(self.players[i].name) + print(self.players[i].character) self.sio.emit('chat_message', room=self.name, data=f'{self.players[i].name} ha come personaggio {self.players[i].character.name}, la sua abilità speciale è: {self.players[i].character.desc}') self.players[i].prepare() for k in range(self.players[i].max_lives): @@ -74,7 +78,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]) @@ -137,8 +141,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 @@ -202,13 +206,14 @@ class Game: def handle_disconnect(self, player: players.Player): print(f'player {player.name} left the game {self.name}') - self.player_death(player=player) + self.player_death(player=player, disconnected=True) if len(self.players) == 0: print(f'no players left in game {self.name}') return True else: return False - def player_death(self, player: players.Player): + def player_death(self, player: players.Player, disconnected=False): + 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,22 +228,15 @@ 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)): - self.deck.scrap(player.hand.pop()) - for i in range(len(player.equipment)): - self.deck.scrap(player.equipment.pop()) - else: - for i in range(len(player.hand)): - vulture[0].hand.append(player.hand.pop()) - for i in range(len(player.equipment)): - vulture[0].hand.append(player.equipment.pop()) + index = self.players.index(player) died_in_his_turn = self.started and index == self.turn if self.started and index <= self.turn: self.turn -= 1 - self.players.pop(index) + + corpse = self.players.pop(index) + if not disconnected: + self.dead_players.append() self.notify_room() self.sio.emit('chat_message', room=self.name, data=f'{player.name} è morto.') if self.started: @@ -256,12 +254,47 @@ class Game: print('WE HAVE A WINNER') for p in self.players: p.win_status = p in winners + self.sio.emit('chat_message', room=self.name, data=f'{p.name} ha vinto.') p.notify_self() - return + eventlet.sleep(5.0) + return self.reset() + vulture = [p for p in self.players if isinstance(p.character, characters.VultureSam)] + if len(vulture) == 0: + for i in range(len(player.hand)): + self.deck.scrap(player.hand.pop()) + for i in range(len(player.equipment)): + self.deck.scrap(player.equipment.pop()) + else: + for i in range(len(player.hand)): + 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()) + if died_in_his_turn: self.next_turn() + def reset(self): + print('resetting lobby') + self.players.extend(self.dead_players) + self.dead_players = [] + print(self.players) + self.started = False + self.waiting_for = 0 + for p in self.players: + p.reset() + p.notify_self() + eventlet.sleep(0.5) + self.notify_room() + def get_visible_players(self, player: players.Player): i = self.players.index(player) sight = player.get_sight() diff --git a/backend/bang/players.py b/backend/bang/players.py index 6b316e5..bb80a84 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 @@ -41,10 +42,38 @@ class Player: self.on_failed_response_cb = None self.event_type: str = None self.expected_response = [] - self.attacker = None + self.attacker: Player = None self.target_p: str = None self.is_drawing = False self.mancato_needed = 0 + self.molly_discarded_cards = 0 + + def reset(self): + self.hand: cs.Card = [] + self.equipment: cs.Card = [] + self.role: r.Role = None + self.character: chars.Character = None + self.lives = 0 + self.max_lives = 0 + self.is_my_turn = False + self.is_waiting_for_action = True + self.has_played_bang = False + self.pending_action: PendingAction = None + self.available_characters = [] + self.was_shot = False + self.on_pick_cb = None + self.on_failed_response_cb = None + self.event_type: str = None + self.expected_response = [] + self.attacker: Player = None + self.target_p: str = None + self.is_drawing = False + try: + del self.win_status + except: + pass + self.mancato_needed = 0 + self.molly_discarded_cards = 0 def join_game(self, game): self.game = game @@ -164,6 +193,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 +207,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): @@ -192,12 +227,13 @@ class Player: if picked.suit == cs.Suit.SPADES and 2 <= picked.number <= 9 and pickable_cards == 0: self.lives -= 3 self.game.deck.scrap(self.equipment.pop(i)) - if isinstance(self.character, chars.BartCassidy): - self.hand.append(self.game.deck.draw()) - self.sio.emit('chat_message', room=self.game.name, - data=f'{self.name} ha ricevuto un risarcimento perchè è stato ferito.') self.sio.emit('chat_message', room=self.game.name, data=f'{self.name} ha fatto esplodere la dinamite.') + if isinstance(self.character, chars.BartCassidy) and self.lives > 0: + for i in range(3): + self.hand.append(self.game.deck.draw()) + self.sio.emit('chat_message', room=self.game.name, + data=f'{self.name} ha ricevuto un risarcimento perchè è stato ferito.') print(f'{self.name} Boom, -3 hp') else: self.game.next_player().equipment.append(self.equipment.pop(i)) @@ -258,7 +294,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) + 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) @@ -327,13 +365,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 +384,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 +398,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 @@ -408,6 +450,8 @@ class Player: while self.lives <= 0 and len(self.game.players) > 2 and len([c for c in self.hand if isinstance(c, cs.Birra)]) > 0: for i in range(len(self.hand)): if isinstance(self.hand[i], cs.Birra): + if isinstance(self.character, chd.MollyStark) and not self.is_my_turn: + self.hand.append(self.game.deck.draw()) self.lives += 1 self.game.deck.scrap(self.hand.pop(i)) self.sio.emit('chat_message', room=self.game.name, @@ -424,6 +468,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) and not self.is_my_turn and self.event_type != 'duel': + self.hand.append(self.game.deck.draw()) card.use_card(self) self.game.deck.scrap(card) self.notify_self() @@ -431,6 +477,8 @@ class Player: if self.mancato_needed <= 0: if self.event_type == 'duel': self.game.duel(self, self.attacker.name) + if isinstance(self.character, chd.MollyStark) and hand_index < len(self.hand) and not self.is_my_turn: + self.molly_discarded_cards += 1 else: self.game.responders_did_respond_resume_turn() self.event_type = '' @@ -438,6 +486,16 @@ class Player: self.pending_action = PendingAction.RESPOND self.notify_self() else: + if isinstance(self.character, chd.MollyStark) and not self.is_my_turn: + for i in range(self.molly_discarded_cards): + self.hand.append(self.game.deck.draw()) + self.molly_discarded_cards = 0 + self.notify_self() + elif self.attacker and isinstance(self.attacker.character, chd.MollyStark) and self.is_my_turn: + for i in range(self.attacker.molly_discarded_cards): + self.attacker.hand.append(self.attacker.game.deck.draw()) + self.attacker.molly_discarded_cards = 0 + self.attacker.notify_self() self.on_failed_response_cb() self.game.responders_did_respond_resume_turn() if self.mancato_needed <= 0: 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/backend/requirements.txt b/backend/requirements.txt index 06b6e86..401095e 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,5 +1,5 @@ certifi==2020.11.8 -dnspython==2.0.0 +dnspython==1.16.0 eventlet==0.29.1 greenlet==0.4.17 python-engineio==3.13.2 diff --git a/frontend/package.json b/frontend/package.json index 9ad6b0c..faf3429 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,14 +10,19 @@ "dependencies": { "core-js": "^3.6.5", "pretty-checkbox-vue": "^1.1.9", + "register-service-worker": "^1.7.1", "socket.io-client": "^3.0.3", "vue": "^2.6.11", + "vue-clipboard2": "^0.3.1", "vue-i18n": "^8.22.2", + "vue-router": "^3.2.0", "vue-socket.io": "^3.0.10" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.5.0", "@vue/cli-plugin-eslint": "~4.5.0", + "@vue/cli-plugin-pwa": "~4.5.0", + "@vue/cli-plugin-router": "~4.5.0", "@vue/cli-service": "~4.5.0", "babel-eslint": "^10.1.0", "eslint": "^6.7.2", diff --git a/frontend/public/img/icons/android-launchericon-144-144.png b/frontend/public/img/icons/android-launchericon-144-144.png new file mode 100755 index 0000000..5d0624d Binary files /dev/null and b/frontend/public/img/icons/android-launchericon-144-144.png differ diff --git a/frontend/public/img/icons/android-launchericon-192-192.png b/frontend/public/img/icons/android-launchericon-192-192.png new file mode 100755 index 0000000..695aaec Binary files /dev/null and b/frontend/public/img/icons/android-launchericon-192-192.png differ diff --git a/frontend/public/img/icons/android-launchericon-48-48.png b/frontend/public/img/icons/android-launchericon-48-48.png new file mode 100755 index 0000000..f60b792 Binary files /dev/null and b/frontend/public/img/icons/android-launchericon-48-48.png differ diff --git a/frontend/public/img/icons/android-launchericon-512-512.png b/frontend/public/img/icons/android-launchericon-512-512.png new file mode 100755 index 0000000..e1bc899 Binary files /dev/null and b/frontend/public/img/icons/android-launchericon-512-512.png differ diff --git a/frontend/public/img/icons/android-launchericon-72-72.png b/frontend/public/img/icons/android-launchericon-72-72.png new file mode 100755 index 0000000..84e1763 Binary files /dev/null and b/frontend/public/img/icons/android-launchericon-72-72.png differ diff --git a/frontend/public/img/icons/android-launchericon-96-96.png b/frontend/public/img/icons/android-launchericon-96-96.png new file mode 100755 index 0000000..4e1e050 Binary files /dev/null and b/frontend/public/img/icons/android-launchericon-96-96.png differ diff --git a/frontend/public/img/icons/chrome-extensionmanagementpage-48-48.png b/frontend/public/img/icons/chrome-extensionmanagementpage-48-48.png new file mode 100755 index 0000000..f60b792 Binary files /dev/null and b/frontend/public/img/icons/chrome-extensionmanagementpage-48-48.png differ diff --git a/frontend/public/img/icons/chrome-favicon-16-16.png b/frontend/public/img/icons/chrome-favicon-16-16.png new file mode 100755 index 0000000..2ffe734 Binary files /dev/null and b/frontend/public/img/icons/chrome-favicon-16-16.png differ diff --git a/frontend/public/img/icons/chrome-installprocess-128-128.png b/frontend/public/img/icons/chrome-installprocess-128-128.png new file mode 100755 index 0000000..458d1e2 Binary files /dev/null and b/frontend/public/img/icons/chrome-installprocess-128-128.png differ diff --git a/frontend/public/img/icons/firefox-general-128-128.png b/frontend/public/img/icons/firefox-general-128-128.png new file mode 100755 index 0000000..458d1e2 Binary files /dev/null and b/frontend/public/img/icons/firefox-general-128-128.png differ diff --git a/frontend/public/img/icons/firefox-general-16-16.png b/frontend/public/img/icons/firefox-general-16-16.png new file mode 100755 index 0000000..2ffe734 Binary files /dev/null and b/frontend/public/img/icons/firefox-general-16-16.png differ diff --git a/frontend/public/img/icons/firefox-general-256-256.png b/frontend/public/img/icons/firefox-general-256-256.png new file mode 100755 index 0000000..d813849 Binary files /dev/null and b/frontend/public/img/icons/firefox-general-256-256.png differ diff --git a/frontend/public/img/icons/firefox-general-32-32.png b/frontend/public/img/icons/firefox-general-32-32.png new file mode 100755 index 0000000..4c9c2ec Binary files /dev/null and b/frontend/public/img/icons/firefox-general-32-32.png differ diff --git a/frontend/public/img/icons/firefox-general-48-48.png b/frontend/public/img/icons/firefox-general-48-48.png new file mode 100755 index 0000000..f60b792 Binary files /dev/null and b/frontend/public/img/icons/firefox-general-48-48.png differ diff --git a/frontend/public/img/icons/firefox-general-64-64.png b/frontend/public/img/icons/firefox-general-64-64.png new file mode 100755 index 0000000..6c05d06 Binary files /dev/null and b/frontend/public/img/icons/firefox-general-64-64.png differ diff --git a/frontend/public/img/icons/firefox-general-90-90.png b/frontend/public/img/icons/firefox-general-90-90.png new file mode 100755 index 0000000..42de742 Binary files /dev/null and b/frontend/public/img/icons/firefox-general-90-90.png differ diff --git a/frontend/public/img/icons/firefox-marketplace-128-128.png b/frontend/public/img/icons/firefox-marketplace-128-128.png new file mode 100755 index 0000000..458d1e2 Binary files /dev/null and b/frontend/public/img/icons/firefox-marketplace-128-128.png differ diff --git a/frontend/public/img/icons/firefox-marketplace-512-512.png b/frontend/public/img/icons/firefox-marketplace-512-512.png new file mode 100755 index 0000000..e1bc899 Binary files /dev/null and b/frontend/public/img/icons/firefox-marketplace-512-512.png differ diff --git a/frontend/public/img/icons/msteams-192-192.png b/frontend/public/img/icons/msteams-192-192.png new file mode 100755 index 0000000..695aaec Binary files /dev/null and b/frontend/public/img/icons/msteams-192-192.png differ diff --git a/frontend/public/img/icons/msteams-silhouette-32-32.png b/frontend/public/img/icons/msteams-silhouette-32-32.png new file mode 100755 index 0000000..4c9c2ec Binary files /dev/null and b/frontend/public/img/icons/msteams-silhouette-32-32.png differ 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! + + + + + + + + + +