diff options
| -rw-r--r-- | server.js | 125 |
1 files changed, 63 insertions, 62 deletions
@@ -2022,25 +2022,25 @@ function insert_rematch_players(old_game_id, new_game_id, req_user_id, order) { throw new Error("missing players") switch (order) { - default: - case "swap": - players.sort((a, b) => roles.indexOf(a.role) - roles.indexOf(b.role)) - for (let i = 0; i < n; ++i) - players[i].role = roles[(i+1) % n] - break - case "keep": - // do nothing - break - case "shuffle": - // unused for now - random but known - shuffle(players) - for (let i = 0; i < n; ++i) - players[i].role = roles[i] - break - case "random": - for (let i = 0; i < n; ++i) - players[i].role = "Random " + (i+1) - break + default: + case "swap": + players.sort((a, b) => roles.indexOf(a.role) - roles.indexOf(b.role)) + for (let i = 0; i < n; ++i) + players[i].role = roles[(i + 1) % n] + break + case "keep": + // do nothing + break + case "shuffle": + // unused for now - random but known + shuffle(players) + for (let i = 0; i < n; ++i) + players[i].role = roles[i] + break + case "random": + for (let i = 0; i < n; ++i) + players[i].role = "Random " + (i + 1) + break } for (let p of players) { @@ -3372,11 +3372,12 @@ function make_pools(seed, players) { return designs.pool_players(players, n+1) throw new Error("cannot create pools for this player/rounds configuration") - + /* if (v > n+1) return designs.pool_players(players, n+1) return [ players ] + */ } if (k === 3) { @@ -4030,53 +4031,53 @@ function broadcast_presence(game_id) { function handle_player_message(socket, cmd, arg) { switch (cmd) { - case "action": - on_action(socket, arg[0], arg[1], arg[2]) - break - case "query": - on_query(socket, arg[0], arg[1]) - break - case "resign": - on_resign(socket) - break - case "getnote": - on_getnote(socket) - break - case "putnote": - on_putnote(socket, arg) - break - case "getchat": - on_getchat(socket, arg) - break - case "chat": - on_chat(socket, arg) - break - case "getsnap": - on_snap(socket, arg | 0) - break - case "querysnap": - on_query_snap(socket, arg[0], arg[1], arg[2]) - break - default: - send_message(socket, "error", "Invalid server command: " + cmd) - break + case "action": + on_action(socket, arg[0], arg[1], arg[2]) + break + case "query": + on_query(socket, arg[0], arg[1]) + break + case "resign": + on_resign(socket) + break + case "getnote": + on_getnote(socket) + break + case "putnote": + on_putnote(socket, arg) + break + case "getchat": + on_getchat(socket, arg) + break + case "chat": + on_chat(socket, arg) + break + case "getsnap": + on_snap(socket, arg | 0) + break + case "querysnap": + on_query_snap(socket, arg[0], arg[1], arg[2]) + break + default: + send_message(socket, "error", "Invalid server command: " + cmd) + break } } function handle_observer_message(socket, cmd, arg) { switch (cmd) { - case "getsnap": - on_snap(socket, arg) - break - case "querysnap": - on_query_snap(socket, arg[0], arg[1], arg[2]) - break - case 'query': - on_query(socket, arg[0], arg[1]) - break - default: - send_message(socket, "error", "Invalid server command: " + cmd) - break + case "getsnap": + on_snap(socket, arg) + break + case "querysnap": + on_query_snap(socket, arg[0], arg[1], arg[2]) + break + case "query": + on_query(socket, arg[0], arg[1]) + break + default: + send_message(socket, "error", "Invalid server command: " + cmd) + break } } |