Merge branch 'dev' into main

This commit is contained in:
Alberto 2021-01-10 20:25:17 +01:00
commit 59f0d1e96d
No known key found for this signature in database
GPG Key ID: 4F026F48309500A2

View File

@ -6,7 +6,7 @@ import eventlet
import socketio import socketio
from bang.game import Game from bang.game import Game
from bang.players import Player from bang.players import Player, PendingAction
import sys import sys
sys.setrecursionlimit(10**6) # this should prevents bots from stopping sys.setrecursionlimit(10**6) # this should prevents bots from stopping
@ -121,15 +121,16 @@ def disconnect(sid):
@sio.event @sio.event
def create_room(sid, room_name): def create_room(sid, room_name):
while len([g for g in games if g.name == room_name]): if sio.get_session(sid).game == None:
room_name += f'_{random.randint(0,100)}' while len([g for g in games if g.name == room_name]):
sio.leave_room(sid, 'lobby') room_name += f'_{random.randint(0,100)}'
sio.enter_room(sid, room_name) sio.leave_room(sid, 'lobby')
g = Game(room_name, sio) sio.enter_room(sid, room_name)
g.add_player(sio.get_session(sid)) g = Game(room_name, sio)
games.append(g) g.add_player(sio.get_session(sid))
print(f'{sid} created a room named {room_name}') games.append(g)
advertise_lobbies() print(f'{sid} created a room named {room_name}')
advertise_lobbies()
@sio.event @sio.event
def private(sid): def private(sid):
@ -270,6 +271,10 @@ def chat_message(sid, msg):
elif '/mebot' in msg: elif '/mebot' in msg:
ses.is_bot = not ses.is_bot ses.is_bot = not ses.is_bot
ses.bot_spin() ses.bot_spin()
elif '/arcadekick' in msg and ses.game.started:
if len([p for p in ses.game.players if p.pending_action != PendingAction.WAIT]) == 0:
sio.emit('chat_message', room=ses.game.name, data={'color': f'','text':f'KICKING THE ARCADE CABINET'})
ses.game.play_turn()
else: else:
sio.emit('chat_message', room=sid, data={'color': f'','text':f'{msg} COMMAND NOT FOUND'}) sio.emit('chat_message', room=sid, data={'color': f'','text':f'{msg} COMMAND NOT FOUND'})
else: else: