two islands map

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

@@ -0,0 +1,29 @@
+{
+  "name": "Two Islands",
+  "nations": [
+    {
+      "coordinates": [2413, 246],
+      "name": "Eloquala"
+    },
+    {
+      "coordinates": [2631, 455],
+      "name": "Goon Nation"
+    },
+    {
+      "coordinates": [2299, 441],
+      "name": "Mike Literas"
+    },
+    {
+      "coordinates": [2656, 307],
+      "name": "Hugh Janus"
+    },
+    {
+      "coordinates": [474, 275],
+      "name": "Pasta Nation"
+    },
+    {
+      "coordinates": [363, 541],
+      "name": "Dixie Normus"
+    }
+  ]
+}

map-generator/main.go

@@ -22,62 +22,63 @@ var maps = []struct {
 	IsTest bool
 }{
 	{Name: "test"},
-	{Name: "africa"},
-	{Name: "asia"},
-	{Name: "australia"},
-	{Name: "achiran"},
-	{Name: "alps"},
-	{Name: "baikal"},
-	{Name: "baikalnukewars"},
-	{Name: "betweentwoseas"},
-	{Name: "blacksea"},
-	{Name: "britannia"},
-	{Name: "britanniaclassic"},
-	{Name: "deglaciatedantarctica"},
-	{Name: "eastasia"},
-	{Name: "europe"},
-	{Name: "europeclassic"},
-	{Name: "falklandislands"},
-	{Name: "faroeislands"},
-	{Name: "fourislands"},
-	{Name: "gatewaytotheatlantic"},
-	{Name: "giantworldmap"},
-	{Name: "gulfofstlawrence"},
-	{Name: "halkidiki"},
-	{Name: "iceland"},
-	{Name: "italia"},
-	{Name: "japan"},
-	{Name: "lisbon"},
-	{Name: "manicouagan"},
-	{Name: "mars"},
-	{Name: "mena"},
-	{Name: "montreal"},
-	{Name: "newyorkcity"},
-	{Name: "northamerica"},
-	{Name: "oceania"},
-	{Name: "pangaea"},
-	{Name: "pluto"},
-	{Name: "sierpinski"},
-	{Name: "southamerica"},
-	{Name: "straitofgibraltar"},
-	{Name: "surrounded"},
-	{Name: "svalmel"},
-	{Name: "world"},
-	{Name: "lemnos"},
-	{Name: "twolakes"},
-	{Name: "thebox"},
-	{Name: "didier"},
-	{Name: "didierfrance"},
-	{Name: "amazonriver"},
-	{Name: "yenisei"},
-	{Name: "tradersdream"},
-	{Name: "hawaii"},
-	{Name: "big_plains", IsTest: true},
-	{Name: "half_land_half_ocean", IsTest: true},
-	{Name: "ocean_and_land", IsTest: true},
-	{Name: "plains", IsTest: true},
-	{Name: "giantworldmap", IsTest: true},
-	{Name: "world", IsTest: true},
+	{Name: "twoislands"},
+	// {Name: "africa"},
+	// {Name: "asia"},
+	// {Name: "australia"},
+	// {Name: "achiran"},
+	// {Name: "alps"},
+	// {Name: "baikal"},
+	// {Name: "baikalnukewars"},
+	// {Name: "betweentwoseas"},
+	// {Name: "blacksea"},
+	// {Name: "britannia"},
+	// {Name: "britanniaclassic"},
+	// {Name: "deglaciatedantarctica"},
+	// {Name: "eastasia"},
+	// {Name: "europe"},
+	// {Name: "europeclassic"},
+	// {Name: "falklandislands"},
+	// {Name: "faroeislands"},
+	// {Name: "fourislands"},
+	// {Name: "gatewaytotheatlantic"},
+	// {Name: "giantworldmap"},
+	// {Name: "gulfofstlawrence"},
+	// {Name: "halkidiki"},
+	// {Name: "iceland"},
+	// {Name: "italia"},
+	// {Name: "japan"},
+	// {Name: "lisbon"},
+	// {Name: "manicouagan"},
+	// {Name: "mars"},
+	// {Name: "mena"},
+	// {Name: "montreal"},
+	// {Name: "newyorkcity"},
+	// {Name: "northamerica"},
+	// {Name: "oceania"},
+	// {Name: "pangaea"},
+	// {Name: "pluto"},
+	// {Name: "sierpinski"},
+	// {Name: "southamerica"},
+	// {Name: "straitofgibraltar"},
+	// {Name: "surrounded"},
+	// {Name: "svalmel"},
+	// {Name: "world"},
+	// {Name: "lemnos"},
+	// {Name: "twolakes"},
+	// {Name: "thebox"},
+	// {Name: "didier"},
+	// {Name: "didierfrance"},
+	// {Name: "amazonriver"},
+	// {Name: "yenisei"},
+	// {Name: "tradersdream"},
+	// {Name: "hawaii"},
+	// {Name: "big_plains", IsTest: true},
+	// {Name: "half_land_half_ocean", IsTest: true},
+	// {Name: "ocean_and_land", IsTest: true},
+	// {Name: "plains", IsTest: true},
+	// {Name: "giantworldmap", IsTest: true},
+	// {Name: "world", IsTest: true},
 }
 
 // mapsFlag holds the comma-separated list of map names passed via the --maps command-line argument.

resources/lang/en.json

@@ -319,6 +319,7 @@
     "svalmel": "Svalmel",
     "manicouagan": "Manicouagan",
     "lemnos": "Lemnos",
+    "twoislands": "Two Islands",
     "test": "Test",
     "sierpinski": "Sierpinski",
     "thebox": "The Box",

resources/maps/twoislands/manifest.json

@@ -0,0 +1,44 @@
+{
+  "map": {
+    "height": 800,
+    "num_land_tiles": 561878,
+    "width": 3000
+  },
+  "map16x": {
+    "height": 200,
+    "num_land_tiles": 33386,
+    "width": 750
+  },
+  "map4x": {
+    "height": 400,
+    "num_land_tiles": 138170,
+    "width": 1500
+  },
+  "name": "Two Islands",
+  "nations": [
+    {
+      "coordinates": [2413, 246],
+      "name": "Eloquala"
+    },
+    {
+      "coordinates": [2631, 455],
+      "name": "Goon Nation"
+    },
+    {
+      "coordinates": [2299, 441],
+      "name": "Mike Literas"
+    },
+    {
+      "coordinates": [2656, 307],
+      "name": "Hugh Janus"
+    },
+    {
+      "coordinates": [474, 275],
+      "name": "Pasta Nation"
+    },
+    {
+      "coordinates": [363, 541],
+      "name": "Dixie Normus"
+    }
+  ]
+}

src/core/game/Game.ts

@@ -110,6 +110,7 @@ export enum GameMapType {
   Lisbon = "Lisbon",
   Manicouagan = "Manicouagan",
   Lemnos = "Lemnos",
+  TwoIslands = "Two Islands",
   Test = "Test",
   Sierpinski = "Sierpinski",
   TheBox = "The Box",
@@ -185,6 +186,7 @@ export const mapCategories: Record<string, GameMapType[]> = {
     GameMapType.Svalmel,
     GameMapType.Surrounded,
     GameMapType.TradersDream,
+    GameMapType.TwoIslands,
   ],
   arcade: [
     GameMapType.TheBox,

src/server/MapPlaylist.ts

@@ -58,6 +58,7 @@ const frequency: Partial<Record<GameMapName, number>> = {
   Svalmel: 8,
   World: 8,
   Lemnos: 3,
+  TwoIslands: 3,
   Test: 10,
   TwoLakes: 6,
   StraitOfHormuz: 4,