openfrontio · evanpelle · Nov 4, 2025 · Sep 13, 2025 · Sep 26, 2025 · Sep 27, 2025
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -20,7 +20,6 @@ on:
         type: choice
         options:
           - masters
-          - nbg1
           - staging
           - falk1
       target_subdomain:
@@ -93,7 +92,6 @@ jobs:
       - name: 🔑 Create SSH private key
         env:
           SERVER_HOST_MASTERS: ${{ secrets.SERVER_HOST_MASTERS }}
-          SERVER_HOST_NBG1: ${{ secrets.SERVER_HOST_NBG1 }}
           SERVER_HOST_FALK1: ${{ secrets.SERVER_HOST_FALK1 }}
           SERVER_HOST_STAGING: ${{ secrets.SERVER_HOST_STAGING }}
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
@@ -102,7 +100,6 @@ jobs:
           mkdir -p ~/.ssh
           echo "${SSH_PRIVATE_KEY}" > ~/.ssh/id_rsa
           test -n "$SERVER_HOST_MASTERS" && ssh-keyscan -H "$SERVER_HOST_MASTERS" >> ~/.ssh/known_hosts
-          test -n "$SERVER_HOST_NBG1" && ssh-keyscan -H "$SERVER_HOST_NBG1" >> ~/.ssh/known_hosts
           test -n "$SERVER_HOST_FALK1" && ssh-keyscan -H "$SERVER_HOST_FALK1" >> ~/.ssh/known_hosts
           test -n "$SERVER_HOST_STAGING" && ssh-keyscan -H "$SERVER_HOST_STAGING" >> ~/.ssh/known_hosts
           chmod 600 ~/.ssh/id_rsa
@@ -125,7 +122,6 @@ jobs:
           R2_SECRET_KEY: ${{ secrets.R2_SECRET_KEY }}
           API_KEY: ${{ secrets.API_KEY }}
           SERVER_HOST_MASTERS: ${{ secrets.SERVER_HOST_MASTERS }}
-          SERVER_HOST_NBG1: ${{ secrets.SERVER_HOST_NBG1 }}
           SERVER_HOST_FALK1: ${{ secrets.SERVER_HOST_FALK1 }}
           SERVER_HOST_STAGING: ${{ secrets.SERVER_HOST_STAGING }}
           SSH_KEY: ~/.ssh/id_rsa

diff --git a/.github/workflows/pr-author.yml b/.github/workflows/pr-author.yml
@@ -1,10 +1,8 @@
 name: 🧼 PR
 
 on:
-  pull_request:
-    types:
-      - edited
-      - opened
+  pull_request_target:
+    types: [opened, reopened]
 
 permissions:
   pull-requests: write

diff --git a/.github/workflows/pr-stale.yml b/.github/workflows/pr-stale.yml
@@ -13,10 +13,14 @@ jobs:
     steps:
       - uses: actions/stale@8f717f0dfca33b78d3c933452e42558e4456c8e7
         with:
-          days-before-close: 14
-          days-before-stale: 14
+          days-before-pr-close: 14
+          days-before-pr-stale: 14
+          days-before-issue-close: -1
+          days-before-issue-stale: -1
           exempt-draft-pr: true
           exempt-pr-assignees: evanpelle
-          stale-pr-label: "stale"
+          exempt-pr-labels: "will not stale"
+          stale-pr-label: "Stale"
           stale-pr-message: "This pull request is stale because it has been open for 14 days with no activity. If you want to keep this pull request open, add a comment or update the branch."
-          start-date: 2025-09-03T00:00:00+00:00
+          close-pr-message: "This pull request has been closed because twenty-eight days have passed without activity. If someone wants to keep working on it, feel free to take the code."
+          close-pr-label: "Orphaned"
diff --git a/CREDITS.md b/CREDITS.md
@@ -0,0 +1,28 @@
+# Credits
+
+## Code
+
+OpenFront is licensed under AGPL-3.0.  
+See [Contributors](https://github.com/openfrontio/OpenFrontIO/graphs/contributors) for code contributors.
+
+## Map Data
+
+### OpenStreetMap
+
+© [OpenStreetMap contributors](https://www.openstreetmap.org/copyright)  
+Licensed under ODbL
+
+### Natural Earth
+
+[Natural Earth](https://www.naturalearthdata.com/)  
+Public Domain
+
+### Bedmap3 Antarctica Dataset
+
+Pritchard, H.D., Fretwell, P.T., Fremand, A.C. et al. Bedmap3 updated ice bed, surface and thickness gridded datasets for Antarctica. _Sci Data_ 12, 109 (2025).  
+[https://doi.org/10.1038/s41597-025-04672-y](https://doi.org/10.1038/s41597-025-04672-y)  
+Licensed under [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/)
+
+## Icons
+
+Icons from [The Noun Project](https://thenounproject.com/)
diff --git a/LICENSE-ASSETS b/LICENSE-ASSETS
@@ -1,19 +1,46 @@
-# Asset License - Creative Commons BY-SA 4.0
+# Asset License
 
-This license applies to all non-code assets in this repository, including but not limited to:
+## Open Assets (/resources) - Creative Commons BY-SA 4.0
+
+Assets in the `/resources` directory are licensed under Creative Commons BY-SA 4.0, including but not limited to:
 - Graphics, sprites, and images (*.png, *.jpg, *.svg, etc.)
 - 3D models and textures (*.obj, *.fbx, *.blend, etc.)
 - Audio files (*.mp3, *.ogg, *.wav, etc.)
 - Animation files
 - Font files
 - Level/map data files
 
-This license does NOT apply to:
-- Source code files (*.js, *.ts, *.py, etc.) - see LICENSE for code licensing
-- Configuration files that contain code
-- Scripts and shaders
-
-Attribution required: "OpenFront.io" or "OpenFront LLC"
+Attribution required: "OpenFront" or "OpenFront LLC"
 
 To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/
-or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+
+## Proprietary Assets (/proprietary) - All Rights Reserved
+
+Assets in the `/proprietary` directory are:
+- Copyright © 2024-2025 OpenFront LLC and Contributors
+- All Rights Reserved
+- NOT licensed for use, modification, or redistribution outside of OpenFront
+- May only be used as part of the complete OpenFront software package
+
+See `/proprietary/LICENSE` for full terms.
+
+## External/Proprietary Assets (Not in Repository)
+
+The following assets are NOT included in this repository and are NOT covered by any open source license:
+- Assets hosted on our CDN/servers
+- Assets stored in our database
+- Premium skins, models, and textures accessed via API
+- Sound effects and music accessed via API
+- Any assets not explicitly included in this repository
+
+These external assets are proprietary property of OpenFront LLC.
+
+## Important Legal Notice
+
+- The CC BY-SA 4.0 license applies ONLY to assets in the `/resources` directory
+- Assets in `/proprietary` are restricted use - see their specific LICENSE
+- External assets not in this repository remain fully proprietary
+- Accessing, downloading, extracting, or using proprietary assets without permission is prohibited
+
+For source code licensing, see LICENSE and LICENSING.md files.
diff --git a/LICENSING.md b/LICENSING.md
@@ -39,6 +39,22 @@ This document provides comprehensive licensing information for the OpenFront.io
   - Added Creative Commons BY-SA 4.0 for all assets
   - All new code is AGPL v3.0 only
 
+### Phase 4: Mixed Asset Licensing
+
+- **Starting After:** c2cf2ce65f74ac91859f68a84aec89aeda5722ee
+- **Date:** September 28, 2025
+- **Licenses:**
+  - **Code:** AGPL v3.0 (unchanged from Phase 3)
+  - **Open Assets (/resources):** Creative Commons BY-SA 4.0 (unchanged from Phase 3)
+  - **Proprietary Assets (/proprietary):** All Rights Reserved
+- **Copyright Holders:** OpenFront LLC and Contributors
+- **Changes:**
+  - Added `/proprietary` directory for copyrighted assets
+  - Established dual-track asset licensing structure
+  - Open assets in `/resources` remain CC BY-SA 4.0
+  - Proprietary assets override open assets during build process
+  - Contributors retain copyright while granting usage rights to OpenFront LLC
+
 ## Important Notes
 
 ### For Code:
@@ -69,6 +85,7 @@ All assets included in this repository (graphics, sounds, music, models) are lic
 - Premium skins, models, and textures
 - Sound effects and music accessed via API
 - Any assets not explicitly included in this repository
+- Any asset in the proprietary/ folder
 
 These external assets are:
 

diff --git a/eslint.config.js b/eslint.config.js
@@ -40,16 +40,22 @@ export default [
     rules: {
       // Disable rules that would fail. The failures should be fixed, and the entries here removed.
       "@typescript-eslint/no-explicit-any": "off",
-      "@typescript-eslint/no-unused-expressions": "off",
-      "@typescript-eslint/no-unused-vars": "off",
-      "no-case-declarations": "off",
+      "no-unused-vars": "off",
     },
   },
   {
     rules: {
       // Enable rules
       "@typescript-eslint/prefer-nullish-coalescing": "error",
       eqeqeq: "error",
+      "no-case-declarations": "error",
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        {
+          args: "none",
+          caughtErrors: "none",
+        },
+      ],
     },
   },
 ];
diff --git a/jest.config.ts b/jest.config.ts
@@ -11,14 +11,18 @@ 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: {
       statements: 21.5,
-      branches: 17.0,
-      lines: 22.0,
+      branches: 16,
+      lines: 21.0,
       functions: 20.5,
     },
   },

diff --git a/map-generator/assets/maps/achiran/image.png b/map-generator/assets/maps/achiran/image.png
diff --git a/map-generator/assets/maps/achiran/info.json b/map-generator/assets/maps/achiran/info.json
@@ -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
+    }
+  ]
+}
diff --git a/map-generator/assets/maps/japan/image.png b/map-generator/assets/maps/japan/image.png
diff --git a/map-generator/assets/maps/japan/info.json b/map-generator/assets/maps/japan/info.json
@@ -0,0 +1,77 @@
+{
+  "name": "japan",
+  "nations": [
+    {
+      "coordinates": [1895, 288],
+      "name": "Hokkaido",
+      "strength": 2,
+      "flag": "jp"
+    },
+    {
+      "coordinates": [1647, 897],
+      "name": "Tohoku",
+      "strength": 2,
+      "flag": "jp"
+    },
+    {
+      "coordinates": [1613, 1133],
+      "name": "Kanto",
+      "strength": 2,
+      "flag": "jp"
+    },
+    {
+      "coordinates": [1391, 1194],
+      "name": "Chubu",
+      "strength": 2,
+      "flag": "jp"
+    },
+    {
+      "coordinates": [1191, 1370],
+      "name": "Kansai",
+      "strength": 2,
+      "flag": "jp"
+    },
+    {
+      "coordinates": [932, 1308],
+      "name": "Chugoku",
+      "strength": 2,
+      "flag": "jp"
+    },
+    {
+      "coordinates": [949, 1454],
+      "name": "Shikoku",
+      "strength": 2,
+      "flag": "jp"
+    },
+    {
+      "coordinates": [709, 1570],
+      "name": "Kyushu",
+      "strength": 2,
+      "flag": "jp"
+    },
+    {
+      "coordinates": [397, 2283],
+      "name": "Okinawa",
+      "strength": 1,
+      "flag": "jp"
+    },
+    {
+      "coordinates": [1493, 1246],
+      "name": "Mount Fuji",
+      "strength": 1,
+      "flag": "jp"
+    },
+    {
+      "coordinates": [1565, 1178],
+      "name": "Tokyo",
+      "strength": 3,
+      "flag": "jp"
+    },
+    {
+      "coordinates": [1158, 1290],
+      "name": "Kyoto",
+      "strength": 3,
+      "flag": "jp"
+    }
+  ]
+}
diff --git a/map-generator/assets/maps/montreal/info.json b/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": [
     {