Merge pull request #61 from wushin/Tile-Fixes-Map-Travel

Tile map fixes travel Sprite 1.5

1 files changed, 14 insertions, 14 deletions

diff --git a/maps/031-1.tmx b/maps/031-1.tmx
index 9bbe6e18..42764d36 100644
--- a/maps/031-1.tmx
+++ b/maps/031-1.tmx
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="128" height="148" tilewidth="32" tileheight="32">
  <properties>
-  <property name="music" value="The Mana World - Snow Village.ogg"/>
+  <property name="music" value="The Mana World - snow Village.ogg"/>
   <property name="name" value="Nivalis Port"/>
  </properties>
  <tileset firstgid="1" source="../tilesets/collision.tsx"/>
- <tileset firstgid="3" source="../tilesets/Snow.tsx"/>
- <tileset firstgid="259" source="../tilesets/Snow_x2.tsx"/>
- <tileset firstgid="275" source="../tilesets/Snow_tree_x3.tsx"/>
- <tileset firstgid="279" source="../tilesets/Snow_village.tsx"/>
- <tileset firstgid="535" source="../tilesets/Snow_ground.tsx"/>
- <tileset firstgid="612" source="../tilesets/Snow_x3.tsx"/>
+ <tileset firstgid="3" source="../tilesets/snow.tsx"/>
+ <tileset firstgid="259" source="../tilesets/snow_x2.tsx"/>
+ <tileset firstgid="275" source="../tilesets/snow_tree_x3.tsx"/>
+ <tileset firstgid="279" source="../tilesets/snow_village.tsx"/>
+ <tileset firstgid="535" source="../tilesets/snow_ground.tsx"/>
+ <tileset firstgid="612" source="../tilesets/snow_x3.tsx"/>
  <tileset firstgid="628" source="../tilesets/snow_docks.tsx"/>
- <layer name="Ground" width="128" height="148">
+ <layer name="Ground1" width="128" height="148">
   <data encoding="csv">
 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,148,86,86,86,86,86,86,86,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,8,8,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,
 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,148,148,148,148,148,148,86,86,86,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,8,8,8,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,
@@ -271,9 +271,9 @@
 32,33,34,147,0,0,0,0,0,0,164,164,164,164,164,164,164,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,164,164,165,181,0,134,165,181,180,181,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 32,33,34,147,0,0,0,0,179,180,180,180,180,180,180,180,180,163,164,164,164,164,164,164,135,0,0,0,0,0,0,0,0,134,164,164,164,164,164,165,180,180,180,181,197,0,149,181,181,180,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,87,88,89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 32,33,34,147,0,0,0,0,179,180,180,180,180,180,180,180,180,179,180,180,180,180,180,180,163,164,164,164,164,164,164,164,164,165,180,180,180,180,180,181,180,180,180,181,0,134,165,181,181,196,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,87,43,0,41,88,89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-32,33,34,147,0,0,0,0,195,196,196,196,196,196,196,196,196,179,180,180,180,180,180,180,179,180,180,180,180,180,180,180,180,181,180,180,180,180,180,181,196,196,196,197,0,149,181,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,87,88,88,43,0,0,0,0,25,0,0,643,0,0,0,0,0,0,0,0,643,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-32,33,34,163,164,164,164,164,164,164,164,164,135,0,0,0,0,195,196,196,196,196,196,196,179,180,180,180,180,180,180,180,180,181,196,196,196,196,196,197,0,0,134,164,164,165,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,87,88,88,88,43,0,0,0,0,0,0,0,41,89,0,659,0,0,0,0,0,0,0,0,659,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-32,33,34,179,180,180,180,180,180,180,180,180,147,0,0,0,0,0,0,0,0,0,0,0,195,196,196,196,196,196,196,196,196,197,0,0,0,134,164,164,164,164,165,180,180,181,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,87,88,43,0,0,0,0,0,0,0,0,0,0,0,3,121,0,675,0,0,0,0,0,0,0,0,675,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,33,34,147,0,0,0,0,195,196,196,196,196,196,196,196,196,179,180,180,180,180,180,180,179,180,180,180,180,180,180,180,180,181,180,180,180,180,180,181,196,196,196,197,0,149,181,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,87,88,88,43,0,0,0,0,25,0,0,643,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,33,34,163,164,164,164,164,164,164,164,164,135,0,0,0,0,195,196,196,196,196,196,196,179,180,180,180,180,180,180,180,180,181,196,196,196,196,196,197,0,0,134,164,164,165,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,87,88,88,88,43,0,0,0,0,0,0,0,41,89,0,659,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,33,34,179,180,180,180,180,180,180,180,180,147,0,0,0,0,0,0,0,0,0,0,0,195,196,196,196,196,196,196,196,196,197,0,0,0,134,164,164,164,164,165,180,180,181,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,87,88,43,0,0,0,0,0,0,0,0,0,0,0,3,121,0,675,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 32,33,34,179,180,180,180,180,180,180,180,180,163,164,164,164,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,164,165,180,180,180,180,181,180,180,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,197,27,0,0,0,0,0,0,0,0,0,0,0,0,0,634,647,648,649,647,648,649,647,648,649,647,648,649,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 32,33,34,179,180,180,180,180,180,180,180,180,179,180,180,180,163,164,164,164,135,0,0,0,0,0,0,0,134,164,164,164,164,164,165,180,180,181,180,180,180,180,181,180,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,87,43,0,0,0,0,0,0,0,0,0,0,0,0,0,650,663,664,665,663,664,665,663,664,665,663,664,665,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 48,49,50,195,196,196,196,196,196,196,196,196,179,180,180,180,179,180,180,180,163,164,164,164,164,164,164,164,165,180,180,180,180,180,181,180,180,181,180,180,180,180,181,196,196,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,197,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,650,679,680,681,679,680,681,679,680,681,679,680,681,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -620,7 +620,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,276,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,275,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over" width="128" height="148">
+ <layer name="Over1" width="128" height="148">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1033,7 +1033,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1076,7 +1076,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup name="Objects" width="0" height="0" visible="0">
+ <objectgroup name="Objects" visible="0">
   <object name="To Nivalis" type="warp" x="1184" y="1760" width="32" height="32">
    <properties>
     <property name="dest_map" value="020-1"/>