summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRawng <rawng.github@gmail.com>2015-04-26 14:05:47 -0400
committerRawng <rawng.github@gmail.com>2015-04-26 14:05:47 -0400
commit5fc7747131ced6b764d5b6b87657150cc63fd1aa (patch)
tree5f125b0cc90935c0eb77349522e0e5906664b373 /tools
parente6ee7b3f99935a594e6462472fdc9d075408da0f (diff)
downloadtmwa-5fc7747131ced6b764d5b6b87657150cc63fd1aa.tar.gz
tmwa-5fc7747131ced6b764d5b6b87657150cc63fd1aa.tar.bz2
tmwa-5fc7747131ced6b764d5b6b87657150cc63fd1aa.tar.xz
tmwa-5fc7747131ced6b764d5b6b87657150cc63fd1aa.zip
Fix merge conflicts
Diffstat (limited to 'tools')
-rwxr-xr-xtools/protocol.py22
1 files changed, 21 insertions, 1 deletions
diff --git a/tools/protocol.py b/tools/protocol.py
index 5d4dc37..83c007b 100755
--- a/tools/protocol.py
+++ b/tools/protocol.py
@@ -4623,7 +4623,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',