Add map chopping block#4082
Open
PatrickPlaysBadly wants to merge 15 commits into
Open
Conversation
Add raw map files
Ad chopping block to Go
Add rendered map file for chopping block
Add chopping block to EN
Updated Game.ts
Updated MapPlaylist
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (2)
✅ Files skipped from review due to trivial changes (1)
WalkthroughAdds the Chopping Block map assets and manifest, registers the map in the map-generator and playlist (replacing Caribbean), adds an English localization entry, and wires GameMapType.ChoppingBlock into the arcade category. ChangesChopping Block Map Addition
Sequence Diagram(s)sequenceDiagram
participant CLI as MapGenerator
participant Manifest as ResourcesManifest
participant Server as MapPlaylist
participant Game as GameCore
CLI->>Manifest: register/load "choppingblock" manifest
Manifest->>Game: expose map metadata (nations, dimensions, spawnAreas)
Game->>Server: map type registered (GameMapType.ChoppingBlock)
Server->>Game: include ChoppingBlock in public playlists (frequency=4)
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ 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. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 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/maps/choppingblock/manifest.json`:
- Around line 1-461: The manifest.json is failing style checks (unformatted JSON
around keys like "additionalNations", "map", "nations", and
"teamGameSpawnAreas"); run the project's Prettier formatter (e.g., npx prettier
--write manifest.json or the repo's npm/yarn format script) against this file to
normalize spacing and ordering, then commit the formatted manifest.json so CI
style checks pass.
🪄 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
Run ID: 2eec93c7-b42a-4306-ba87-480616ac5593
⛔ Files ignored due to path filters (4)
map-generator/assets/maps/choppingblock/image.pngis excluded by!**/*.pngresources/maps/choppingblock/map.binis excluded by!**/*.binresources/maps/choppingblock/map16x.binis excluded by!**/*.binresources/maps/choppingblock/map4x.binis excluded by!**/*.bin
📒 Files selected for processing (7)
map-generator/assets/maps/choppingblock/info.jsonmap-generator/main.goresources/lang/en.jsonresources/maps/choppingblock/manifest.jsonresources/maps/choppingblock/thumbnail.webpsrc/core/game/Game.tssrc/server/MapPlaylist.ts
Comment on lines
+1
to
+461
| { | ||
| "additionalNations": [ | ||
| { | ||
| "name": "Repeaterer" | ||
| }, | ||
| { | ||
| "name": "Checkered" | ||
| }, | ||
| { | ||
| "name": "Plaid" | ||
| }, | ||
| { | ||
| "name": "Gingham" | ||
| }, | ||
| { | ||
| "name": "Tartan" | ||
| }, | ||
| { | ||
| "name": "Madras" | ||
| }, | ||
| { | ||
| "name": "Pinstripe" | ||
| }, | ||
| { | ||
| "name": "Awning" | ||
| }, | ||
| { | ||
| "name": "Argyle" | ||
| }, | ||
| { | ||
| "name": "Houndstooth" | ||
| }, | ||
| { | ||
| "name": "Herringbone" | ||
| }, | ||
| { | ||
| "name": "Chevron" | ||
| }, | ||
| { | ||
| "name": "Lattice" | ||
| }, | ||
| { | ||
| "name": "Graph Check" | ||
| }, | ||
| { | ||
| "name": "Windowpane" | ||
| }, | ||
| { | ||
| "name": "Polka Dots" | ||
| }, | ||
| { | ||
| "name": "Confetti" | ||
| }, | ||
| { | ||
| "name": "Speckled" | ||
| }, | ||
| { | ||
| "name": "Cheetah" | ||
| }, | ||
| { | ||
| "name": "Zebra" | ||
| }, | ||
| { | ||
| "name": "Tiger" | ||
| }, | ||
| { | ||
| "name": "Giraffe" | ||
| }, | ||
| { | ||
| "name": "Snakeskin" | ||
| }, | ||
| { | ||
| "name": "Cowhide" | ||
| }, | ||
| { | ||
| "name": "Camouflage" | ||
| }, | ||
| { | ||
| "name": "Peacock" | ||
| }, | ||
| { | ||
| "name": "Botanical" | ||
| }, | ||
| { | ||
| "name": "Chintz" | ||
| }, | ||
| { | ||
| "name": "Damask" | ||
| }, | ||
| { | ||
| "name": "Toile" | ||
| }, | ||
| { | ||
| "name": "Brocade" | ||
| }, | ||
| { | ||
| "name": "Ikat" | ||
| }, | ||
| { | ||
| "name": "Batik" | ||
| }, | ||
| { | ||
| "name": "Moroccan" | ||
| }, | ||
| { | ||
| "name": "Suzani" | ||
| }, | ||
| { | ||
| "name": "Kashmiri" | ||
| }, | ||
| { | ||
| "name": "Greek Key" | ||
| }, | ||
| { | ||
| "name": "Geometrical" | ||
| }, | ||
| { | ||
| "name": "Kaleidoscope" | ||
| }, | ||
| { | ||
| "name": "Gradient" | ||
| }, | ||
| { | ||
| "name": "Splatter" | ||
| }, | ||
| { | ||
| "name": "Marbled" | ||
| }, | ||
| { | ||
| "name": "Quilted" | ||
| }, | ||
| { | ||
| "name": "Eyelet" | ||
| }, | ||
| { | ||
| "name": "Scallop" | ||
| }, | ||
| { | ||
| "name": "Bubble" | ||
| }, | ||
| { | ||
| "name": "Honeycomb" | ||
| } | ||
| ], | ||
| "map": { | ||
| "height": 1616, | ||
| "num_land_tiles": 1485703, | ||
| "width": 1616 | ||
| }, | ||
| "map16x": { | ||
| "height": 404, | ||
| "num_land_tiles": 87035, | ||
| "width": 404 | ||
| }, | ||
| "map4x": { | ||
| "height": 808, | ||
| "num_land_tiles": 364395, | ||
| "width": 808 | ||
| }, | ||
| "name": "Chopping Block", | ||
| "nations": [ | ||
| { | ||
| "coordinates": [ | ||
| 230, | ||
| 230 | ||
| ], | ||
| "flag": "", | ||
| "name": "Boxey" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 230, | ||
| 570 | ||
| ], | ||
| "flag": "", | ||
| "name": "Gridsly" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 580, | ||
| 230 | ||
| ], | ||
| "flag": "", | ||
| "name": "Blocko" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 570, | ||
| 570 | ||
| ], | ||
| "flag": "", | ||
| "name": "Squarm" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1030, | ||
| 230 | ||
| ], | ||
| "flag": "", | ||
| "name": "Boximilian" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1030, | ||
| 570 | ||
| ], | ||
| "flag": "", | ||
| "name": "Rectanglo" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1370, | ||
| 230 | ||
| ], | ||
| "flag": "", | ||
| "name": "Cornerlius" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1380, | ||
| 570 | ||
| ], | ||
| "flag": "", | ||
| "name": "Repeater" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 230, | ||
| 1030 | ||
| ], | ||
| "flag": "", | ||
| "name": "Derorrim" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 230, | ||
| 1380 | ||
| ], | ||
| "flag": "", | ||
| "name": "Boxedin" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 580, | ||
| 1040 | ||
| ], | ||
| "flag": "", | ||
| "name": "Mazely" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 580, | ||
| 1380 | ||
| ], | ||
| "flag": "", | ||
| "name": "Diagonalf" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1040, | ||
| 1040 | ||
| ], | ||
| "flag": "", | ||
| "name": "Blockedhof" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1040, | ||
| 1390 | ||
| ], | ||
| "flag": "", | ||
| "name": "Blockhead" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1380, | ||
| 1035 | ||
| ], | ||
| "flag": "", | ||
| "name": "Chopin" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1380, | ||
| 1390 | ||
| ], | ||
| "flag": "", | ||
| "name": "Hacker" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 400, | ||
| 160 | ||
| ], | ||
| "flag": "", | ||
| "name": "Slasher" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 160, | ||
| 410 | ||
| ], | ||
| "flag": "", | ||
| "name": "Brixs" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 410, | ||
| 650 | ||
| ], | ||
| "flag": "", | ||
| "name": "Plaido" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 650, | ||
| 415 | ||
| ], | ||
| "flag": "", | ||
| "name": "Harlequin" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 410, | ||
| 970 | ||
| ], | ||
| "flag": "", | ||
| "name": "Checkheir" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 160, | ||
| 1210 | ||
| ], | ||
| "flag": "", | ||
| "name": "Zigzag" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 410, | ||
| 1460 | ||
| ], | ||
| "flag": "", | ||
| "name": "Scaler" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 650, | ||
| 1220 | ||
| ], | ||
| "flag": "", | ||
| "name": "Crossed" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1210, | ||
| 970 | ||
| ], | ||
| "flag": "", | ||
| "name": "Beeline" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 960, | ||
| 1220 | ||
| ], | ||
| "flag": "", | ||
| "name": "Bowtie" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1210, | ||
| 1460 | ||
| ], | ||
| "flag": "", | ||
| "name": "Buckly" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1450, | ||
| 1210 | ||
| ], | ||
| "flag": "", | ||
| "name": "Dexted" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1210, | ||
| 170 | ||
| ], | ||
| "flag": "", | ||
| "name": "Flukes" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 970, | ||
| 410 | ||
| ], | ||
| "flag": "", | ||
| "name": "Jonqal" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1210, | ||
| 650 | ||
| ], | ||
| "flag": "", | ||
| "name": "Huggins" | ||
| }, | ||
| { | ||
| "coordinates": [ | ||
| 1460, | ||
| 410 | ||
| ], | ||
| "flag": "", | ||
| "name": "Keeko" | ||
| } | ||
| ], | ||
| "teamGameSpawnAreas": { | ||
| "2": [ | ||
| { | ||
| "height": 1610, | ||
| "width": 800, | ||
| "x": 0, | ||
| "y": 0 | ||
| }, | ||
| { | ||
| "height": 1610, | ||
| "width": 800, | ||
| "x": 809, | ||
| "y": 0 | ||
| } | ||
| ], | ||
| "4": [ | ||
| { | ||
| "height": 800, | ||
| "width": 800, | ||
| "x": 0, | ||
| "y": 0 | ||
| }, | ||
| { | ||
| "height": 800, | ||
| "width": 800, | ||
| "x": 809, | ||
| "y": 0 | ||
| }, | ||
| { | ||
| "height": 800, | ||
| "width": 800, | ||
| "x": 0, | ||
| "y": 809 | ||
| }, | ||
| { | ||
| "height": 800, | ||
| "width": 800, | ||
| "x": 809, | ||
| "y": 809 | ||
| } | ||
| ] | ||
| } | ||
| } No newline at end of file |
Contributor
There was a problem hiding this comment.
Run Prettier on this manifest before merge.
CI is already failing style checks for this file; please format it with Prettier to unblock the pipeline.
🧰 Tools
🪛 GitHub Actions: 🧪 CI / 🎨 Prettier
[warning] 1-1: Prettier reported code style issues in this file. Run 'prettier --write resources/maps/choppingblock/manifest.json' (or 'npx prettier --write .') to fix.
🪛 GitHub Actions: 🧪 CI / 2_🎨 Prettier.txt
[warning] 1-1: Prettier --check reported code style issues. Run 'npx prettier --write resources/maps/choppingblock/manifest.json' (or 'npx prettier --write .' ) to fix.
🤖 Prompt for 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.
In `@resources/maps/choppingblock/manifest.json` around lines 1 - 461, The
manifest.json is failing style checks (unformatted JSON around keys like
"additionalNations", "map", "nations", and "teamGameSpawnAreas"); run the
project's Prettier formatter (e.g., npx prettier --write manifest.json or the
repo's npm/yarn format script) against this file to normalize spacing and
ordering, then commit the formatted manifest.json so CI style checks pass.
github-project-automation
Bot
moved this from Triage
to Development
in OpenFront Release Management
evanpelle
previously approved these changes
Jun 1, 2026
Updated Game.ts
Contributor
There was a problem hiding this comment.
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 `@src/core/game/Game.ts`:
- Line 183: The PR adds a new map enum GameMapType.Caribbean and assets/playlist
wiring for the Caribbean map but the PR title/description only mentions
“Chopping Block”; update the PR metadata to accurately reflect that Caribbean is
included (or split the Caribbean changes into a separate PR) so reviewers know
the scope; locate the symbol GameMapType.Caribbean in src/core/game/Game.ts and
the Caribbean entry in src/server/MapPlaylist.ts and ensure the PR description
lists both maps (or separate the commits/files into distinct PRs).
In `@src/server/MapPlaylist.ts`:
- Line 53: The diff adds a "Caribbean" entry to the playlist frequency map (the
key "Caribbean" in MapPlaylist.ts) but the PR only intended to add "Chopping
Block" per the objectives; verify whether "Caribbean" should be part of this
change and if not, remove the "Caribbean: 5" entry from the playlist frequency
map to keep the commit focused (also check Game.ts for any related additions of
Caribbean and revert them if they were added accidentally).
🪄 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
Run ID: e4ddc826-a163-4d53-abb5-538e0edd3452
📒 Files selected for processing (3)
resources/lang/en.jsonsrc/core/game/Game.tssrc/server/MapPlaylist.ts
🚧 Files skipped from review as they are similar to previous changes (1)
- resources/lang/en.json
iiamlewis
added
Maps
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves #4080
Description:
Add Map Chopping Block
https://youtu.be/NpX73lHiKO8
Please complete the following:
Please put your Discord username so you can be contacted if a bug or regression is found:
PlaysBadly