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

updated descriptions

Browse Source 
and fix
This commit is contained in:
Giulio 2020-11-27 12:52:49 +01:00
parent 0e0f3271bb
commit 18fdce103f
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/bang/cards.py
View File

@ -110,7 +110,7 @@ class Prigione(Card):
def play_card(self, player, against, _with=None): def play_card(self, player, against, _with=None):
if against != None and not isinstance(player.game.get_player_named(against).role, r.Sheriff): if against != None and not isinstance(player.game.get_player_named(against).role, r.Sheriff):
player.sio.emit('chat_message', room=player.game.name, player.sio.emit('chat_message', room=player.game.name,
data=f'{self.name} ha giocato {self.name} contro {against}.') data=f'{player.name} ha giocato {self.name} contro {against}.')
player.game.get_player_named(against).equipment.append(self) player.game.get_player_named(against).equipment.append(self)
player.game.get_player_named(against).notify_self() player.game.get_player_named(against).notify_self()
return False return False

26
backend/bang/expansions/dodge_city/cards.py
View File

@ -44,10 +44,10 @@ class RagTime(Panico):
def __init__(self, suit, number): def __init__(self, suit, number):
Card.__init__(self, suit, 'Rag Time', number) Card.__init__(self, suit, 'Rag Time', number)
self.icon = '🎹' self.icon = '🎹'
self.desc = "Ruba 1 carta dalla mano di un giocatore" self.desc = "Ruba 1 carta dalla mano di un giocatore a prescindere dalla distanza"
self.need_target = True self.need_target = True
self.need_with = True self.need_with = True
self.alt_text = '‼️' self.alt_text = '2🃏'
def play_card(self, player, against, _with): def play_card(self, player, against, _with):
if against != None and _with != None: if against != None and _with != None:
@ -61,9 +61,10 @@ class Rissa(CatBalou):
super().__init__(suit, number) super().__init__(suit, number)
self.name = 'Rissa' self.name = 'Rissa'
self.icon = '🥊' 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.need_with = True self.need_with = True
self.need_target = False self.need_target = False
self.alt_text = '‼️' self.alt_text = '2🃏'
def play_card(self, player, against, _with): def play_card(self, player, against, _with):
if _with != None: if _with != None:
@ -77,10 +78,10 @@ class SpringField(Card):
def __init__(self, suit, number): def __init__(self, suit, number):
super().__init__(suit, 'Springfield', number) super().__init__(suit, 'Springfield', number)
self.icon = '🌵' self.icon = '🌵'
self.desc = "Spara a un giocatore" self.desc = "Spara a un giocatore a prescindere dalla distanza"
self.need_target = True self.need_target = True
self.need_with = True self.need_with = True
self.alt_text = '‼️' self.alt_text = '2🃏'
def play_card(self, player, against, _with=None): def play_card(self, player, against, _with=None):
if against != None and _with != None: if against != None and _with != None:
@ -94,13 +95,15 @@ class Tequila(Card):
def __init__(self, suit, number): def __init__(self, suit, number):
super().__init__(suit, 'Tequila', number) super().__init__(suit, 'Tequila', number)
self.icon = '🍹' self.icon = '🍹'
self.desc = "Fai recuperare 1 vita a un giocatore" self.desc = "Fai recuperare 1 vita a un giocatore a tua scelta, anche te stesso"
self.need_target = True self.need_target = True
self.need_with = True self.need_with = True
self.alt_text = '‼️' self.alt_text = '2🃏'
def play_card(self, player, against, _with=None): def play_card(self, player, against, _with=None):
if against != None and _with != None: if against != None and _with != None:
beneficiario = f'{against}' if against != player.name else 'se stesso'
player.sio.emit('chat_message', room=player.game.name, data=f'{player.name} ha giocato {self.name} per {beneficiario}.')
player.game.deck.scrap(_with) player.game.deck.scrap(_with)
player.game.get_player_named(against).lives = min(player.game.get_player_named(against).lives+1, player.game.get_player_named(against).max_lives) player.game.get_player_named(against).lives = min(player.game.get_player_named(against).lives+1, player.game.get_player_named(against).max_lives)
player.game.get_player_named(against).notify_self() player.game.get_player_named(against).notify_self()
@ -111,12 +114,13 @@ class Whisky(Card):
def __init__(self, suit, number): def __init__(self, suit, number):
super().__init__(suit, 'Whisky', number) super().__init__(suit, 'Whisky', number)
self.icon = '🥃' self.icon = '🥃'
self.desc = "Recupera 2 vite" self.desc = "Gioca questa carta per recuperare fino a 2 punti vita."
self.need_with = True self.need_with = True
self.alt_text = '‼️' self.alt_text = '2🃏'
def play_card(self, player, against, _with=None): def play_card(self, player, against, _with=None):
if _with != None: if _with != None:
super().play_card(player, against=against)
player.game.deck.scrap(_with) player.game.deck.scrap(_with)
player.lives = min(player.lives+2, player.max_lives) player.lives = min(player.lives+2, player.max_lives)
player.notify_self() player.notify_self()
@ -146,10 +150,10 @@ def get_starting_deck() -> List[Card]:
Mancato(Suit.DIAMONDS, 8), Mancato(Suit.DIAMONDS, 8),
Panico(Suit.HEARTS, 'J'), Panico(Suit.HEARTS, 'J'),
Pugno(Suit.SPADES, 10), Pugno(Suit.SPADES, 10),
Schivata(Suit.DIAMONDS, 7),
Schivata(Suit.HEARTS, 'K'),
RagTime(Suit.HEARTS, 9), RagTime(Suit.HEARTS, 9),
Rissa(Suit.SPADES, 'J'), Rissa(Suit.SPADES, 'J'),
Schivata(Suit.DIAMONDS, 7),
Schivata(Suit.HEARTS, 'K'),
SpringField(Suit.SPADES, 'K'), SpringField(Suit.SPADES, 'K'),
Tequila(Suit.CLUBS, 9), Tequila(Suit.CLUBS, 9),
Whisky(Suit.HEARTS, 'Q'), Whisky(Suit.HEARTS, 'Q'),

2
frontend/src/components/Player.vue
View File

@ -34,7 +34,7 @@
<Chooser v-if="notifycard" :key="notifycard.card" :text="`${notifycard.player} ha pescato come seconda carta:`" :cards="[notifycard.card]" hintText="Se la carta è cuori o quadri ne pesca un'altra" class="turn-notify-4s"/> <Chooser v-if="notifycard" :key="notifycard.card" :text="`${notifycard.player} ha pescato come seconda carta:`" :cards="[notifycard.card]" hintText="Se la carta è cuori o quadri ne pesca un'altra" class="turn-notify-4s"/>
<Chooser v-if="!show_role && is_my_turn && pending_action < 2" text="GIOCA IL TUO TURNO" :key="is_my_turn" class="turn-notify" /> <Chooser v-if="!show_role && is_my_turn && pending_action < 2" text="GIOCA IL TUO TURNO" :key="is_my_turn" class="turn-notify" />
<Chooser v-if="hasToPickResponse" :text="`ESTRAI UNA CARTA ${attacker?('PER DIFENDERTI DA '+attacker):''}`" :key="hasToPickResponse" class="turn-notify" /> <Chooser v-if="hasToPickResponse" :text="`ESTRAI UNA CARTA ${attacker?('PER DIFENDERTI DA '+attacker):''}`" :key="hasToPickResponse" class="turn-notify" />
<Chooser v-if="!card_against && card_with" :text="`SCEGLI CHE CARTA SCARTARE PER GIOCCARE ${card_with.name}`" :cards="hand.filter(x => x !== card_with)" :select="selectWith" :cancel="()=>{card_with = null}"/> <Chooser v-if="!card_against && card_with" :text="`SCEGLI CHE CARTA SCARTARE PER USARE ${card_with.name.toUpperCase()}`" :cards="hand.filter(x => x !== card_with)" :select="selectWith" :cancel="()=>{card_with = null}"/>
<Chooser v-if="showScrapScreen" :text="`SCARTA ${hand.length}/${lives}`" :cards="hand" :select="scrap" :cancel="cancelEndingTurn"/> <Chooser v-if="showScrapScreen" :text="`SCARTA ${hand.length}/${lives}`" :cards="hand" :select="scrap" :cancel="cancelEndingTurn"/>
<Chooser v-if="sidWantsScrapForHealth && sidScrapForHealth.length < 2" :text="`SCARTA ${2 - sidScrapForHealth.length} PER RECUPERARE 1 VITA`" <Chooser v-if="sidWantsScrapForHealth && sidScrapForHealth.length < 2" :text="`SCARTA ${2 - sidScrapForHealth.length} PER RECUPERARE 1 VITA`"
:cards="sidScrapHand" :select="sidScrap" :cancel="() => {sidWantsScrapForHealth = false;sidScrapForHealth=[]}"/> :cards="sidScrapHand" :select="sidScrap" :cancel="() => {sidWantsScrapForHealth = false;sidScrapForHealth=[]}"/>