Merge branch 'main' into meta3AI. remove underline at 90.

src/core/game/Game.ts

@@ -51,6 +51,7 @@ export enum Team {
 export enum GameMapType {
   World = "World",
   Europe = "Europe",
+  EuropeClassic = "Europe Classic",
   Mena = "Mena",
   NorthAmerica = "North America",
   SouthAmerica = "South America",
@@ -76,6 +77,7 @@ export const mapCategories: Record<string, GameMapType[]> = {
     GameMapType.NorthAmerica,
     GameMapType.SouthAmerica,
     GameMapType.Europe,
+    GameMapType.EuropeClassic,
     GameMapType.Asia,
     GameMapType.Africa,
     GameMapType.Oceania,

src/core/game/GameImpl.ts

@@ -102,13 +102,15 @@ export class GameImpl implements Game {
 
     if (_config.gameConfig().gameMode === GameMode.Team) {
       const numPlayerTeams = _config.numPlayerTeams();
-      if (numPlayerTeams < 2) throw new Error("Too few teams!");
+      if (numPlayerTeams < 2)
+        throw new Error(`Too few teams: ${numPlayerTeams}`);
       if (numPlayerTeams >= 3) this.playerTeams.push(Team.Teal);
       if (numPlayerTeams >= 4) this.playerTeams.push(Team.Purple);
       if (numPlayerTeams >= 5) this.playerTeams.push(Team.Yellow);
       if (numPlayerTeams >= 6) this.playerTeams.push(Team.Orange);
       if (numPlayerTeams >= 7) this.playerTeams.push(Team.Green);
-      if (numPlayerTeams >= 8) throw new Error("Too many teams!");
+      if (numPlayerTeams >= 8)
+        throw new Error(`Too many teams: ${numPlayerTeams}`);
     }
   }
 

src/core/game/GameMap.ts

@@ -277,7 +277,11 @@ export class GameMapImpl implements GameMap {
   ): Set<TileRef> {
     const seen = new Set<TileRef>();
     const q: TileRef[] = [];
-    q.push(tile);
+    if (filter(this, tile)) {
+      seen.add(tile);
+      q.push(tile);
+    }
+
     while (q.length > 0) {
       const curr = q.pop();
       for (const n of this.neighbors(curr)) {

src/core/game/TerrainMapFileLoader.ts

@@ -42,6 +42,7 @@ const MAP_FILE_NAMES: Record<GameMapType, string> = {
   [GameMapType.BetweenTwoSeas]: "BetweenTwoSeas",
   [GameMapType.KnownWorld]: "KnownWorld",
   [GameMapType.FaroeIslands]: "FaroeIslands",
+  [GameMapType.EuropeClassic]: "EuropeClassic",
 };
 
 class GameMapLoader {