mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-08-08 11:44:25 -05:00
9a7b15d19b
Currently Cockatrice allows revealing the whole hand, or one card at random from the hand. Sometimes, a player needs to reveal a specific card from their hand instead, which is not supported. To achieve a similar effect, players usually move the corresponding card (or cards) to a public zone, then back to their hand. While this works, it is unsatisfactory (compared to a regular reveal, you can't keep the "revealed" window around, for one) and somewhat unintuitive. This patch adds a "Reveal to..." menu to cards and card selections in the player's hand or in custom zones (this includes looking at the player's library). This menu allows revealing a card or set of cards to any given player, or to all players. To implement this functionality at the protocol level, the existing RevealCards command is extended to support revealing multiple specific cards. This is done by making `card_id` a non-packed repeated field in the `Command_RevealCards` and `Event_RevealCards` protobufs. Using a non-packed repeated fields allows maintaining backwards compatibility: an empty optional field is encoded the same way as an empty non-packed list, an optional field with a value is encoded the same way as a one-element non-packed list, and when decoding a multi-elements non-packed list as an optional, only the last item in the list is read. Since the RevealCards command already exists, and due to the compatible encodings, a new client connecting to an old server can reveal a single specific card from their hand. When trying to reveal multiple cards at once, the old server will only see the request for one of the cards to be revealed, and the player will have to reveal each card separately. On the other hand, `Event_RevealedCards` already has an explicit list of cards revealed by the server, and the `card_id` field is only used when exactly one card has been revealed: thus, old and new clients will behave identically when receiving a new `Event_RevealedCards`. In particular, if a player using a new client reveals multiple cards from their hand on a new server, another player using an old client will correctly see all the revealed cards. The approach used to build the "Reveal to..." menu is slightly different from the approach used to build other player selection menus. Because the "Reveal to..." menu is specific to each card, but must also be updated whenever a player is added to or removed from the game, I chose to re-create it on the fly whenever a card is clicked, as that seemed the safest way to avoid both memory leaks and inconsistent state given my understanding of the code. |
||
|---|---|---|
| .. | ||
| admin_commands.proto | ||
| card_attributes.proto | ||
| CMakeLists.txt | ||
| color.proto | ||
| command_attach_card.proto | ||
| command_change_zone_properties.proto | ||
| command_concede.proto | ||
| command_create_arrow.proto | ||
| command_create_counter.proto | ||
| command_create_token.proto | ||
| command_deck_del_dir.proto | ||
| command_deck_del.proto | ||
| command_deck_download.proto | ||
| command_deck_list.proto | ||
| command_deck_new_dir.proto | ||
| command_deck_select.proto | ||
| command_deck_upload.proto | ||
| command_del_counter.proto | ||
| command_delete_arrow.proto | ||
| command_draw_cards.proto | ||
| command_dump_zone.proto | ||
| command_flip_card.proto | ||
| command_game_say.proto | ||
| command_inc_card_counter.proto | ||
| command_inc_counter.proto | ||
| command_kick_from_game.proto | ||
| command_leave_game.proto | ||
| command_move_card.proto | ||
| command_mulligan.proto | ||
| command_next_turn.proto | ||
| command_ready_start.proto | ||
| command_replay_delete_match.proto | ||
| command_replay_download.proto | ||
| command_replay_list.proto | ||
| command_replay_modify_match.proto | ||
| command_reveal_cards.proto | ||
| command_reverse_turn.proto | ||
| command_roll_die.proto | ||
| command_set_active_phase.proto | ||
| command_set_card_attr.proto | ||
| command_set_card_counter.proto | ||
| command_set_counter.proto | ||
| command_set_sideboard_lock.proto | ||
| command_set_sideboard_plan.proto | ||
| command_shuffle.proto | ||
| command_undo_draw.proto | ||
| commands.proto | ||
| context_concede.proto | ||
| context_connection_state_changed.proto | ||
| context_deck_select.proto | ||
| context_move_card.proto | ||
| context_mulligan.proto | ||
| context_ping_changed.proto | ||
| context_ready_start.proto | ||
| context_set_sideboard_lock.proto | ||
| context_undo_draw.proto | ||
| event_add_to_list.proto | ||
| event_attach_card.proto | ||
| event_change_zone_properties.proto | ||
| event_connection_closed.proto | ||
| event_create_arrow.proto | ||
| event_create_counter.proto | ||
| event_create_token.proto | ||
| event_del_counter.proto | ||
| event_delete_arrow.proto | ||
| event_destroy_card.proto | ||
| event_draw_cards.proto | ||
| event_dump_zone.proto | ||
| event_flip_card.proto | ||
| event_game_closed.proto | ||
| event_game_host_changed.proto | ||
| event_game_joined.proto | ||
| event_game_say.proto | ||
| event_game_state_changed.proto | ||
| event_join_room.proto | ||
| event_join.proto | ||
| event_kicked.proto | ||
| event_leave_room.proto | ||
| event_leave.proto | ||
| event_list_games.proto | ||
| event_list_rooms.proto | ||
| event_move_card.proto | ||
| event_notify_user.proto | ||
| event_player_properties_changed.proto | ||
| event_remove_from_list.proto | ||
| event_remove_messages.proto | ||
| event_replay_added.proto | ||
| event_reveal_cards.proto | ||
| event_reverse_turn.proto | ||
| event_roll_die.proto | ||
| event_room_say.proto | ||
| event_server_complete_list.proto | ||
| event_server_identification.proto | ||
| event_server_message.proto | ||
| event_server_shutdown.proto | ||
| event_set_active_phase.proto | ||
| event_set_active_player.proto | ||
| event_set_card_attr.proto | ||
| event_set_card_counter.proto | ||
| event_set_counter.proto | ||
| event_shuffle.proto | ||
| event_user_joined.proto | ||
| event_user_left.proto | ||
| event_user_message.proto | ||
| game_commands.proto | ||
| game_event_container.proto | ||
| game_event_context.proto | ||
| game_event.proto | ||
| game_replay.proto | ||
| isl_message.proto | ||
| moderator_commands.proto | ||
| move_card_to_zone.proto | ||
| response_activate.proto | ||
| response_adjust_mod.proto | ||
| response_ban_history.proto | ||
| response_deck_download.proto | ||
| response_deck_list.proto | ||
| response_deck_upload.proto | ||
| response_dump_zone.proto | ||
| response_forgotpasswordrequest.proto | ||
| response_get_games_of_user.proto | ||
| response_get_user_info.proto | ||
| response_join_room.proto | ||
| response_list_users.proto | ||
| response_login.proto | ||
| response_password_salt.proto | ||
| response_register.proto | ||
| response_replay_download.proto | ||
| response_replay_list.proto | ||
| response_viewlog_history.proto | ||
| response_warn_history.proto | ||
| response_warn_list.proto | ||
| response.proto | ||
| room_commands.proto | ||
| room_event.proto | ||
| server_message.proto | ||
| serverinfo_arrow.proto | ||
| serverinfo_ban.proto | ||
| serverinfo_card.proto | ||
| serverinfo_cardcounter.proto | ||
| serverinfo_chat_message.proto | ||
| serverinfo_counter.proto | ||
| serverinfo_deckstorage.proto | ||
| serverinfo_game.proto | ||
| serverinfo_gametype.proto | ||
| serverinfo_player.proto | ||
| serverinfo_playerping.proto | ||
| serverinfo_playerproperties.proto | ||
| serverinfo_replay_match.proto | ||
| serverinfo_replay.proto | ||
| serverinfo_room.proto | ||
| serverinfo_user.proto | ||
| serverinfo_warning.proto | ||
| serverinfo_zone.proto | ||
| session_commands.proto | ||
| session_event.proto | ||