Some map bugs reported by Strump, fixed by Zipon.

1 files changed, 7 insertions, 7 deletions

diff --git a/maps/new_1-1.tmx b/maps/new_1-1.tmx
index 08f6bb73..a006c486 100644
--- a/maps/new_1-1.tmx
+++ b/maps/new_1-1.tmx
@@ -8,13 +8,13 @@
   <property name="overlay2scrollX" value="12"/>
   <property name="overlay1scrollY" value="-2"/>
   <property name="overlay1scrollX" value="8"/>
-  <property name="minimap" value="graphics/images/minimap_new_1-1.png"/>
   <property name="overlay0scrollY" value="-1"/>
-  <property name="overlay2image" value="graphics/images/ambient/sandstorm.png"/>
-  <property name="overlay0scrollX" value="4"/>
+  <property name="minimap" value="graphics/images/minimap_new_1-1.png"/>
   <property name="overlay1parallax" value="1.5"/>
-  <property name="overlay2parallax" value="2.0"/>
+  <property name="overlay0scrollX" value="4"/>
+  <property name="overlay2image" value="graphics/images/ambient/sandstorm.png"/>
   <property name="overlay0image" value="graphics/images/ambient/sandstorm.png"/>
+  <property name="overlay2parallax" value="2.0"/>
  </properties>
  <tileset name="Desert1" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png"/>
@@ -46,12 +46,12 @@
  </layer>
  <layer name="Over" width="200" height="200">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAO3dSW/TQACGYZuyHtnhWHa4sS+3lp1rs3Dvgf//D/gskLCqjAMoeMHPI71KpFxGSUfJeGy3qgAAAACAvtV1VZ1Ke+l0OpPOpnPpfLpQDz1CGM7F/P1fSpfTlXQ1XUvX04100/zgH3lUj7/9dCvdTnfS3XQv3U8P0sMRjHFbTNObevw9Tk/S0/QsPU8v0sv0Kr0ewRi3xTR9qcffQTpMb9O79D59SB/Tp/R5BGPcFgAAzM0qrVt9HXY4MKiT86GtWTJ+631E83ZU/fosFq3nyyEHNSPrqjwfGN5xx2vt+bJoPZYCAAAAgF1rju86FQs2a47vmh9QZn4AAAAA/J7mOIrrP/pj72NaXP/RL3sf0M38AP4X1iBQZg0CZX4PAwAAADBm9j+gzP4HlNn/AAAAAAAAAAAAAAAAAAAAAAAAYNdWafGz9YlH905kzlYdr7l3InPWNTdgzswN2Oxo6AEAAAAAf8T/V4Mye4RQVle+Q6CL75DhNHtV6x6DqalbAQDw95q1h99UsNlxZX5AF/MDAGA3rM2nqfncmvuaLKsf1+g2e67OPdk9a/Ppqit7un3w3gIAANDm+igoc30UAAAAjEOzRl8OPQgYKffBgjLnIgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADOM73J+U/QBxAgA=
+   H4sIAAAAAAAAAO3dSW/TUBiGUZuZJTMsmYcdlHnHPGzbJOy7gP//C3gtqLBKrgMoeKjPkR6lUjZXTT8l9o3dqgIAAAAA+lbXVXUsHU8n0sl0Kp1OZ9LZeugVwnDO5e//fLqQLqZL6XK6kq6ma+aD/+RBPf6upxvpZrqVbqc76W66l+6PYI2bYppe1uPvYXqUdtLj9CQ9Tc/S8/RiBGvcFNP0uR5/r9Lr9Ca9Te/S+/QhfUyfRrDGTQEAwNws06rVl2GXA4M6PA9tzSHj195XNG+71a/XYq/182LIRc3IqirPA8Pb73iuPS97rcdSAAAAALBtzfldX8WC9Zrzu+YDyswHAAAAwJ9pzqO4/qM/9j6mxfUf/bL3Ad3MB3BUOAaBMscgUObzMAAAAABjZv8Dyux/QJn9DwAAAAAAAAAAAAAAAAAAAAAAALZtmfZ+tjr06N6JzNmy4zn3TmTOumYD5sxswHq7Qy8AAAAA+Cv+vxqU2SOEsrryHgJdvIcMp9mrWvUYTE3dCgCAf9cce/hMBevtV+YDupgPAIDtcGw+Tc3r1tzXZFH9uEa32XP13ZPtc2w+XXVlT7cPfrcAAAC0uT4KylwfBQAAAOPQHKMvhl4EjJT7YEHZwXw4zwu/O5iPb0MvBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAj6TsxX0zZAHECAA==
   </data>
  </layer>
- <layer name="Collision" width="200" height="200">
+ <layer name="Collisions" width="200" height="200">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
 </map>