diff --git a/map-generator/assets/maps/alps/image.png b/map-generator/assets/maps/alps/image.png new file mode 100644 index 000000000..a2bcef486 Binary files /dev/null and b/map-generator/assets/maps/alps/image.png differ diff --git a/map-generator/assets/maps/alps/info.json b/map-generator/assets/maps/alps/info.json new file mode 100644 index 000000000..b47421976 --- /dev/null +++ b/map-generator/assets/maps/alps/info.json @@ -0,0 +1,45 @@ +{ + "name": "Alps", + "nations": [ + { + "coordinates": [740, 620], + "name": "Savoy", + "flag": "fr" + }, + { + "coordinates": [980, 580], + "name": "Switzerland", + "flag": "ch" + }, + { + "coordinates": [1220, 560], + "name": "Tyrol", + "flag": "at" + }, + { + "coordinates": [980, 820], + "name": "Lombardy", + "flag": "it" + }, + { + "coordinates": [1180, 820], + "name": "Veneto", + "flag": "venice" + }, + { + "coordinates": [1320, 690], + "name": "Bavaria", + "flag": "de" + }, + { + "coordinates": [1450, 820], + "name": "Slovenia", + "flag": "si" + }, + { + "coordinates": [1100, 650], + "name": "Liechtenstein", + "flag": "li" + } + ] +} diff --git a/map-generator/main.go b/map-generator/main.go index b6fbbb626..d6bc24cd3 100644 --- a/map-generator/main.go +++ b/map-generator/main.go @@ -25,6 +25,7 @@ var maps = []struct { {Name: "asia"}, {Name: "australia"}, {Name: "achiran"}, + {Name: "alps"}, {Name: "baikal"}, {Name: "baikalnukewars"}, {Name: "betweentwoseas"}, @@ -63,7 +64,7 @@ var maps = []struct { {Name: "world"}, {Name: "lemnos"}, {Name: "twolakes"}, - {Name: "thebox"}, + {Name: "thebox"}, {Name: "didier"}, {Name: "didierfrance"}, {Name: "amazonriver"}, diff --git a/resources/lang/en.json b/resources/lang/en.json index 55b302322..7e0a7fb82 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -329,7 +329,8 @@ "didierfrance": "Didier (France)", "amazonriver": "Amazon River", "tradersdream": "Traders Dream", - "hawaii": "Hawaii" + "hawaii": "Hawaii", + "alps": "Alps" }, "map_categories": { "featured": "Featured", diff --git a/resources/maps/alps/manifest.json b/resources/maps/alps/manifest.json new file mode 100644 index 000000000..826a3c4f0 --- /dev/null +++ b/resources/maps/alps/manifest.json @@ -0,0 +1,60 @@ +{ + "map": { + "height": 1836, + "num_land_tiles": 3672000, + "width": 2000 + }, + "map16x": { + "height": 459, + "num_land_tiles": 229500, + "width": 500 + }, + "map4x": { + "height": 918, + "num_land_tiles": 918000, + "width": 1000 + }, + "name": "Alps", + "nations": [ + { + "coordinates": [740, 620], + "flag": "fr", + "name": "Savoy" + }, + { + "coordinates": [980, 580], + "flag": "ch", + "name": "Switzerland" + }, + { + "coordinates": [1220, 560], + "flag": "at", + "name": "Tyrol" + }, + { + "coordinates": [980, 820], + "flag": "it", + "name": "Lombardy" + }, + { + "coordinates": [1180, 820], + "flag": "venice", + "name": "Veneto" + }, + { + "coordinates": [1320, 690], + "flag": "de", + "name": "Bavaria" + }, + { + "coordinates": [1450, 820], + "flag": "si", + "name": "Slovenia" + }, + { + "coordinates": [1100, 650], + "flag": "li", + "name": "Liechtenstein" + } + ] +} diff --git a/resources/maps/alps/map.bin b/resources/maps/alps/map.bin new file mode 100644 index 000000000..f18a3947d --- /dev/null +++ b/resources/maps/alps/map.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/maps/alps/map16x.bin b/resources/maps/alps/map16x.bin new file mode 100644 index 000000000..d7a10adb7 --- /dev/null +++ b/resources/maps/alps/map16x.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/maps/alps/map4x.bin b/resources/maps/alps/map4x.bin new file mode 100644 index 000000000..aabc48077 --- /dev/null +++ b/resources/maps/alps/map4x.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/maps/alps/thumbnail.webp b/resources/maps/alps/thumbnail.webp new file mode 100644 index 000000000..96e327ae6 Binary files /dev/null and b/resources/maps/alps/thumbnail.webp differ diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts index 4fcf1aa84..06f9e280d 100644 --- a/src/core/game/Game.ts +++ b/src/core/game/Game.ts @@ -121,6 +121,7 @@ export enum GameMapType { Yenisei = "Yenisei", TradersDream = "Traders Dream", Hawaii = "Hawaii", + Alps = "Alps", } export type GameMapName = keyof typeof GameMapType; @@ -170,6 +171,7 @@ export const mapCategories: Record = { GameMapType.AmazonRiver, GameMapType.Yenisei, GameMapType.Hawaii, + GameMapType.Alps, ], fantasy: [ GameMapType.Pangaea, diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts index 6ef8fe24b..912189274 100644 --- a/src/server/MapPlaylist.ts +++ b/src/server/MapPlaylist.ts @@ -69,6 +69,7 @@ const frequency: Partial> = { Yenisei: 6, TradersDream: 4, Hawaii: 4, + Alps: 4, }; const TEAM_WEIGHTS: { config: TeamCountConfig; weight: number }[] = [