By QOAL: Fixes for layer names collision/fringe for 0.1 client. Fixed some half trees on map 14 and 16. Add missing collision tile on map 24. Fixes for map 17 reported by Zipon. Remove spotlight from map 25 since its lit by torches.

1 files changed, 12 insertions, 8 deletions

diff --git a/maps/new_1-1.tmx b/maps/new_1-1.tmx
index 306bf1d0..72c35536 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="overlay0scrollY" value="-1"/>
   <property name="minimap" value="graphics/images/minimap_new_1-1.png"/>
-  <property name="overlay1parallax" value="1.5"/>
-  <property name="overlay0scrollX" value="4"/>
+  <property name="overlay0scrollY" value="-1"/>
   <property name="overlay2image" value="graphics/images/ambient/sandstorm.png"/>
-  <property name="overlay0image" value="graphics/images/ambient/sandstorm.png"/>
+  <property name="overlay0scrollX" value="4"/>
+  <property name="overlay1parallax" value="1.5"/>
   <property name="overlay2parallax" value="2.0"/>
+  <property name="overlay0image" value="graphics/images/ambient/sandstorm.png"/>
  </properties>
  <tileset name="Desert1" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/desert1.png"/>
@@ -38,21 +38,25 @@
   <data encoding="base64" compression="gzip">
    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
   </data>
+  <tileproperties/>
  </layer>
  <layer name="Fringe" width="200" height="200">
   <data encoding="base64" compression="gzip">
    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
   </data>
+  <tileproperties/>
  </layer>
  <layer name="Over" width="200" height="200">
   <data encoding="base64" compression="gzip">
    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>
+  <tileproperties/>
  </layer>
- <layer name="Collisions" width="200" height="200">
+ <layer name="Collision" width="200" height="200">
   <data encoding="base64" compression="gzip">
    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
   </data>
+  <tileproperties/>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
   <object name="ToTulimshar" type="WARP" x="1792" y="384" width="160" height="32">
@@ -73,12 +77,12 @@
     <property name="SPAWN_RATE">
      10
     </property>
-    <property name="MAX_BEINGS">
-     20
-    </property>
     <property name="MONSTER_ID">
      1002
     </property>
+    <property name="MAX_BEINGS">
+     20
+    </property>
    </properties>
   </object>
   <object name="npc1" type="NPC" x="1712" y="688" width="0" height="0">