diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/config.py | 8 | ||||
| -rwxr-xr-x | tools/protocol.py | 28 |
2 files changed, 23 insertions, 13 deletions
diff --git a/tools/config.py b/tools/config.py index a32e8ca..aeb4e99 100755 --- a/tools/config.py +++ b/tools/config.py @@ -419,7 +419,6 @@ def build_config(): admin_realm = rv.realm('src/admin') char_realm = rv.realm('src/char') map_realm = rv.realm('src/map') - monitor_realm = rv.realm('src/monitor') # confs login_conf = login_realm.conf() @@ -434,8 +433,6 @@ def build_config(): map_conf = map_realm.conf() battle_conf = map_realm.conf('battle') - monitor_conf = monitor_realm.conf() - # headers cstdint_sys = SystemHeader('cstdint') vector_sys = SystemHeader('vector') @@ -677,11 +674,6 @@ def build_config(): battle_conf.opt('itemheal_regeneration_factor', i32, '1') battle_conf.opt('mob_splash_radius', i32, '-1', min='-1') - monitor_conf.opt('login_server', RString, lit('./login-server')) - monitor_conf.opt('char_server', RString, lit('./char-server')) - monitor_conf.opt('map_server', RString, lit('./map-server')) - monitor_conf.opt('workdir', RString, '{}') # initialized specially - return rv def main(): diff --git a/tools/protocol.py b/tools/protocol.py index db14f6d..688821f 100755 --- a/tools/protocol.py +++ b/tools/protocol.py @@ -2297,10 +2297,8 @@ def build_context(): at(30, u16, 'unused head mid or maybe part of guild id'), at(32, u16, 'unused hair color'), at(34, u16, 'unused clothes color'), - at(36, u16, 'unused 1'), - at(38, u16, 'unused 2'), - at(40, u16, 'unused 3'), - at(42, u16, 'unused 4'), + at(36, i32, 'max_hp'), + at(40, i32, 'hp'), at(44, u16, 'unused 5'), at(46, u16, 'unused zero 1'), at(48, u8, 'unused zero 2'), @@ -4655,7 +4653,27 @@ def build_context(): # 0x0222 define='CMSG_CHAT_MESSAGE2', # 0x0223 define='SMSG_BEING_CHAT2', # 0x0224 define='SMSG_PLAYER_CHAT2', - # 0x0225 define='SMSG_BEING_MOVE3', + map_user.s(0x0225, 'being move 3', + define='SMSG_BEING_MOVE3', + head=[ + at(0, u16, 'packet id'), + at(2, u16, 'packet length'), + at(4, block_id, 'id'), + at(8, interval16, 'speed'), + at(10, u16, 'x position'), + at(12, u16, 'y position'), + ], + head_size=14, + repeat=[ + at(0, dir, 'move'), + ], + repeat_size=1, + pre=[NOTHING], + post=[PRETTY], + desc=''' + Send mob walkpath data to client + ''', + ) # 0x0226 define='SMSG_MAP_MASK', # 0x0227 define='SMSG_MAP_MUSIC', # 0x0228 define='SMSG_NPC_CHANGETITLE', |