From 4498fe1232b51ff0155a203c5533baead3d50689 Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Fri, 8 Sep 2023 23:35:16 -0700 Subject: [PATCH] rename ep3 game command handlers --- src/Episode3/Server.cc | 92 +++++++++++++++++++++--------------------- src/Episode3/Server.hh | 46 ++++++++++----------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/Episode3/Server.cc b/src/Episode3/Server.cc index 1d4ebcf9..7152d804 100644 --- a/src/Episode3/Server.cc +++ b/src/Episode3/Server.cc @@ -1527,29 +1527,29 @@ bool Server::update_registration_phase() { } const unordered_map Server::subcommand_handlers({ - {0x0B, &Server::handle_6xB3x0B_mulligan_hand}, - {0x0C, &Server::handle_6xB3x0C_end_mulligan_phase}, - {0x0D, &Server::handle_6xB3x0D_end_non_action_phase}, - {0x0E, &Server::handle_6xB3x0E_discard_card_from_hand}, - {0x0F, &Server::handle_6xB3x0F_set_card_from_hand}, - {0x10, &Server::handle_6xB3x10_move_fc_to_location}, - {0x11, &Server::handle_6xB3x11_enqueue_attack_or_defense}, - {0x12, &Server::handle_6xB3x12_end_attack_list}, - {0x13, &Server::handle_6xB3x13_update_map_during_setup}, - {0x14, &Server::handle_6xB3x14_update_deck_during_setup}, - {0x15, &Server::handle_6xB3x15_unused_hard_reset_server_state}, - {0x1B, &Server::handle_6xB3x1B_update_player_name}, - {0x1D, &Server::handle_6xB3x1D_start_battle}, - {0x21, &Server::handle_6xB3x21_end_battle}, - {0x28, &Server::handle_6xB3x28_end_defense_list}, - {0x2B, &Server::handle_6xB3x2B_ignored}, - {0x34, &Server::handle_6xB3x34_subtract_ally_atk_points}, - {0x37, &Server::handle_6xB3x37_client_ready_to_advance_from_starter_roll_phase}, - {0x3A, &Server::handle_6xB3x3A_ignored}, - {0x40, &Server::handle_6xB3x40_map_list_request}, - {0x41, &Server::handle_6xB3x41_map_request}, - {0x48, &Server::handle_6xB3x48_end_turn}, - {0x49, &Server::handle_6xB3x49_card_counts}, + {0x0B, &Server::handle_CAx0B_mulligan_hand}, + {0x0C, &Server::handle_CAx0C_end_mulligan_phase}, + {0x0D, &Server::handle_CAx0D_end_non_action_phase}, + {0x0E, &Server::handle_CAx0E_discard_card_from_hand}, + {0x0F, &Server::handle_CAx0F_set_card_from_hand}, + {0x10, &Server::handle_CAx10_move_fc_to_location}, + {0x11, &Server::handle_CAx11_enqueue_attack_or_defense}, + {0x12, &Server::handle_CAx12_end_attack_list}, + {0x13, &Server::handle_CAx13_update_map_during_setup}, + {0x14, &Server::handle_CAx14_update_deck_during_setup}, + {0x15, &Server::handle_CAx15_unused_hard_reset_server_state}, + {0x1B, &Server::handle_CAx1B_update_player_name}, + {0x1D, &Server::handle_CAx1D_start_battle}, + {0x21, &Server::handle_CAx21_end_battle}, + {0x28, &Server::handle_CAx28_end_defense_list}, + {0x2B, &Server::handle_CAx2B_ignored}, + {0x34, &Server::handle_CAx34_subtract_ally_atk_points}, + {0x37, &Server::handle_CAx37_client_ready_to_advance_from_starter_roll_phase}, + {0x3A, &Server::handle_CAx3A_ignored}, + {0x40, &Server::handle_CAx40_map_list_request}, + {0x41, &Server::handle_CAx41_map_request}, + {0x48, &Server::handle_CAx48_end_turn}, + {0x49, &Server::handle_CAx49_card_counts}, }); void Server::on_server_data_input(const string& data) { @@ -1585,7 +1585,7 @@ void Server::on_server_data_input(const string& data) { } } -void Server::handle_6xB3x0B_mulligan_hand(const string& data) { +void Server::handle_CAx0B_mulligan_hand(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.client_id, in_cmd.header.subsubcommand, "REDRAW"); @@ -1613,7 +1613,7 @@ void Server::handle_6xB3x0B_mulligan_hand(const string& data) { this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, out_cmd.error_code); } -void Server::handle_6xB3x0C_end_mulligan_phase(const string& data) { +void Server::handle_CAx0C_end_mulligan_phase(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.client_id, in_cmd.header.subsubcommand, "SETUP ADV 2"); @@ -1665,7 +1665,7 @@ void Server::handle_6xB3x0C_end_mulligan_phase(const string& data) { this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, out_cmd_fin.error_code); } -void Server::handle_6xB3x0D_end_non_action_phase(const string& data) { +void Server::handle_CAx0D_end_non_action_phase(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.client_id, in_cmd.header.subsubcommand, "END PHASE"); @@ -1683,7 +1683,7 @@ void Server::handle_6xB3x0D_end_non_action_phase(const string& data) { this->send(out_cmd_fin); } -void Server::handle_6xB3x0E_discard_card_from_hand(const string& data) { +void Server::handle_CAx0E_discard_card_from_hand(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.client_id, in_cmd.header.subsubcommand, "DISCARD"); @@ -1719,7 +1719,7 @@ void Server::handle_6xB3x0E_discard_card_from_hand(const string& data) { this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, out_cmd.error_code); } -void Server::handle_6xB3x0F_set_card_from_hand(const string& data) { +void Server::handle_CAx0F_set_card_from_hand(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.client_id, in_cmd.header.subsubcommand, "SET FC"); @@ -1758,7 +1758,7 @@ void Server::handle_6xB3x0F_set_card_from_hand(const string& data) { this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, out_cmd.error_code); } -void Server::handle_6xB3x10_move_fc_to_location(const string& data) { +void Server::handle_CAx10_move_fc_to_location(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.client_id, in_cmd.header.subsubcommand, "MOVE"); @@ -1793,7 +1793,7 @@ void Server::handle_6xB3x10_move_fc_to_location(const string& data) { this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, out_cmd.error_code); } -void Server::handle_6xB3x11_enqueue_attack_or_defense(const string& data) { +void Server::handle_CAx11_enqueue_attack_or_defense(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.client_id, in_cmd.header.subsubcommand, "ENQUEUE ACT"); @@ -1826,7 +1826,7 @@ void Server::handle_6xB3x11_enqueue_attack_or_defense(const string& data) { this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, out_cmd.error_code); } -void Server::handle_6xB3x12_end_attack_list(const string& data) { +void Server::handle_CAx12_end_attack_list(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.client_id, in_cmd.header.subsubcommand, "END ATK LIST"); @@ -1846,7 +1846,7 @@ void Server::handle_6xB3x12_end_attack_list(const string& data) { this->send_debug_message_if_error_code_nonzero(in_cmd.client_id, error_code); } -void Server::handle_6xB3x13_update_map_during_setup(const string& data) { +void Server::handle_CAx13_update_map_during_setup(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.header.subsubcommand, "UPDATE MAP"); @@ -1881,7 +1881,7 @@ void Server::handle_6xB3x13_update_map_during_setup(const string& data) { } } -void Server::handle_6xB3x14_update_deck_during_setup(const string& data) { +void Server::handle_CAx14_update_deck_during_setup(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.client_id, in_cmd.header.subsubcommand, "UPDATE DECK"); @@ -1928,14 +1928,14 @@ void Server::handle_6xB3x14_update_deck_during_setup(const string& data) { } } -void Server::handle_6xB3x15_unused_hard_reset_server_state(const string& data) { +void Server::handle_CAx15_unused_hard_reset_server_state(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.header.subsubcommand, "HARD RESET"); this->hard_reset_flag = true; } -void Server::handle_6xB3x1B_update_player_name(const string& data) { +void Server::handle_CAx1B_update_player_name(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.entry.client_id, in_cmd.header.subsubcommand, "UPDATE NAME"); @@ -1952,7 +1952,7 @@ void Server::handle_6xB3x1B_update_player_name(const string& data) { this->send(out_cmd); } -void Server::handle_6xB3x1D_start_battle(const string& data) { +void Server::handle_CAx1D_start_battle(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.header.subsubcommand, "START BATTLE"); @@ -1991,7 +1991,7 @@ void Server::handle_6xB3x1D_start_battle(const string& data) { } } -void Server::handle_6xB3x21_end_battle(const string& data) { +void Server::handle_CAx21_end_battle(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.header.subsubcommand, "END BATTLE"); @@ -2000,7 +2000,7 @@ void Server::handle_6xB3x21_end_battle(const string& data) { } } -void Server::handle_6xB3x28_end_defense_list(const string& data) { +void Server::handle_CAx28_end_defense_list(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.client_id, in_cmd.header.subsubcommand, "END DEF LIST"); @@ -2050,9 +2050,9 @@ void Server::handle_6xB3x28_end_defense_list(const string& data) { this->send(out_cmd_fin); } -void Server::handle_6xB3x2B_ignored(const string&) {} +void Server::handle_CAx2B_ignored(const string&) {} -void Server::handle_6xB3x34_subtract_ally_atk_points(const string& data) { +void Server::handle_CAx34_subtract_ally_atk_points(const string& data) { const auto& in_cmd = check_size_t(data); uint8_t card_ref_client_id = client_id_for_card_ref(in_cmd.card_ref); @@ -2129,7 +2129,7 @@ void Server::handle_6xB3x34_subtract_ally_atk_points(const string& data) { } } -void Server::handle_6xB3x37_client_ready_to_advance_from_starter_roll_phase(const string& data) { +void Server::handle_CAx37_client_ready_to_advance_from_starter_roll_phase(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.client_id, in_cmd.header.subsubcommand, "SETUP ADV 1"); @@ -2156,9 +2156,9 @@ void Server::handle_6xB3x37_client_ready_to_advance_from_starter_roll_phase(cons } } -void Server::handle_6xB3x3A_ignored(const string&) {} +void Server::handle_CAx3A_ignored(const string&) {} -void Server::handle_6xB3x40_map_list_request(const string& data) { +void Server::handle_CAx40_map_list_request(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.header.subsubcommand, "MAP LIST"); @@ -2186,7 +2186,7 @@ void Server::handle_6xB3x40_map_list_request(const string& data) { } } -void Server::handle_6xB3x41_map_request(const string& data) { +void Server::handle_CAx41_map_request(const string& data) { const auto& cmd = check_size_t(data); this->send_debug_command_received_message( cmd.header.subsubcommand, "MAP DATA"); @@ -2211,7 +2211,7 @@ void Server::handle_6xB3x41_map_request(const string& data) { } } -void Server::handle_6xB3x48_end_turn(const string& data) { +void Server::handle_CAx48_end_turn(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.client_id, in_cmd.header.subsubcommand, "END TURN"); @@ -2226,7 +2226,7 @@ void Server::handle_6xB3x48_end_turn(const string& data) { this->send(out_cmd); } -void Server::handle_6xB3x49_card_counts(const string& data) { +void Server::handle_CAx49_card_counts(const string& data) { const auto& in_cmd = check_size_t(data); this->send_debug_command_received_message( in_cmd.header.sender_client_id, in_cmd.header.subsubcommand, "CARD COUNTS"); diff --git a/src/Episode3/Server.hh b/src/Episode3/Server.hh index de68ce2c..d6ddfc02 100644 --- a/src/Episode3/Server.hh +++ b/src/Episode3/Server.hh @@ -190,29 +190,29 @@ public: bool always_send = false); bool update_registration_phase(); void on_server_data_input(const std::string& data); - void handle_6xB3x0B_mulligan_hand(const std::string& data); - void handle_6xB3x0C_end_mulligan_phase(const std::string& data); - void handle_6xB3x0D_end_non_action_phase(const std::string& data); - void handle_6xB3x0E_discard_card_from_hand(const std::string& data); - void handle_6xB3x0F_set_card_from_hand(const std::string& data); - void handle_6xB3x10_move_fc_to_location(const std::string& data); - void handle_6xB3x11_enqueue_attack_or_defense(const std::string& data); - void handle_6xB3x12_end_attack_list(const std::string& data); - void handle_6xB3x13_update_map_during_setup(const std::string& data); - void handle_6xB3x14_update_deck_during_setup(const std::string& data); - void handle_6xB3x15_unused_hard_reset_server_state(const std::string& data); - void handle_6xB3x1B_update_player_name(const std::string& data); - void handle_6xB3x1D_start_battle(const std::string& data); - void handle_6xB3x21_end_battle(const std::string& data); - void handle_6xB3x28_end_defense_list(const std::string& data); - void handle_6xB3x2B_ignored(const std::string&); - void handle_6xB3x34_subtract_ally_atk_points(const std::string& data); - void handle_6xB3x37_client_ready_to_advance_from_starter_roll_phase(const std::string& data); - void handle_6xB3x3A_ignored(const std::string& data); - void handle_6xB3x40_map_list_request(const std::string& data); - void handle_6xB3x41_map_request(const std::string& data); - void handle_6xB3x48_end_turn(const std::string& data); - void handle_6xB3x49_card_counts(const std::string& data); + void handle_CAx0B_mulligan_hand(const std::string& data); + void handle_CAx0C_end_mulligan_phase(const std::string& data); + void handle_CAx0D_end_non_action_phase(const std::string& data); + void handle_CAx0E_discard_card_from_hand(const std::string& data); + void handle_CAx0F_set_card_from_hand(const std::string& data); + void handle_CAx10_move_fc_to_location(const std::string& data); + void handle_CAx11_enqueue_attack_or_defense(const std::string& data); + void handle_CAx12_end_attack_list(const std::string& data); + void handle_CAx13_update_map_during_setup(const std::string& data); + void handle_CAx14_update_deck_during_setup(const std::string& data); + void handle_CAx15_unused_hard_reset_server_state(const std::string& data); + void handle_CAx1B_update_player_name(const std::string& data); + void handle_CAx1D_start_battle(const std::string& data); + void handle_CAx21_end_battle(const std::string& data); + void handle_CAx28_end_defense_list(const std::string& data); + void handle_CAx2B_ignored(const std::string&); + void handle_CAx34_subtract_ally_atk_points(const std::string& data); + void handle_CAx37_client_ready_to_advance_from_starter_roll_phase(const std::string& data); + void handle_CAx3A_ignored(const std::string& data); + void handle_CAx40_map_list_request(const std::string& data); + void handle_CAx41_map_request(const std::string& data); + void handle_CAx48_end_turn(const std::string& data); + void handle_CAx49_card_counts(const std::string& data); void compute_losing_team_id_and_add_winner_flags(uint32_t flags); uint32_t get_team_exp(uint8_t team_id) const; uint32_t send_6xB4x06_if_card_ref_invalid(