Add a few missing NPCs. Mapfixes, mainly the collision in 008-1-1.

1 files changed, 51 insertions, 52 deletions

diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx
index eb685d76..fd40aa25 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-3-0.tmx
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="250" height="175" tilewidth="32" tileheight="32">
+<map version="1.0" tiledversion="1.1.3" orientation="orthogonal" renderorder="right-down" width="250" height="175" tilewidth="32" tileheight="32" infinite="0" nextobjectid="39">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -8,37 +7,37 @@
   <property name="music" value=""/>
   <property name="name" value="Sewer"/>
  </properties>
- <tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Cellar" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="Indoor Cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="321" name="Sewer x2x2" tilewidth="32" tileheight="32">
+ <tileset firstgid="321" name="Sewer x2x2" tilewidth="32" tileheight="32" tilecount="8" columns="4">
   <image source="../graphics/tilesets/artis-sewer-x2x2.png" width="128" height="64"/>
  </tileset>
- <tileset firstgid="329" name="Sewer x3x3" tilewidth="32" tileheight="32">
+ <tileset firstgid="329" name="Sewer x3x3" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/artis-sewer-x3x3.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="365" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="365" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="493" name="Box" tilewidth="32" tileheight="32">
+ <tileset firstgid="493" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="529" name="Box x1x2" tilewidth="32" tileheight="32">
+ <tileset firstgid="529" name="Box x1x2" tilewidth="32" tileheight="32" tilecount="16" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="545" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="673" name="Level Number" tilewidth="32" tileheight="32">
+ <tileset firstgid="673" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="689" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="689" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="698" name="Indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="698" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
  <layer name="Ground" width="250" height="175">
@@ -1652,55 +1651,55 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="Object" width="0" height="0">
-  <object name="to Artis" type="warp" x="6272" y="1120" width="32" height="32">
+ <objectgroup name="Object">
+  <object id="1" name="to Artis" type="warp" x="6272" y="1120" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="197"/>
     <property name="dest_y" value="35"/>
    </properties>
   </object>
-  <object name="to RivercaveEast" type="warp" x="5504" y="1312" width="32" height="32">
+  <object id="2" name="to RivercaveEast" type="warp" x="5504" y="1312" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-3-1"/>
     <property name="dest_x" value="34"/>
     <property name="dest_y" value="58"/>
    </properties>
   </object>
-  <object name="to RivercaveWest" type="warp" x="5184" y="1280" width="32" height="32">
+  <object id="3" name="to RivercaveWest" type="warp" x="5184" y="1280" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-3-1"/>
     <property name="dest_x" value="23"/>
     <property name="dest_y" value="57"/>
    </properties>
   </object>
-  <object name="to ArtisCoast" type="warp" x="6336" y="1888" width="32" height="32">
+  <object id="4" name="to ArtisCoast" type="warp" x="6336" y="1888" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="199"/>
     <property name="dest_y" value="61"/>
    </properties>
   </object>
-  <object name="To ArtisCentral" type="warp" x="4864" y="1760" width="32" height="32">
+  <object id="5" name="To ArtisCentral" type="warp" x="4864" y="1760" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="152"/>
     <property name="dest_y" value="51"/>
    </properties>
   </object>
-  <object name="to ArtisSouth" type="warp" x="2720" y="4160" width="32" height="32">
+  <object id="6" name="to ArtisSouth" type="warp" x="2720" y="4160" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="86"/>
     <property name="dest_y" value="130"/>
    </properties>
   </object>
-  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="3520" y="1888" width="32" height="32"/>
-  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="6304" y="2432" width="32" height="32"/>
-  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="4320" y="4000" width="32" height="32"/>
-  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="1536" y="4000" width="32" height="32"/>
-  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="5056" y="1632" width="32" height="32"/>
-  <object name="Ratto" type="spawn" x="5536" y="960" width="192" height="160">
+  <object id="7" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="3520" y="1888" width="32" height="32"/>
+  <object id="8" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="6304" y="2432" width="32" height="32"/>
+  <object id="9" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="4320" y="4000" width="32" height="32"/>
+  <object id="10" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="1536" y="4000" width="32" height="32"/>
+  <object id="11" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="5056" y="1632" width="32" height="32"/>
+  <object id="12" name="Ratto" type="spawn" x="5536" y="960" width="192" height="160">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="2"/>
@@ -1708,7 +1707,7 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="6368" y="1664" width="192" height="160">
+  <object id="13" name="Ratto" type="spawn" x="6368" y="1664" width="192" height="160">
    <properties>
     <property name="death" value="10000"/>
     <property name="max_beings" value="3"/>
@@ -1716,7 +1715,7 @@
     <property name="spawn" value="25000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="4256" y="3072" width="1184" height="96">
+  <object id="14" name="Ratto" type="spawn" x="4256" y="3072" width="1184" height="96">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="3"/>
@@ -1724,7 +1723,7 @@
     <property name="spawn" value="40000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="2976" y="3456" width="576" height="224">
+  <object id="15" name="Ratto" type="spawn" x="2976" y="3456" width="576" height="224">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="4"/>
@@ -1732,7 +1731,7 @@
     <property name="spawn" value="30000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="4576" y="2112" width="192" height="160">
+  <object id="16" name="Ratto" type="spawn" x="4576" y="2112" width="192" height="160">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="2"/>
@@ -1740,7 +1739,7 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="4608" y="864" width="160" height="96">
+  <object id="17" name="Ratto" type="spawn" x="4608" y="864" width="160" height="96">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="2"/>
@@ -1748,7 +1747,7 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="2784" y="1984" width="224" height="256">
+  <object id="18" name="Ratto" type="spawn" x="2784" y="1984" width="224" height="256">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="3"/>
@@ -1756,7 +1755,7 @@
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="1536" y="1472" width="544" height="320">
+  <object id="19" name="Ratto" type="spawn" x="1536" y="1472" width="544" height="320">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="4"/>
@@ -1764,7 +1763,7 @@
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="1248" y="3168" width="224" height="256">
+  <object id="20" name="Ratto" type="spawn" x="1248" y="3168" width="224" height="256">
    <properties>
     <property name="death" value="20000"/>
     <property name="max_beings" value="3"/>
@@ -1772,7 +1771,7 @@
     <property name="spawn" value="40000"/>
    </properties>
   </object>
-  <object name="Green Slime" type="spawn" x="4960" y="2496" width="160" height="160">
+  <object id="21" name="Green Slime" type="spawn" x="4960" y="2496" width="160" height="160">
    <properties>
     <property name="death" value="80000"/>
     <property name="max_beings" value="3"/>
@@ -1780,7 +1779,7 @@
     <property name="spawn" value="15000"/>
    </properties>
   </object>
-  <object name="Cave Maggot" type="spawn" x="5984" y="1248" width="256" height="1280">
+  <object id="22" name="Cave Maggot" type="spawn" x="5984" y="1248" width="256" height="1280">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="7"/>
@@ -1788,7 +1787,7 @@
     <property name="spawn" value="5000"/>
    </properties>
   </object>
-  <object name="Cave Maggot" type="spawn" x="5472" y="1408" width="96" height="160">
+  <object id="23" name="Cave Maggot" type="spawn" x="5472" y="1408" width="96" height="160">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="3"/>
@@ -1796,7 +1795,7 @@
     <property name="spawn" value="5000"/>
    </properties>
   </object>
-  <object name="Ratto" type="spawn" x="5600" y="1472" width="64" height="288">
+  <object id="24" name="Ratto" type="spawn" x="5600" y="1472" width="64" height="288">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="2"/>
@@ -1804,7 +1803,7 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object name="Cave Maggot" type="spawn" x="5504" y="1984" width="256" height="160">
+  <object id="25" name="Cave Maggot" type="spawn" x="5504" y="1984" width="256" height="160">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="4"/>
@@ -1812,7 +1811,7 @@
     <property name="spawn" value="5000"/>
    </properties>
   </object>
-  <object name="Cave Maggot" type="spawn" x="1792" y="1024" width="3136" height="2816">
+  <object id="26" name="Cave Maggot" type="spawn" x="1792" y="1024" width="3136" height="2816">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="25"/>
@@ -1820,7 +1819,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Cave Maggot" type="spawn" x="2816" y="1984" width="224" height="352">
+  <object id="27" name="Cave Maggot" type="spawn" x="2816" y="1984" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1828,7 +1827,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Green Slime" type="spawn" x="4000" y="2592" width="224" height="352">
+  <object id="28" name="Green Slime" type="spawn" x="4000" y="2592" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1836,7 +1835,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Green Slime" type="spawn" x="1248" y="3136" width="224" height="352">
+  <object id="29" name="Green Slime" type="spawn" x="1248" y="3136" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1844,7 +1843,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Little Green Slime" type="spawn" x="3616" y="2656" width="480" height="192">
+  <object id="30" name="Little Green Slime" type="spawn" x="3616" y="2656" width="480" height="192">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1852,7 +1851,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Green Slime" type="spawn" x="4608" y="3744" width="224" height="352">
+  <object id="31" name="Green Slime" type="spawn" x="4608" y="3744" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1860,7 +1859,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Green Slime" type="spawn" x="4608" y="3744" width="224" height="352">
+  <object id="32" name="Green Slime" type="spawn" x="4608" y="3744" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1868,7 +1867,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Green Slime" type="spawn" x="3072" y="3232" width="224" height="352">
+  <object id="33" name="Green Slime" type="spawn" x="3072" y="3232" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1876,7 +1875,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Little Green Slime" type="spawn" x="4128" y="896" width="672" height="288">
+  <object id="34" name="Little Green Slime" type="spawn" x="4128" y="896" width="672" height="288">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1884,7 +1883,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Little Green Slime" type="spawn" x="2624" y="4128" width="288" height="192">
+  <object id="35" name="Little Green Slime" type="spawn" x="2624" y="4128" width="288" height="192">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1892,7 +1891,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Little Green Slime" type="spawn" x="5472" y="928" width="288" height="192">
+  <object id="36" name="Little Green Slime" type="spawn" x="5472" y="928" width="288" height="192">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1900,7 +1899,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Little Green Slime" type="spawn" x="4576" y="2080" width="288" height="192">
+  <object id="37" name="Little Green Slime" type="spawn" x="4576" y="2080" width="288" height="192">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1908,7 +1907,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object name="Poison Skull" type="spawn" x="1568" y="1600" width="352" height="224">
+  <object id="38" name="Poison Skull" type="spawn" x="1568" y="1600" width="352" height="224">
    <properties>
     <property name="death" value="60000"/>
     <property name="max_beings" value="1"/>