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

Merge branch 'dev' into main

Browse Source
This commit is contained in:
Giulio 2021-05-10 12:24:54 +02:00
commit a1edf476d5
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/__init__.py
View File

@ -194,7 +194,9 @@ def chat_message(sid, msg):
# ses.game.add_player(Player(f'AI_{random.randint(0,1000)}', 'bot', sio, bot=True)) # ses.game.add_player(Player(f'AI_{random.randint(0,1000)}', 'bot', sio, bot=True))
sio.emit('chat_message', room=ses.game.name, data={'color': f'red','text':f'Only 1 bot at the time'}) sio.emit('chat_message', room=ses.game.name, data={'color': f'red','text':f'Only 1 bot at the time'})
else: else:
bot = Player(f'AI_{random.randint(0,1000)}', 'bot', sio, bot=True) bot = Player(f'AI_{random.randint(0,10)}', 'bot', sio, bot=True)
while any([p for p in ses.game.players if p.name == bot.name]):
bot = Player(f'AI_{random.randint(0,10)}', 'bot', sio, bot=True)
ses.game.add_player(bot) ses.game.add_player(bot)
bot.bot_spin() bot.bot_spin()
elif '/removebot' in msg and not ses.game.started: elif '/removebot' in msg and not ses.game.started:

6
backend/bang/game.py
View File

@ -39,6 +39,7 @@ class Game:
self.did_resuscitate_deadman = False self.did_resuscitate_deadman = False
self.is_handling_death = False self.is_handling_death = False
self.pending_winners = [] self.pending_winners = []
self.noStar = False # no Sheriff, because there are only three players
def notify_room(self, sid=None): def notify_room(self, sid=None):
@ -124,6 +125,8 @@ class Game:
print('GAME IS STARING') print('GAME IS STARING')
if self.started: if self.started:
return return
if len(self.players) == 3:
self.noStar = True
self.players_map = {c.name: i for i, c in enumerate(self.players)} self.players_map = {c.name: i for i, c in enumerate(self.players)}
self.sio.emit('chat_message', room=self.name, data=f'_starting') self.sio.emit('chat_message', room=self.name, data=f'_starting')
self.sio.emit('start', room=self.name) self.sio.emit('start', room=self.name)
@ -318,7 +321,7 @@ class Game:
print(f'{self.players[self.turn]} is dead, next turn') print(f'{self.players[self.turn]} is dead, next turn')
return self.next_turn() return self.next_turn()
self.player_bangs = 0 self.player_bangs = 0
if isinstance(self.players[self.turn].role, roles.Sheriff): if isinstance(self.players[self.turn].role, roles.Sheriff) or (self.noStar and isinstance(self.players[self.turn].role, roles.Vice)):
self.deck.flip_event() self.deck.flip_event()
if len(self.deck.event_cards) > 0 and self.deck.event_cards[0] != None: if len(self.deck.event_cards) > 0 and self.deck.event_cards[0] != None:
print(f'flip new event {self.deck.event_cards[0].name}') print(f'flip new event {self.deck.event_cards[0].name}')
@ -534,6 +537,7 @@ class Game:
self.players = [p for p in self.players if not p.is_bot] self.players = [p for p in self.players if not p.is_bot]
print(self.players) print(self.players)
self.started = False self.started = False
self.noStar = False
self.is_handling_death = False self.is_handling_death = False
self.waiting_for = 0 self.waiting_for = 0
self.incremental_turn = 0 self.incremental_turn = 0

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

@ -172,7 +172,7 @@ export default {
}, },
computed: { computed: {
inviteLink() { inviteLink() {
return `${window.location.origin}/game?code=${this.lobbyName}${this.password?`&pwd=${this.password}`:''}` return `${window.location.origin}/game?code=${encodeURIComponent(this.lobbyName)}${this.password?`&pwd=${this.password}`:''}`
}, },
isThereAnyBot() { isThereAnyBot() {
return this.players.filter(x => x.is_bot).length > 0; return this.players.filter(x => x.is_bot).length > 0;