From: Benjamin Auder <benjamin.auder@somewhere>
Date: Wed, 23 Mar 2022 08:48:33 +0000 (+0100)
Subject: Showing rules after random rematch only
X-Git-Url: https://git.auder.net/%7B%7B%20asset%28%27mixstore/images/css/current/common.css?a=commitdiff_plain;h=cae17481021b89a75bf5e0c0a41a1fd449ac68bd;p=xogo.git

Showing rules after random rematch only
---

diff --git a/server.js b/server.js
index 9c85eeb..0a85deb 100644
--- a/server.js
+++ b/server.js
@@ -22,9 +22,7 @@ function launchGame(vname, players, options) {
     Crypto.randomBytes(randstrSize).toString("hex").slice(0, randstrSize);
   games[gid] = {
     vname: vname,
-    players: players.map(p => {
-               return (!p ? null : {sid: p.sid, name: p.name});
-             }),
+    players: players,
     options: options,
     time: Date.now()
   };
@@ -127,8 +125,10 @@ wss.on("connection", (socket, req) => {
           if (games[obj.gid].rematch[1-myIndex]) {
             // Launch new game, colors reversed
             let vname = games[obj.gid].vname;
-            if (games[obj.gid].rematch.every(r => r == 2))
-              vname = getRandomVariant();
+            const allrand = games[obj.gid].rematch.every(r => r == 2);
+            if (allrand) vname = getRandomVariant();
+            games[obj.gid].players.forEach(p =>
+              p.randvar = allrand ? true : false);
             launchGame(vname,
                        games[obj.gid].players.reverse(),
                        games[obj.gid].options);