From 53fbe550aa94ee903c9a3b77c04d8bf8ff56c0be Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Mon, 6 May 2013 23:41:52 +0200
Subject: [PATCH] Align mapchange areas
 roadbeforecrossroads1->roadbeforecrossroads2.

---
 AndorsTrail/res/xml/roadbeforecrossroads1.tmx | 12 ++++----
 AndorsTrail/res/xml/worldmap.xml              | 28 ++++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/AndorsTrail/res/xml/roadbeforecrossroads1.tmx b/AndorsTrail/res/xml/roadbeforecrossroads1.tmx
index f75f9c2d1..91f8eac63 100644
--- a/AndorsTrail/res/xml/roadbeforecrossroads1.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads1.tmx
@@ -130,20 +130,20 @@
  </layer>
  <layer name="Objects" width="29" height="25">
   <data encoding="base64" compression="zlib">
-   eJyVVktOIzEQdSOWtnCvWDNn4AaTHUdIcwVYgTQjYBbsEGw5AlfhBIBEiBIBElI6gwJLFCFctIt+LttN8yTLsWPXq5+r+sUqpUqlVtx4db+LslnLmf//yUzYsvF9krmw7frFNms5o7y+etC5T04V7n8iYU/OXppr3erRdY/ObSfsPHDzoRtT9/+tBvkeS7dXGqUGbjzo2G7GF5/ycgD/dchLOLINN49DG3KPdOyfpB8Qfm+kwz3Wcy70OvK8Y7f/rMPzaB/Le3Pz34TefPcOzpGcXdty7ZlmPi5aXsK99fcSvATi++fP1jrUG7Hh5P9y48Ttn8JgHch2vlcL/2DeTNx/Q3fmyo1rf3fgda/8+gliNbVhHGa60QFtZ17Kn5GIAcsZ+vPkywvTxqoS+k50+/4U8C6Adx38lMuvpdDzvGjmHbc+g5jK/BtDrFJyEKk4EYZir0J/izzAeoO8hQl5902e903HeUE2bsKdPnVr4WWiLOJn3zEvxXgK9S14p2W6bnxXLwkcE7Z7Lt4DxyZVh6S8yw4+1A+B/q516OcCfPmceM8Uvxv7vZ1UD1ZN6KfUezqwcR2qM7y5Pklryo0nG9db5OXalaufowwv7Y9lf1LN/gz6TdD/EvYSZp77Efw+yfCuCP/9MSoC+p255Rs5tek6Ju9zz5F2UizvbZwPGAdCCfoNTOz3qqMuYLy4/5ys+beg0uf5ewB1uNVhXSJO2bdz74Ry6LeJ/SLfL+uHvMw5193+zfXHLr2oBi19b59CbZD51ce/nCd9vkc47yXYVqrVVcLOPt+NhBrkv3vb5jqWh31V2vkBM8MoeQ==
+   eJyVVjtOAzEQ9SJKW3grajgDNyAdR8hyBahAAvEp6BC0HIGrcAJAIkSJAAkpG1CgRBHCw3rY57GdhJEsx1573sybj/NhlVKlUktufLrfRdms5czf/zOTbNn4Pumc2Hb9YZu1nFHfonbQuV9MFe7/SsKfnL8017q1Y9Y9Ored8PPIzcduDN33Bw36vUzdXmmU6rjxrGO/Wf7wlNcD8qZDXJIT22DzOLYhdk/H/CR5QPF7PR3usZ1jYdeJx+27/Xcdnkf/WN+Xmw8TdvPdRzhHenZti7VnmvmsaHFJnqy/l8AlIbxTf7bWod0oa07/uhvnbv8CBttAvvO9WvCDeTNw37ruzK0bd/5ux9te+fUrxGpowziMdGMD+s64lD89EQPW0/Xnictr08aqEvYOdFt/CnAngLsKPOXyayrsvCqaecetLyGmMv/6EKuUHpRUnEi6Yq9CvkUeYL9B3MKEuPsmj/ul47wgHzfgziJ9a+J1oi7CZ+4Yl2I8hP4W1GmZ7hvz+iUJx4T9Hot64Nik+pDUdzMDD+1DQb5rHfJcAJfviXqm+N3b+X5SP1g2IU+pejqycR+qM7i5d5LWlBuvNu63iMu9K9c/exlc2u/L90k1+yN4b4L3L+EvychjvwDvgwzukuDvwKhIkHfGljVyYdN9TN7nN0f6SbF8snE+YBxISrCvY2Leqxl9AePF78/5iq8FlT7P/wfQhgcd9iXClO92rk4ohzZNzIusX7YPcRlzrGfzm3sfs/8PVNODpv5tH0JvkPm1CL+cJxKHa2IEtcF5L4V9pV5dJfycxzP3vxr0f3vfxr7nSj5kTNnPH62fKRI=
   </data>
  </layer>
  <layer name="Above" width="29" height="25">
   <data encoding="base64" compression="zlib">
-   eJzFVkkOwyAMTHpHSt7Sv/aYJ/QXba+IS39RlR8kVoNkuWZzHJgTYfGMxwZlGM6Dn04MnsG3I3cOoI16w+mFPdw8d16iIYXXvr4Yfr4WLpIfxnv/vht+Xgse5fbYxk8SH+ccvLYKnsN5nNsNjWnOGLX1pvtxzT5jOcdllucMNaO9g/3O9V8pL9VNfUz5KubdfBnn39BO/zquRnZHa2ucitPq/ZPwgD7H+NYaLXmxTz3yPXKXYwjxHKnnEV7NvvVKPcadLdWpxZvis8xajLdEd+796PlfFxBqGqut9vtXE28FFIpbCg==
+   eJzFVEkOgzAMhN4jhbf0rz32Cfyi7TXKhV9UzQ/AKqiW62zGhDmFLJ7xTEjXHYdgDyyewedE7hxAG/WG0wt7uHnuvERDCq91/W74+Vr4SH8Y0/o9Gn5eCwH19ljGT1If97x57RQ8h/O4txsa054xavOm+3Fm776c4zLIe4bM6N3BfufuXykv1U19TPkq5l186Yfv0Nl/HVcj+0drM07VafX+SXhAn2d8a42WvNinM/rd8y/HsNXzJM89vJr3NijdMe5sqU4t3hSfY9ZivCW6W74fEjj7yzSWbY3+koxq6s3Pm1vq
   </data>
  </layer>
- <layer name="Walkable" width="29" height="25" visible="0">
+ <layer name="Walkable" width="29" height="25">
   <data encoding="base64" compression="zlib">
-   eJy9k1kOgDAIBXsEL9X7X8n41xCWoYAkxtj6GNb9rLUHn88m/VtMyZ2MQ+Od5/JeM+KX6CzT7mlekZ4aqc/5lufWt8cjXOKnoqP1tTSUReImM6LtDeHLmaWa25wtn5TRWesK82aPTs6fXG/OunlRHLe5Tu1ztDvT3EjXzaTarGV72DXX1TwzM9bRT+0/kjvlZuLzuJV9nZyjrH/anxfQv32D
+   eJy9k9sNgDAIRTuCS3X/lYx/DeFxKCCJMVIvByjsZ609+Hw2Gd9iSu5kHhrv9MtzzTIcT2eZdp7hUZ9npD/nW/qtb49HuCRORUf7a2koi+RNZkTbG8KXu0A1tzVbMSmjs9cV5s0enZw/ud6cdfOiPG5rndrnaHemuZGum0m1WcveYddcV+vMzFjHfWr/kdopl851xK3sasU6WZn7eQHtbnyE
   </data>
  </layer>
- <objectgroup name="Mapevents" width="29" height="25" visible="0">
+ <objectgroup name="Mapevents" width="29" height="25">
   <object name="west" type="mapchange" x="0" y="64" width="32" height="192">
    <properties>
     <property name="map" value="roadbeforecrossroads"/>
@@ -156,7 +156,7 @@
     <property name="place" value="north2"/>
    </properties>
   </object>
-  <object name="south1" type="mapchange" x="352" y="768" width="256" height="32">
+  <object name="south1" type="mapchange" x="320" y="768" width="256" height="32">
    <properties>
     <property name="map" value="roadbeforecrossroads2"/>
     <property name="place" value="north1"/>
diff --git a/AndorsTrail/res/xml/worldmap.xml b/AndorsTrail/res/xml/worldmap.xml
index fcdb132e2..01b16ddb6 100644
--- a/AndorsTrail/res/xml/worldmap.xml
+++ b/AndorsTrail/res/xml/worldmap.xml
@@ -38,8 +38,8 @@
  <map id="lodar7" x="281" y="322" />
  <map id="lodar4" x="312" y="296" />
  <map id="lodar5" x="281" y="306" />
- <map id="fields9" x="117" y="284" />
  <map id="lodar2" x="281" y="275" />
+ <map id="fields9" x="117" y="284" />
  <map id="lodar3" x="312" y="275" />
  <map id="lodar10" x="374" y="277" />
  <map id="waterway9" x="550" y="228" />
@@ -60,6 +60,7 @@
  <map id="fields3" x="127" y="263" />
  <map id="lodar18" x="343" y="334" />
  <map id="lodar17" x="313" y="384" />
+ <map id="woodcave0" x="201" y="331" />
  <map id="fields0" x="179" y="284" />
  <map id="lodar19" x="343" y="365" />
  <map id="fallhaven_nw" x="210" y="382" area="fallhaven" />
@@ -79,33 +80,33 @@
  <map id="wild4" x="201" y="351" />
  <map id="wild7" x="147" y="459" />
  <map id="wild6" x="155" y="428" />
- <map id="wild9" x="186" y="442" />
+ <map id="wild9" x="186" y="434" />
  <map id="wild8" x="126" y="468" />
  <map id="blackwater_mountain0" x="53" y="469" />
- <map id="blackwater_mountain1" x="11" y="441" />
  <map id="roadbeforecrossroads" x="210" y="318" />
+ <map id="blackwater_mountain1" x="11" y="441" />
  <map id="blackwater_mountain2" x="11" y="430" />
  <map id="blackwater_mountain3" x="14" y="419" />
  <map id="wild1" x="179" y="353" />
  <map id="wild0" x="179" y="331" />
  <map id="wild17" x="32" y="455" />
- <map id="wild15" x="335" y="448" />
  <map id="roadbeforecrossroads8" x="335" y="420" />
+ <map id="wild15" x="335" y="448" />
  <map id="mountainlake13a" x="648" y="50" />
- <map id="wild16" x="74" y="469" />
  <map id="roadbeforecrossroads9" x="356" y="420" />
- <map id="wild13" x="293" y="436" />
+ <map id="wild16" x="74" y="469" />
  <map id="roadbeforecrossroads6" x="293" y="405" />
- <map id="flagstone0" x="95" y="469" area="flagstone" />
- <map id="wild14" x="314" y="441" />
+ <map id="wild13" x="293" y="436" />
  <map id="roadbeforecrossroads7" x="314" y="420" />
+ <map id="wild14" x="314" y="441" />
+ <map id="flagstone0" x="95" y="469" area="flagstone" />
  <map id="wild11" x="238" y="434" />
  <map id="roadbeforecrossroads4" x="272" y="382" />
- <map id="wild12" x="272" y="426" />
  <map id="roadbeforecrossroads5" x="272" y="403" />
+ <map id="wild12" x="272" y="426" />
  <map id="roadbeforecrossroads2" x="232" y="348" />
- <map id="wild10" x="217" y="434" />
  <map id="roadbeforecrossroads3" x="262" y="366" />
+ <map id="wild10" x="217" y="434" />
  <map id="waterway6" x="395" y="228" />
  <map id="waterway7" x="426" y="228" />
  <map id="waterway4" x="372" y="166" />
@@ -139,17 +140,18 @@
  <map id="vilegard_sw" x="349" y="505" />
  <map id="mountainlake8" x="779" y="31" />
  <map id="gapfiller1" x="259" y="434" />
+ <map id="gapfiller2" x="186" y="407" />
  <map id="lostmine0" x="426" y="361" />
- <map id="gapfiller3" x="179" y="375" />
  <map id="fallhaven_se" x="241" y="413" area="fallhaven" />
+ <map id="gapfiller3" x="179" y="375" />
  <map id="gapfiller4" x="194" y="382" />
  <map id="fields10" x="96" y="284" />
  <map id="waytolake0" x="649" y="266" />
  <map id="fields11" x="238" y="218" />
  <map id="fields12" x="259" y="214" />
  <map id="vilegard_n" x="360" y="471" area="vilegard" />
- <map id="waytolostmine0" x="395" y="347" />
  <map id="roadbeforecrossroads1" x="232" y="322" />
+ <map id="waytolostmine0" x="395" y="347" />
  <map id="waytolake3" x="672" y="208" />
  <map id="vilegard_s" x="360" y="492" area="vilegard" />
  <map id="waytolake1" x="670" y="255" />
@@ -170,8 +172,8 @@
  <map id="remgard2" x="673" y="114" area="remgard" />
  <map id="remgard4" x="621" y="107" area="remgard" />
  <map id="road1" x="356" y="445" area="fflask" />
- <map id="crossroads" x="179" y="300" area="crossroads" />
  <map id="road3" x="403" y="459" />
+ <map id="crossroads" x="179" y="300" area="crossroads" />
  <map id="road2" x="382" y="455" />
  <map id="road5" x="455" y="462" />
  <map id="road4" x="429" y="454" />