mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-05 09:33:25 -08:00
5ea16c805f
* [Protocol] Add shuffle players option and player order command/event Adds a 'Shuffle players at start' option to game creation plus a local player id on the game state so clients can reconcile seat changes, and a SET_PLAYER_ORDER command (1206) with a PLAYER_ORDER_CHANGED event (2023) so the game host can set or randomize the seating order. Took 6 minutes * [Server] Shuffle and reorder player seats before a game starts Auto-shuffles the seats at game start when enabled (now for games with two or more players instead of three or more) and handles the new SET_PLAYER_ORDER command so the game host or a moderator can reorder or randomize the seats before the game starts. Re-seating re-keys the player ids while keeping the per-user game/seat routing and persistent player records in sync, then broadcasts the new order to everyone. * [Client] Add shuffle players option and turn order dialog Adds the 'Shuffle players at start' checkbox to game creation and a host-only 'Set turn order...' action that opens a dialog to reorder or randomize the seats before the game starts. Seating changes are shown in the game's message log. * [Client] Move the turn order dialog strings into retranslateUi Follows the DlgInviteToGame convention so the dialog can be retranslated instead of freezing its strings at construction time. * [Server] Keep player ids stable across seat shuffles * [Client] Lay out table and turn order dialog in seat order * [Server] Send game-joined player list in seat order * [Client] Reword the shuffle option to match its behaviour * [Client] Address the seat-order review comments - Give the game setup checkboxes a row of their own so they no longer collide in the create-game dialog - Rename DlgTurnOrder::randomize() to isRandomizeRequested() - Document what the ids in GameState::seatOrder mean - Keep "Set turn order..." in sync with the game: hidden for non-hosts and once the game has started, re-shown when the game ends or hosting moves to the local player (new GameState::hostChanged signal) * [Client] Do not preview a randomized turn order Randomizing is a request to the server, not a local shuffle. Shuffling the list locally meant the dialog showed an order the server then discarded, and let the host re-open it until a favourable order appeared. The dialog now switches to a mode that says the server will randomize and toggles back to the manual list on request. * [Client] Let moderators set the turn order The server accepts SET_PLAYER_ORDER from the host or a moderator, but the client hid the action from everyone except the host, making the moderator branch unreachable. Visibility and the handler now share canSetTurnOrder(). * [Server] Rely on the player order event instead of a full state resend cmdSetPlayerOrder re-sent the whole game state after reseating, so every client reloaded its deck view mid-lobby for no reason. The new seating reaches clients through the Event_PlayerOrderChanged that reseatPlayers broadcasts. * [Client] Show random turn order in the game selector The restrictions column listed "open decklists" but not the new seating option, so a joining player had no way to see that seats will be randomized each game. Game info already shows the disabled checkbox. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de> |
||
|---|---|---|
| .. | ||
| dlg_connect.cpp | ||
| dlg_connect.h | ||
| dlg_convert_deck_to_cod_format.cpp | ||
| dlg_convert_deck_to_cod_format.h | ||
| dlg_crash_report.cpp | ||
| dlg_crash_report.h | ||
| dlg_create_game.cpp | ||
| dlg_create_game.h | ||
| dlg_default_tags_editor.cpp | ||
| dlg_default_tags_editor.h | ||
| dlg_edit_avatar.cpp | ||
| dlg_edit_avatar.h | ||
| dlg_edit_password.cpp | ||
| dlg_edit_password.h | ||
| dlg_edit_tokens.cpp | ||
| dlg_edit_tokens.h | ||
| dlg_edit_user.cpp | ||
| dlg_edit_user.h | ||
| dlg_filter_games.cpp | ||
| dlg_filter_games.h | ||
| dlg_forgot_password_challenge.cpp | ||
| dlg_forgot_password_challenge.h | ||
| dlg_forgot_password_request.cpp | ||
| dlg_forgot_password_request.h | ||
| dlg_forgot_password_reset.cpp | ||
| dlg_forgot_password_reset.h | ||
| dlg_invite_to_game.cpp | ||
| dlg_invite_to_game.h | ||
| dlg_load_deck.cpp | ||
| dlg_load_deck.h | ||
| dlg_load_deck_from_clipboard.cpp | ||
| dlg_load_deck_from_clipboard.h | ||
| dlg_load_deck_from_website.cpp | ||
| dlg_load_deck_from_website.h | ||
| dlg_load_remote_deck.cpp | ||
| dlg_load_remote_deck.h | ||
| dlg_local_game_options.cpp | ||
| dlg_local_game_options.h | ||
| dlg_login_prompt.cpp | ||
| dlg_login_prompt.h | ||
| dlg_manage_sets.cpp | ||
| dlg_manage_sets.h | ||
| dlg_my_reports.cpp | ||
| dlg_my_reports.h | ||
| dlg_register.cpp | ||
| dlg_register.h | ||
| dlg_report_user.cpp | ||
| dlg_report_user.h | ||
| dlg_select_set_for_cards.cpp | ||
| dlg_select_set_for_cards.h | ||
| dlg_settings.cpp | ||
| dlg_settings.h | ||
| dlg_share_deck.cpp | ||
| dlg_share_deck.h | ||
| dlg_shared_decks_preview.cpp | ||
| dlg_shared_decks_preview.h | ||
| dlg_startup_card_check.cpp | ||
| dlg_startup_card_check.h | ||
| dlg_tip_of_the_day.cpp | ||
| dlg_tip_of_the_day.h | ||
| dlg_turn_order.cpp | ||
| dlg_turn_order.h | ||
| dlg_update.cpp | ||
| dlg_update.h | ||
| dlg_view_log.cpp | ||
| dlg_view_log.h | ||
| override_printing_warning.cpp | ||
| override_printing_warning.h | ||
| path_safety_warning.cpp | ||
| path_safety_warning.h | ||
| settings_view.cpp | ||
| settings_view.h | ||
| tip_of_the_day.cpp | ||
| tip_of_the_day.h | ||