diff options
| author | gumi <git@gumi.ca> | 2018-03-04 16:56:27 -0500 |
|---|---|---|
| committer | gumi <git@gumi.ca> | 2018-03-04 16:56:27 -0500 |
| commit | c58cbd9adea1c87da56d36eea222aa8932dc3835 (patch) | |
| tree | 9662b5fce4e20b50cb385d40364f8ed5c0c66bd8 | |
| parent | 3a1e762a4b02522fa88989158ebe02f28f73f22c (diff) | |
| download | tmwa-c58cbd9adea1c87da56d36eea222aa8932dc3835.tar.gz tmwa-c58cbd9adea1c87da56d36eea222aa8932dc3835.tar.bz2 tmwa-c58cbd9adea1c87da56d36eea222aa8932dc3835.tar.xz tmwa-c58cbd9adea1c87da56d36eea222aa8932dc3835.zip | |
send base level where appropriate
| -rw-r--r-- | src/map/clif.cpp | 5 | ||||
| -rwxr-xr-x | tools/protocol.py | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 9f837db..4aad3e4 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -680,6 +680,7 @@ void clif_set0078_main_1d8(dumb_ptr<map_session_data> sd, Buffer& buf) fixed_1d8.pos.dir = sd->dir; fixed_1d8.gm_bits = pc_isGM(sd).get_public_word(); fixed_1d8.dead_sit = sd->state.dead_sit; + fixed_1d8.base_level = sd->status.base_level; fixed_1d8.unused = 0; buf = create_fpacket<0x01d8, 54>(fixed_1d8); @@ -733,7 +734,8 @@ void clif_set0078_alt_1d9(dumb_ptr<map_session_data> sd, Buffer& buf) fixed_1d8.pos.y = sd->bl_y; fixed_1d8.pos.dir = sd->dir; fixed_1d8.gm_bits = pc_isGM(sd).get_public_word(); - fixed_1d8.unused = 0; + fixed_1d8.dead_sit = sd->state.dead_sit; + fixed_1d8.base_level = sd->status.base_level; buf = create_fpacket<0x01d9, 53>(fixed_1d8); } @@ -790,6 +792,7 @@ void clif_set007b(dumb_ptr<map_session_data> sd, Buffer& buf) fixed_1da.pos2.y1 = sd->to_y; fixed_1da.gm_bits = pc_isGM(sd).get_public_word(); fixed_1da.five = 5; + fixed_1da.base_level = sd->status.base_level; fixed_1da.unused = 0; buf = create_fpacket<0x01da, 60>(fixed_1da); diff --git a/tools/protocol.py b/tools/protocol.py index 0c64e6f..1001158 100755 --- a/tools/protocol.py +++ b/tools/protocol.py @@ -4447,7 +4447,8 @@ def build_context(): at(46, pos1, 'pos'), at(49, u16, 'gm bits'), at(51, u8, 'dead sit'), - at(52, u16, 'unused'), + at(52, u8, 'base level'), + at(53, u8, 'unused'), ], fixed_size=54, pre=[FINISH, GM, MAGIC, SCRIPT, TIMER, 0x007d, 0x0085, 0x0089, 0x008c, 0x009f, 0x00a2, 0x00a7, 0x00a9, 0x00ab, 0x00b2, 0x00b8, 0x00b9, 0x00bb, 0x00c8, 0x00c9, 0x00e4, 0x00e6, 0x00e8, 0x00eb, 0x00ed, 0x00ef, 0x00f3, 0x00f5, 0x00f7, 0x0112, 0x0143, 0x0146, 0x01d5, 0x2afd, 0x2b0d], @@ -4487,7 +4488,8 @@ def build_context(): at(45, sex, 'sex'), at(46, pos1, 'pos'), at(49, u16, 'gm bits'), - at(51, u16, 'unused'), + at(51, u8, 'dead sit'), + at(52, u8, 'base level'), ], fixed_size=53, pre=[0x007d], @@ -4529,7 +4531,8 @@ def build_context(): at(50, pos2, 'pos2'), at(55, u16, 'gm bits'), at(57, u8, 'five'), - at(58, u16, 'unused'), + at(58, u8, 'base level'), + at(59, u8, 'unused'), ], fixed_size=60, pre=[FINISH, GM, MAGIC, SCRIPT, TIMER, 0x007d, 0x0085, 0x0089, 0x008c, 0x009f, 0x00a2, 0x00a7, 0x00a9, 0x00ab, 0x00b2, 0x00b8, 0x00b9, 0x00bb, 0x00c8, 0x00c9, 0x00e4, 0x00e6, 0x00e8, 0x00eb, 0x00ed, 0x00ef, 0x00f3, 0x00f5, 0x00f7, 0x0112, 0x0143, 0x0146, 0x01d5, 0x2afd, 0x2b0d], |