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

handle devil's/demon's in EnemyDamageSync

Browse Source
This commit is contained in:
Martin Michelsen
2025-09-12 22:41:32 -07:00
parent 526bfb64e5
commit 22d7825ba3
7 changed files with 343 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/XB-GC-EnemyDamageSyncSwitch.test.txt
+74 -63
View File
@@ -955,7 +955,7 @@ I 34886 2025-07-21 23:45:01 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127
0000 | B3 00 0C 00 55 45 4F 34 00 00 00 00 | UEO4
I 34886 2025-07-21 23:45:01 - [C-3] Version detected as 344F4555
I 34886 2025-07-21 23:45:22 - [Commands] Sending to C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=B2 flag=00)
0000 | B2 00 B4 05 A4 05 00 00 00 00 00 00 00 00 00 00 |
0000 | B2 00 2C 06 1C 06 00 00 00 00 00 00 00 00 00 00 | ,
0010 | 7C 01 00 00 51 52 E8 B0 00 00 00 42 4A 4F 34 60 | | QR BJO4`
0020 | D4 43 00 78 05 40 00 7C 05 40 00 F0 63 2C 00 E0 | C x @ | @ c,
0030 | 05 63 00 44 4A 4F 34 D0 D7 43 00 18 09 40 00 1C | c DJO4 C @
@@ -979,7 +979,7 @@ I 34886 2025-07-21 23:45:22 - [Commands] Sending to C-3 (Jess Lv.51) @ ip:127.0.
0150 | 00 8B 44 2C 08 39 C1 7D 07 C6 04 0A 90 41 EB F5 | D, 9 } A
0160 | FF 74 2C 08 FF 74 2C 08 8B 4F 08 FF 11 83 C5 08 | t, t, O
0170 | 4B 75 B4 89 E9 8B 3C 24 8B 74 24 04 8B 6C 24 08 | Ku <$ t$ l$
0180 | 8B 5C 24 0C 8B 44 24 10 01 CC FF E0 E8 69 01 00 | \$ D$ i
0180 | 8B 5C 24 0C 8B 44 24 10 01 CC FF E0 E8 AB 01 00 | \$ D$
0190 | 00 E8 35 00 00 00 E8 01 00 00 00 C3 6A 05 68 A5 | 5 j h
01A0 | 58 2B 00 6A 01 E8 04 00 00 00 0F 00 00 00 58 FF | X+ j X
01B0 | 30 E8 0F 00 00 00 F6 05 B8 54 63 00 80 75 05 66 | 0 Tc u f
@@ -990,63 +990,70 @@ I 34886 2025-07-21 23:45:22 - [Commands] Sending to C-3 (Jess Lv.51) @ ip:127.0.
0200 | 88 2A 00 6A 05 68 CC 88 2A 00 6A 05 68 D2 8C 2A | * j h * j h *
0210 | 00 6A 05 68 13 8D 2A 00 6A 05 68 E8 92 2A 00 6A | j h * j h * j
0220 | 05 68 77 95 2A 00 6A 05 68 70 96 2A 00 6A 05 68 | hw * j hp * j h
0230 | FF 98 2A 00 6A 0F E8 04 00 00 00 AD 00 00 00 58 | * j X
0240 | FF 30 E8 AD 00 00 00 50 51 53 F6 05 B8 54 63 00 | 0 PQS Tc
0250 | 80 0F 84 83 00 00 00 0F B7 50 1C 81 FA 00 10 00 | P
0260 | 00 7C 77 81 FA 50 1B 00 00 7D 6F 81 E2 FF 0F 00 | |w P }o
0270 | 00 6B D2 0C 03 15 90 7F 63 00 83 EC 0C 66 C7 04 | k c f
0280 | 24 E4 03 66 8B 58 1C 66 89 5C 24 02 81 7C 24 18 | $ f X f \$ |$
0290 | 20 85 2A 00 75 03 66 F7 D9 66 89 4C 24 04 66 8B | * u f f L$ f
02A0 | 5A 06 66 89 5C 24 06 66 8B 98 30 03 00 00 66 89 | Z f \$ f 0 f
02B0 | 5C 24 08 66 8B 98 BC 02 00 00 66 89 5C 24 0A 89 | \$ f f \$
02C0 | E1 8B 1D 20 3E 72 00 85 DB 74 0F B8 0C 00 00 00 | >r t
02D0 | BA 80 C5 2D 00 FF D2 83 C4 0C BA E0 9C 2A 00 B8 | - *
02E0 | 10 9D 2A 00 81 7C 24 0C 20 85 2A 00 0F 44 D0 5B | * |$ * D [
02F0 | 59 58 FF E2 E8 1B FD FF FF C3 51 52 E8 B0 00 00 | YX QR
0300 | 00 42 4A 4F 34 60 D4 43 00 78 05 40 00 7C 05 40 | BJO4` C x @ | @
0310 | 00 F0 63 2C 00 E0 05 63 00 44 4A 4F 34 D0 D7 43 | c, c DJO4 C
0320 | 00 18 09 40 00 1C 09 40 00 40 6F 2C 00 40 0C 63 | @ @ @o, @ c
0330 | 00 55 4A 4F 34 E0 0F 44 00 3C 3E 40 00 40 3E 40 | UJO4 D <>@ @>@
0340 | 00 E0 84 2C 00 8C 87 63 00 44 45 4F 34 4C 17 44 | , c DEO4L D
0350 | 00 18 45 40 00 1C 45 40 00 30 80 2C 00 74 5C 63 | E@ E@ 0 , t\c
0360 | 00 55 45 4F 34 EC 0F 44 00 3C 3E 40 00 40 3E 40 | UEO4 D <>@ @>@
0370 | 00 10 82 2C 00 0C 55 63 00 44 50 4F 34 68 17 44 | , Uc DPO4h D
0380 | 00 38 45 40 00 3C 45 40 00 60 80 2C 00 74 5C 63 | 8E@ <E@ ` , t\c
0390 | 00 55 50 4F 34 F8 1A 44 00 1C 49 40 00 20 49 40 | UPO4 D I@ I@
03A0 | 00 30 83 2C 00 0C 60 63 00 00 00 00 00 00 00 00 | 0 , `c
03B0 | 00 5A 31 C0 83 EA 18 83 C2 18 8B 4A 04 85 C9 74 | Z1 J t
03C0 | 0A 81 39 44 72 65 61 75 EE 89 D0 5A 59 85 C0 75 | 9Dreau ZY u
03D0 | 01 C3 56 57 53 89 C7 EB 47 5B 83 7B 04 00 75 09 | VWS G[ { u
03E0 | 5B 5F 5E B8 01 00 00 00 C3 FF 33 8B 4F 0C FF 11 | [_^ 3 O
03F0 | 89 C6 6A 04 FF 73 04 FF 33 8B 4F 08 FF 11 31 C9 | j s 3 O 1
0400 | 8B 13 8A 44 0B 08 88 04 0A 41 39 4B 04 75 F3 56 | D A9K u V
0410 | FF 73 04 FF 33 8D 5C 0B 08 8B 4F 08 FF 11 EB BA | s 3 \ O
0420 | E8 B4 FF FF FF 00 DC 2D 00 09 00 00 00 83 3D B8 | - =
0430 | 54 63 00 00 74 38 40 B8 53 00 08 00 00 00 E4 00 | Tc t8@ S
0440 | 06 00 73 C9 2D 00 70 C9 2D 00 FA 00 00 00 C2 04 | s - p -
0450 | 00 53 56 57 F6 05 B8 54 63 00 80 0F 84 E3 00 00 | SVW Tc
0460 | 00 8B 5C 24 10 0F B7 43 02 3D 00 10 00 00 0F 8C | \$ C =
0470 | D0 00 00 00 3D 50 1B 00 00 0F 8D C5 00 00 00 89 | =P
0480 | C7 E8 58 8A FD FF 50 0F B7 43 02 25 FF 0F 00 00 | X P C %
0490 | 6B C0 0C 03 05 90 7F 63 00 0F B7 50 06 0F BF 73 | k c P s
04A0 | 04 0F B7 7B 0A 01 F2 39 FA 7C 77 66 89 78 06 8B | { 9 |wf x
04B0 | 10 F7 C2 00 08 00 00 0F 85 84 00 00 00 81 CA 00 |
04C0 | 08 00 00 89 10 83 3C 24 00 74 76 52 83 EC 08 66 | <$ tvR f
04D0 | C7 04 24 0A 03 66 8B 73 02 66 89 74 24 02 66 81 | $ f s f t$ f
04E0 | E6 FF 0F 66 89 74 24 04 66 89 7C 24 06 89 E1 51 | f t$ f |$ Q
04F0 | 8B 1D 20 3E 72 00 85 DB 74 0A B8 0C 00 00 00 E8 | >r t
0500 | 5A FB FF FF C7 05 E8 37 72 00 01 00 00 00 E8 5B | Z 7r [
0510 | 16 00 00 C7 05 E8 37 72 00 00 00 00 00 83 C4 14 | 7r
0520 | EB 22 31 FF 39 D2 0F 4C D7 66 89 50 06 89 C6 8B | "1 9 L f P
0530 | 04 24 85 C0 74 0B 89 C1 56 8B 11 FF 92 38 01 00 | $ t V 8
0540 | 00 83 C4 04 5F 5E 5B C3 A0 9C 2A 00 13 00 00 00 | _^[ *
0550 | 66 83 B8 28 03 00 00 02 75 03 31 C0 C3 E8 FF FF | f ( u 1
0560 | FF FF C3 EA 7C 2A 00 1A 00 00 00 66 89 C1 89 F8 | |* f
0570 | E8 FF FF FF FF EB 0E CC CC CC CC CC CC CC CC CC |
0580 | CC CC CC CC CC 00 00 00 00 00 00 00 00 00 00 00 |
0590 | 00 00 00 00 80 05 00 00 01 00 00 00 00 00 00 00 |
05A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
05B0 | 00 00 00 00 |
0230 | FF 98 2A 00 6A 0F E8 04 00 00 00 EF 00 00 00 58 | * j X
0240 | FF 30 E8 EF 00 00 00 50 51 53 F6 05 B8 54 63 00 | 0 PQS Tc
0250 | 80 0F 84 C5 00 00 00 0F B7 50 1C 81 FA 00 10 00 | P
0260 | 00 0F 8C B5 00 00 00 81 FA 50 1B 00 00 0F 8D A9 | P
0270 | 00 00 00 81 E2 FF 0F 00 00 6B D2 0C 03 15 90 7F | k
0280 | 63 00 83 EC 10 66 C7 04 24 E4 04 66 8B 58 1C 66 | c f $ f X f
0290 | 89 5C 24 02 81 7C 24 1C 20 85 2A 00 75 03 66 F7 | \$ |$ * u f
02A0 | D9 66 89 4C 24 04 66 8B 5A 06 66 89 5C 24 06 66 | f L$ f Z f \$ f
02B0 | 8B 98 30 03 00 00 66 89 5C 24 08 66 8B 98 BC 02 | 0 f \$ f
02C0 | 00 00 66 89 5C 24 0A C7 44 24 0C 00 00 80 BF 81 | f \$ D$
02D0 | 7C 24 1C 04 99 2A 00 75 28 66 B9 64 00 66 2B 4C | |$ * u(f d f+L
02E0 | 24 34 0F BF C9 89 4C 24 FC DB 44 24 FC D8 4C 24 | $4 L$ D$ L$
02F0 | 38 C7 44 24 FC 00 00 C8 42 D8 74 24 FC D9 5C 24 | 8 D$ B t$ \$
0300 | 0C 89 E1 8B 1D 20 3E 72 00 85 DB 74 0F B8 10 00 | >r t
0310 | 00 00 BA 80 C5 2D 00 FF D2 83 C4 10 BA E0 9C 2A | - *
0320 | 00 B8 10 9D 2A 00 81 7C 24 0C 20 85 2A 00 0F 44 | * |$ * D
0330 | D0 5B 59 58 FF E2 E8 D9 FC FF FF C3 51 52 E8 B0 | [YX QR
0340 | 00 00 00 42 4A 4F 34 60 D4 43 00 78 05 40 00 7C | BJO4` C x @ |
0350 | 05 40 00 F0 63 2C 00 E0 05 63 00 44 4A 4F 34 D0 | @ c, c DJO4
0360 | D7 43 00 18 09 40 00 1C 09 40 00 40 6F 2C 00 40 | C @ @ @o, @
0370 | 0C 63 00 55 4A 4F 34 E0 0F 44 00 3C 3E 40 00 40 | c UJO4 D <>@ @
0380 | 3E 40 00 E0 84 2C 00 8C 87 63 00 44 45 4F 34 4C | >@ , c DEO4L
0390 | 17 44 00 18 45 40 00 1C 45 40 00 30 80 2C 00 74 | D E@ E@ 0 , t
03A0 | 5C 63 00 55 45 4F 34 EC 0F 44 00 3C 3E 40 00 40 | \c UEO4 D <>@ @
03B0 | 3E 40 00 10 82 2C 00 0C 55 63 00 44 50 4F 34 68 | >@ , Uc DPO4h
03C0 | 17 44 00 38 45 40 00 3C 45 40 00 60 80 2C 00 74 | D 8E@ <E@ ` , t
03D0 | 5C 63 00 55 50 4F 34 F8 1A 44 00 1C 49 40 00 20 | \c UPO4 D I@
03E0 | 49 40 00 30 83 2C 00 0C 60 63 00 00 00 00 00 00 | I@ 0 , `c
03F0 | 00 00 00 5A 31 C0 83 EA 18 83 C2 18 8B 4A 04 85 | Z1 J
0400 | C9 74 0A 81 39 44 72 65 61 75 EE 89 D0 5A 59 85 | t 9Dreau ZY
0410 | C0 75 01 C3 56 57 53 89 C7 EB 47 5B 83 7B 04 00 | u VWS G[ {
0420 | 75 09 5B 5F 5E B8 01 00 00 00 C3 FF 33 8B 4F 0C | u [_^ 3 O
0430 | FF 11 89 C6 6A 04 FF 73 04 FF 33 8B 4F 08 FF 11 | j s 3 O
0440 | 31 C9 8B 13 8A 44 0B 08 88 04 0A 41 39 4B 04 75 | 1 D A9K u
0450 | F3 56 FF 73 04 FF 33 8D 5C 0B 08 8B 4F 08 FF 11 | V s 3 \ O
0460 | EB BA E8 B4 FF FF FF 00 DC 2D 00 09 00 00 00 83 | -
0470 | 3D B8 54 63 00 00 74 38 40 B8 53 00 08 00 00 00 | = Tc t8@ S
0480 | E4 00 06 00 73 C9 2D 00 70 C9 2D 00 33 01 00 00 | s - p - 3
0490 | C2 04 00 53 56 57 F6 05 B8 54 63 00 80 0F 84 1C | SVW Tc
04A0 | 01 00 00 8B 5C 24 10 0F B7 43 02 3D 00 10 00 00 | \$ C =
04B0 | 0F 8C 09 01 00 00 3D 50 1B 00 00 0F 8D FE 00 00 | =P
04C0 | 00 89 C7 E8 58 8A FD FF 50 0F B7 43 02 25 FF 0F | X P C %
04D0 | 00 00 6B C0 0C 03 05 90 7F 63 00 83 7B 0C 00 7C | k c { |
04E0 | 33 66 8B 4B 0A 66 2B 48 06 0F B7 C9 31 D2 39 D1 | 3f K f+H 1 9
04F0 | 0F 4C CA 89 4C 24 FC DB 44 24 FC D9 43 0C DE C9 | L L$ D$ C
0500 | DB 5C 24 FC 8B 4C 24 FC 31 D2 42 39 D1 0F 4C CA | \$ L$ 1 B9 L
0510 | 66 89 4B 04 0F B7 50 06 0F BF 73 04 0F B7 7B 0A | f K P s {
0520 | 01 F2 39 FA 7C 77 66 89 78 06 8B 10 F7 C2 00 08 | 9 |wf x
0530 | 00 00 0F 85 84 00 00 00 81 CA 00 08 00 00 89 10 |
0540 | 83 3C 24 00 74 76 52 83 EC 08 66 C7 04 24 0A 03 | <$ tvR f $
0550 | 66 8B 73 02 66 89 74 24 02 66 81 E6 FF 0F 66 89 | f s f t$ f f
0560 | 74 24 04 66 89 7C 24 06 89 E1 51 8B 1D 20 3E 72 | t$ f |$ Q >r
0570 | 00 85 DB 74 0A B8 0C 00 00 00 E8 21 FB FF FF C7 | t !
0580 | 05 E8 37 72 00 01 00 00 00 E8 22 16 00 00 C7 05 | 7r "
0590 | E8 37 72 00 00 00 00 00 83 C4 14 EB 22 31 FF 39 | 7r "1 9
05A0 | D2 0F 4C D7 66 89 50 06 89 C6 8B 04 24 85 C0 74 | L f P $ t
05B0 | 0B 89 C1 56 8B 11 FF 92 38 01 00 00 83 C4 04 5F | V 8 _
05C0 | 5E 5B C3 A0 9C 2A 00 13 00 00 00 66 83 B8 28 03 | ^[ * f (
05D0 | 00 00 02 75 03 31 C0 C3 E8 FF FF FF FF C3 EA 7C | u 1 |
05E0 | 2A 00 1A 00 00 00 66 89 C1 89 F8 E8 FF FF FF FF | * f
05F0 | EB 0E CC CC CC CC CC CC CC CC CC CC CC CC CC CC |
0600 | 00 00 00 00 00 00 00 00 00 00 00 00 F8 05 00 00 |
0610 | 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
0620 | 00 00 00 00 00 00 00 00 00 00 00 00 |
I 34886 2025-07-21 23:45:24 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=B3 flag=00)
0000 | B3 00 0C 00 46 25 E8 00 00 00 00 00 | F%
I 34886 2025-07-21 23:45:25 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
@@ -1559,7 +1566,8 @@ I 34886 2025-07-21 23:46:44 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127
I 34886 2025-07-21 23:46:44 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
0000 | 60 00 10 00 46 03 00 00 01 00 00 00 8C 10 00 00 | ` F
I 34886 2025-07-21 23:46:44 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
0000 | 60 00 10 00 E4 03 8C 10 66 00 00 00 AB 01 AB 01 | ` f
0000 | 60 00 14 00 E4 04 8C 10 66 00 00 00 AB 01 AB 01 | ` f
0010 | 00 00 80 BF |
I 34886 2025-07-21 23:46:44 - [C-3] E-08E damage incremented by 102; before hit, damage was 0 (cmd) or 0 (ene_st) and HP was 427/427
I 34886 2025-07-21 23:46:45 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
0000 | 60 00 10 00 0A 03 8C 10 8C 00 66 00 00 02 B0 20 | ` f
@@ -4305,7 +4313,8 @@ I 34886 2025-07-21 23:47:50 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127
I 34886 2025-07-21 23:47:51 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
0000 | 60 00 10 00 46 03 00 00 01 00 00 00 8E 10 00 00 | ` F
I 34886 2025-07-21 23:47:51 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
0000 | 60 00 10 00 E4 03 8E 10 76 00 00 00 AB 01 AB 01 | ` v
0000 | 60 00 14 00 E4 04 8E 10 76 00 00 00 AB 01 AB 01 | ` v
0010 | 00 00 80 BF |
I 34886 2025-07-21 23:47:51 - [C-3] E-090 damage incremented by 118; before hit, damage was 0 (cmd) or 0 (ene_st) and HP was 427/427
I 34886 2025-07-21 23:47:51 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
0000 | 60 00 10 00 0A 03 8E 10 8E 00 76 00 00 06 90 20 | ` v
@@ -4315,7 +4324,8 @@ I 34886 2025-07-21 23:47:52 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127
I 34886 2025-07-21 23:47:53 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
0000 | 60 00 10 00 46 03 00 00 01 00 00 00 8E 10 00 00 | ` F
I 34886 2025-07-21 23:47:53 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
0000 | 60 00 10 00 E4 03 8E 10 76 00 76 00 35 01 AB 01 | ` v v 5
0000 | 60 00 14 00 E4 04 8E 10 76 00 76 00 35 01 AB 01 | ` v v 5
0010 | 00 00 80 BF |
I 34886 2025-07-21 23:47:53 - [C-3] E-090 damage incremented by 118; before hit, damage was 118 (cmd) or 118 (ene_st) and HP was 309/427
I 34886 2025-07-21 23:47:53 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
0000 | 60 00 10 00 0A 03 8E 10 8E 00 EC 00 00 06 90 20 | `
@@ -4325,7 +4335,8 @@ I 34886 2025-07-21 23:47:53 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127
I 34886 2025-07-21 23:47:54 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
0000 | 60 00 10 00 46 03 00 00 01 00 00 00 8E 10 00 00 | ` F
I 34886 2025-07-21 23:47:54 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
0000 | 60 00 10 00 E4 03 8E 10 66 00 EC 00 BF 00 AB 01 | ` f
0000 | 60 00 14 00 E4 04 8E 10 66 00 EC 00 BF 00 AB 01 | ` f
0010 | 00 00 80 BF |
I 34886 2025-07-21 23:47:54 - [C-3] E-090 damage incremented by 102; before hit, damage was 236 (cmd) or 236 (ene_st) and HP was 191/427
I 34886 2025-07-21 23:47:54 - [Commands] Received from C-3 (Jess Lv.51) @ ip:127.0.0.1:54521 (version=XB_V3 command=60 flag=00)
0000 | 60 00 10 00 0A 03 8E 10 8E 00 52 01 00 02 B0 20 | ` R