Add Baikal map (fixed) (#690)

## Description:
This PR adds the "Baikal" map which is a cutout from the whole real life
lake, as the lake itself is very large vertically and wouldn't make as a
very good map by itself. This map has some rivers and a very big sort of
water body that seperates the map in two(it was kind of designed for the
teams gamemode). It's nations are some features around that region.

## Please complete the following:

- [ ] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

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

Nikola123

resources/flags/bai_bur.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="150px" height="150px" viewBox="0 0 150 75" version="1.1">
+<g id="surface1">
+<rect x="0" y="0" width="150" height="75" style="fill:rgb(100%,85.09804%,0%);fill-opacity:1;stroke:none;"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 0 0 L 150 0 L 150 56.25 L 0 56.25 Z M 0 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,22.352941%,65.098041%);fill-opacity:1;" d="M 0 0 L 150 0 L 150 37.5 L 0 37.5 Z M 0 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,85.09804%,0%);fill-opacity:1;" d="M 27.675781 20.625 C 26.925781 24.578125 28.617188 28.59375 31.96875 30.820312 C 35.320312 33.042969 39.679688 33.042969 43.03125 30.820312 C 46.382812 28.59375 48.074219 24.578125 47.324219 20.625 C 46.429688 25.34375 42.304688 28.761719 37.5 28.761719 C 32.695312 28.761719 28.570312 25.34375 27.675781 20.625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,85.09804%,0%);fill-opacity:1;" d="M 45 20 C 45 15.859375 41.640625 12.5 37.5 12.5 C 33.359375 12.5 30 15.859375 30 20 C 30 24.140625 33.359375 27.5 37.5 27.5 C 41.640625 27.5 45 24.140625 45 20 Z M 45 20 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,85.09804%,0%);fill-opacity:1;" d="M 37.425781 2.5 C 37.480469 2.925781 37.734375 3.269531 37.976562 3.605469 C 38.160156 3.949219 38.167969 4.355469 38.050781 4.726562 C 37.992188 5.105469 37.925781 5.539062 38.179688 5.867188 C 38.445312 6.226562 38.695312 6.652344 38.625 7.121094 C 38.617188 7.605469 38.292969 8.058594 38.351562 8.539062 C 38.480469 8.859375 38.847656 9.269531 39.050781 8.761719 C 39.3125 8.347656 38.925781 7.890625 39.042969 7.453125 C 39.121094 7.019531 39.476562 6.652344 39.386719 6.183594 C 39.378906 5.773438 38.804688 5.386719 39.25 5 C 39.40625 4.820312 39.664062 4.457031 39.640625 4.917969 C 39.90625 5.230469 40.214844 5.585938 40.175781 6.03125 C 40.132812 6.46875 39.964844 6.976562 40.375 7.300781 C 40.792969 7.742188 41.160156 8.296875 41.164062 8.925781 C 41.210938 9.476562 41.097656 10.0625 40.734375 10.488281 C 40.257812 10.882812 39.742188 11.292969 39.117188 11.394531 C 38.667969 11.457031 38.226562 11.578125 37.9375 11.953125 C 37.523438 12.296875 37.117188 11.964844 36.863281 11.632812 C 36.421875 11.457031 35.929688 11.503906 35.480469 11.359375 C 34.882812 11.1875 34.316406 10.816406 34.042969 10.246094 C 33.761719 9.675781 33.726562 9.015625 33.765625 8.390625 C 33.777344 7.890625 34.0625 7.449219 34.414062 7.105469 C 34.757812 6.800781 34.617188 6.304688 34.632812 5.90625 C 34.804688 5.457031 35.273438 5.226562 35.527344 4.828125 C 35.824219 4.460938 35.742188 5.351562 35.75 5.539062 C 35.761719 5.863281 35.40625 6.0625 35.476562 6.394531 C 35.4375 6.820312 35.941406 7.03125 35.984375 7.4375 C 36.167969 7.84375 35.746094 8.28125 36.007812 8.660156 C 36.148438 8.84375 36.507812 9.285156 36.550781 8.800781 C 36.765625 8.425781 36.738281 7.992188 36.5625 7.605469 C 36.496094 7.175781 36.128906 6.773438 36.328125 6.328125 C 36.476562 5.929688 36.960938 5.722656 36.992188 5.257812 C 37.050781 4.835938 36.765625 4.472656 36.707031 4.066406 C 36.585938 3.605469 36.796875 3.058594 37.144531 2.742188 C 37.234375 2.660156 37.320312 2.566406 37.425781 2.5 Z M 37.425781 2.5 "/>
+</g>
+</svg>

resources/lang/en.json

@@ -128,7 +128,8 @@
     "faroeislands": "Faroe Islands",
     "deglaciatedantarctica": "Deglaciated Antarctica",
     "europeclassic": "Europe (classic)",
-    "falklandislands": "Falkland Islands"
+    "falklandislands": "Falkland Islands",
+    "baikal": "Baikal"
   },
   "map_categories": {
     "continental": "Continental",

resources/maps/Baikal.json

@@ -0,0 +1,73 @@
+{
+  "name": "Baikal",
+  "width": 2500,
+  "height": 1565,
+  "nations": [
+    {
+      "coordinates": [695, 665],
+      "name": "Irkutsk Oblast",
+      "strength": 2,
+      "flag": "bai_irk"
+    },
+    {
+      "coordinates": [2188, 1001],
+      "name": "Republic of Buryatia",
+      "strength": 2,
+      "flag": "bai_bur"
+    },
+    {
+      "coordinates": [754, 1170],
+      "name": "Olkhon Island",
+      "strength": 1,
+      "flag": "ru"
+    },
+    {
+      "coordinates": [1025, 831],
+      "name": "Cape Khoboy",
+      "strength": 1,
+      "flag": "ru"
+    },
+    {
+      "coordinates": [361, 1195],
+      "name": "Ogoi Island",
+      "strength": 1,
+      "flag": "ru"
+    },
+    {
+      "coordinates": [1805, 115],
+      "name": "Bolshoy Ushkan Island",
+      "strength": 1,
+      "flag": "ru"
+    },
+    {
+      "coordinates": [2030, 335],
+      "name": "Svyatoy Nos Peninsula",
+      "strength": 2,
+      "flag": "ru"
+    },
+    {
+      "coordinates": [2194, 659],
+      "name": "Chivyrkuisky Bay",
+      "strength": 1,
+      "flag": "ru"
+    },
+    {
+      "coordinates": [309, 230],
+      "name": "Chanchur",
+      "strength": 2,
+      "flag": "ru"
+    },
+    {
+      "coordinates": [2165, 1439],
+      "name": "Zabaykalsky National Park",
+      "strength": 1,
+      "flag": "ru"
+    },
+    {
+      "coordinates": [132, 751],
+      "name": "Listvyanka",
+      "strength": 1,
+      "flag": "ru"
+    }
+  ]
+}

src/client/components/Maps.ts

@@ -27,6 +27,7 @@ export const MapDescription: Record<keyof typeof GameMapType, string> = {
   FaroeIslands: "Faroe Islands",
   DeglaciatedAntarctica: "Deglaciated Antarctica",
   FalklandIslands: "Falkland Islands",
+  Baikal: "Baikal",
 };
 
 @customElement("map-display")

src/client/utilities/Maps.ts

@@ -1,6 +1,7 @@
 import africa from "../../../resources/maps/AfricaThumb.webp";
 import asia from "../../../resources/maps/AsiaThumb.webp";
 import australia from "../../../resources/maps/AustraliaThumb.webp";
+import baikal from "../../../resources/maps/BaikalThumb.webp";
 import betweenTwoSeas from "../../../resources/maps/BetweenTwoSeasThumb.webp";
 import blackSea from "../../../resources/maps/BlackSeaThumb.webp";
 import britannia from "../../../resources/maps/BritanniaThumb.webp";
@@ -69,6 +70,8 @@ export function getMapsImage(map: GameMapType): string {
       return deglaciatedAntarctica;
     case GameMapType.FalklandIslands:
       return falklandislands;
+    case GameMapType.Baikal:
+      return baikal;
     default:
       return "";
   }

src/core/configuration/DefaultConfig.ts

@@ -100,6 +100,7 @@ export abstract class DefaultServerConfig implements ServerConfig {
           GameMapType.Britannia,
           GameMapType.Asia,
           GameMapType.FalklandIslands,
+          GameMapType.Baikal,
         ].includes(map)
       ) {
         return Math.random() < 0.3 ? 50 : 25;

src/core/game/Game.ts

@@ -75,6 +75,7 @@ export enum GameMapType {
   FaroeIslands = "Faroe Islands",
   DeglaciatedAntarctica = "Deglaciated Antarctica",
   FalklandIslands = "Falkland Islands",
+  Baikal = "Baikal",
 }
 
 export const mapCategories: Record<string, GameMapType[]> = {
@@ -99,6 +100,7 @@ export const mapCategories: Record<string, GameMapType[]> = {
     GameMapType.Australia,
     GameMapType.FaroeIslands,
     GameMapType.FalklandIslands,
+    GameMapType.Baikal,
   ],
   fantasy: [
     GameMapType.Pangaea,

src/core/game/TerrainMapFileLoader.ts

@@ -45,6 +45,7 @@ const MAP_FILE_NAMES: Record<GameMapType, string> = {
   [GameMapType.DeglaciatedAntarctica]: "DeglaciatedAntarctica",
   [GameMapType.EuropeClassic]: "EuropeClassic",
   [GameMapType.FalklandIslands]: "FalklandIslands",
+  [GameMapType.Baikal]: "Baikal",
 };
 
 class GameMapLoader {

src/scripts/generateTerrainMaps.ts

@@ -26,6 +26,7 @@ const maps = [
   "FaroeIslands",
   "DeglaciatedAntarctica",
   "FalklandIslands",
+  "Baikal",
 ];
 
 const removeSmall = true;

src/server/MapPlaylist.ts

@@ -30,6 +30,7 @@ const frequency = {
   BlackSea: 1,
   FaroeIslands: 1,
   FalklandIslands: 1,
+  Baikal: 1,
 };
 
 interface MapWithMode {