diff options
| author | Wushin <pasekei@gmail.com> | 2015-05-06 13:02:50 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-05-06 13:02:50 -0500 |
| commit | 535f89f055ce211f483e09f8680f10b14d87b92d (patch) | |
| tree | 3bd3937dcb44f8707fbe73ed7d06f0b4db90943e | |
| parent | 85edc4773feebcf492be2c7e7684fab57f49b465 (diff) | |
| parent | 7c46e351a2f2cf99e9d26ee16729695530427083 (diff) | |
| download | tmwa-535f89f055ce211f483e09f8680f10b14d87b92d.tar.gz tmwa-535f89f055ce211f483e09f8680f10b14d87b92d.tar.bz2 tmwa-535f89f055ce211f483e09f8680f10b14d87b92d.tar.xz tmwa-535f89f055ce211f483e09f8680f10b14d87b92d.zip | |
Merge pull request #17 from Rawng/mobhp
Send mob max_hp and hp to client in packet 0x007b
| -rw-r--r-- | src/map/clif.cpp | 2 | ||||
| -rwxr-xr-x | tools/protocol.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 2c65d44..243ffaf 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -807,6 +807,8 @@ void clif_mob007b(dumb_ptr<mob_data> md, Buffer& buf) fixed_7b.mob_class = md->mob_class; // snip: stuff for monsters disguised as PCs fixed_7b.tick_and_maybe_part_of_guild_emblem = gettick(); + fixed_7b.max_hp = md->stats[mob_stat::MAX_HP]; + fixed_7b.hp = md->hp; fixed_7b.pos2.x0 = md->bl_x; fixed_7b.pos2.y0 = md->bl_y; diff --git a/tools/protocol.py b/tools/protocol.py index db14f6d..7547bc6 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'), |