Merge branch 'main' into fix-sam-bug

Author: ryanbarlow97

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

@@ -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"
+    }
+  ]
+}

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

@@ -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"},

map-generator/main.go

@@ -329,7 +329,8 @@
     "didierfrance": "Didier (France)",
     "amazonriver": "Amazon River",
     "tradersdream": "Traders Dream",
-    "hawaii": "Hawaii"
+    "hawaii": "Hawaii",
+    "alps": "Alps"
   },
   "map_categories": {
     "featured": "Featured",

resources/lang/en.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"
+    }
+  ]
+}

resources/maps/alps/manifest.json

@@ -61,7 +61,7 @@ export class WinModal extends LitElement implements Layer {
     return html`
       <div
         class="${this.isVisible
-          ? "fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 bg-gray-800/70 p-6 shrink-0 rounded-lg z-9999 shadow-2xl backdrop-blur-xs text-white w-87.5 max-w-[90%] md:w-175 animate-fadeIn"
+          ? "fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 bg-gray-800/70 p-6 shrink-0 rounded-lg z-9999 shadow-2xl backdrop-blur-xs text-white w-87.5 max-w-[90%] md:w-175"
           : "hidden"}"
       >
         <h2 class="m-0 mb-4 text-[26px] text-center text-white">
@@ -99,23 +99,6 @@ export class WinModal extends LitElement implements Layer {
           </button>
         </div>
       </div>
-
-      <style>
-        @keyframes fadeIn {
-          from {
-            opacity: 0;
-            transform: translate(-50%, -48%);
-          }
-          to {
-            opacity: 1;
-            transform: translate(-50%, -50%);
-          }
-        }
-
-        .animate-fadeIn {
-          animation: fadeIn 0.3s ease-out;
-        }
-      </style>
     `;
   }