diff options
Diffstat (limited to 'tools/protocol.py')
| -rwxr-xr-x | tools/protocol.py | 85 |
1 files changed, 44 insertions, 41 deletions
diff --git a/tools/protocol.py b/tools/protocol.py index f13d627..86b625f 100755 --- a/tools/protocol.py +++ b/tools/protocol.py @@ -1456,9 +1456,6 @@ def build_context(): #md5_native = md5_h.native('md5_native') #SaltString = md5_h.native('SaltString') - VERSION_2 = login_th.native('VERSION_2') - - Position1 = clif_th.native('Position1') NetPosition1 = clif_th.network('NetPosition1') Position2 = clif_th.native('Position2') @@ -1588,8 +1585,6 @@ def build_context(): ] ) - version_2 = ctx.enum(VERSION_2, u8) - stats6 = ctx.struct( 'Stats6', [ @@ -1966,7 +1961,7 @@ def build_context(): at(2, u32, 'unknown'), at(6, account_name, 'account name'), at(30, account_pass, 'account pass'), - at(54, version_2, 'version 2 flags'), + at(54, u8, 'version'), ], fixed_size=55, pre=[HUMAN, 0x7531], @@ -2249,27 +2244,30 @@ def build_context(): at(10, opt2, 'opt2'), at(12, option, 'option'), at(14, species, 'species'), - at(16, u16, 'unused hair style'), - at(18, u16, 'unused weapon'), - at(20, u16, 'unused head bottom or species again'), - at(22, u16, 'unused shield or part of guild emblem'), - at(24, u16, 'unused head top or unused part of guild emblem'), - at(26, u16, 'unused head mid or part of guild id'), - at(28, u16, 'unused hair color or part of guild id'), - at(30, u16, 'unused clothes color'), - at(32, u16, 'unused 1'), - at(34, u16, 'unused 2'), - at(36, pos1, 'unused pos again'), - at(39, u8, 'unused 4b'), - at(40, u16, 'unused 5'), - at(42, u16, 'unused zero 1'), - at(44, u8, 'unused zero 2'), - at(45, u8, 'unused sex'), + at(16, u8, 'hair style'), + at(17, u8, 'look'), + at(18, u16, 'weapon'), + at(20, u16, 'head bottom'), + at(22, u16, 'shield'), + at(24, u16, 'head top'), + at(26, u16, 'head mid'), + at(28, u8, 'hair color'), + at(29, u8, 'unused 1'), + at(30, u16, 'shoes or clothes color'), + at(32, u16, 'gloves or part of hp'), + at(34, u16, 'part of guild id or part of hp'), + at(36, u16, 'part of guild id or part of max hp'), + at(38, u16, 'guild emblem or part of max hp'), + at(40, u16, 'manner'), + at(42, u16, 'opt3'), + at(44, u8, 'karma or attack range'), + at(45, sex, 'sex'), at(46, pos1, 'pos'), - at(49, u8, 'five1'), - at(50, u8, 'five2'), - at(51, u8, 'zero'), - at(52, u16, 'level'), + at(49, u8, 'unused 2'), + at(50, u8, 'unused 3'), + at(51, u8, 'unused 4'), + at(52, u8, 'unused 5'), + at(53, u8, 'unused 6'), ], fixed_size=54, pre=[BOOT, FINISH, GM, MAGIC, SCRIPT, TIMER, 0x007d, 0x0085, 0x0089, 0x008c, 0x009f, 0x00b8, 0x00b9, 0x00e6, 0x00f7, 0x0143, 0x0146, 0x01d5], @@ -2288,26 +2286,31 @@ def build_context(): at(10, opt2, 'opt2'), at(12, option, 'option'), at(14, species, 'mob class'), - at(16, u16, 'unused hair style'), + at(16, u8, 'hair style'), + at(17, u8, 'look'), at(18, u16, 'unused weapon'), at(20, u16, 'unused head bottom'), - at(22, tick32, 'tick and maybe part of guild emblem'), - at(26, u16, 'unused shield or maybe part of guild emblem'), - at(28, u16, 'unused head top or maybe part of guild id'), - at(30, u16, 'unused head mid or maybe part of guild id'), - at(32, u16, 'unused hair color'), + at(22, tick32, 'tick'), + at(26, u16, 'unused shield'), + at(28, u16, 'unused head top'), + at(30, u16, 'unused head mid'), + at(32, u8, 'unused hair color'), + at(33, u8, 'unused 1'), at(34, u16, 'unused clothes color'), - 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'), + at(36, u16, 'gloves or part of hp'), + at(38, u16, 'part of guild id or part of hp'), + at(40, u16, 'part of guild id or part of max hp'), + at(42, u16, 'guild emblem or part of max hp'), + at(44, u16, 'manner'), + at(46, u16, 'opt3'), + at(48, u8, 'karma or attack range'), at(49, u8, 'unused sex'), at(50, pos2, 'pos2'), - at(55, u8, 'zero'), - at(56, u8, 'five1'), - at(57, u8, 'five2'), - at(58, u16, 'level'), + at(55, u8, 'unused 2'), + at(56, u8, 'unused 3'), + at(57, u8, 'unused 4'), + at(58, u8, 'unused 5'), + at(59, u8, 'unused 6'), ], fixed_size=60, pre=[FINISH, GM, MAGIC, SCRIPT, TIMER, 0x007d, 0x0085, 0x0089, 0x008c, 0x009f], |