Incorporate tilesets (Tulimshar)

1 files changed, 62 insertions, 23 deletions

diff --git a/maps/003-0-1.tmx b/maps/003-0-1.tmx
index 40066935..8d32f566 100644
--- a/maps/003-0-1.tmx
+++ b/maps/003-0-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="104" height="75" tilewidth="32" tileheight="32" nextobjectid="40">
+<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-down" width="104" height="75" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="40">
  <properties>
   <property name="license" value="GPL 2.0"/>
   <property name="manaplus version" value="2"/>
@@ -13,26 +13,65 @@
  <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="266" source="../graphics/tilesets/desert_castle_interior_x4.tsx"/>
- <tileset firstgid="298" source="../graphics/tilesets/desert_castle_interior_x5.tsx"/>
- <tileset firstgid="314" source="../graphics/tilesets/inn2.tsx"/>
- <tileset firstgid="570" source="../graphics/tilesets/desert_castle_interior.tsx"/>
- <tileset firstgid="826" source="../graphics/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="1082" source="../graphics/tilesets/desert_city_indoors.tsx"/>
- <tileset firstgid="1232" source="../graphics/tilesets/inn.tsx"/>
- <tileset firstgid="1488" source="../graphics/tilesets/desert_castle_interior_x2.tsx"/>
- <tileset firstgid="1504" source="../graphics/tilesets/inn_x3.tsx"/>
- <tileset firstgid="1584" source="../graphics/tilesets/inn_x2.tsx"/>
- <tileset firstgid="1632" source="../graphics/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="1680" source="../graphics/tilesets/desert_city_indoors_x3.tsx"/>
- <tileset firstgid="1725" source="../graphics/tilesets/wood_lab.tsx"/>
+ <tileset firstgid="266" name="desert_castle_interior_x4" tilewidth="32" tileheight="128" tilecount="32" columns="16">
+  <image source="../graphics/tilesets/desert_castle_interior_x4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="298" name="desert_castle_interior_x5" tilewidth="32" tileheight="160" tilecount="16" columns="16">
+  <image source="../graphics/tilesets/desert_castle_interior_x5.png" width="512" height="160"/>
+ </tileset>
+ <tileset firstgid="314" name="inn2" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/inn2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="570" name="desert_castle_interior" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/desert_castle_interior.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="826" name="woodland_indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1082" name="desert_city_indoors" tilewidth="32" tileheight="32" tilecount="150" columns="15">
+  <image source="../graphics/tilesets/desert_city_indoors.png" width="480" height="320"/>
+ </tileset>
+ <tileset firstgid="1232" name="inn" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/inn.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1488" name="desert_castle_interior_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+  <image source="../graphics/tilesets/desert_castle_interior_x2.png" width="512" height="64"/>
+ </tileset>
+ <tileset firstgid="1504" name="inn_x3" tilewidth="32" tileheight="96" tilecount="80" columns="16">
+  <image source="../graphics/tilesets/inn_x3.png" width="512" height="480"/>
+ </tileset>
+ <tileset firstgid="1584" name="inn_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/tilesets/inn_x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="1632" name="woodland_indoor_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/tilesets/woodland_indoor_x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="1680" name="desert_city_indoors_x3" tilewidth="32" tileheight="96" tilecount="45" columns="15">
+  <image source="../graphics/tilesets/desert_city_indoors_x3.png" width="480" height="288"/>
+ </tileset>
+ <tileset firstgid="1725" name="wood_lab" tilewidth="96" tileheight="96" tilecount="12" columns="4">
+  <image source="../graphics/tilesets/wood_lab.png" width="384" height="288"/>
+  <tile id="8">
+   <animation>
+    <frame tileid="8" duration="100"/>
+    <frame tileid="0" duration="100"/>
+    <frame tileid="1" duration="100"/>
+    <frame tileid="2" duration="100"/>
+    <frame tileid="3" duration="100"/>
+    <frame tileid="4" duration="100"/>
+    <frame tileid="5" duration="100"/>
+    <frame tileid="6" duration="100"/>
+    <frame tileid="7" duration="100"/>
+   </animation>
+  </tile>
+ </tileset>
  <tileset firstgid="1737" name="grade_x3" tilewidth="32" tileheight="96" tilecount="3" columns="3">
   <image source="../graphics/tilesets/grade_x3.png" width="96" height="96"/>
  </tileset>
  <tileset firstgid="1740" name="desert_city" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/desert_city.png" width="512" height="512"/>
  </tileset>
- <layer name="Ground1" width="104" height="75">
+ <layer id="1" name="Ground1" width="104" height="75">
   <data encoding="csv">
 58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,
 58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,
@@ -111,7 +150,7 @@
 58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58
 </data>
  </layer>
- <layer name="Ground2" width="104" height="75">
+ <layer id="2" name="Ground2" width="104" height="75">
   <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,
@@ -190,7 +229,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
 </data>
  </layer>
- <layer name="Ground3" width="104" height="75">
+ <layer id="3" name="Ground3" width="104" height="75">
   <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,
@@ -269,7 +308,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
 </data>
  </layer>
- <layer name="Fringe" width="104" height="75">
+ <layer id="4" name="Fringe" width="104" height="75">
   <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,
@@ -348,7 +387,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
 </data>
  </layer>
- <layer name="Over 1" width="104" height="75">
+ <layer id="5" name="Over 1" width="104" height="75">
   <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,
@@ -427,7 +466,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
 </data>
  </layer>
- <layer name="Over 2" width="104" height="75">
+ <layer id="6" name="Over 2" width="104" height="75">
   <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,
@@ -506,7 +545,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
 </data>
  </layer>
- <layer name="Collision" width="104" height="75">
+ <layer id="7" name="Collision" width="104" height="75">
   <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,
@@ -585,7 +624,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
 </data>
  </layer>
- <layer name="Heights" width="104" height="75">
+ <layer id="8" name="Heights" width="104" height="75">
   <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,
@@ -664,7 +703,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
 </data>
  </layer>
- <objectgroup name="Objects">
+ <objectgroup id="9" name="Objects">
   <object id="39" name="To Tulimshar" type="warp" x="1504" y="1664" width="128" height="32">
    <properties>
     <property name="dest_map" value="003-1"/>