Merge branch 'main' into fow3

map-generator/assets/maps/surrounded/info.json

@@ -0,0 +1,45 @@
+{
+  "name": "Surrounded",
+  "nations": [
+    {
+      "coordinates": [1043, 910],
+      "flag": "",
+      "name": "Endangered Islander"
+    },
+    {
+      "coordinates": [684, 271],
+      "flag": "",
+      "name": "North Islander"
+    },
+    {
+      "coordinates": [1429, 429],
+      "flag": "",
+      "name": "Isolated Islander"
+    },
+    {
+      "coordinates": [1726, 1022],
+      "flag": "",
+      "name": "Volcano Islander"
+    },
+    {
+      "coordinates": [1422, 1569],
+      "flag": "",
+      "name": "Resilient Islander"
+    },
+    {
+      "coordinates": [670, 1742],
+      "flag": "",
+      "name": "Vulnerable Islander"
+    },
+    {
+      "coordinates": [282, 1160],
+      "flag": "",
+      "name": "Unyielding Islander"
+    },
+    {
+      "coordinates": [384, 469],
+      "flag": "",
+      "name": "Rugged Islander"
+    }
+  ]
+}

map-generator/main.go

@@ -57,6 +57,7 @@ var maps = []struct {
 	{Name: "pluto"},
 	{Name: "southamerica"},
 	{Name: "straitofgibraltar"},
+	{Name: "surrounded"},
 	{Name: "svalmel"},
 	{Name: "world"},
 	{Name: "lemnos"},

resources/lang/en.json

@@ -251,7 +251,8 @@
     "manicouagan": "Manicouagan",
     "lemnos": "Lemnos",
     "twolakes": "Two Lakes",
-    "straitofhormuz": "Strait of Hormuz"
+    "straitofhormuz": "Strait of Hormuz",
+    "surrounded": "Surrounded"
   },
   "map_categories": {
     "continental": "Continental",

resources/maps/surrounded/manifest.json

@@ -0,0 +1,60 @@
+{
+  "map": {
+    "height": 1976,
+    "num_land_tiles": 767607,
+    "width": 1976
+  },
+  "map16x": {
+    "height": 494,
+    "num_land_tiles": 45797,
+    "width": 494
+  },
+  "map4x": {
+    "height": 988,
+    "num_land_tiles": 188989,
+    "width": 988
+  },
+  "name": "Surrounded",
+  "nations": [
+    {
+      "coordinates": [1043, 910],
+      "flag": "",
+      "name": "Endangered Islander"
+    },
+    {
+      "coordinates": [684, 271],
+      "flag": "",
+      "name": "North Islander"
+    },
+    {
+      "coordinates": [1429, 429],
+      "flag": "",
+      "name": "Isolated Islander"
+    },
+    {
+      "coordinates": [1726, 1022],
+      "flag": "",
+      "name": "Volcano Islander"
+    },
+    {
+      "coordinates": [1422, 1569],
+      "flag": "",
+      "name": "Resilient Islander"
+    },
+    {
+      "coordinates": [670, 1742],
+      "flag": "",
+      "name": "Vulnerable Islander"
+    },
+    {
+      "coordinates": [282, 1160],
+      "flag": "",
+      "name": "Unyielding Islander"
+    },
+    {
+      "coordinates": [384, 469],
+      "flag": "",
+      "name": "Rugged Islander"
+    }
+  ]
+}

src/client/components/Maps.ts

@@ -46,6 +46,7 @@ export const MapDescription: Record<keyof typeof GameMapType, string> = {
   Lemnos: "Lemnos",
   TwoLakes: "Two Lakes",
   StraitOfHormuz: "Strait of Hormuz",
+  Surrounded: "Surrounded",
 };
 
 @customElement("map-display")

src/core/configuration/DefaultConfig.ts

@@ -87,6 +87,7 @@ const numPlayersConfig = {
   [GameMapType.Lemnos]: [20, 15, 10],
   [GameMapType.TwoLakes]: [60, 50, 40],
   [GameMapType.StraitOfHormuz]: [40, 36, 30],
+  [GameMapType.Surrounded]: [56, 28, 14], // 4, 2, 1 players per island
 } as const satisfies Record<GameMapType, [number, number, number]>;
 
 export abstract class DefaultServerConfig implements ServerConfig {

src/core/game/Game.ts

@@ -109,6 +109,7 @@ export enum GameMapType {
   Lemnos = "Lemnos",
   TwoLakes = "Two Lakes",
   StraitOfHormuz = "Strait of Hormuz",
+  Surrounded = "Surrounded",
 }
 
 export type GameMapName = keyof typeof GameMapType;
@@ -159,6 +160,7 @@ export const mapCategories: Record<string, GameMapType[]> = {
     GameMapType.BaikalNukeWars,
     GameMapType.FourIslands,
     GameMapType.Svalmel,
+    GameMapType.Surrounded,
   ],
 };
 

src/server/MapPlaylist.ts

@@ -59,6 +59,7 @@ const frequency: Partial<Record<GameMapName, number>> = {
   Lemnos: 3,
   TwoLakes: 6,
   StraitOfHormuz: 4,
+  Surrounded: 4,
 };
 
 interface MapWithMode {