incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use a cleaner method to deal with duplicate 97 commands

Browse Source
This commit is contained in:
Martin Michelsen
2023-12-21 14:53:56 -08:00
parent d7978aa99e
commit 522c1848e1
15 changed files with 153 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/GC-Episode3Battle.test.txt
+6 -2
View File
@@ -71,6 +71,10 @@ I 16332 2023-09-17 10:14:34 - [Commands] Sending to C-1 (version=GC command=D5 f
0020 | 61 6E 64 72 69 61 09 43 37 2E 00 00 | andria C7.
I 16332 2023-09-17 10:14:34 - [Commands] Received from C-1 (version=GC command=96 flag=00)
0000 | 96 00 0C 00 03 1B 8F 2C C0 00 00 00 | ,
I 16332 2023-09-17 10:14:34 - [Commands] Sending to C-1 (version=GC command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 | , 2
0010 | 30 45 53 33 00 91 00 42 60 00 04 00 00 00 00 00 | 0ES3@ `
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 16332 2023-09-17 10:14:34 - [Commands] Sending to C-1 (version=GC command=B1 flag=00)
0000 | B1 00 1C 00 32 30 32 33 3A 30 39 3A 31 37 3A 20 | 2023:09:17:
0010 | 31 37 3A 31 34 3A 33 34 2E 30 30 30 | 17:14:34.000
@@ -2619,7 +2623,7 @@ I 16332 2023-09-17 10:14:34 - [Commands] Sending to C-1 (version=GC command=CC f
0500 | 00 00 00 00 00 00 00 00 00 00 00 00 |
I 16332 2023-09-17 10:14:34 - [Commands] Sending to C-1 (version=GC command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 | , 2
0010 | 30 45 53 33 00 91 00 4A 60 00 00 00 00 00 00 00 | 0ES3@ `
0010 | 30 45 53 33 00 91 00 4A 60 00 04 00 00 00 00 00 | 0ES3@ `
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 16332 2023-09-17 10:14:34 - [Commands] Received from C-1 (Tali) (version=GC command=99 flag=00)
0000 | 99 00 04 00 |
@@ -2627,7 +2631,7 @@ I 16332 2023-09-17 10:14:34 - [Commands] Received from C-1 (Tali) (version=GC co
0000 | D6 00 04 00 |
I 16332 2023-09-17 10:14:34 - [Commands] Sending to C-1 (Tali) (version=GC command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 | , 2
0010 | 30 45 53 33 00 91 00 48 60 00 00 00 00 00 00 00 | 0ES3@ `
0010 | 30 45 53 33 00 91 00 48 60 00 04 00 00 00 00 00 | 0ES3@ `
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 16332 2023-09-17 10:14:34 - [Commands] Sending to C-1 (Tali) (version=GC command=07 flag=06)
0000 | 07 06 C8 00 11 00 00 11 FF FF FF FF 04 00 41 6C | Al
tests/GC-Episode3BattleWithSpectator.test.txt
+13 -5
View File
@@ -71,6 +71,10 @@ I 17097 2023-09-19 21:52:47 - [Commands] Sending to C-1 (version=GC command=D5 f
0020 | 61 6E 64 72 69 61 09 43 37 2E 00 00 | andria C7.
I 17097 2023-09-19 21:52:47 - [Commands] Received from C-1 (version=GC command=96 flag=00)
0000 | 96 00 0C 00 03 1B 8F 2C 06 01 00 00 | ,
I 17097 2023-09-19 21:52:47 - [Commands] Sending to C-1 (version=GC command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 | , 2
0010 | 30 45 53 33 00 91 00 42 60 00 04 00 00 00 00 00 | 0ES3@ `
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 17097 2023-09-19 21:52:47 - [Commands] Sending to C-1 (version=GC command=B1 flag=00)
0000 | B1 00 1C 00 32 30 32 33 3A 30 39 3A 32 30 3A 20 | 2023:09:20:
0010 | 30 34 3A 35 32 3A 34 37 2E 30 30 30 | 04:52:47.000
@@ -2619,15 +2623,15 @@ I 17097 2023-09-19 21:52:47 - [Commands] Sending to C-1 (version=GC command=CC f
0500 | 00 00 00 00 00 00 00 00 00 00 00 00 |
I 17097 2023-09-19 21:52:47 - [Commands] Sending to C-1 (version=GC command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 | , 2
0010 | 30 45 53 33 00 91 00 4A 60 00 00 00 00 00 00 00 | 0ES3@ `
0010 | 30 45 53 33 00 91 00 4A 60 00 04 00 00 00 00 00 | 0ES3@ `
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 17097 2023-09-19 21:52:47 - [Commands] Received from C-1 (Tali) (version=GC command=99 flag=00)
0000 | 99 00 04 00 |
I 17097 2023-09-19 21:52:47 - [Commands] Received from C-1 (Tali) (version=GC command=D6 flag=00)
0000 | D6 00 04 00 |
I 17097 2023-09-19 21:52:47 - [Commands] Sending to C-1 (Tali) (version=GC command=04 flag=00)
I 17097 2023-09-19 21:52:47 - [Commands] Sending to C-1 (version=GC command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 | , 2
0010 | 30 45 53 33 00 91 00 48 60 00 00 00 00 00 00 00 | 0ES3@ `
0010 | 30 45 53 33 00 91 00 48 60 00 04 00 00 00 00 00 | 0ES3@ `
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 17097 2023-09-19 21:52:47 - [Commands] Sending to C-1 (Tali) (version=GC command=07 flag=06)
0000 | 07 06 C8 00 11 00 00 11 FF FF FF FF 04 00 41 6C | Al
@@ -5882,6 +5886,10 @@ I 17097 2023-09-19 21:53:53 - [Commands] Sending to C-3 (version=GC command=D5 f
0020 | 61 6E 64 72 69 61 09 43 37 2E 00 00 | andria C7.
I 17097 2023-09-19 21:53:53 - [Commands] Received from C-3 (version=GC command=96 flag=00)
0000 | 96 00 0C 00 30 AA 74 2C 27 00 00 00 | 0 t,'
I 17097 2023-09-19 21:53:53 - [Commands] Sending to C-3 (version=GC command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 22 22 22 22 32 AC 99 83 | , """"2
0010 | 00 00 00 33 00 A1 00 42 60 00 04 00 00 00 00 00 | 3@ `
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 17097 2023-09-19 21:53:53 - [Commands] Sending to C-3 (version=GC command=B1 flag=00)
0000 | B1 00 1C 00 32 30 32 33 3A 30 39 3A 32 30 3A 20 | 2023:09:20:
0010 | 30 34 3A 35 33 3A 35 33 2E 30 30 30 | 04:53:53.000
@@ -8430,7 +8438,7 @@ I 17097 2023-09-19 21:53:53 - [Commands] Sending to C-3 (version=GC command=CC f
0500 | 00 00 00 00 00 00 00 00 00 00 00 00 |
I 17097 2023-09-19 21:53:53 - [Commands] Sending to C-3 (version=GC command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 22 22 22 22 32 AC 99 83 | , """"2
0010 | 30 4A 53 33 00 A1 00 4A 60 00 00 00 00 00 00 00 | 3@ `
0010 | 30 4A 53 33 00 A1 00 4A 60 00 04 00 00 00 00 00 | 3@ `
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 17097 2023-09-19 21:53:53 - [Commands] Received from C-3 (Tali) (version=GC command=99 flag=00)
0000 | 99 00 04 00 |
@@ -8438,7 +8446,7 @@ I 17097 2023-09-19 21:53:53 - [Commands] Received from C-3 (Tali) (version=GC co
0000 | D6 00 04 00 |
I 17097 2023-09-19 21:53:53 - [Commands] Sending to C-3 (Tali) (version=GC command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 22 22 22 22 32 AC 99 83 | , """"2
0010 | 30 4A 53 33 00 A1 00 48 60 00 00 00 00 00 00 00 | 3@ `
0010 | 30 4A 53 33 00 A1 00 48 60 00 04 00 00 00 00 00 | 3@ `
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 17097 2023-09-19 21:53:53 - [Commands] Sending to C-3 (Tali) (version=GC command=07 flag=08)
0000 | 07 06 C8 00 11 00 00 11 FF FF FF FF 04 00 41 6C | Al
tests/GC-Episode3TrialEditionLobbySmokeTest.test.txt
+11 -3
View File
@@ -75,6 +75,10 @@ I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (version=GC_EP3 command=
0020 | 61 6E 64 72 69 61 09 43 37 2E 00 00 | andria C7.
I 25793 2023-11-24 23:03:38 - [Commands] Received from C-4 (version=GC_EP3 command=96 flag=00)
0000 | 96 00 0C 00 5C E6 6B 2C 3B 00 00 00 | \ k,;
I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (version=GC_EP3 command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 | , 2
0010 | 00 00 00 33 00 A1 00 42 60 00 04 00 00 00 00 00 | 3 B`
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (version=GC_EP3 command=B1 flag=00)
0000 | B1 00 1C 00 32 30 32 33 3A 31 31 3A 32 35 3A 20 | 2023:11:25:
0010 | 30 37 3A 30 33 3A 33 38 2E 30 30 30 | 07:03:38.000
@@ -2130,15 +2134,15 @@ I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (version=GC_EP3_TRIAL_ED
7940 | 00 00 00 00 |
I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (version=GC_EP3_TRIAL_EDITION command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 | , 2
0010 | 54 4A 53 33 00 81 00 4A 60 00 00 00 00 00 00 00 | TJS3 J`
0010 | 54 4A 53 33 00 81 00 4A 60 00 04 00 00 00 00 00 | TJS3 J`
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 25793 2023-11-24 23:03:38 - [Commands] Received from C-4 (Tali) (version=GC_EP3_TRIAL_EDITION command=99 flag=00)
0000 | 99 00 04 00 |
I 25793 2023-11-24 23:03:38 - [Commands] Received from C-4 (Tali) (version=GC_EP3_TRIAL_EDITION command=D6 flag=00)
0000 | D6 00 04 00 |
I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (Tali) (version=GC_EP3_TRIAL_EDITION command=04 flag=00)
I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (version=GC_EP3_TRIAL_EDITION command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 | , 2
0010 | 54 4A 53 33 00 81 00 48 60 00 00 00 00 00 00 00 | TJS3 H`
0010 | 54 4A 53 33 00 81 00 48 60 00 04 00 00 00 00 00 | TJS3 J`
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (Tali) (version=GC_EP3_TRIAL_EDITION command=07 flag=08)
0000 | 07 06 C8 00 11 00 00 11 FF FF FF FF 04 00 41 6C | Al
@@ -2357,6 +2361,10 @@ I 25793 2023-11-24 23:03:44 - [Commands] Received from C-5 (version=GC_EP3 comma
0670 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
I 25793 2023-11-24 23:03:44 - [C-5] Game version changed to GC_EP3_TRIAL_EDITION
I 25793 2023-11-24 23:03:44 - [Commands] Sending to C-5 (Tali) (version=GC_EP3_TRIAL_EDITION command=C5 flag=01)
0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 | , 2
0010 | 54 4A 53 33 00 81 00 4C 60 00 00 00 00 00 00 00 | TJS3 L`
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 25793 2023-11-24 23:03:44 - [Commands] Sending to C-5 (Tali) (version=GC_EP3_TRIAL_EDITION command=C5 flag=01)
0000 | C5 01 20 01 00 00 00 00 FF 7F 00 00 00 00 00 00 |
0010 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
0020 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
tests/GC-ForestGame.test.txt
+5 -1
View File
@@ -66,6 +66,10 @@ I 49108 2023-05-26 16:18:01 - [Commands] Sending to C-1 (version=GC command=D5 f
0020 | 61 6E 64 72 69 61 09 43 37 2E 00 00 | andria C7.
I 49108 2023-05-26 16:18:01 - [Commands] Received from C-1 (version=GC command=96 flag=00)
0000 | 96 00 0C 00 C7 32 CE 2A 57 00 00 00 | 2 *W
I 49108 2023-05-26 16:18:01 - [Commands] Sending to C-1 (version=GC command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 | , 2
0010 | 30 50 4F 33 00 01 00 42 60 00 04 00 00 00 00 00 | 3 `
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 49108 2023-05-26 16:18:01 - [Commands] Sending to C-1 (version=GC command=B1 flag=00)
0000 | B1 00 1C 00 32 30 32 33 3A 30 35 3A 32 36 3A 20 | 2023:05:26:
0010 | 32 33 3A 31 38 3A 30 31 2E 30 30 30 | 23:18:01.000
@@ -75,7 +79,7 @@ I 49108 2023-05-26 16:18:02 - [Commands] Received from C-1 (version=GC command=D
0000 | D6 00 04 00 |
I 49108 2023-05-26 16:18:02 - [Commands] Sending to C-1 (version=GC command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 | , 2
0010 | 30 50 4F 33 00 01 00 40 60 00 00 00 00 00 00 00 | 3 `
0010 | 30 50 4F 33 00 01 00 40 60 00 04 00 00 00 00 00 | 3 `
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 49108 2023-05-26 16:18:02 - [Commands] Sending to C-1 (version=GC command=07 flag=08)
0000 | 07 06 C8 00 11 00 00 11 FF FF FF FF 04 00 41 6C | Al
tests/XB-ForestGame.test.txt
+5 -1
View File
@@ -60,6 +60,10 @@ I 16496 2023-11-08 01:54:08 - [Commands] Sending to C-1 (version=XB command=D5 f
0020 | 61 6E 64 72 69 61 09 43 37 2E 00 00 | andria C7.
I 16496 2023-11-08 01:54:09 - [Commands] Received from C-1 (version=XB command=96 flag=00)
0000 | 96 00 0C 00 7C 9C DA 2C 62 00 00 00 | | ,b
I 16496 2023-11-08 01:54:09 - [Commands] Sending to C-1 (version=XB command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 E2 D4 45 39 32 AC 99 83 | , E92
0010 | 00 00 00 00 00 81 00 42 60 00 04 00 00 00 00 00 | 4 @`
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 16496 2023-11-08 01:54:09 - [Commands] Sending to C-1 (version=XB command=B1 flag=00)
0000 | B1 00 1C 00 32 30 32 33 3A 31 31 3A 30 38 3A 20 | 2023:11:08:
0010 | 30 31 3A 35 34 3A 30 39 2E 30 30 30 | 01:54:09.000
@@ -69,7 +73,7 @@ I 16496 2023-11-08 01:54:13 - [Commands] Received from C-1 (version=XB command=D
0000 | D6 00 04 00 |
I 16496 2023-11-08 01:54:13 - [Commands] Sending to C-1 (version=XB command=04 flag=00)
0000 | 04 00 2C 00 00 00 01 00 E2 D4 45 39 32 AC 99 83 | , E92
0010 | 00 00 00 00 00 81 00 40 60 00 00 00 00 00 00 00 | 4 @`
0010 | 00 00 00 00 00 81 00 40 60 00 04 00 00 00 00 00 | 4 @`
0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF |
I 16496 2023-11-08 01:54:13 - [Commands] Sending to C-1 (version=XB command=07 flag=05)
0000 | 07 04 90 00 11 00 00 11 FF FF FF FF 04 00 41 6C | Al
tests/config.json
+20 -20
View File
@@ -45,29 +45,29 @@
"Episode3FinalRoundMesetaBonus": 300,
"PortConfiguration": {
"gc-jp10": [9000, "gc", "initial_login_server"],
"gc-jp11": [9001, "gc", "initial_login_server"],
"gc-jp3te": [9002, "gc", "initial_login_server"],
"gc-jp3": [9003, "gc", "initial_login_server"],
"gc-us12t1": [9064, "gc", "initial_login_server"],
"gc-jp10": [9000, "gc", "login_server"],
"gc-jp11": [9001, "gc", "login_server"],
"gc-jp3te": [9002, "gc", "login_server"],
"gc-jp3": [9003, "gc", "login_server"],
"gc-us12t1": [9064, "gc", "login_server"],
"gc-us10": [9100, "pc", "pc_console_detect"],
"gc-us3": [9103, "gc", "initial_login_server"],
"gc-eu10": [9200, "gc", "initial_login_server"],
"gc-eu11": [9201, "gc", "initial_login_server"],
"gc-eu3-50": [9202, "gc", "initial_login_server"],
"gc-eu3-60a": [9203, "gc", "initial_login_server"],
"gc-eu3-60b": [9204, "gc", "initial_login_server"],
"pc": [9300, "pc", "initial_login_server"],
"xb": [9500, "xb", "initial_login_server"],
"gc-us3": [9103, "gc", "login_server"],
"gc-eu10": [9200, "gc", "login_server"],
"gc-eu11": [9201, "gc", "login_server"],
"gc-eu3-50": [9202, "gc", "login_server"],
"gc-eu3-60a": [9203, "gc", "login_server"],
"gc-eu3-60b": [9204, "gc", "login_server"],
"pc": [9300, "pc", "login_server"],
"xb": [9500, "xb", "login_server"],
"pc-patch": [10000, "patch", "patch_server_pc"],
"bb-patch": [11000, "patch", "patch_server_bb"],
"bb-init": [12000, "bb", "initial_login_server"],
"bb-init": [12000, "bb", "login_server"],
"bb-patch2": [10500, "patch", "patch_server_bb"],
"bb-proxy2": [9932, "bb", "proxy_server"],
"bb-patch3": [13000, "bb", "initial_login_server"],
"console-login": [5100, "gc", "subsequent_login_server"],
"pc-login": [5101, "pc", "subsequent_login_server"],
"xb-login": [5102, "xb", "subsequent_login_server"],
"bb-patch3": [13000, "bb", "login_server"],
"console-login": [5100, "gc", "login_server"],
"pc-login": [5101, "pc", "login_server"],
"xb-login": [5102, "xb", "login_server"],
"console-lobby": [5110, "gc", "lobby_server"],
"pc-lobby": [5111, "pc", "lobby_server"],
"xb-lobby": [5105, "xb", "lobby_server"],
@@ -77,8 +77,8 @@
"xb-proxy": [5113, "xb", "proxy_server"],
"pc-proxy": [5121, "pc", "proxy_server"],
"bb-proxy": [5122, "bb", "proxy_server"],
"bb-data1": [12004, "bb", "subsequent_login_server"],
"bb-data2": [12005, "bb", "subsequent_login_server"],
"bb-data1": [12004, "bb", "login_server"],
"bb-data2": [12005, "bb", "login_server"],
},
"ProxyDestinations-GC": {