aboutsummaryrefslogtreecommitdiff
path: root/api/game/random.py
diff options
context:
space:
mode:
Diffstat (limited to 'api/game/random.py')
-rw-r--r--api/game/random.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/api/game/random.py b/api/game/random.py
index 54ab2a8..ae7dc95 100644
--- a/api/game/random.py
+++ b/api/game/random.py
@@ -4,8 +4,10 @@ from randid import new_uuid
import time
import json
import random
-from game.socket import io, game, games
+from game.socket import game, games
+from game.new import create_game, start_game
from auth.login_token import token_login
+from socket_io import io
random_game = Blueprint('random', __name__)
@@ -28,15 +30,12 @@ def index():
game_started = False
if len(public_games) == 0:
- game_id = new_uuid("games")
-
- cursor.execute("insert into games values (?, NULL, \"\", ?, NULL, NULL, ?, NULL, ?, NULL, NULL, NULL, \"wait_for_opponent\", \"default\", FALSE, FALSE) ", (game_id, user_id, timestamp, timestamp))
- connection.commit()
+ game_id = create_game(user_id)
player_1 = True
else:
game_id = random.choice(public_games)[0]
- cursor.execute("update games set player_2_id = ?, status = \"in_progress\", started = ?, last_activity = ? where game_id = ?", (user_id, timestamp, timestamp, game_id))
- connection.commit()
+
+ start_game(game_id, user_id)
players = cursor.execute("select player_1_id, player_2_id from games where game_id = ?", [game_id]).fetchone()
games[game_id] = game(game_id, io, players[0], players[1])