From 5fc7747131ced6b764d5b6b87657150cc63fd1aa Mon Sep 17 00:00:00 2001
From: Rawng <rawng.github@gmail.com>
Date: Sun, 26 Apr 2015 14:05:47 -0400
Subject: Fix merge conflicts

---
 tools/protocol.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'tools/protocol.py')

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',
-- 
cgit v1.2.3-60-g2f50