Spit out Nivalis Gift Shop so I can add Agostine already

1 files changed, 17 insertions, 18 deletions

diff --git a/maps/020-1.tmx b/maps/020-1.tmx
index cf8c9b1a..8549d027 100644
--- a/maps/020-1.tmx
+++ b/maps/020-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="128" height="148" tilewidth="32" tileheight="32" nextobjectid="28">
+<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-down" width="128" height="148" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="28">
  <properties>
   <property name="author" value="The Mana World Team, Jesusalva"/>
   <property name="license" value="GPL v2+"/>
@@ -22,8 +22,8 @@
   <property name="overlay2scrollX" value="0.3"/>
   <property name="overlay2scrollY" value="0.2"/>
   <property name="overlay3image" value="graphics/images/ambient/night.png"/>
-  <property name="overlay3mask" value="8"/>
   <property name="overlay3keepratio" value="true"/>
+  <property name="overlay3mask" value="8"/>
   <property name="overlay4image" value="graphics/images/ambient/rain.png"/>
   <property name="overlay4mask" value="16"/>
   <property name="overlay4parallax" value="1.0"/>
@@ -50,7 +50,7 @@
  <tileset firstgid="623" source="../graphics/tilesets/snow_village_x3.tsx"/>
  <tileset firstgid="633" source="../graphics/tilesets/snow_village_x4.tsx"/>
  <tileset firstgid="643" source="../graphics/tilesets/snow_x4.tsx"/>
- <layer name="Ground1" width="128" height="148">
+ <layer id="1" name="Ground1" width="128" height="148">
   <data encoding="csv">
 93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,155,93,93,93,93,93,15,15,15,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,155,155,93,93,93,93,93,93,93,93,93,93,93,93,93,
 155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,155,93,93,93,93,93,155,93,93,93,93,93,15,15,15,15,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,93,93,93,93,93,93,93,93,93,93,93,93,93,93,155,155,155,155,155,155,155,93,93,93,93,93,93,93,93,93,
@@ -202,7 +202,7 @@
 93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,15,15,15,15,15,15,15,15,93,93,77,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,93,155,155,155,155,155,155,93,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,93,93,93,93,93,93,93,93,93,93
 </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,0,0,0,141,172,0,0,0,0,0,0,0,0,0,0,154,0,0,0,0,0,94,95,96,0,0,0,0,0,186,154,0,0,0,0,0,0,0,0,0,126,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,112,0,0,0,0,0,0,0,156,157,139,140,0,0,0,0,157,140,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,156,204,0,0,0,0,0,0,0,0,0,0,154,0,0,0,0,0,110,0,48,96,0,0,0,0,202,170,142,0,0,0,0,0,0,0,0,0,126,127,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,112,0,0,0,0,0,0,141,172,0,0,157,139,139,139,140,0,157,139,139,140,0,0,0,0,0,0,0,0,0,0,
@@ -354,7 +354,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,156,203,203,203,203,204,156,204,0,0,0,0,0,0,0,0,0,0,0,0,0,0,126,18,0,0,16,127,127,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,186,188,154,155,155,155,155,155,155,156,0,0,0,0,0,0,0,16,127,128,77,126,0,0,0,0,0,48,96,154,0,0,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,
@@ -506,7 +506,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="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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,282,0,0,282,0,0,0,0,0,0,0,0,0,0,0,282,0,0,0,
 282,0,0,0,0,282,0,0,0,0,282,0,0,0,0,0,0,282,0,0,0,0,0,0,0,282,0,0,0,0,0,0,0,282,0,0,282,0,282,0,0,0,0,0,0,0,282,0,0,0,0,0,283,0,0,0,0,0,0,0,0,0,282,0,0,0,0,0,0,0,0,0,283,0,0,0,0,0,0,0,283,0,282,0,0,0,0,0,0,0,0,283,0,0,0,0,0,0,0,282,0,0,0,282,0,0,0,0,0,0,0,0,0,0,283,0,0,0,0,282,0,0,0,0,0,0,0,0,
@@ -658,7 +658,7 @@
 0,0,0,0,0,0,282,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,126,18,283,0,0,0,283,16,127,0,155,126,18,0,282,0,0,48,202,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,
@@ -810,7 +810,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,
@@ -962,7 +962,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,186,188,0,0,0,0,0,0,0,0,0,0,0,0,0,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,
@@ -1114,7 +1114,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" visible="0">
+ <layer id="8" name="Collision" width="128" height="148" visible="0">
   <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,
@@ -1266,7 +1266,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>
- <layer name="Heights" width="128" height="148" visible="0">
+ <layer id="9" name="Heights" width="128" height="148" visible="0">
   <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,
@@ -1418,7 +1418,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>
- <objectgroup name="Warps">
+ <objectgroup id="10" name="Warps">
   <object id="2" name="To Nivalis Bank" type="warp" x="1504" y="1536" width="32" height="32">
    <properties>
     <property name="dest_map" value="020-2"/>
@@ -1487,14 +1487,13 @@
   </object>
   <object id="27" name="To Nivalis Gift Shop" type="warp" x="1056" y="3008" width="32" height="32">
    <properties>
-    <property name="dest_map" value="020-2"/>
-    <property name="dest_x" value="72"/>
-    <property name="dest_y" value="70"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="020-6"/>
+    <property name="dest_x" value="30"/>
+    <property name="dest_y" value="32"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup color="#ff007f" name="Particles" visible="0">
+ <objectgroup color="#ff007f" id="11" name="Particles" visible="0">
   <object id="10" name="graphics/particles/whirlpool.particle.xml" type="particle_effect" x="2000" y="4016"/>
   <object id="11" name="graphics/particles/whirlpool.particle.xml" type="particle_effect" x="2032" y="4016"/>
   <object id="12" name="graphics/particles/whirlpool.particle.xml" type="particle_effect" x="2000" y="4048"/>
@@ -1510,7 +1509,7 @@
   <object id="22" name="graphics/particles/whirlpool.particle.xml" type="particle_effect" x="2032" y="4112"/>
   <object id="23" name="graphics/particles/whirlpool.particle.xml" type="particle_effect" x="2064" y="4112"/>
  </objectgroup>
- <objectgroup color="#ff7f00" name="Spawns" visible="0">
+ <objectgroup color="#ff7f00" id="12" name="Spawns" visible="0">
   <object id="24" name="Fluffy" type="spawn" x="384" y="768" width="3264" height="3328">
    <properties>
     <property name="death" value="30000"/>