Skip to content

Adds Clearwater Lakes map : conjoined circles map#4716

Open
RickD004 wants to merge 1 commit into
openfrontio:mainfrom
RickD004:clearwaterlakes
Open

Adds Clearwater Lakes map : conjoined circles map#4716
RickD004 wants to merge 1 commit into
openfrontio:mainfrom
RickD004:clearwaterlakes

Conversation

@RickD004

Copy link
Copy Markdown
Contributor

Description:

More fun impassable-centric maps: Clearwater Lakes: https://en.wikipedia.org/wiki/Clearwater_Lakes in Northern Quebec

A map made of 2 circles , the borders are shape while the center of these circles are lakes. Fun linear map with a chokepoint in the middle and multiple islands for players who enjoy island and pirate plays.

This is an obscure location, so i gave it rotation of 3.

clearwaters.mp4

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 Jul 25, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Walkthrough

Adds the Clearwater Lakes map with metadata, regional country definitions, map assets, English localization, and generated registry entries.

Changes

Clearwater Lakes map

Layer / File(s) Summary
Regional country metadata
resources/countries.json
Adds Anishinaabe, Inuvialuit, Métis, Mi'kmaq, Natuaqanek, and Nunavik, and changes Haida's code to haida_flag.
Map resource definitions
map-generator/assets/maps/clearwaterlakes/info.json, resources/maps/clearwaterlakes/manifest.json, resources/maps/clearwaterlakes/thumbnail.webp
Adds Clearwater Lakes metadata, nation coordinates and flags, map dimensions, and a replacement thumbnail.
Map registry and localization
src/core/game/Maps.gen.ts, resources/lang/en.json
Registers ClearwaterLakes in the map enum and exported map list, and adds its English name.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

Suggested labels: Maps

Poem

Clearwater waters join the map,
With northern names in every gap.
Flags and shores align just right,
A thumbnail brings the view to light.
One new map now sails into sight.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly names the new Clearwater Lakes map and hints at its conjoined-circle layout.
Description check ✅ Passed The description matches the added map, translation, screenshots, and test-related changes.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

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.

@RickD004 RickD004 added the Maps A new map, or adjustments to an existing map itself, its json, etc, label Jul 25, 2026
@RickD004 RickD004 added this to the v33 milestone Jul 25, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@resources/countries.json`:
- Around line 145-149: Update every newly added country object in
resources/countries.json, including the entries identified at the referenced
locations, to explicitly include the "restricted" field set to false. Ensure
each affected entry remains valid JSON and follows the existing country-entry
property structure.

In `@src/core/game/Maps.gen.ts`:
- Line 34: Update the existing generic map-registry/schema test to discover and
validate every generated map entry, including ClearwaterLakes, without adding a
map-specific assertion. Keep the coverage data-driven so future entries are
validated automatically.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 252f6967-6508-4817-bd5e-5b35f8a52a07

📥 Commits

Reviewing files that changed from the base of the PR and between 9b73e91 and 722579d.

⛔ Files ignored due to path filters (10)
  • map-generator/assets/maps/clearwaterlakes/image.png is excluded by !**/*.png
  • resources/flags/Anishinaabe.svg is excluded by !**/*.svg
  • resources/flags/Inuvialuit.svg is excluded by !**/*.svg
  • resources/flags/Metis.svg is excluded by !**/*.svg
  • resources/flags/Mi'kmaq.svg is excluded by !**/*.svg
  • resources/flags/Natuaqanek.svg is excluded by !**/*.svg
  • resources/flags/Nunavik.svg is excluded by !**/*.svg
  • resources/maps/clearwaterlakes/map.bin is excluded by !**/*.bin
  • resources/maps/clearwaterlakes/map16x.bin is excluded by !**/*.bin
  • resources/maps/clearwaterlakes/map4x.bin is excluded by !**/*.bin
📒 Files selected for processing (6)
  • map-generator/assets/maps/clearwaterlakes/info.json
  • resources/countries.json
  • resources/lang/en.json
  • resources/maps/clearwaterlakes/manifest.json
  • resources/maps/clearwaterlakes/thumbnail.webp
  • src/core/game/Maps.gen.ts

Comment thread resources/countries.json
Comment thread src/core/game/Maps.gen.ts
@github-project-automation github-project-automation Bot moved this from Triage to Development in OpenFront Release Management Jul 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Maps A new map, or adjustments to an existing map itself, its json, etc,

Projects

Status: Development

Development

Successfully merging this pull request may close these issues.

1 participant