diff --git a/src/Episode3/Server.cc b/src/Episode3/Server.cc index 39623f81..f8e1f7eb 100644 --- a/src/Episode3/Server.cc +++ b/src/Episode3/Server.cc @@ -1869,7 +1869,7 @@ void Server::handle_CAx0B_mulligan_hand(shared_ptr, const string& data) void Server::handle_CAx0C_end_mulligan_phase(shared_ptr, 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"); + this->send_debug_command_received_message(in_cmd.client_id, in_cmd.header.subsubcommand, "HAND READY"); if (in_cmd.client_id >= 4) { throw runtime_error("invalid client ID"); } @@ -2495,7 +2495,7 @@ void Server::handle_CAx34_subtract_ally_atk_points(shared_ptr, const str void Server::handle_CAx37_client_ready_to_advance_from_starter_roll_phase(shared_ptr, 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"); + this->send_debug_command_received_message(in_cmd.client_id, in_cmd.header.subsubcommand, "CHOOSE ORDER"); if (in_cmd.client_id >= 4) { throw runtime_error("invalid client ID"); } diff --git a/tests/GC-Episode3BattleVirusAndCreatureTech.rdtest.txt b/tests/GC-Episode3BattleVirusAndCreatureTech.rdtest.txt index 3dc398ff..01b17205 100644 --- a/tests/GC-Episode3BattleVirusAndCreatureTech.rdtest.txt +++ b/tests/GC-Episode3BattleVirusAndCreatureTech.rdtest.txt @@ -6650,8 +6650,8 @@ I 94811 2024-09-01 16:34:13 - [Commands] Received from C-2 (Tali) @ ipss:N-1:127 0010 | 00 00 00 00 01 45 6C A0 | El I 94811 2024-09-01 16:34:13 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=B0 flag=00) 0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 35 31 | $ C51 -0010 | 2F 43 41 78 33 37 20 53 45 54 55 50 20 41 44 56 | /CAx37 SETUP ADV -0020 | 20 31 00 00 | 1 +0010 | 2F 43 41 78 33 37 20 43 48 4F 4F 53 45 20 4F 52 | /CAx37 CHOOSE OR +0020 | 44 45 52 00 | DER I 94811 2024-09-01 16:34:13 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=C9 flag=00) 0000 | C9 00 64 00 B4 18 00 00 02 00 00 00 01 00 00 00 | d 0010 | 06 00 00 00 00 00 00 01 08 00 00 00 05 01 09 01 | @@ -6665,8 +6665,8 @@ I 94811 2024-09-01 16:34:13 - [Commands] Received from C-2 (Tali) @ ipss:N-1:127 0010 | 00 00 00 00 00 45 6C A0 | El I 94811 2024-09-01 16:34:13 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=B0 flag=00) 0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 35 30 | $ C50 -0010 | 2F 43 41 78 33 37 20 53 45 54 55 50 20 41 44 56 | /CAx37 SETUP ADV -0020 | 20 31 00 00 | 1 +0010 | 2F 43 41 78 33 37 20 43 48 4F 4F 53 45 20 4F 52 | /CAx37 CHOOSE OR +0020 | 44 45 52 00 | DER I 94811 2024-09-01 16:34:13 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=C9 flag=00) 0000 | C9 00 64 00 B4 18 00 00 02 00 00 00 00 00 00 00 | d 0010 | 05 00 00 00 00 00 00 00 08 00 00 00 16 00 0D 00 | @@ -6687,8 +6687,8 @@ I 94811 2024-09-01 16:34:15 - [Commands] Received from C-2 (Tali) @ ipss:N-1:127 0010 | 00 00 00 00 01 00 11 20 | I 94811 2024-09-01 16:34:15 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=B0 flag=00) 0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 35 31 | $ C51 -0010 | 2F 43 41 78 30 43 20 53 45 54 55 50 20 41 44 56 | /CAx0C SETUP ADV -0020 | 20 32 00 00 | 2 +0010 | 2F 43 41 78 30 43 20 48 41 4E 44 20 52 45 41 44 | /CAx0C HAND READ +0020 | 59 00 00 00 | Y I 94811 2024-09-01 16:34:15 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=C9 flag=00) 0000 | C9 00 14 00 B4 04 00 00 1E 00 00 00 00 00 00 00 | 0010 | 00 01 00 00 | @@ -6900,8 +6900,8 @@ I 94811 2024-09-01 16:34:20 - [Commands] Received from C-2 (Tali) @ ipss:N-1:127 0010 | 00 00 00 00 00 00 10 E0 | I 94811 2024-09-01 16:34:20 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=B0 flag=00) 0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 35 30 | $ C50 -0010 | 2F 43 41 78 30 43 20 53 45 54 55 50 20 41 44 56 | /CAx0C SETUP ADV -0020 | 20 32 00 00 | 2 +0010 | 2F 43 41 78 30 43 20 48 41 4E 44 20 52 45 41 44 | /CAx0C HAND READ +0020 | 59 00 00 00 | Y I 94811 2024-09-01 16:34:20 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=C9 flag=00) 0000 | C9 00 14 00 B4 04 00 00 1E 00 00 00 00 00 00 08 | 0010 | 00 01 00 00 | diff --git a/tests/GC-Episode3BattleWithSpectatorTeam.rdtest.txt b/tests/GC-Episode3BattleWithSpectatorTeam.rdtest.txt index d5811ad6..80ea28c9 100644 --- a/tests/GC-Episode3BattleWithSpectatorTeam.rdtest.txt +++ b/tests/GC-Episode3BattleWithSpectatorTeam.rdtest.txt @@ -17522,8 +17522,8 @@ I 64538 2024-09-01 15:26:24 - [Commands] Received from C-8 (Tali) @ ipss:N-4: (v 0010 | 00 00 00 00 00 45 90 A0 | E I 64538 2024-09-01 15:26:24 - [Commands] Sending to C-8 (Tali) @ ipss:N-4: (version=GC_EP3 command=B0 flag=00) 0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 35 30 | $ C50 -0010 | 2F 43 41 78 33 37 20 53 45 54 55 50 20 41 44 56 | /CAx37 SETUP ADV -0020 | 20 31 00 00 | 1 +0010 | 2F 43 41 78 33 37 20 43 48 4F 4F 53 45 20 4F 52 | /CAx37 CHOOSE OR +0020 | 44 45 52 00 | DER I 64538 2024-09-01 15:26:24 - [Commands] Sending to C-8 (Tali) @ ipss:N-4: (version=GC_EP3 command=C9 flag=00) 0000 | C9 00 64 00 B4 18 00 00 02 00 00 00 00 00 00 00 | d 0010 | 05 00 00 00 00 00 00 00 08 00 00 00 16 00 0D 00 | @@ -17545,8 +17545,8 @@ I 64538 2024-09-01 15:26:28 - [Commands] Received from C-8 (Tali) @ ipss:N-4: (v 0010 | 00 00 00 00 01 45 90 A0 | E I 64538 2024-09-01 15:26:28 - [Commands] Sending to C-8 (Tali) @ ipss:N-4: (version=GC_EP3 command=B0 flag=00) 0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 35 31 | $ C51 -0010 | 2F 43 41 78 33 37 20 53 45 54 55 50 20 41 44 56 | /CAx37 SETUP ADV -0020 | 20 31 00 00 | 1 +0010 | 2F 43 41 78 33 37 20 43 48 4F 4F 53 45 20 4F 52 | /CAx37 CHOOSE OR +0020 | 44 45 52 00 | DER I 64538 2024-09-01 15:26:28 - [Commands] Sending to C-8 (Tali) @ ipss:N-4: (version=GC_EP3 command=C9 flag=00) 0000 | C9 00 64 00 B4 18 00 00 02 00 00 00 01 00 00 00 | d 0010 | 06 00 00 00 00 00 00 01 08 00 00 00 05 01 09 01 | @@ -17588,8 +17588,8 @@ I 64538 2024-09-01 15:26:34 - [Commands] Received from C-8 (Tali) @ ipss:N-4: (v 0010 | 00 00 00 00 01 00 46 E0 | F I 64538 2024-09-01 15:26:34 - [Commands] Sending to C-8 (Tali) @ ipss:N-4: (version=GC_EP3 command=B0 flag=00) 0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 35 31 | $ C51 -0010 | 2F 43 41 78 30 43 20 53 45 54 55 50 20 41 44 56 | /CAx0C SETUP ADV -0020 | 20 32 00 00 | 2 +0010 | 2F 43 41 78 30 43 20 48 41 4E 44 20 52 45 41 44 | /CAx0C HAND READ +0020 | 59 00 00 00 | Y I 64538 2024-09-01 15:26:34 - [Commands] Sending to C-8 (Tali) @ ipss:N-4: (version=GC_EP3 command=C9 flag=00) 0000 | C9 00 14 00 B4 04 00 00 1E 00 00 00 00 00 00 00 | 0010 | 00 01 00 00 | @@ -17623,8 +17623,8 @@ I 64538 2024-09-01 15:26:34 - [Commands] Received from C-8 (Tali) @ ipss:N-4: (v 0010 | 00 00 00 00 00 00 6A 60 | j` I 64538 2024-09-01 15:26:34 - [Commands] Sending to C-8 (Tali) @ ipss:N-4: (version=GC_EP3 command=B0 flag=00) 0000 | B0 00 24 00 00 00 00 00 00 00 00 00 09 43 35 30 | $ C50 -0010 | 2F 43 41 78 30 43 20 53 45 54 55 50 20 41 44 56 | /CAx0C SETUP ADV -0020 | 20 32 00 00 | 2 +0010 | 2F 43 41 78 30 43 20 48 41 4E 44 20 52 45 41 44 | /CAx0C HAND READ +0020 | 59 00 00 00 | Y I 64538 2024-09-01 15:26:34 - [Commands] Sending to C-8 (Tali) @ ipss:N-4: (version=GC_EP3 command=C9 flag=00) 0000 | C9 00 14 00 B4 04 00 00 1E 00 00 00 00 00 00 04 | 0010 | 00 01 00 00 |