diff --git a/backend/__init__.py b/backend/__init__.py index 4a8c047..e74445b 100644 --- a/backend/__init__.py +++ b/backend/__init__.py @@ -227,6 +227,34 @@ def chat_message(sid, msg): eventlet.sleep(0.3) else: sio.emit('chat_message', room=sid, data={'color': f'','text':f'{msg} bad format'}) + elif '/ddc' in msg and ses.game.started: + cmd = msg.split() + if len(cmd) == 2: + sio.emit('chat_message', room=ses.game.name, data={'color': f'red','text':f'🚨 {ses.name} is in debug mode destroyed {cmd[1]} cards'}) + if cmd[1] == "*": + for p in ses.game.players_map: + ses.game.get_player_named(p).hand = [] + ses.game.get_player_named(p).equipment = [] + ses.game.get_player_named(p).notify_self() + elif cmd[1] in ses.game.players_map: + ses.game.get_player_named(cmd[1]).hand = [] + ses.game.get_player_named(cmd[1]).equipment = [] + ses.game.get_player_named(cmd[1]).notify_self() + else: + sio.emit('chat_message', room=sid, data={'color': f'','text':f'{msg} bad format'}) + elif '/dsh' in msg and ses.game.started: + cmd = msg.split() + if len(cmd) == 3: + sio.emit('chat_message', room=ses.game.name, data={'color': f'red','text':f'🚨 {ses.name} is in debug mode and is changing {cmd[1]} health'}) + if cmd[1] == "*": + for p in ses.game.players_map: + ses.game.get_player_named(p).lives = int(cmd[2]) + ses.game.get_player_named(p).notify_self() + elif cmd[1] in ses.game.players_map: + ses.game.get_player_named(cmd[1]).lives = int(cmd[2]) + ses.game.get_player_named(cmd[1]).notify_self() + else: + sio.emit('chat_message', room=sid, data={'color': f'','text':f'{msg} bad format'}) elif '/togglecomp' in msg and ses.game: ses.game.toggle_competitive() elif '/togglebot' in msg and ses.game: diff --git a/backend/bang/game.py b/backend/bang/game.py index 5d2da93..b107b27 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -455,7 +455,8 @@ class Game: if player.attacker and player.attacker in self.players: attacker_role = player.attacker.role winners = [p for p in self.players if p.role != None and p.role.on_player_death(self.get_alive_players(), initial_players=self.initial_players, dead_role=player.role, attacker_role=attacker_role)] - if len(winners) > 0: + # print('ready:', self.readyCount, ' waiting:', self.waiting_for) + if self.readyCount == self.waiting_for and len(winners) > 0: print('WE HAVE A WINNER') for p in self.get_alive_players(): p.win_status = p in winners diff --git a/frontend/public/index.html b/frontend/public/index.html index ab4c5a4..bc4dd0c 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -4,11 +4,12 @@ + - + PewPew!