Update app.py

app.py

@@ -12,7 +12,7 @@ socketio = SocketIO(app)
 
 ROOMS_DB = os.path.join(app.root_path, 'rooms.json')
 USERS_DB = os.path.join(app.root_path, 'users.json')
-GAMES_DB = os.path.join(app.root_path, 'games.json')  # Добавляем файл для хранения данных об играх
+GAMES_DB = os.path.join(app.root_path, 'games.json')
 
 
 def load_json(file_path, default={}):
@@ -37,26 +37,33 @@ def save_json(file_path, data):
 rooms = load_json(ROOMS_DB)
 users = load_json(USERS_DB)
 games_data = load_json(GAMES_DB, default={
-    "game1": {
-        "name": "Угадай число",
-        "description": "Админ загадывает число от 1 до 100. Участники по очереди пытаются угадать число. Админ даёт подсказки 'больше' или 'меньше'.",
-        "min_players": 1,
-        "max_players": 5,
-        "state": {}  # Состояние игры для каждой комнаты
-    },
-    "game2": {
+    "crocodile": {
         "name": "Крокодил",
         "description": "Один игрок (ведущий) получает слово и должен показать его жестами остальным игрокам, не произнося ни слова. Остальные игроки пытаются угадать слово.",
         "min_players": 2,
         "max_players": 5,
-         "state": {}
+        "state": {}
     },
-    "game3":{
-        "name": "Викторина",
-        "description": "Администратор задает вопросы , а участники по очереди отвечают на них ",
-        "min_players": 1,
+    "alias": {
+        "name": "Alias",
+        "description": "Один игрок (ведущий) получает слово и должен объяснить его другими словами, не используя однокоренные. Остальные игроки пытаются угадать слово.",
+        "min_players": 2,
         "max_players": 5,
         "state": {}
+    },
+     "mafia": {
+        "name": "Мафия",
+        "description": "Игроки делятся на две команды: мафию и мирных жителей. Мафия пытается тайно убивать мирных жителей, а мирные жители пытаются вычислить и казнить мафию.",
+        "min_players": 4,
+        "max_players": 5,  # Можно увеличить, но для теста оставим так
+        "state": {}
+    },
+    "durak": {
+        "name": "Дурак",
+        "description": "Карточная игра, в которой игроки стараются избавиться от всех своих карт.",
+        "min_players": 2,
+        "max_players": 5,
+        "state": {}  # Состояние игры
     }
 })
 save_json(GAMES_DB, games_data)
@@ -100,7 +107,7 @@ def index():
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Видеоконференция</title>
-    <style>
+     <style>
         :root {
             --primary-color: #6200ee;
             --secondary-color: #3700b3;
@@ -218,7 +225,7 @@ def dashboard():
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Панель управления</title>
-    <style>
+     <style>
         :root {
             --primary-color: #6200ee;
             --secondary-color: #3700b3;
@@ -346,7 +353,7 @@ def room(token):
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Комната {{ token }}</title>
     <style>
-        :root {
+      :root {
             --primary-color: #4CAF50;
             --secondary-color: #388E3C;
             --background-color: #f0f0f0;
@@ -554,39 +561,127 @@ def room(token):
             background-color: var(--secondary-color);
         }
         
-        #game-display {
-            margin-top: 20px;
-            padding: 15px;
-            background-color: var(--surface-color);
-            border-radius: var(--border-radius);
-            box-shadow: var(--box-shadow);
-            text-align: center;
-            display: none; /* Скрыто по умолчанию */
-        }
+       #game-display {
+          margin-top: 20px;
+          padding: 20px;
+          background-color: var(--surface-color);
+          border-radius: var(--border-radius);
+          box-shadow: var(--box-shadow);
+          text-align: center;
+          display: none; /* Скрыто по умолчанию */
+          width: 80%; /* Ширина */
+          max-width: 800px; /* Максимальная ширина */
+          margin-left: auto; /* Центрирование по горизонтали */
+          margin-right: auto;
+      }
+      #game-display h2 {
+          color: var(--primary-color);
+          margin-bottom: 10px;
+      }
+      #game-description {
+          margin-bottom: 15px;
+          font-size: 1.1rem;
+          color: var(--text-color);
+      }
+      #game-content {
+          display: flex;
+          flex-direction: column;
+          align-items: center; /* Центрирование элементов */
+          gap: 10px; /* Расстояние между элементами */
+      }
+      .game-input {
+        padding: 8px;
+        border: 1px solid #ccc;
+        border-radius: var(--border-radius);
+        font-size: 1rem;
+        width: 60%; /* Ширина инпутов */
+        max-width: 300px; /* Максимальная ширина */
+    }
 
-        #game-display h2 {
-            color: var(--primary-color);
-        }
+    .game-button {
+        background-color: var(--primary-color);
+        color: white;
+        border: none;
+        border-radius: var(--border-radius);
+        padding: 10px 15px;
+        cursor: pointer;
+        transition: background-color 0.2s;
+        font-size: 1rem;
+    }
+    .game-button:hover {
+        background-color: var(--secondary-color);
+    }
+
+    #game-result {
+        margin-top: 15px;
+        font-size: 1rem;
+        color: var(--text-color);
+        width: 100%; /* Ширина */
+    }
+      #game-result p{
+           word-break: break-word;
+      }
+      #crocodile-timer {
+        font-size: 1.2rem;
+        font-weight: bold;
+        margin-top: 10px;
+        color: var(--primary-color);
+    }
+        /*Стили для карт*/
+    .card {
+        width: 60px;
+        height: 90px;
+        border: 1px solid black;
+        border-radius: 5px;
+        display: inline-block; /* Чтобы карты шли в ряд */
+        margin: 2px;
+        text-align: center;
+        font-size: 1rem;
+        background-color: white;
+        user-select: none; /* Предотвращает выделение текста */
+     }
+    .card.selected {
+        border-color: blue;
+        box-shadow: 0 0 5px blue;
+    }
+    .card.back {
+        background-color: #ddd; /* Цвет рубашки */
+        color: transparent; /* Скрываем текст на рубашке */
+    }
+
+    .card-container{
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: center;
+        gap: 5px;
+        margin-bottom: 10px;
+
+    }
+     #durak-buttons{
+       margin-top: 10px;
+       display: flex;
+       justify-content: center;
+       gap: 10px;
+
+     }
+      #durak-table{
+         display: flex;
+         flex-wrap: wrap;
+         justify-content: center;
+         gap: 10px;
+         min-height: 100px;
+         border: 2px dashed #ccc;
+         padding: 10px;
+         margin-top: 10px;
+         margin-bottom: 10px;
+
+      }
+     #durak-info{
+       font-size: 1rem;
+       font-weight: bold;
+     }
 
-        #game-display p {
-            margin-bottom: 10px;
-        }
 
-        #game-display button {
-             background-color: var(--primary-color);
-            color: white;
-            border: none;
-            border-radius: var(--border-radius);
-            padding: 5px 10px;
-            cursor: pointer;
-            transition: background-color 0.2s;
-            margin-top: 10px;
-        }
-         #game-display button:hover{
-              background-color: var(--secondary-color);
-         }
-        
-        
         @media (max-width: 768px) {
             .main-container {
                 flex-direction: column;
@@ -943,132 +1038,36 @@ def room(token):
             gameContent.innerHTML = ''; 
             
             // Инициализация игры в зависимости от gameId
-            if(gameId === 'game1'){
-                initGuessNumber(gameId, gameInfo, gameContent);
-            } else if (gameId === 'game2'){
+            if (gameId === 'crocodile'){
                 initCrocodile(gameId, gameInfo, gameContent);
-            }else if (gameId === 'game3'){
-                initQuiz(gameId, gameInfo, gameContent)
-            }
-        });
-        
-        // Игра "Угадай число"
-        function initGuessNumber(gameId, gameInfo, gameContent) {
-            if (isAdmin) {
-              const input = document.createElement('input');
-              input.type = 'number';
-              input.id = 'admin-guess-number';
-              input.placeholder = 'Загадайте число (1-100)';
-              gameContent.appendChild(input);
-        
-              const button = document.createElement('button');
-              button.textContent = 'Загадать';
-              button.onclick = () => {
-                const number = parseInt(input.value, 10);
-                if (number >= 1 && number <= 100) {
-                  socket.emit('set_game_state', { token, game_id: gameId, state: { number: number, guesses: [] } });
-                } else {
-                  alert('Пожалуйста, введите число от 1 до 100.');
-                }
-              };
-              gameContent.appendChild(button);
-            }
-        
-            const guessInput = document.createElement('input');
-            guessInput.type = 'number';
-            guessInput.id = 'user-guess-input';
-            guessInput.placeholder = 'Ваша догадка';
-            guessInput.disabled = !isAdmin; // Изначально отключено для всех, кроме админа
-            gameContent.appendChild(guessInput);
-        
-            const guessButton = document.createElement('button');
-            guessButton.textContent = 'Угадать';
-            guessButton.id = 'user-guess-button';
-            guessButton.disabled = !isAdmin;
-            guessButton.onclick = () => {
-              const guess = parseInt(guessInput.value, 10);
-              if (!isNaN(guess)) {
-                socket.emit('game_action', { token, game_id: gameId, action: 'guess', value: guess, user: username });
-                guessInput.value = ''; //очистка
-              }
-            };
-            gameContent.appendChild(guessButton);
-        
-            const resultDiv = document.createElement('div');
-            resultDiv.id = 'guess-result';
-            gameContent.appendChild(resultDiv);
-        }
-
-        
-        socket.on('update_game_state', (data) => {
-            const gameId = data.game_id;
-            const gameState = data.state;
-            
-             if(gameId === 'game1'){
-                 updateGuessNumberState(gameId, gameState);
-             }else if (gameId === 'game2'){
-                 updateCrocodileState(gameId,gameState);
-             }else if (gameId === 'game3'){
-                 updateQuizState(gameId, gameState);
-             }
-
-        });
-        
-        function updateGuessNumberState(gameId, gameState){
-            const resultDiv = document.getElementById('guess-result');
-             if (!resultDiv) return; // Если элемента нет (игра не "Угадай число")
-
-            resultDiv.innerHTML = ''; // Очищаем предыдущие результаты
-            
-            // Включаем ввод для всех, когда число загадано
-            if (gameState.number) {
-                 document.getElementById('user-guess-input').disabled = false;
-                 document.getElementById('user-guess-button').disabled = false;
-
-            }
-            if(gameState.guesses && gameState.guesses.length > 0){
-                const lastGuess = gameState.guesses[gameState.guesses.length - 1];
-                const p = document.createElement('p');
-                p.textContent = `${lastGuess.user}: ${lastGuess.value} - ${lastGuess.result}`;
-                resultDiv.appendChild(p);
-
-                if (lastGuess.result === 'Угадано!') {
-                    const winMessage = document.createElement('p');
-                    winMessage.textContent = `Победил ${lastGuess.user}!`;
-                    resultDiv.appendChild(winMessage);
-                    document.getElementById('user-guess-input').disabled = true; // Отключаем после победы
-                    document.getElementById('user-guess-button').disabled = true;
-
-                }
-            }
-        }
-        
-        socket.on('game_action_result', (data) => {
-            const gameId = data.game_id;
-            const action = data.action;
-
-            if (gameId === 'game1' && action === 'guess') {
-                // Обработка результата уже происходит в update_game_state
+            } else if (gameId === 'alias'){
+                initAlias(gameId, gameInfo, gameContent);
+            } else if(gameId === 'mafia'){
+                initMafia(gameId, gameInfo, gameContent);
+            }else if(gameId === 'durak'){
+                initDurak(gameId, gameInfo, gameContent);
             }
         });
 
-
-         // Игра "Крокодил"
+        // Игра "Крокодил"
          function initCrocodile(gameId, gameInfo, gameContent){
                const wordInput = document.createElement('input');
                 wordInput.type = 'text';
                 wordInput.id = 'crocodile-word-input';
                 wordInput.placeholder = 'Введите слово';
+                wordInput.classList.add('game-input');
                 wordInput.disabled = true; // По умолчанию отключен
                 gameContent.appendChild(wordInput);
 
                 const startTurnButton = document.createElement('button');
                 startTurnButton.textContent = 'Начать ход';
+                startTurnButton.classList.add('game-button');
                 startTurnButton.id = 'start-turn-button';
                 gameContent.appendChild(startTurnButton);
 
                 const guessInput = document.createElement('input');
                 guessInput.type = 'text';
+                guessInput.classList.add('game-input');
                 guessInput.id = 'crocodile-guess-input';
                 guessInput.placeholder = 'Ваша догадка';
                 guessInput.disabled = true;
@@ -1076,6 +1075,7 @@ def room(token):
 
                 const guessButton = document.createElement('button');
                 guessButton.textContent = 'Угадать';
+                guessButton.classList.add('game-button');
                 guessButton.id = 'crocodile-guess-button';
                 guessButton.disabled = true;
                 gameContent.appendChild(guessButton);
@@ -1172,153 +1172,523 @@ def room(token):
                  }
             }
         }
-         
-        socket.on('timer_tick', (data) => {
-            const gameId = data.game_id;
-            if(gameId === 'game2' && document.getElementById('crocodile-timer')){
-                document.getElementById('crocodile-timer').textContent = `Время: ${data.time}`;
-            }
-        })
-
-        //Игра викторина 
-        function initQuiz(gameId, gameInfo, gameContent){
-            const questionInput = document.createElement('input');
-            questionInput.type = 'text';
-            questionInput.id = 'quiz-question-input';
-            questionInput.placeholder = 'Введите вопрос';
-            gameContent.appendChild(questionInput);
-
-            const answerInput = document.createElement('input');
-            answerInput.type = 'text';
-            answerInput.id = 'quiz-answer-input';
-            answerInput.placeholder = 'Введите правильный ответ';
-            gameContent.appendChild(answerInput);
-
-            const askQuestionButton = document.createElement('button');
-            askQuestionButton.textContent = 'Задать вопрос';
-            askQuestionButton.id = 'ask-question-button';
-            gameContent.appendChild(askQuestionButton);
-
-            const userAnswerInput = document.createElement('input');
-            userAnswerInput.type = 'text';
-            userAnswerInput.id = 'user-answer-input';
-            userAnswerInput.placeholder = 'Ваш ответ';
-            userAnswerInput.disabled = true;
-            gameContent.appendChild(userAnswerInput);
-
-            const answerButton = document.createElement('button');
-            answerButton.textContent = 'Ответить';
-            answerButton.id = 'answer-button';
-            answerButton.disabled = true;
-            gameContent.appendChild(answerButton);
+
+        //игра "Alias"
+        function initAlias(gameId, gameInfo, gameContent){
+            const wordInput = document.createElement('input');
+            wordInput.type = 'text';
+            wordInput.id = 'alias-word-input';
+            wordInput.placeholder = 'Введите слово';
+            wordInput.classList.add('game-input');
+            wordInput.disabled = true; // По умолчанию отключен
+            gameContent.appendChild(wordInput);
+
+            const startTurnButton = document.createElement('button');
+            startTurnButton.textContent = 'Начать ход';
+            startTurnButton.classList.add('game-button');
+            startTurnButton.id = 'start-turn-button';
+            gameContent.appendChild(startTurnButton);
+
+            const guessInput = document.createElement('input');
+            guessInput.type = 'text';
+            guessInput.id = 'alias-guess-input';
+            guessInput.classList.add('game-input');
+            guessInput.placeholder = 'Ваша догадка';
+            guessInput.disabled = true;
+            gameContent.appendChild(guessInput);
+
+            const guessButton = document.createElement('button');
+            guessButton.textContent = 'Угадать';
+            guessButton.classList.add('game-button');
+            guessButton.id = 'alias-guess-button';
+            guessButton.disabled = true;
+            gameContent.appendChild(guessButton);
 
             const resultDiv = document.createElement('div');
-            resultDiv.id = 'quiz-result';
+            resultDiv.id = 'alias-result';
             gameContent.appendChild(resultDiv);
 
-             if (isAdmin) {
-                questionInput.disabled = false;
-                answerInput.disabled = false;
-                askQuestionButton.onclick = () => {
-                  const question = questionInput.value.trim();
-                  const answer = answerInput.value.trim();
-                  if (question && answer) {
-                    socket.emit('set_game_state', { token, game_id: gameId, state: { question: question, answer: answer, answers: [], currentPlayerIndex: 0, scores: {} } });
-                    questionInput.value = '';
-                    answerInput.value = '';
-                    // Блокируем поля ввода после отправки вопроса
-                    questionInput.disabled = true;
-                    answerInput.disabled = true;
-
-                  } else {
-                    alert('Введите вопрос и ответ!');
-                  }
-                };
-              } else {
-                 questionInput.disabled = true;
-                 answerInput.disabled = true;
-              }
-
-              answerButton.onclick = () => {
-                const userAnswer = userAnswerInput.value.trim();
-                if (userAnswer) {
-                    socket.emit('game_action', { token, game_id: gameId, action: 'answer', value: userAnswer, user: username });
-                    userAnswerInput.value = '';
+            const timerDisplay = document.createElement('div');
+            timerDisplay.id = 'alias-timer';
+            gameContent.appendChild(timerDisplay);
+
+
+             if(isAdmin){
+                wordInput.disabled = false;
+                startTurnButton.onclick = () => {
+                    const word = wordInput.value.trim();
+                    if(word){
+                         const users = {{ rooms[token]['users']|tojson }};
+                         const nonAdminUsers = users.filter(u => u !== username);
+                         const presenter = nonAdminUsers.length > 0 ? nonAdminUsers[Math.floor(Math.random() * nonAdminUsers.length)] : null;
+
+                         if(presenter){
+                            socket.emit('set_game_state', {token, game_id: gameId, state: {word: word, presenter: presenter, guesses: [], timer: 60, isRunning: true}});
+                         }else{
+                             alert("Нет игроков для выбора ведущего");
+                         }
+                    }else{
+                        alert("Введите слово");
+                    }
                 }
-              }
+             }
 
+             guessButton.onclick = () => {
+                const guess = guessInput.value.trim();
+                if(guess){
+                    socket.emit('game_action', {token, game_id: gameId, action: 'guess', value: guess, user: username});
+                    guessInput.value = '';
+                }
+             }
         }
 
-        function updateQuizState(gameId, gameState){
-             const resultDiv = document.getElementById('quiz-result');
-            const userAnswerInput = document.getElementById('user-answer-input');
-            const answerButton = document.getElementById('answer-button');
-            const questionInput = document.getElementById('quiz-question-input');
-            const askQuestionButton = document.getElementById('ask-question-button');
+        function updateAliasState(gameId, gameState){
+            const resultDiv = document.getElementById('alias-result');
+            const wordInput = document.getElementById('alias-word-input');
+            const guessInput = document.getElementById('alias-guess-input');
+            const guessButton = document.getElementById('alias-guess-button');
+            const timerDisplay = document.getElementById('alias-timer');
 
-             if (!resultDiv || !userAnswerInput || !answerButton) return;
+            if(!resultDiv || !wordInput || !guessInput || !guessButton || !timerDisplay) return;
 
-              resultDiv.innerHTML = ''; // Очистка
+            resultDiv.innerHTML = '';
+
+             if(gameState.isRunning){
+                 timerDisplay.textContent = `Время: ${gameState.timer}`;
 
-              if (gameState.question) {
+                 if(username === gameState.presenter){
+                    wordInput.value = gameState.word;
+                    wordInput.disabled = true;
+                 }else{
+                     wordInput.value = '';
+                     wordInput.disabled = true;
+                 }
 
-                   if (!isAdmin){
-                        const questionText = document.createElement('p');
-                        questionText.textContent = `Вопрос: ${gameState.question}`;
-                        resultDiv.appendChild(questionText);
-                    }
+                 guessInput.disabled = username === gameState.presenter;
+                 guessButton.disabled = username === gameState.presenter;
 
-                 // Включаем поля для ответа для текущего игрока.
-                const users = {{ rooms[token]['users']|tojson }};
+                 if(gameState.guesses && gameState.guesses.length > 0){
+                    gameState.guesses.forEach(guess => {
+                        const p = document.createElement('p');
+                        p.textContent = `${guess.user}: ${guess.value} - ${guess.result}`;
+                        resultDiv.appendChild(p);
+                    });
+                 }
+                 if (gameState.guesses.length>0 && gameState.guesses[gameState.guesses.length - 1].result === "Угадано!"){
+                       const winMessage = document.createElement('p');
+                        winMessage.textContent = `Победил ${gameState.guesses[gameState.guesses.length - 1].user}!`;
+                        resultDiv.appendChild(winMessage);
+                         guessInput.disabled = true;
+                         guessButton.disabled = true;
+                         timerDisplay.textContent = '';
+                         gameState.isRunning = false; // Остановка игры
 
-                if(gameState.currentPlayerIndex < users.length){
-                  const currentPlayer = users[gameState.currentPlayerIndex];
+                         //Очистка
+                         wordInput.value = '';
 
-                  if (username === currentPlayer) {
-                    userAnswerInput.disabled = false;
-                    answerButton.disabled = false;
-                  } else {
-                    userAnswerInput.disabled = true;
-                    answerButton.disabled = true;
-                  }
+                 }
+             }
+        }
+
+        //Игра "Мафия"
+        function initMafia(gameId, gameInfo, gameContent) {
+            const startMafiaButton = document.createElement('button');
+            startMafiaButton.textContent = 'Начать игру';
+            startMafiaButton.classList.add('game-button');
+            startMafiaButton.id = 'start-mafia-button';
+            gameContent.appendChild(startMafiaButton);
+
+            const resultDiv = document.createElement('div');
+            resultDiv.id = 'mafia-result';
+            gameContent.appendChild(resultDiv);
+
+              const voteInput = document.createElement('input');
+                voteInput.type = 'text';
+                voteInput.id = 'mafia-vote-input';
+                voteInput.placeholder = 'За кого голосуете?';
+                voteInput.classList.add('game-input');
+                voteInput.disabled = true;
+                gameContent.appendChild(voteInput);
+
+                const voteButton = document.createElement('button');
+                voteButton.textContent = 'Голосовать';
+                voteButton.classList.add('game-button');
+                voteButton.id = 'mafia-vote-button';
+                voteButton.disabled = true;
+                gameContent.appendChild(voteButton);
+
+                if (isAdmin) {
+                    startMafiaButton.onclick = () => {
+                      const users = {{ rooms[token]['users']|tojson }};
+                        // Раздача ролей
+                        const roles = assignMafiaRoles(users);
+                        socket.emit('set_game_state', { token, game_id: gameId, state: { roles: roles, phase: 'night', votes: {}, isRunning: true, killed: null, checked: null } });
+                    };
                 }
 
-                if (gameState.answers && gameState.answers.length > 0){
-                      gameState.answers.forEach(ans => {
-                          const p = document.createElement('p');
-                          p.textContent = `${ans.user}: ${ans.value} - ${ans.isCorrect ? 'Верно' : 'Неверно'}`;
-                          resultDiv.appendChild(p);
-
-                          if(gameState.scores && gameState.scores[ans.user] !== undefined){
-                               const scoreText = document.createElement('p');
-                                scoreText.textContent = `Текущий счет ${ans.user}: ${gameState.scores[ans.user]}`;
-                                resultDiv.appendChild(scoreText);
-                          }
-                      });
+                 voteButton.onclick = () => {
+                  const vote = voteInput.value.trim();
+                  if (vote) {
+                      socket.emit('game_action', { token, game_id: gameId, action: 'vote', value: vote, user: username });
+                        voteInput.value = '';  //Очищаем поле
+                  }
+              };
+        }
+
+          function assignMafiaRoles(users) {
+            const numPlayers = users.length;
+            let numMafia = 1;
+            if (numPlayers >= 5) {
+                numMafia = 2;
+            }
+            // Создаем массив ролей: сначала мафия, потом мирные
+             const roles = Array(numMafia).fill('mafia').concat(Array(numPlayers - numMafia).fill('civilian'));
+
+            // Перемешиваем роли
+             for (let i = roles.length - 1; i > 0; i--) {
+                const j = Math.floor(Math.random() * (i + 1));
+                [roles[i], roles[j]] = [roles[j], roles[i]]; // ES6 деструктуризация для обмена
+            }
+
+            // Назначаем роли пользователям
+            const assignedRoles = {};
+            for (let i = 0; i < numPlayers; i++) {
+                assignedRoles[users[i]] = roles[i];
+            }
+            return assignedRoles;
+        }
+
+         function updateMafiaState(gameId, gameState) {
+
+            const resultDiv = document.getElementById('mafia-result');
+            const voteInput = document.getElementById('mafia-vote-input');
+            const voteButton = document.getElementById('mafia-vote-button');
+
+
+            if (!resultDiv || !voteInput || !voteButton) return;
+
+            resultDiv.innerHTML = ''; // Очищаем
+
+             // Ночь
+            if (gameState.isRunning && gameState.phase === 'night') {
+                voteInput.disabled = true; // Отключаем голосование ночью
+                voteButton.disabled = true;
+                if (gameState.roles[username] === 'mafia') {
+                    resultDiv.innerHTML = '<p>Вы мафия. Обсудите с другими мафиози, кого убить.</p>';
+                } else {
+                    resultDiv.innerHTML = '<p>Ночь. Все спят.</p>';
                 }
+            }
+             // День
+            else if(gameState.isRunning && gameState.phase === 'day'){
+                voteInput.disabled = false;
+                voteButton.disabled = false;
 
-                // Проверяем, все ли игроки ответили
-                if(gameState.currentPlayerIndex >= users.length){
+                if (gameState.killed) {
+                    resultDiv.innerHTML += `<p>Ночью был убит ${gameState.killed}.</p>`;
+                }
 
-                   const winner = Object.entries(gameState.scores).sort(([,a],[,b]) => b-a)[0];
+                 resultDiv.innerHTML += '<p>День. Обсуждение и голосование.</p>';
 
-                    if(winner){
-                         const winMessage = document.createElement('p');
-                        winMessage.textContent = `Игра окончена, победитель ${winner[0]}!`;
-                         resultDiv.appendChild(winMessage);
+                if (gameState.votes && Object.keys(gameState.votes).length > 0) {
+                    resultDiv.innerHTML += '<p>Голоса:</p>';
+                    for (const voter in gameState.votes) {
+                        resultDiv.innerHTML += `<p>${voter}: ${gameState.votes[voter]}</p>`;
                     }
+                }
 
-                    userAnswerInput.disabled = true;
-                    answerButton.disabled = true;
-                    if(isAdmin && questionInput && askQuestionButton){
-                        questionInput.disabled = false;
-                         askQuestionButton.disabled = false; // Разблокировка кнопки задать вопрос
+                // Подсчет голосов и определение, кого казнят
+                 if(Object.keys(gameState.votes).length === {{ rooms[token]['users']|length }}){
+                    const voteCounts = {};
+                    let maxVotes = 0;
+                    let votedOut = null;
+                    let tied = false; // Флаг ничьей
+
+                      for(const voter in gameState.votes){
+                        const votedFor = gameState.votes[voter];
+                        voteCounts[votedFor] = (voteCounts[votedFor] || 0) + 1;
+
+                        if(voteCounts[votedFor] > maxVotes){
+                             maxVotes = voteCounts[votedFor];
+                              votedOut = votedFor;
+                              tied = false; // Сбрасываем ничью, если новый лидер
+                        }else if(voteCounts[votedFor] === maxVotes){
+                            tied = true; // Ничья
+                        }
+                      }
+
+                    if (tied) {
+                         resultDiv.innerHTML += '<p>Голосование завершилось ничьей. Никто не казнен.</p>';
+                    }else{
+                        resultDiv.innerHTML += `<p>По итогам голосования казнен ${votedOut}.</p>`;
+                         // Проверяем, была ли это мафия
+                        if (gameState.roles[votedOut] === 'mafia') {
+                          resultDiv.innerHTML += '<p>Мирные жители победили!</p>';
+                          gameState.isRunning = false;
+                        }
+                     }
+                      // Проверяем, остались ли мафиози
+                    const remainingMafia = Object.values(gameState.roles).filter(role => role === 'mafia').length;
+                    if (remainingMafia === 0) {
+                         resultDiv.innerHTML += '<p>Мирные жители победили!</p>';
+                         gameState.isRunning = false;
                     }
+                }
+            }
+         }
+        
+        //Карточная игра "Дурак"
+        function initDurak(gameId, gameInfo, gameContent){
+            if (isAdmin) {
+                const startButton = document.createElement('button');
+                startButton.textContent = 'Раздать карты';
+                startButton.classList.add('game-button');
+                startButton.onclick = () => {
+                    const { deck, hands } = dealDurakCards({{ rooms[token]['users']|tojson }});
+                    socket.emit('set_game_state', { token, game_id: gameId, state: { deck, hands, table: [], turn: 0, attacker: null, defender: null, trumpSuit: deck.length > 0 ? deck[deck.length-1].suit : null,  isGameEnd: false, winner: null} });
+                };
+                gameContent.appendChild(startButton);
+            }
+
+            const playerHandContainer = document.createElement('div');
+            playerHandContainer.id = 'player-hand';
+            playerHandContainer.classList.add('card-container');
+            gameContent.appendChild(playerHandContainer);
 
+            const tableContainer = document.createElement('div');
+            tableContainer.id = 'durak-table';
+            gameContent.appendChild(tableContainer);
+
+
+             const buttonsDiv = document.createElement('div');
+            buttonsDiv.id = 'durak-buttons';
+            gameContent.appendChild(buttonsDiv);
+
+            const takeButton = document.createElement('button');
+            takeButton.textContent = 'Взять';
+            takeButton.id = 'take-button';
+            takeButton.classList.add('game-button');
+            buttonsDiv.appendChild(takeButton);
+
+
+            const doneButton = document.createElement('button');
+            doneButton.textContent = 'Готово/Пас';
+            doneButton.id = 'done-button';
+            doneButton.classList.add('game-button');
+             buttonsDiv.appendChild(doneButton);
+
+            const infoDiv = document.createElement('div');
+            infoDiv.id = 'durak-info';
+            gameContent.appendChild(infoDiv);
+
+             takeButton.onclick = () => {
+                socket.emit('game_action', { token, game_id: gameId, action: 'take', user: username });
+             };
+            doneButton.onclick = () => {
+                socket.emit('game_action', { token, game_id: gameId, action: 'done', user: username });
+            }
+        }
+
+        function dealDurakCards(players) {
+              const suits = ['Hearts', 'Diamonds', 'Clubs', 'Spades'];
+            const ranks = ['6', '7', '8', '9', '10', 'J', 'Q', 'K', 'A'];
+            let deck = [];
+
+            // Создаем колоду
+            for (const suit of suits) {
+                for (const rank of ranks) {
+                    deck.push({ suit, rank });
                 }
-              }
+            }
+
+            // Перемешиваем колоду
+              for (let i = deck.length - 1; i > 0; i--) {
+                const j = Math.floor(Math.random() * (i + 1));
+                [deck[i], deck[j]] = [deck[j], deck[i]];
+            }
+
+            // Раздаем карты
+            const hands = {};
+            players.forEach(player => hands[player] = []);
+            let cardIndex = 0;
+             while (cardIndex < 6 * players.length && cardIndex < deck.length) {
+                players.forEach(player => {
+                    if (cardIndex < deck.length) {
+                        hands[player].push(deck[cardIndex]);
+                        cardIndex++;
+                    }
+                });
+            }
+             deck = deck.slice(cardIndex); // Оставшиеся карты - колода.
+             return { deck, hands };
+        }
+
+        function renderCard(card, isHidden) {
+             const cardElement = document.createElement('div');
+            cardElement.classList.add('card');
+             if (isHidden) {
+                cardElement.classList.add('back'); // Рубашка
+            } else {
+                cardElement.textContent = `${card.rank}${getSuitSymbol(card.suit)}`;
+                 cardElement.dataset.suit = card.suit;
+                cardElement.dataset.rank = card.rank;
+            }
+
+            return cardElement;
+        }
+          function getSuitSymbol(suit) {
+            switch (suit) {
+                case 'Hearts': return '♥';
+                case 'Diamonds': return '♦';
+                case 'Clubs': return '♣';
+                case 'Spades': return '♠';
+                default: return '';
+            }
         }
         
+        function canBeat(attackingCard, defendingCard, trumpSuit){
+            if(attackingCard.suit === defendingCard.suit){
+                return compareRanks(defendingCard.rank, attackingCard.rank) > 0;
+            }else{
+                return defendingCard.suit === trumpSuit;
+            }
+        }
+
+        function compareRanks(rank1, rank2){
+            const ranks = ['6', '7', '8', '9', '10', 'J', 'Q', 'K', 'A'];
+            return ranks.indexOf(rank1) - ranks.indexOf(rank2);
+        }
+
+        function updateDurakState(gameId, gameState){
+            const playerHandContainer = document.getElementById('player-hand');
+            const tableContainer = document.getElementById('durak-table');
+            const infoDiv = document.getElementById('durak-info');
+
+            if (!playerHandContainer || !tableContainer || !infoDiv) return;
+            playerHandContainer.innerHTML = ''; // Очистка
+            tableContainer.innerHTML = '';
+            infoDiv.innerHTML = '';
+
+             const trumpCardEl = document.createElement('div');
+            if(gameState.trumpSuit){
+                 infoDiv.innerHTML = `Козырь: ${getSuitSymbol(gameState.trumpSuit)}`;
+
+                 trumpCardEl.classList.add('card');
+
+                 if(gameState.deck.length > 0){
+                    trumpCardEl.textContent = `${gameState.deck[gameState.deck.length -1].rank} ${getSuitSymbol(gameState.deck[gameState.deck.length -1].suit)}`;
+                    infoDiv.appendChild(trumpCardEl)
+                 }
+
+            }
+
+             const myHand = gameState.hands[username] || [];
+            myHand.forEach(card => {
+                const cardElement = renderCard(card, false);
+                cardElement.addEventListener('click', () => {
+
+                   const selectedCards = playerHandContainer.querySelectorAll('.selected');
+
+                    if (cardElement.classList.contains('selected')) {
+                         cardElement.classList.remove('selected');
+                     } else {
+                         // Логика выбора карты для хода/защиты
+                        if(gameState.attacker === username){ //Если игрок атакующий
+                            if(gameState.table.length < 6){
+                                //Выбираем только одну карту
+                               selectedCards.forEach(c => c.classList.remove('selected'));
+                                cardElement.classList.add('selected');
+                            }
+                        }
+                        else if(gameState.defender === username){
+                           // Можно выбрать только одну карту для защиты
+                          selectedCards.forEach(c => c.classList.remove('selected'));
+                          cardElement.classList.add('selected');
+                        }
+
+                         //Выделяем карту
+                         //cardElement.classList.add('selected');
+                     }
+                     //Определяем, можем ли мы сделать ход выбранной картой
+                     const selected = playerHandContainer.querySelector('.selected');  //Одна карта
+                    if(selected){
+                        const selectedCard = {suit: selected.dataset.suit, rank: selected.dataset.rank};
+                        socket.emit('game_action', {token, game_id: gameId, action: 'move', card: selectedCard, user: username});
+                    }
+
+                });
+                playerHandContainer.appendChild(cardElement);
+            });
+
+            const takeButton = document.getElementById('take-button');
+            const doneButton = document.getElementById('done-button');
+
+              // Обновляем кнопки
+            takeButton.style.display = 'none';
+            doneButton.style.display = 'none';
+
+             // Если текущий игрок - защищающийся, и он еще не взял карты, показываем кнопку
+            if (gameState.defender === username && gameState.turn === 1) { //turn === 1 - Защищающийся
+                 takeButton.style.display = 'inline-block';
+            }
+            // Если текущий игрок - атакующий, и он еще не закончил ход, показываем "Готово"
+             if(gameState.attacker === username && gameState.turn === 0){
+                 doneButton.style.display = 'inline-block';
+             }
+
+             // Отображаем карты на столе
+            gameState.table.forEach(pair => {
+                const pairDiv = document.createElement('div');
+                pairDiv.classList.add('card-pair');
+
+                const attackingCardEl = renderCard(pair.attackingCard, false);
+                pairDiv.appendChild(attackingCardEl);
+
+                if (pair.defendingCard) {
+                    const defendingCardEl = renderCard(pair.defendingCard, false);
+                    pairDiv.appendChild(defendingCardEl);
+                }
+                tableContainer.appendChild(pairDiv);
+            });
+
+            if(gameState.isGameEnd){
+                infoDiv.innerHTML += `<p>Игра окончена, победитель - ${gameState.winner} </p>`
+            }
+        }
+
+        socket.on('update_game_state', (data) => {
+            const gameId = data.game_id;
+            const gameState = data.state;
+            
+             if (gameId === 'crocodile'){
+                 updateCrocodileState(gameId, gameState);
+             }else if(gameId === 'alias'){
+                 updateAliasState(gameId, gameState);
+             }else if(gameId === 'mafia'){
+                 updateMafiaState(gameId, gameState)
+             }else if(gameId === 'durak'){
+                 updateDurakState(gameId, gameState);
+             }
+
+        });
+
+         socket.on('timer_tick', (data) => {
+            const gameId = data.game_id;
+            if(gameId === 'crocodile' && document.getElementById('crocodile-timer')){
+                document.getElementById('crocodile-timer').textContent = `Время: ${data.time}`;
+            }else if(gameId === 'alias' && document.getElementById('alias-timer')){
+                document.getElementById('alias-timer').textContent = `Время: ${data.time}`;
+            }
+        });
+
+        socket.on('game_action_result', (data) => {
+             const gameId = data.game_id;
+             const action = data.action;
+             //console.log("LOG:", gameId, action)
+             if(gameId === 'durak' && action === 'move'){ // Для дурака убрал, так как все через update
+             }
+        });
+
         function leaveRoom() {
             socket.emit('leave', { token, username });
             if (localStream) {
@@ -1339,7 +1709,7 @@ def room(token):
 def handle_join(data):
     token = data['token']
     username = data['username']
-    print(f"User {username} joining room {token}")
+    print(    f"User {username} joining room {token}")
     if token in rooms and len(rooms[token]['users']) < rooms[token]['max_users']:
         join_room(token)
         if username not in rooms[token]['users']:
@@ -1377,14 +1747,7 @@ def handle_leave(data):
         if rooms[token].get('current_game'): # Если игра в процессе
             game_id = rooms[token]['current_game']
             if games_data[game_id]['state'].get(token):
-                #Если "угадай число"
-                if game_id == 'game1':
-                    if(games_data[game_id]['state'][token].get('guesses')):
-                      new_guesses = [guess for guess in games_data[game_id]['state'][token]['guesses'] if guess['user'] != username]
-                      games_data[game_id]['state'][token]['guesses'] = new_guesses
-
-                #Если "крокодил"
-                elif game_id == 'game2':
+                if game_id == 'crocodile':
                     if games_data[game_id]['state'][token].get('presenter') == username:
                         # Сброс игры, если уходит ведущий
                         del games_data[game_id]['state'][token]
@@ -1394,22 +1757,35 @@ def handle_leave(data):
                     #Удаление догадок
                     if games_data[game_id]['state'][token].get('guesses'):
                         games_data[game_id]['state'][token]['guesses'] = [guess for guess in games_data[game_id]['state'][token]['guesses'] if guess['user'] != username]
-                
-                elif game_id == 'game3':
-                    if games_data[game_id]['state'][token].get('answers'):
-                        games_data[game_id]['state'][token]['answers'] = [answer for answer in games_data[game_id]['state'][token]['answers'] if answer['user'] != username]
-                        
-                    if games_data[game_id]['state'][token].get('scores') and username in games_data[game_id]['state'][token]['scores']:
-                         del games_data[game_id]['state'][token]['scores'][username]
-                         
-                    if games_data[game_id]['state'][token].get('currentPlayerIndex') != None:
-                         users_in_room = rooms.get(token, {}).get('users',[])
-                         current_index = games_data[game_id]['state'][token]['currentPlayerIndex']
-
-                         if len(users_in_room) > 0 :
-                           games_data[game_id]['state'][token]['currentPlayerIndex'] = current_index % len(users_in_room)
-                         else:
-                             games_data[game_id]['state'][token]['currentPlayerIndex'] = 0
+
+                elif game_id == 'alias':
+                    if games_data[game_id]['state'][token].get('presenter') == username:
+                         del games_data[game_id]['state'][token]
+                         emit('update_game_state', {'game_id': game_id, 'state': {}}, room=token)
+                         save_json(GAMES_DB, games_data)
+                         return
+                    if games_data[game_id]['state'][token].get('guesses'):
+                         games_data[game_id]['state'][token]['guesses'] = [guess for guess in games_data[game_id]['state'][token]['guesses'] if guess['user'] != username]
+
+                elif game_id == 'mafia':
+                    if games_data[game_id]['state'][token].get('roles') and username in games_data[game_id]['state'][token]['roles']:
+                         del games_data[game_id]['state'][token]['roles'][username]
+
+                    if games_data[game_id]['state'][token].get('votes'):
+                         #Удаляем голос, если он был
+                        if username in games_data[game_id]['state'][token]['votes']:
+                            del games_data[game_id]['state'][token]['votes'][username]
+
+                elif game_id == 'durak':
+                    if games_data[game_id]['state'][token].get('hands') and username in games_data[game_id]['state'][token]['hands']:
+                        del games_data[game_id]['state'][token]['hands'][username]
+
+                        #Если ушел атакующий или защищающийся
+                        if games_data[game_id]['state'][token].get('attacker') == username:
+                            games_data[game_id]['state'][token]['attacker'] = None;
+
+                        if games_data[game_id]['state'][token].get('defender') == username:
+                            games_data[game_id]['state'][token]['defender'] = None;
                 save_json(GAMES_DB, games_data); # Сохраняем изменения в любом случае
                 emit('update_game_state', {'game_id': game_id, 'state': games_data[game_id]['state'][token]}, room=token);
 
@@ -1445,6 +1821,7 @@ def handle_set_game_state(data):
     token = data['token']
     game_id = data['game_id']
     state = data['state']
+     #print("SET STATE", data)
 
     if token in rooms:
       if  rooms[token]['admin'] == session.get('username'):
@@ -1454,7 +1831,7 @@ def handle_set_game_state(data):
              save_json(GAMES_DB, games_data)
              emit('update_game_state', {'game_id': game_id, 'state': state}, room=token)
 
-             if game_id == 'game2' and state.get('isRunning'):  # Запуск таймера для крокодила
+             if (game_id == 'crocodile' or game_id == 'alias') and state.get('isRunning'):  # Запуск таймера
                 start_timer(token, game_id)
 
 @socketio.on('game_action')
@@ -1462,31 +1839,14 @@ def handle_game_action(data):
      token = data['token']
      game_id = data['game_id']
      action = data['action']
-     value = data['value']
+     value = data.get('value') # Могут быть и другие данные (не только value)
      user = data['user']
+     card = data.get('card') # Для карт
 
      if token in rooms and game_id == rooms[token]['current_game']:
         current_state = games_data[game_id]['state'].get(token, {})
 
-        if game_id == 'game1': # Угадай число
-            if action == 'guess' and current_state.get('number') is not None:
-                result = ""
-                if value < current_state['number']:
-                    result = "Больше"
-                elif value > current_state['number']:
-                    result = "Меньше"
-                else:
-                    result = "Угадано!"
-
-                if 'guesses' not in current_state:
-                   current_state['guesses'] = []
-
-                current_state['guesses'].append({'user': user, 'value': value, 'result': result})
-                games_data[game_id]['state'][token] = current_state  # Сохраняем обновленное состояние
-                save_json(GAMES_DB, games_data)  # Сохраняем в файл
-                emit('update_game_state', { 'game_id': game_id, 'state': current_state}, room=token)
-
-        elif game_id == 'game2': # Крокодил
+        if game_id == 'crocodile' or game_id == 'alias':
             if action == 'guess' and current_state.get('isRunning'):
                 result = "Не угадано"
                 if value.lower() == current_state.get('word', '').lower():
@@ -1500,30 +1860,124 @@ def handle_game_action(data):
                 save_json(GAMES_DB, games_data)
                 emit('update_game_state', {'game_id': game_id, 'state': current_state}, room=token)
 
-        elif game_id == 'game3':
-             if action == 'answer' and current_state.get('question'):
-                  is_correct = value.lower() == current_state.get('answer', '').lower()
+        elif game_id == 'mafia':
+             if action == 'vote' and current_state.get('phase') == 'day' and current_state.get('isRunning'):
+                  if 'votes' not in current_state:
+                    current_state['votes'] = {}
 
-                  if 'answers' not in current_state:
-                      current_state['answers'] = []
-                  current_state['answers'].append({'user':user, 'value': value, 'isCorrect': is_correct})
+                  current_state['votes'][user] = value # Сохраняем голос
 
-                  if 'scores' not in current_state:
-                      current_state['scores'] = {}
-                  if is_correct:
-                     current_state['scores'][user] = current_state['scores'].get(user, 0) + 1
-
-                  # Переходим к следующему игроку
-                  users_in_room = rooms.get(token,{}).get('users',[])
-                  current_state['currentPlayerIndex'] = (current_state.get('currentPlayerIndex', 0) + 1) % len(users_in_room)
+                  #Если все проголосовали
+                  if len(current_state['votes']) == len(rooms[token]['users']):
+                      #Меняем фазу на ночь
+                      current_state['phase'] = 'night'
 
                   games_data[game_id]['state'][token] = current_state
-                  save_json(GAMES_DB, games_data)
+                  save_json(GAMES_DB, games_data);
                   emit('update_game_state', {'game_id': game_id, 'state': current_state}, room=token)
 
+        elif game_id == 'durak':
+            if action == 'move':
+                if current_state.get('attacker') == user:
+                    # Проверяем, можно ли походить этой картой
+                    if len(current_state['table']) == 0 or any(c['rank'] == card['rank'] for pair in current_state['table'] for c in [pair.get('attackingCard'), pair.get('defendingCard')] if c):
+                        current_state['table'].append({'attackingCard': card, 'defendingCard': None})
+                        current_state['hands'][user].remove(card)
+                         #Передаем ход защищающемуся
+                        current_state['turn'] = 1;
+                        current_state['defender'] = get_next_player(token, current_state['attacker']);
+
+                        games_data[game_id]['state'][token] = current_state
+                        save_json(GAMES_DB, games_data)
+                        emit('update_game_state', {'game_id': game_id, 'state': current_state}, room=token)
+
+                elif current_state.get('defender') == user:
+
+                    if len(current_state['table']) > 0 :
+                        last_pair = current_state['table'][-1]
+                        if last_pair.get('defendingCard') is None:
+                            attacking_card = last_pair['attackingCard']
+                             #Можем ли побить
+                            if canBeat(attacking_card, card, current_state['trumpSuit']):
+                                last_pair['defendingCard'] = card
+                                current_state['hands'][user].remove(card)
+                                current_state['turn'] = 0 #Ход переходит атакующему
+                                #Меняем атакующего и защищающегося, если нужно
+                                current_state['attacker'] = get_next_player(token, current_state['defender']);
+                                current_state['defender'] = get_next_player(token, current_state['attacker']);
+
+                                games_data[game_id]['state'][token] = current_state
+                                save_json(GAMES_DB, games_data)
+                                emit('update_game_state', {'game_id': game_id, 'state': current_state}, room=token)
+
+            elif action == 'take':
+                if current_state.get('defender') == user:
+                    # Защищающийся берет карты со стола
+                    taken_cards = []
+                    for pair in current_state['table']:
+                        taken_cards.append(pair['attackingCard'])
+                        if pair.get('defendingCard'):
+                            taken_cards.append(pair['defendingCard'])
+                    current_state['hands'][user].extend(taken_cards)
+                    current_state['table'] = []  # Очищаем стол
+                    #Добираем карты
+                    current_state = refill_hands(current_state, token);
+
+                    # Ход переходит к следующему игроку после защищавшегося.
+                    current_state['attacker'] = get_next_player(token, current_state['defender']);
+                    current_state['defender'] = get_next_player(token, current_state['attacker']);
+                    current_state['turn'] = 0; # Ходит атакующий
+
+                    games_data[game_id]['state'][token] = current_state
+                    save_json(GAMES_DB, games_data)
+                    emit('update_game_state', {'game_id': game_id, 'state': current_state}, room=token)
+
+            elif action == 'done':
+                 if current_state.get('attacker') == user:
+                     current_state['table'] = []
+                     current_state = refill_hands(current_state, token); #Раздача
+
+                     #Определение следующего атакующего и защищающегося
+                     current_state['attacker'] = get_next_player(token, current_state['attacker']);
+                     current_state['defender'] = get_next_player(token, current_state['attacker']);
+                     current_state['turn'] = 0;  # Ходит атакующий
+
+                     games_data[game_id]['state'][token] = current_state;
+                     save_json(GAMES_DB, games_data);
+                     emit('update_game_state', {'game_id': game_id, 'state':current_state}, room=token);
+
+
+def get_next_player(token, current_player):
+    """Определяет следующего игрока в комнате."""
+    if token not in rooms:
+        return None
+
+    users = rooms[token]['users']
+    if not users:
+       return None
+
+    current_index = users.index(current_player)
+    next_index = (current_index + 1) % len(users)  # Циклический переход
+    return users[next_index]
+
+def refill_hands(game_state, token):
+    """Раздает карты игрокам до 6, если в колоде еще есть карты."""
+    players = rooms[token]['users']
+    for player in players:
+        while len(game_state['hands'].get(player, [])) < 6 and len(game_state['deck']) > 0:
+            game_state['hands'][player].append(game_state['deck'].pop())
+
+    #Проверка, не закончилась ли игра
+    if len(game_state['deck']) == 0:
+       players_without_cards = [player for player in players if len(game_state['hands'].get(player,[])) == 0]
+       if len(players_without_cards) > 0:
+           game_state['isGameEnd'] = True
+           game_state['winner'] = players_without_cards[0] # Первый, кто избавился от карт
+
+    return game_state;
 
 def start_timer(token, game_id):
-    if game_id != 'game2':  # Таймер пока только для крокодила
+    if game_id != 'crocodile' and game_id != 'alias':  # Таймер пока только для крокодила
         return
 
     def timer_loop():