From: Laurent Mazet <mazet@softndesign.org>
Date: Mon, 10 Feb 2025 22:46:48 +0000 (+0100)
Subject: remove useless default bag factor
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=5e446ce10a4dee9a2b104c92bcac65977f842f57;p=trivabble.git

remove useless default bag factor
---

diff --git a/server/trivabble-server.js b/server/trivabble-server.js
index 2623023..8fd47e8 100644
--- a/server/trivabble-server.js
+++ b/server/trivabble-server.js
@@ -35,7 +35,7 @@ const KEEP_ALIVE = 30000;
 const GAMES_BACKUP = process.env.TRIVABBLE_GAMES_BACKUP || "games.backup.json";
 const DEFAULT_BOARD_LANG = process.env.TRIVABBLE_DEFAULT_BOARD_LANG || "fr";
 const DEFAULT_BOARD_LABEL = process.env.TRIVABBLE_DEFAULT_BOARD_LABEL || "15x15-7";
-const DEFAULT_BAG_FACTOR = Math.min(1, parseInt(process.env.TRIVABBLE_DEFAULT_BAG_FACTOR) || 1);
+const DEFAULT_BAG_FACTOR = 1;
 
 const VERSION = 202005070100;
 
@@ -482,11 +482,15 @@ function joinGame(gameNumber, message) {
     if (!gameNumber) {
         gameNumber = newGameId();
         if (message) {
-            message.gameNumber = gameNumber;
+            //message.gameNumber = gameNumber;
+            gameNumber = message.gameNumber;
         }
     }
 
-    const game = games[gameNumber] || (games[gameNumber] = new Game());
+    let game = games[gameNumber] || (games[gameNumber] = new Game());
+    if ((message) && (message.bagFactor) && (message.bagFactor != game.factor)) {
+        game.init(message.boardLang, message.boardLabel, message.bagFactor);
+    }
 
     return {gameNumber, game};
 }
@@ -498,7 +502,7 @@ function reply(message, response, cmdNumber, r) {
 }
 
 function handleCommand(cmdNumber, message, response) {
-    const {gameNumber, game} = joinGame(message.gameNumber);
+    const {gameNumber, game} = joinGame(message.gameNumber, message);
 
     game.lastUpdated = new Date();