Auto sort multiplayer fields by turn order#9723
Open
MostCromulent wants to merge 14 commits intoCard-Forge:masterfrom
Open
Auto sort multiplayer fields by turn order#9723MostCromulent wants to merge 14 commits intoCard-Forge:masterfrom
MostCromulent wants to merge 14 commits intoCard-Forge:masterfrom
Conversation
Reorder player panels in 3+ player games so turns flow counterclockwise through the visual layout (bottom-left to top-left to top-right to bottom-right) instead of zigzagging. Controlled by a toggleable Layout > View menu preference, enabled by default. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Replace single sort toggle with two-axis preference system: - Layout (Off/Grid/Rows) controls which cell opponents go in - Panel Style (Tabbed/Split) controls tabs vs side-by-side panels Grid mode uses counterclockwise flow; rows mode puts all opponents on top. Split mode creates dynamic DragCells with percentage-based bounds. Live relayout when preferences change mid-game. Fix duplicate tab bug by restoring parentCell null guard in assignExtraFieldsToCells. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Add early return in assignExtraFieldsToCells() when all extra fields already have parent cells, preventing base bounds restoration from expanding c0/c1 while dynamic cells still exist. Also reconstruct base bounds via fillGap() instead of using stale saved values, and add debug logging throughout the split layout path. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Replace fragile baseRoughBounds save/restore with on-demand computation. cleanupDynamicCells() now removes any emptied non-base cell (including cells persisted in saved layouts) and computeFieldRegion() scans adjacent cells to find available space. Removes all debug logging. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- Rewrite computeFieldRegion to only skip the target cell so the other base cell acts as a boundary in same-row layouts - Add fillGap before removing emptied cells to reclaim vacant space - Sync rough bounds from pixel positions before computing field regions - Rearrange c0/c1 vertically in ROWS mode when they share a row - Add stay-open behavior to multiplayer field preference menu items Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- Rename menu label to "Auto Sort Multiplayer Fields" - Change default layout preference from GRID to OFF - Change default panel style from TABBED to SPLIT Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
When there are 3 (or other odd number of) players, the extra opponent is placed on the top row so the local player is alone on the bottom row. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
|
I tried to rebase it on #9637 |
Contributor
Author
Just tested and seems to be working properly, both with auto-sort enabled and disabled. Separately, I was thinking may be worth including something in the wiki documentation to point this feature out but not sure where it should go? I don't think it's worth its own page like Network Play or the Yield Rework options, so maybe added as a small section in the User Guide? (I might have a crack at fleshing out the user guide documentation a bit more thoroughly when I get time). |
Contributor
|
sure, I did collect information about various features here: |
Documents the desktop drag-cell layout system (rearranging, saving/loading XML layouts) and the new auto-sort multiplayer fields feature (sort toggle, grid/rows layout, tabbed/split panels). Also adds a table of contents. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Guard the entire sort fields workflow in populate() behind the preference check, restoring master's i%2 tabbed behavior when OFF. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
Author
This should now be fixed if you want to re-test. Original version included a preference guard but it was located in the wrong place so missed part of the cleanup workflow. |
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
2 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.
Summary
Adds an "Auto Sort Multiplayer Fields" option for 3+ player games on desktop in the Layout > View menu. When enabled, player fields are automatically reordered to follow turn order at the start of each match. Supports multiple layout modes to suit individual user preferences. Intended to reduce user friction of getting fields set up for multiplayer games.
The Problem
In multiplayer games (3+ players), by default the desktop client assigns player fields to panels in a fixed alternating pattern with no awareness of turn order or seating position. This means opponents appear in arbitrary panel positions that don't reflect the actual game flow, making it difficult to track who acts next or to visually follow the turn sequence around the table. The user has to manually re-order fields to address this each game.
The Solution
Menu Options
Layout/Style Options
Technical Implementation
The existing DragCell layout system only supports two field panels (FIELD_0 and FIELD_1) loaded from XML layout files. Extra players (index 2+) are by default added as tabs to alternating panels with no turn-order awareness. Supporting configurable layouts for 3+ players required working within the constraint that saved layouts only define positions for two field cells.
The approach is a cleanup-and-reconstruct cycle: on each layout pass, extra field documents are stripped from their parent cells, emptied cells are removed (with adjacent cells expanded to fill gaps via fillGap), and the two base field cells are restored to their full available width. Available space is computed dynamically by scanning all non-field DragCells to find horizontal boundaries at each field row's vertical position, making the layout independent of any particular saved XML layout.
After cleanup, extra fields are assigned to cells based on the current preferences. In split mode, the base cell's percentage-based rough bounds are divided evenly and new DragCells are created for each extra player, making the layout resolution-independent. In rows mode, if the two base cells share the same row (e.g. after gap-filling absorbs a removed row), they are rearranged vertically before splitting.
Player sort order is computed in CMatchUI.sortPlayersForMultiplayer() at game start. Grid mode interleaves players across top and bottom rows for a counterclockwise visual flow; rows mode uses simple turn order.
Testing
🤖 Code authored by Claude (Opus 4.6) under human direction.