Skip to content

Adds "Juan De Fuca Strait" map - 3 way team map#4215

Merged
evanpelle merged 1 commit into
openfrontio:mainfrom
RickD004:juandefuca
Jun 11, 2026
Merged

Adds "Juan De Fuca Strait" map - 3 way team map#4215
evanpelle merged 1 commit into
openfrontio:mainfrom
RickD004:juandefuca

Conversation

@RickD004

Copy link
Copy Markdown
Contributor

Resolves #4148

Description:

Adds "Juan de Fuca Strait" map. This is the Strait in Washington and British Columbia: https://en.wikipedia.org/wiki/Strait_of_Juan_de_Fuca

This map is meant to be a brand new 3-team way map, since all the team maps we have are either made for 2 or 4 teams.
The map is bumped towards this gamemode similar to how Baikal is bumped to 2 teams.

Map also has Additional Nations, for a total fof 62, for Human vs Nations and solo games
image
image
data from OpenTopography, already credited

Please complete the following:

  • I have added screenshots for all UI updates
  • I process any text displayed to the user through translateText() and I've added it to the en.json file
  • I have added relevant tests to the test directory

Please put your Discord username so you can be contacted if a bug or regression is found:

tri.star1011

@coderabbitai

coderabbitai Bot commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 34f5a5c0-bd9d-4b41-85f6-f9d32f4a1968

📥 Commits

Reviewing files that changed from the base of the PR and between f17ca9b and dc9fa6f.

⛔ Files ignored due to path filters (4)
  • map-generator/assets/maps/juandefucastrait/image.png is excluded by !**/*.png
  • resources/maps/juandefucastrait/map.bin is excluded by !**/*.bin
  • resources/maps/juandefucastrait/map16x.bin is excluded by !**/*.bin
  • resources/maps/juandefucastrait/map4x.bin is excluded by !**/*.bin
📒 Files selected for processing (7)
  • map-generator/assets/maps/juandefucastrait/info.json
  • map-generator/main.go
  • resources/lang/en.json
  • resources/maps/juandefucastrait/manifest.json
  • resources/maps/juandefucastrait/thumbnail.webp
  • src/core/game/Game.ts
  • src/server/MapPlaylist.ts

Walkthrough

The PR adds the "Juan De Fuca Strait" map as a new 3-team regional option. The map type is registered in the game type system, full geographic and spawn-area data are created for both the map generator and runtime, and the map is wired into playlist rotation with appropriate frequency and team-count preferences plus English localization.

Changes

Juan De Fuca Strait Map

Layer / File(s) Summary
Map type definition and category
src/core/game/Game.ts
GameMapType enum gains JuanDeFucaStrait entry, and it is added to the mapCategories.regional list for map selection.
Map asset and manifest files
map-generator/main.go, map-generator/assets/maps/juandefucastrait/info.json, resources/maps/juandefucastrait/manifest.json
Generator registry includes the new map. Info and manifest files define map name, nation locations with flags, additional nation locations, and team-3 spawn-area rectangles (height, width, x/y position).
Playlist frequency, team override, and localization
resources/lang/en.json, src/server/MapPlaylist.ts
English label for the map is added. Playlist FREQUENCE assigns frequency 4. SPECIAL_TEAM_MAPS forces preferred team count to 3 to bump this map toward 3-team games.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Possibly related PRs

  • openfrontio/OpenFrontIO#4105: Both extend GameMapType in src/core/game/Game.ts and update src/server/MapPlaylist.ts frequency/team-selection tables for map registration.
  • openfrontio/OpenFrontIO#3998: Both follow the same pattern—add regional map type to GameMapType/mapCategories, register in map-generator/main.go, and wire into MapPlaylist.ts frequency and team-override logic.
  • openfrontio/OpenFrontIO#3920: Both add a map end-to-end by extending GameMapType, updating mapCategories.regional, registering in the generator, adding English localization, and updating MapPlaylist.ts playlist weighting.

Suggested labels

bypass-pr-check

Suggested reviewers

  • evanpelle

Poem

🗺️ A strait now spans the regional play,
Three nations meet where waters sway,
Juan De Fuca joins the fray—
Fresh spawn zones brighten the day! ⚔️

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and specifically summarizes the main change: adding a new map called 'Juan De Fuca Strait' that is designed as a 3-team map.
Description check ✅ Passed The description comprehensively explains the changeset, including the map's geographic context, its purpose as a 3-team map variant, Additional Nations, and relevant credits.
Linked Issues check ✅ Passed All requirements from issue #4148 are met: the Juan de Fuca Strait map is added [#4148], configured as a 3-team map with bumped frequency [#4148], includes Additional Nations [#4148], and appropriate localization is provided.
Out of Scope Changes check ✅ Passed All code changes are directly related to adding the Juan De Fuca Strait map; no unrelated or out-of-scope modifications are present.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 golangci-lint (2.12.2)

level=error msg="[linters_context] typechecking error: pattern ./...: directory prefix . does not contain main module or its selected dependencies"


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@evanpelle evanpelle added this to the v32 milestone Jun 11, 2026
@github-project-automation github-project-automation Bot moved this from Triage to Final Review in OpenFront Release Management Jun 11, 2026
@evanpelle evanpelle merged commit af2849a into openfrontio:main Jun 11, 2026
13 of 14 checks passed
@github-project-automation github-project-automation Bot moved this from Final Review to Complete in OpenFront Release Management Jun 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Complete

Development

Successfully merging this pull request may close these issues.

Adds "Juan de Fuca Strait" map

2 participants