From c820f46a60b46f14485ae1f52ef06676501db2f8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 3 Oct 2015 18:20:14 +0300
Subject: Add some more collisions to test map and allow npc4 swim

---
 maps/test.tmx | 4 ++--
 npcs.xml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/maps/test.tmx b/maps/test.tmx
index 7deebd97..e2910907 100644
--- a/maps/test.tmx
+++ b/maps/test.tmx
@@ -34,7 +34,7 @@
    <property name="Mask" value="4"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJzt1rsNgDAMBcB4BManZROmYQ1Eh5DCp8GEXHGNK9uvsKOUEgAA0KHpRHZvPartXR7t5DFUZM/yB/u9Lzfz4J08rupz3JM9U8vcj2/xXwEAALAZ47nsngEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI5WixFGvg==
+   eJzt1rENgCAQBVAYwfFt3cRpXMPWmICQGC/IK15Ddfd/COSUUgYAgAltFdGzzaiUuz7G6WMpiN7lD665H4198E0fT+d7bhO908jeeD9qfwL3rL8POQIAALDmftEzAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3J1WD0vG
   </data>
  </layer>
  <layer name="Fringe" width="100" height="100">
@@ -44,7 +44,7 @@
  </layer>
  <layer name="Collision" width="100" height="100">
   <data encoding="base64" compression="zlib">
-   eJztw7EJADAIADDxBOn/t/aFOghSEkgEAAAAABMq3wIAAAD85GQ/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADANhfk1gHn
+   eJztw7EJACAMALDSE9T/b/UDaQfRIYFEAAAAAHDDyFremnkOAAAA9KzsBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+M0G3dwCjw==
   </data>
  </layer>
  <layer name="Heights" width="100" height="100">
diff --git a/npcs.xml b/npcs.xml
index 1e8e0fa9..5a7b055a 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -427,7 +427,7 @@ IDs 990-999 = Special
         <menu name="Sell" command="sell 'NAME'"/>
         <menu name="Poke" command="w2 NPC:'NAME' poke"/>
     </npc>
-    <npc id="801">
+    <npc id="801" walkType="walkswim">
         <!-- npc with player look. -->
         <sprite>races/human-male.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
-- 
cgit v1.2.3-70-g09d2