Merge branch 'v27'

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

@@ -87,7 +87,7 @@
     },
     {
       "coordinates": [1094, 1093],
-      "name": "Democratic Republic of the Congo",
+      "name": "DR Congo",
       "strength": 2,
       "flag": "cd"
     },

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

@@ -153,7 +153,7 @@
     },
     {
       "coordinates": [517, 1483],
-      "name": "People's Democratic Republic of Algeria",
+      "name": "Algeria",
       "strength": 1,
       "flag": "dz"
     },

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

@@ -69,7 +69,7 @@
     },
     {
       "coordinates": [1609, 1837],
-      "name": "People's Republic of Algeria'",
+      "name": "Algeria'",
       "strength": 2,
       "flag": "dz"
     },

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

@@ -69,7 +69,7 @@
     },
     {
       "coordinates": [143, 37],
-      "name": "Lao People's Democratic Republic",
+      "name": "Lao PDR",
       "strength": 1,
       "flag": "la"
     },
@@ -99,7 +99,7 @@
     },
     {
       "coordinates": [834, 215],
-      "name": "Federated States of Micronesia",
+      "name": "Micronesia",
       "strength": 1,
       "flag": "fm"
     },

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

@@ -238,7 +238,7 @@
     {
       "coordinates": [1074, 508],
       "flag": "cd",
-      "name": "The Democratic Republic of the Congo",
+      "name": "DR Congo",
       "strength": 1
     },
     {

map-generator/main.go

@@ -45,7 +45,6 @@ var maps = []struct {
 	{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},

map-generator/map_generator.go

@@ -108,8 +108,11 @@ func GenerateMap(args GeneratorArgs) (MapResult, error) {
 	processWater(terrain, args.RemoveSmall)
 
 	terrain4x := createMiniMap(terrain)
+    processWater(terrain4x, false)
+	
 	terrain16x := createMiniMap(terrain4x)
-
+	processWater(terrain16x, false)
+	
 	thumb := createMapThumbnail(terrain4x, 0.5)
 	webp, err := convertToWebP(ThumbData{
 		Data:   thumb.Pix,

resources/maps/gatewaytotheatlantic/manifest.json

@@ -85,7 +85,7 @@
     {
       "coordinates": [1609, 1837],
       "flag": "dz",
-      "name": "Algeria",
+      "name": "Algeria'",
       "strength": 2
     },
     {

resources/maps/japan/manifest.json

@@ -1,5 +1,4 @@
 {
-  "height": 2500,
   "map": {
     "height": 2500,
     "num_land_tiles": 488183,
@@ -89,6 +88,5 @@
       "name": "Kyoto",
       "strength": 3
     }
-  ],
-  "width": 2500
+  ]
 }