Merge branch 'v26'

src/server/GameServer.ts

@@ -21,7 +21,7 @@ import {
   ServerTurnMessage,
   Turn,
 } from "../core/Schemas";
-import { createPartialGameRecord } from "../core/Util";
+import { createPartialGameRecord, getClanTag } from "../core/Util";
 import { archive, finalizeGameRecord } from "./Archive";
 import { Client } from "./Client";
 export enum GamePhase {
@@ -689,6 +689,7 @@ export class GameServer {
             this.allClients.get(player.clientID)?.persistentID ?? "",
           stats,
           cosmetics: player.cosmetics,
+          clanTag: getClanTag(player.username) ?? undefined,
         } satisfies PlayerRecord;
       },
     );

src/server/MapPlaylist.ts

@@ -130,19 +130,33 @@ export class MapPlaylist {
 
     const rand = new PseudoRandom(Date.now());
 
-    const ffa: GameMapType[] = rand.shuffleArray([...maps]);
-    const team: GameMapType[] = rand.shuffleArray([...maps]);
+    const ffa1: GameMapType[] = rand.shuffleArray([...maps]);
+    const team1: GameMapType[] = rand.shuffleArray([...maps]);
+    const ffa2: GameMapType[] = rand.shuffleArray([...maps]);
+    const team2: GameMapType[] = rand.shuffleArray([...maps]);
+    const ffa3: GameMapType[] = rand.shuffleArray([...maps]);
 
     this.mapsPlaylist = [];
     for (let i = 0; i < maps.length; i++) {
-      if (!this.addNextMap(this.mapsPlaylist, ffa, GameMode.FFA)) {
+      if (!this.addNextMap(this.mapsPlaylist, ffa1, GameMode.FFA)) {
         return false;
       }
       if (!this.disableTeams) {
-        if (!this.addNextMap(this.mapsPlaylist, team, GameMode.Team)) {
+        if (!this.addNextMap(this.mapsPlaylist, team1, GameMode.Team)) {
           return false;
         }
       }
+      if (!this.addNextMap(this.mapsPlaylist, ffa2, GameMode.FFA)) {
+        return false;
+      }
+      if (!this.disableTeams) {
+        if (!this.addNextMap(this.mapsPlaylist, team2, GameMode.Team)) {
+          return false;
+        }
+      }
+      if (!this.addNextMap(this.mapsPlaylist, ffa3, GameMode.FFA)) {
+        return false;
+      }
     }
     return true;
   }