Merge branch 'main' into sounds

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

@@ -1,14 +1,4 @@
 {
-  "map": {
-    "height": 1500,
-    "num_land_tiles": 1961549,
-    "width": 1530
-  },
-  "mini_map": {
-    "height": 750,
-    "num_land_tiles": 485392,
-    "width": 765
-  },
   "name": "Montreal",
   "nations": [
     {

map-generator/main.go

@@ -15,32 +15,34 @@ var maps = []struct {
 }{
 	{Name: "africa"},
 	{Name: "asia"},
-	{Name: "world"},
-	{Name: "giantworldmap"},
+	{Name: "australia"},
+	{Name: "baikal"},
+	{Name: "betweentwoseas"},
 	{Name: "blacksea"},
+	{Name: "britannia"},
+	{Name: "deglaciatedantarctica"},
+	{Name: "eastasia"},
 	{Name: "europe"},
 	{Name: "europeclassic"},
-	{Name: "mars"},
-	{Name: "mena"},
-	{Name: "oceania"},
-	{Name: "northamerica"},
-	{Name: "southamerica"},
-	{Name: "britannia"},
-	{Name: "gatewaytotheatlantic"},
-	{Name: "australia"},
-	{Name: "pangaea"},
-	{Name: "iceland"},
-	{Name: "betweentwoseas"},
-	{Name: "eastasia"},
-	{Name: "faroeislands"},
-	{Name: "deglaciatedantarctica"},
 	{Name: "falklandislands"},
-	{Name: "baikal"},
+	{Name: "faroeislands"},
+	{Name: "gatewaytotheatlantic"},
+	{Name: "giantworldmap"},
 	{Name: "halkidiki"},
+	{Name: "iceland"},
 	{Name: "italia"},
 	{Name: "japan"},
-	{Name: "straitofgibraltar"},
+	{Name: "mars"},
+	{Name: "mena"},
+	{Name: "montreal"},
+	{Name: "northamerica"},
+	{Name: "oceania"},
+	{Name: "pangaea"},
 	{Name: "pluto"},
+	{Name: "southamerica"},
+	{Name: "straitofgibraltar"},
+	{Name: "world"},
+	{Name: "yenisei"},
 	{Name: "big_plains", IsTest: true},
 	{Name: "half_land_half_ocean", IsTest: true},
 	{Name: "ocean_and_land", IsTest: true},

resources/maps/montreal/manifest.json

@@ -1,13 +1,18 @@
 {
   "map": {
     "height": 1500,
-    "num_land_tiles": 1957697,
-    "width": 1530
+    "num_land_tiles": 1954940,
+    "width": 1528
   },
-  "mini_map": {
+  "map16x": {
+    "height": 375,
+    "num_land_tiles": 118558,
+    "width": 382
+  },
+  "map4x": {
     "height": 750,
-    "num_land_tiles": 484387,
-    "width": 765
+    "num_land_tiles": 483700,
+    "width": 764
   },
   "name": "Montreal",
   "nations": [

resources/maps/yenisei/manifest.json

@@ -1,12 +1,17 @@
 {
   "map": {
     "height": 2500,
-    "num_land_tiles": 3371126,
+    "num_land_tiles": 3371389,
     "width": 2000
   },
-  "mini_map": {
+  "map16x": {
+    "height": 625,
+    "num_land_tiles": 202240,
+    "width": 500
+  },
+  "map4x": {
     "height": 1250,
-    "num_land_tiles": 830966,
+    "num_land_tiles": 831004,
     "width": 1000
   },
   "name": "Yenisei",