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

Merge branch 'dev' into main

Browse Source
This commit is contained in:
Alberto 2021-01-01 14:07:59 +01:00
commit 30d8fa20bd
No known key found for this signature in database
GPG Key ID: 4F026F48309500A2
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/bang/game.py
View File

@ -408,7 +408,7 @@ class Game:
player.attacker.hand.append(self.deck.draw(True)) player.attacker.hand.append(self.deck.draw(True))
player.attacker.notify_self() player.attacker.notify_self()
print(f'player {player.name} died') print(f'player {player.name} died')
if (self.waiting_for > 0): if self.waiting_for > 0 and player.pending_action == pl.PendingAction.RESPOND:
self.responders_did_respond_resume_turn() self.responders_did_respond_resume_turn()
if player.is_dead: return if player.is_dead: return
@ -486,6 +486,8 @@ class Game:
herb[0].notify_self() herb[0].notify_self()
self.is_handling_death = False self.is_handling_death = False
if corpse.is_my_turn: if corpse.is_my_turn:
corpse.is_my_turn = False
corpse.notify_self()
self.next_turn() self.next_turn()
def reset(self): def reset(self):

8
backend/bang/players.py
View File

@ -406,8 +406,6 @@ class Player:
self.hand.append(self.game.deck.draw_from_scrap_pile()) self.hand.append(self.game.deck.draw_from_scrap_pile())
if not self.game.check_event(ceh.Sete): if not self.game.check_event(ceh.Sete):
self.hand.append(self.game.deck.draw()) self.hand.append(self.game.deck.draw())
if self.game.check_event(ceh.IlTreno) or (self.is_ghost and self.game.ceck_event(ceh.CittaFantasma)):
self.hand.append(self.game.deck.draw())
self.sio.emit('chat_message', room=self.game.name, self.sio.emit('chat_message', room=self.game.name,
data=f'_draw_from_scrap|{self.name}') data=f'_draw_from_scrap|{self.name}')
elif type(pile) == str and pile != self.name and pile in self.game.players_map and self.character.check(self.game, chars.JesseJones) and len(self.game.get_player_named(pile).hand) > 0: elif type(pile) == str and pile != self.name and pile in self.game.players_map and self.character.check(self.game, chars.JesseJones) and len(self.game.get_player_named(pile).hand) > 0:
@ -418,15 +416,11 @@ class Player:
data=f'_draw_from_player|{self.name}|{pile}') data=f'_draw_from_player|{self.name}|{pile}')
if not self.game.check_event(ceh.Sete): if not self.game.check_event(ceh.Sete):
self.hand.append(self.game.deck.draw()) self.hand.append(self.game.deck.draw())
if self.game.check_event(ceh.IlTreno) or (self.is_ghost and self.game.ceck_event(ceh.CittaFantasma)):
self.hand.append(self.game.deck.draw())
elif self.character.check(self.game, chd.BillNoface): elif self.character.check(self.game, chd.BillNoface):
self.hand.append(self.game.deck.draw()) self.hand.append(self.game.deck.draw())
if not self.game.check_event(ceh.Sete): if not self.game.check_event(ceh.Sete):
for i in range(self.max_lives-self.lives): for i in range(self.max_lives-self.lives):
self.hand.append(self.game.deck.draw()) self.hand.append(self.game.deck.draw())
if self.game.check_event(ceh.IlTreno):
self.hand.append(self.game.deck.draw())
else: else:
for i in range(2): for i in range(2):
card: cs.Card = self.game.deck.draw() card: cs.Card = self.game.deck.draw()
@ -486,10 +480,12 @@ class Player:
data=f'_flipped|{self.name}|{picked}') data=f'_flipped|{self.name}|{picked}')
if not picked.check_suit(self.game, [cs.Suit.HEARTS]) and pickable_cards == 0: if not picked.check_suit(self.game, [cs.Suit.HEARTS]) and pickable_cards == 0:
self.game.deck.scrap(self.equipment.pop(i), True) self.game.deck.scrap(self.equipment.pop(i), True)
self.sio.emit('chat_message', room=self.game.name, data=f'_prison_turn|{self.name}')
self.end_turn(forced=True) self.end_turn(forced=True)
return return
elif pickable_cards == 0: elif pickable_cards == 0:
self.game.deck.scrap(self.equipment.pop(i), True) self.game.deck.scrap(self.equipment.pop(i), True)
self.sio.emit('chat_message', room=self.game.name, data=f'_prison_free|{self.name}')
break break
break break
if any([isinstance(c, cs.Prigione) for c in self.equipment]): if any([isinstance(c, cs.Prigione) for c in self.equipment]):

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

@ -96,7 +96,9 @@
"doctor_heal": "{0} was healed by the doctor.", "doctor_heal": "{0} was healed by the doctor.",
"respond": "{0} responded with {1}.", "respond": "{0} responded with {1}.",
"change_username": "{0} is now {1}.", "change_username": "{0} is now {1}.",
"lobby_reset": "Going back to lobby in {0} seconds..." "lobby_reset": "Going back to lobby in {0} seconds...",
"prison_free": "{0} got out of prison",
"prison_turn": "{0} stayed in prison this turn"
}, },
"foc": { "foc": {
"leggedelwest": "He must play this card on this turn if possible." "leggedelwest": "He must play this card on this turn if possible."

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

@ -96,7 +96,9 @@
"doctor_heal": "{0} è stato curato dal dottore.", "doctor_heal": "{0} è stato curato dal dottore.",
"respond": "{0} ha risposto con {1}.", "respond": "{0} ha risposto con {1}.",
"change_username": "{0} ha cambiato nome in {1}.", "change_username": "{0} ha cambiato nome in {1}.",
"lobby_reset": "Si ritorna alla stanza in {0} secondi..." "lobby_reset": "Si ritorna alla stanza in {0} secondi...",
"prison_free": "{0} è uscito di prigione",
"prison_turn": "{0} rimane in prigione questo turno"
}, },
"foc": { "foc": {
"leggedelwest": "Ed è obbligato a usarla nel suo turno, se possibile" "leggedelwest": "Ed è obbligato a usarla nel suo turno, se possibile"