Merge branch 'main' into feature/quick-chat-radial-menu

Author: baculinivan-web

CREDITS.md

@@ -59,6 +59,11 @@ Licensed under [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/)
 [Arctic SDI](https://catalogue.arctic-sdi.org/geonetwork/srv/spa/catalog.search#/metadata/8b4f2b34-2d0d-4744-ae0f-d7989b9f7a02)
 Licensed under [CC0 1.0.](https://creativecommons.org/publicdomain/zero/1.0/legalcode.en)
 
+### Milky Way Map
+
+[NASA/JPL-Caltech](https://www.jpl.nasa.gov/images/pia10748-our-milky-way-gets-a-makeover-artist-concept/)
+[Public Domain](https://www.jpl.nasa.gov/jpl-image-use-policy/)
+
 ## Icons
 
 ### [The Noun Project](https://thenounproject.com/)

map-generator/assets/maps/milkyway/image.png

@@ -0,0 +1,35 @@
+{
+  "name": "milkyway",
+  "nations": [
+    {
+      "coordinates": [775, 757],
+      "name": "Sagittarius A*",
+      "flag": ""
+    },
+    {
+      "coordinates": [967, 247],
+      "name": "Perseus Arm",
+      "flag": ""
+    },
+    {
+      "coordinates": [478, 1139],
+      "name": "Centaurus Arm",
+      "flag": ""
+    },
+    {
+      "coordinates": [840, 1048],
+      "name": "Empire of Mankind",
+      "flag": "un"
+    },
+    {
+      "coordinates": [1055, 1330],
+      "name": "Aliens",
+      "flag": ""
+    },
+    {
+      "coordinates": [531, 164],
+      "name": "The Void",
+      "flag": "Cthulhu Republic"
+    }
+  ]
+}

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

@@ -83,6 +83,7 @@ var maps = []struct {
 	{Name: "arctic"},
 	{Name: "sanfrancisco"},
 	{Name: "aegean"},
+	{Name: "milkyway"},
 	{Name: "big_plains", IsTest: true},
 	{Name: "half_land_half_ocean", IsTest: true},
 	{Name: "ocean_and_land", IsTest: true},

map-generator/main.go

@@ -350,7 +350,8 @@
     "niledelta": "Nile Delta",
     "arctic": "Arctic",
     "sanfrancisco": "San Francisco",
-    "aegean": "Aegean"
+    "aegean": "Aegean",
+    "milkyway": "Milky Way"
   },
   "map_categories": {
     "featured": "Featured",
@@ -1033,6 +1034,8 @@
     "public": "Public",
     "private": "Private",
     "solo": "Solo",
+    "ranked": "Ranked",
+    "ranked_1v1": "1v1",
     "mode": "Mode",
     "stats_wins": "Wins",
     "stats_losses": "Losses",

package-lock.json

@@ -0,0 +1,50 @@
+{
+  "map": {
+    "height": 1500,
+    "num_land_tiles": 442979,
+    "width": 1500
+  },
+  "map16x": {
+    "height": 375,
+    "num_land_tiles": 24807,
+    "width": 375
+  },
+  "map4x": {
+    "height": 750,
+    "num_land_tiles": 106678,
+    "width": 750
+  },
+  "name": "milkyway",
+  "nations": [
+    {
+      "coordinates": [775, 757],
+      "flag": "",
+      "name": "Sagittarius A*"
+    },
+    {
+      "coordinates": [967, 247],
+      "flag": "",
+      "name": "Perseus Arm"
+    },
+    {
+      "coordinates": [478, 1139],
+      "flag": "",
+      "name": "Centaurus Arm"
+    },
+    {
+      "coordinates": [840, 1048],
+      "flag": "un",
+      "name": "Empire of Mankind"
+    },
+    {
+      "coordinates": [1055, 1330],
+      "flag": "",
+      "name": "Aliens"
+    },
+    {
+      "coordinates": [531, 164],
+      "flag": "Cthulhu Republic",
+      "name": "The Void"
+    }
+  ]
+}