Merge branch 'v26' into warship-afk-handling

Author: VariableVince

jest.config.ts

@@ -11,8 +11,12 @@ export default {
   },
   transform: {
     "^.+\\.tsx?$": ["@swc/jest"],
+    "^.+\\.mjs$": ["@swc/jest"],
+    "^.+\\.js$": ["@swc/jest"],
   },
-  transformIgnorePatterns: ["node_modules/(?!(node:)/)"],
+  transformIgnorePatterns: [
+    "node_modules/(?!(nanoid|@jsep|fastpriorityqueue|@datastructures-js)/)",
+  ],
   collectCoverageFrom: ["src/**/*.ts", "!src/**/*.d.ts"],
   coverageThreshold: {
     global: {

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

@@ -0,0 +1,29 @@
+{
+  "name": "Achiran",
+  "nations": [
+    {
+      "coordinates": [785, 985],
+      "flag": "ie",
+      "name": "Inishmore",
+      "strength": 1
+    },
+    {
+      "coordinates": [1360, 1360],
+      "flag": "ie",
+      "name": "Inishmann",
+      "strength": 2
+    },
+    {
+      "coordinates": [1630, 1515],
+      "flag": "ie",
+      "name": "Inisheer",
+      "strength": 1
+    },
+    {
+      "coordinates": [1400, 480],
+      "flag": "ie",
+      "name": "Achill",
+      "strength": 2
+    }
+  ]
+}

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

@@ -16,6 +16,7 @@ var maps = []struct {
 	{Name: "africa"},
 	{Name: "asia"},
 	{Name: "australia"},
+	{Name: "achiran"},
 	{Name: "baikal"},
 	{Name: "betweentwoseas"},
 	{Name: "blacksea"},