When converting old gamefile formats to new, the winConditions are al…

…ways specified
Infinite-Chess · Jan 18, 2025 · 19d124f · 19d124f
1 parent 4f042e5
commit 19d124f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/client/scripts/esm/chess/logic/backcompatible.js b/src/client/scripts/esm/chess/logic/backcompatible.js
@@ -86,9 +86,10 @@ function getLongformatInNewNotation(longformat) {
 		//       // koth: 'both'
 		//     }
 		// }
-		const newGameRules = {};
-		newGameRules.turnOrder = turnOrder;
-		if (longformat.gameRules.slideLimit && longformat.gameRules.slideLimit !== "Infinity") newGameRules.slideLimit = longformat.gameRules.slideLimit;
+		const newGameRules = {
+			turnOrder,
+			winConditions: { white: ['checkmate'], black: ['checkmate'] }
+		};
 		if (longformat.gameRules.winConditions) {
 			const newWinConditions = { white: [], black: [] };
 			for (const condition in longformat.gameRules.winConditions) {
@@ -103,6 +104,7 @@ function getLongformatInNewNotation(longformat) {
 			// The old gamefiles did not specify promotions allowed, because it's determined by the pieces the game starts with
 			newGameRules.promotionsAllowed = variant.getPromotionsAllowed(longformat.startingPosition, newGameRules.promotionRanks);
 		}
+		if (longformat.gameRules.slideLimit && longformat.gameRules.slideLimit !== "Infinity") newGameRules.slideLimit = longformat.gameRules.slideLimit;
 		converted.gameRules = newGameRules;
 	}
 

diff --git a/src/client/scripts/esm/chess/logic/formatconverter.js b/src/client/scripts/esm/chess/logic/formatconverter.js
@@ -308,7 +308,7 @@ function ShortToLong_Format(shortformat/*, reconstruct_optional_move_flags = tru
 		// Splice the extra gamerules out of the ICN, so that its nested [ and ] don't break the metadata parser
 		shortformat = shortformat.substring(0, indexOfGameRulesStart) + shortformat.substring(indexOfGameRulesEnd + 1, shortformat.length);
 
-		if (!isJson(stringifiedExtraGamerules)) throw new Error("Extra optional arguments not in JSON format");
+		if (!isJson(stringifiedExtraGamerules)) throw new Error(`Extra optional arguments not in valid JSON format: ${stringifiedExtraGamerules}`);
 
 		const parsedGameRules = JSON.parse(stringifiedExtraGamerules);
 		Object.assign(longformat.gameRules, parsedGameRules); // Copy over the parsed gamerules to the longformat