Add Two Lakes (#2743)

## Description:
This PR adds the Two Lakes map, based on the irl area around lake Ohrid
and lake Prespa

Describe the PR.

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced

## Please put your Discord username so you can be contacted if a bug or
regression is found:

DISCORD_USERNAME
Nikola123

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

@@ -0,0 +1,25 @@
+{
+  "name": "Two Lakes",
+  "nations": [
+    {
+      "coordinates": [1025, 750],
+      "name": "Galicica"
+    },
+    {
+      "coordinates": [1815, 820],
+      "name": "Pelister"
+    },
+    {
+      "coordinates": [920, 1250],
+      "name": "Podgorie"
+    },
+    {
+      "coordinates": [100, 1410],
+      "name": "Valamara"
+    },
+    {
+      "coordinates": [1320, 1485],
+      "name": "Prespa"
+    }
+  ]
+}

map-generator/main.go

@@ -60,6 +60,7 @@ var maps = []struct {
 	{Name: "svalmel"},
 	{Name: "world"},
 	{Name: "lemnos"},
+	{Name: "twolakes"},
 	{Name: "big_plains", IsTest: true},
 	{Name: "half_land_half_ocean", IsTest: true},
 	{Name: "ocean_and_land", IsTest: true},

resources/lang/en.json

@@ -245,7 +245,8 @@
     "lisbon": "Lisbon",
     "svalmel": "Svalmel",
     "manicouagan": "Manicouagan",
-    "lemnos": "Lemnos"
+    "lemnos": "Lemnos",
+    "twolakes": "Two Lakes"
   },
   "map_categories": {
     "continental": "Continental",

resources/maps/twolakes/manifest.json

@@ -0,0 +1,40 @@
+{
+  "map": {
+    "height": 1840,
+    "num_land_tiles": 3426566,
+    "width": 2100
+  },
+  "map16x": {
+    "height": 460,
+    "num_land_tiles": 211836,
+    "width": 525
+  },
+  "map4x": {
+    "height": 920,
+    "num_land_tiles": 853511,
+    "width": 1050
+  },
+  "name": "Two Lakes",
+  "nations": [
+    {
+      "coordinates": [1025, 750],
+      "name": "Galicica"
+    },
+    {
+      "coordinates": [1815, 820],
+      "name": "Pelister"
+    },
+    {
+      "coordinates": [920, 1250],
+      "name": "Podgorie"
+    },
+    {
+      "coordinates": [100, 1410],
+      "name": "Valamara"
+    },
+    {
+      "coordinates": [1320, 1485],
+      "name": "Prespa"
+    }
+  ]
+}

src/client/components/Maps.ts

@@ -44,6 +44,7 @@ export const MapDescription: Record<keyof typeof GameMapType, string> = {
   Lisbon: "Lisbon",
   Manicouagan: "Manicouagan",
   Lemnos: "Lemnos",
+  TwoLakes: "Two Lakes",
 };
 
 @customElement("map-display")

src/core/configuration/DefaultConfig.ts

@@ -85,6 +85,7 @@ const numPlayersConfig = {
   [GameMapType.Svalmel]: [40, 36, 30],
   [GameMapType.World]: [50, 30, 20],
   [GameMapType.Lemnos]: [20, 15, 10],
+  [GameMapType.TwoLakes]: [60, 50, 40],
 } as const satisfies Record<GameMapType, [number, number, number]>;
 
 export abstract class DefaultServerConfig implements ServerConfig {

src/core/game/Game.ts

@@ -107,6 +107,7 @@ export enum GameMapType {
   Lisbon = "Lisbon",
   Manicouagan = "Manicouagan",
   Lemnos = "Lemnos",
+  TwoLakes = "Two Lakes",
 }
 
 export type GameMapName = keyof typeof GameMapType;
@@ -145,6 +146,7 @@ export const mapCategories: Record<string, GameMapType[]> = {
     GameMapType.NewYorkCity,
     GameMapType.Manicouagan,
     GameMapType.Lemnos,
+    GameMapType.TwoLakes,
   ],
   fantasy: [
     GameMapType.Pangaea,

src/server/MapPlaylist.ts

@@ -57,6 +57,7 @@ const frequency: Partial<Record<GameMapName, number>> = {
   Svalmel: 8,
   World: 8,
   Lemnos: 3,
+  TwoLakes: 6,
 };
 
 interface MapWithMode {