Merge pull request #443 from HoraK-FDF/map_031-1

fixed map 031-1 and updated its minimap

1 files changed, 23 insertions, 22 deletions

diff --git a/maps/031-1.tmx b/maps/031-1.tmx
index 992a220e..50034935 100644
--- a/maps/031-1.tmx
+++ b/maps/031-1.tmx
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="128" height="148" tilewidth="32" tileheight="32" nextobjectid="8">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="128" height="148" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="8">
  <properties>
   <property name="music" value="snow-village.ogg"/>
   <property name="name" value="Nivalis Port"/>
   <property name="overlay0image" value="graphics/images/ambient/warning.png"/>
+  <property name="overlay0mask" value="2"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="1.2"/>
   <property name="overlay0scrollY" value="0.0"/>
-  <property name="overlay0mask" value="2"/>
  </properties>
  <tileset firstgid="1" source="../tilesets/collision.tsx"/>
  <tileset firstgid="3" source="../tilesets/snow.tsx"/>
@@ -19,7 +19,8 @@
  <tileset firstgid="616" source="../tilesets/snow_docks.tsx"/>
  <tileset firstgid="776" source="../tilesets/snow_village_x4.tsx"/>
  <tileset firstgid="786" source="../tilesets/snow_village_x3.tsx"/>
- <layer name="Ground1" width="128" height="148">
+ <tileset firstgid="796" source="../tilesets/snow_x4.tsx"/>
+ <layer id="1" 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,
@@ -98,9 +99,9 @@
 86,86,86,86,86,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,86,86,86,86,180,148,148,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,560,560,560,8,8,8,8,8,8,8,8,8,560,560,560,560,8,8,8,8,560,560,560,560,557,581,599,551,565,577,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
 86,86,86,86,86,86,86,86,86,86,86,86,86,69,69,69,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,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,560,560,560,560,8,8,8,8,8,8,8,560,560,560,560,560,8,8,8,8,8,560,560,560,560,546,599,562,539,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
 86,86,86,86,86,86,86,86,86,86,86,86,86,69,69,69,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,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,560,560,560,560,8,8,8,8,8,8,8,560,560,560,560,560,8,8,8,8,8,560,560,560,560,557,581,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
-69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,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,560,560,560,560,560,8,8,8,8,8,8,8,560,560,560,8,8,8,8,8,8,8,8,560,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
-69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,86,86,86,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,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,560,560,560,560,560,8,8,8,8,8,8,8,8,8,8,348,348,348,8,8,8,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
-69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,86,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,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,348,348,348,560,560,560,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
+69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,8,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,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,560,560,560,560,560,8,8,8,8,8,8,8,560,560,560,8,8,8,8,8,8,8,8,560,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
+69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,8,8,8,8,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,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,560,560,560,560,560,8,8,8,8,8,8,8,8,8,8,348,348,348,8,8,8,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
+69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,86,8,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,86,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,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,348,348,348,560,560,560,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
 69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,86,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,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,348,348,348,560,560,560,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
 69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,86,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,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,560,560,560,560,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
 69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,86,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,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,560,560,8,8,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
@@ -171,7 +172,7 @@
 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,148,148,148,148,148,86,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,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,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,555,555,555,555,555,555,555,555
 </data>
  </layer>
- <layer name="Ground2" width="128" height="148">
+ <layer id="2" name="Ground2" 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,105,0,0,0,0,0,0,0,149,150,132,133,0,0,0,0,150,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,133,0,0,0,103,0,0,0,0,0,0,0,0,41,89,0,0,0,147,0,0,0,0,0,0,0,0,163,164,135,0,0,0,0,0,0,147,0,0,149,0,0,0,0,147,0,0,0,0,0,0,0,0,
 11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,105,0,0,0,0,0,0,134,165,0,0,150,132,132,132,133,0,150,132,132,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,133,0,0,119,120,120,11,0,0,0,0,0,0,41,89,0,0,163,135,0,0,0,0,0,0,0,179,180,163,135,0,0,0,0,0,147,0,0,150,133,0,0,0,147,0,0,0,0,0,0,0,0,
@@ -250,14 +251,14 @@
 0,0,0,0,35,93,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,95,35,0,0,0,0,0,0,0,0,0,0,0,195,147,0,0,0,0,0,0,0,0,0,0,150,133,196,196,197,0,0,0,0,0,0,0,0,0,0,0,0,149,181,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,9,121,0,0,0,0,103,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,54,52,52,52,52,52,52,52,53,16,17,18,54,52,52,52,52,52,52,52,38,0,0,0,0,0,0,0,0,0,0,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,0,149,197,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,103,0,0,0,0,0,105,0,0,0,0,0,103,0,0,41,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,0,0,0,0,0,0,0,0,32,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,149,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,105,0,0,0,315,287,348,348,348,286,317,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-17,17,17,17,17,17,17,17,17,17,17,17,17,14,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,149,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,103,0,0,0,0,41,89,0,0,331,305,348,348,348,304,333,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,
-33,33,33,33,33,33,33,33,33,33,33,33,33,33,31,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,149,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,119,11,0,0,0,0,41,88,88,347,407,408,409,348,348,349,11,41,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,
-33,33,33,33,33,33,33,33,33,33,33,33,33,31,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,134,165,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,0,363,375,376,377,348,348,365,103,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+17,17,17,17,17,17,17,17,17,17,17,17,17,14,33,34,0,0,0,87,88,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,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,103,0,0,0,0,41,89,0,0,331,305,348,348,348,304,333,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,
+33,33,33,33,33,33,33,33,33,33,33,33,33,33,31,50,0,0,0,103,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,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,0,149,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,119,11,0,0,0,0,41,88,88,347,407,408,409,348,348,349,11,41,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,
+33,33,33,33,33,33,33,33,33,33,33,33,33,31,50,0,0,0,0,119,120,120,121,0,0,0,0,0,0,0,0,0,0,0,0,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,134,165,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,0,363,375,376,377,348,348,365,103,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,181,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,363,391,392,393,364,364,365,103,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,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,149,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,0,105,0,0,0,0,103,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,142,143,0,0,0,0,0,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,134,165,181,181,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,103,0,0,0,0,0,0,105,0,0,87,88,26,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,157,158,159,0,0,0,0,0,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,134,165,181,181,181,3,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,41,88,88,26,0,0,9,121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,134,164,165,181,181,181,181,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,103,0,0,0,0,0,0,0,0,0,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,134,165,181,181,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,103,0,0,0,0,0,0,105,0,0,87,88,26,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,134,165,181,181,181,3,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,41,88,88,26,0,0,9,121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,44,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,134,164,165,181,181,181,181,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,103,0,0,0,0,0,0,0,0,0,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,134,164,165,180,181,181,181,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,103,0,0,0,0,0,0,0,0,0,0,9,121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 33,33,33,33,33,33,33,33,33,33,33,33,33,34,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,0,0,0,0,0,134,165,180,181,180,181,181,181,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,103,0,0,0,0,0,0,0,0,0,9,121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,181,0,0,0,0,0,149,181,180,181,180,181,181,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,0,9,120,121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -323,7 +324,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,181,147,148,148,148,148,148,148,149,119,11,0,0,0,0,0,9,120,121,148,119,11,0,0,0,0,41,89,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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
 </data>
  </layer>
- <layer name="Ground3" width="128" height="148">
+ <layer id="3" name="Ground3" 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,
@@ -475,7 +476,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="Fringe" width="128" height="148">
+ <layer id="4" name="Fringe" 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,275,0,0,275,0,0,0,0,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,0,0,0,0,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,0,0,0,0,276,0,275,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,275,0,0,0,275,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,275,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,275,0,0,0,275,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,
@@ -560,8 +561,8 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,776,0,0,0,0,0,0,0,777,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,613,614,615,0,0,0,0,0,0,0,0,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,796,0,797,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -627,7 +628,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="Over1" width="128" height="148">
+ <layer id="5" 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,
@@ -779,7 +780,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="Over2" width="128" height="148">
+ <layer id="6" name="Over2" 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,
@@ -931,7 +932,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="Over3" width="128" height="148">
+ <layer id="7" name="Over3" 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,
@@ -1083,7 +1084,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="Collision" width="128" height="148">
+ <layer id="8" name="Collision" width="128" height="148">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1235,7 +1236,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">
+ <objectgroup id="9" name="Objects" visible="0">
   <object id="1" name="To Nivalis" type="warp" x="1184" y="1760" width="32" height="32">
    <properties>
     <property name="dest_map" value="020-1"/>