Client/Server: permitir criacao e entrada em gamelobby

Mudar o protocolo para informar o tipo de jogo
Isso ainda ta errado: a mensagem action:lobby_game_created nao informa o mesmo
que action:lobby_info na lista de jogos

Agora eh possivel enviar chat no lobby principal e no lobby do jogo

Author: igoralmeida

client/client_connection.py

@@ -118,11 +118,17 @@ def message_sender(self, msg):
         """ Oversees message sendings for important events """
 
         if msg.__class__ == dict:
-            if 'action' in msg and msg[u'action'] == 'lobby_create_game':
-                #TODO do the same with 'lobby_join_game', but this requires
-                #gametype info in self.rooms
+            if msg[u'action'] in ('lobby_create_game', 'lobby_join_game'):
+                if msg[u'action'] == 'lobby_create_game':
+                    gametype = msg[u'game_type']
+                else:
+                    rooms = self.lh.rooms
+                    for r in rooms:
+                        if r['game_id'] == msg[u'room_id']:
+                            gametype = r['game_type']
+
                 self.gamehandler = games.GAMETYPE_TO_GAMEHANDLER[
-                    msg[u'game_type']
+                    gametype
                 ](msg_sender=self.message_sender, ui=self.ui)
 
             self.write(self.message_handler.to_string(msg))

server/lobby.py

@@ -50,7 +50,7 @@ def handle_create_game(self, session, message):
       logging.info("Session {0} is trying to create a game of type {1} and room name of {2}".format(session.username , message['game_type'], message['room_name']))
       game_lobby = self.game_builders[message['game_type']].build_lobby(main_lobby=self, room_owner=session, room_configuration= message, game_id=game_id)
 
-      self.games[game_id]  =  { 'game_name' : message['room_name'], 'game_lobby' : game_lobby }
+      self.games[game_id]  =  { 'game_name' : message['room_name'], 'game_type': message['game_type'], 'game_lobby' : game_lobby }
 
       logging.info("Created sucessfully")
 
@@ -101,7 +101,11 @@ def handle_chat(self, session, message):
 
     def get_rooms(self):
         logging.debug("Getting rooms")
-        return [ { 'game_name' : self.games[room_id]['game_name'], 'game_id' : room_id } for room_id in self.games ]
+        return [
+            {   'game_name' : self.games[room_id]['game_name'],
+                'game_type' : self.games[room_id]['game_type'],
+                'game_id' : room_id }
+            for room_id in self.games ]
 
     def get_users(self):
         logging.debug("Getting users")