Merge branch 'map-warps' into 'master'

Converted warps into maps

See merge request !15

1 files changed, 325 insertions, 26 deletions

diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 532050aa..7225d3e1 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="250" height="175" tilewidth="32" tileheight="32" nextobjectid="83">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="250" height="175" tilewidth="32" tileheight="32" nextobjectid="116">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -1540,50 +1540,65 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Library" type="warp" x="1632" y="2560" width="32" height="32">
+  <object id="1" name="To Library" type="ani_warp" x="1632" y="2560" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-4"/>
     <property name="dest_x" value="48"/>
     <property name="dest_y" value="40"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="2" name="To Moon's House" type="warp" x="2240" y="2464" width="32" height="32">
+  <object id="2" name="To Moon's House" type="ani_warp" x="2240" y="2464" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-2"/>
     <property name="dest_x" value="38"/>
     <property name="dest_y" value="38"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="3" name="To Light Armor Shop West" type="warp" x="1632" y="2080" width="32" height="32">
+  <object id="3" name="To Light Armor Shop West" type="ani_warp" x="1632" y="2080" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-0"/>
     <property name="dest_x" value="30"/>
     <property name="dest_y" value="34"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="4" name="To Light Armor Shop East" type="warp" x="1760" y="2272" width="32" height="32">
+  <object id="4" name="To Light Armor Shop East" type="ani_warp" x="1760" y="2272" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-0"/>
     <property name="dest_x" value="37"/>
     <property name="dest_y" value="45"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="5" name="To Harbourmaster Lodge" type="warp" x="5376" y="3136" width="32" height="32">
+  <object id="5" name="To Harbourmaster Lodge" type="ani_warp" x="5376" y="3136" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-16"/>
     <property name="dest_x" value="32"/>
     <property name="dest_y" value="35"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
   <object id="6" name="graphics/particles/panels.xml" type="particle_effect" x="5760" y="800" width="32" height="32"/>
   <object id="7" name="To Ship" type="warp" x="6208" y="3488" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="0"/>
-    <property name="dest_y" value="0"/>
+    <property name="dest_map" value="001-2-21"/>
+    <property name="dest_x" value="20"/>
+    <property name="dest_y" value="28"/>
    </properties>
   </object>
-  <object id="8" name="To Merchant Hall" type="warp" x="3216" y="1184" width="32" height="32">
+  <object id="8" name="To Merchant Hall" type="warp" x="3200" y="1184" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-19"/>
     <property name="dest_x" value="32"/>
@@ -1597,116 +1612,158 @@
     <property name="dest_y" value="49"/>
    </properties>
   </object>
-  <object id="10" name="To RedPlush's Right Entrance" type="warp" x="4304" y="2656" width="32" height="32">
+  <object id="10" name="To RedPlush's Right Entrance" type="warp" x="4288" y="2656" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-28"/>
     <property name="dest_x" value="60"/>
     <property name="dest_y" value="31"/>
    </properties>
   </object>
-  <object id="11" name="To RedPlush's INN" type="warp" x="3776" y="2816" width="32" height="32">
+  <object id="11" name="To RedPlush's INN" type="ani_warp" x="3776" y="2816" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-28"/>
     <property name="dest_x" value="29"/>
     <property name="dest_y" value="39"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="12" name="To Dock Warehouse" type="warp" x="5824" y="2368" width="32" height="32">
+  <object id="12" name="To Dock Warehouse" type="ani_warp" x="5824" y="2368" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-18"/>
     <property name="dest_x" value="39"/>
     <property name="dest_y" value="35"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="13" name="To Alchemy Lab" type="warp" x="5216" y="2240" width="32" height="32">
+  <object id="13" name="To Alchemy Lab" type="ani_warp" x="5216" y="2240" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-26"/>
     <property name="dest_x" value="28"/>
     <property name="dest_y" value="46"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="14" name="To Geo and Meorwen's House" type="warp" x="4224" y="2144" width="32" height="32">
+  <object id="14" name="To Geo and Meorwen's House" type="ani_warp" x="4224" y="2144" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-15"/>
     <property name="dest_x" value="34"/>
     <property name="dest_y" value="45"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="15" name="To Blacksmith" type="warp" x="3232" y="3424" width="32" height="32">
+  <object id="15" name="To Blacksmith" type="ani_warp" x="3232" y="3424" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-27"/>
     <property name="dest_x" value="35"/>
     <property name="dest_y" value="35"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="16" name="To Town Hall" type="warp" x="2848" y="2080" width="32" height="32">
+  <object id="16" name="To Town Hall" type="ani_warp" x="2848" y="2080" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-7"/>
     <property name="dest_x" value="36"/>
     <property name="dest_y" value="45"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="17" name="To Legion of Aemil" type="warp" x="1824" y="1312" width="32" height="32">
+  <object id="17" name="To Legion of Aemil" type="script_warp" x="1824" y="1312" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="1"/>
     <property name="dest_y" value="1"/>
    </properties>
   </object>
-  <object id="18" name="To Noble House #1" type="warp" x="4544" y="960" width="32" height="32">
+  <object id="18" name="To Noble House #1" type="ani_warp" x="4544" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-12"/>
     <property name="dest_x" value="34"/>
     <property name="dest_y" value="35"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="19" name="To Noble House #2" type="warp" x="4096" y="960" width="32" height="32">
+  <object id="19" name="To Noble House #2" type="ani_warp" x="4096" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-1"/>
     <property name="dest_x" value="37"/>
     <property name="dest_y" value="40"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="20" name="To Merchant Hall North" type="warp" x="3328" y="1024" width="32" height="32">
+  <object id="20" name="To Merchant Hall North" type="ani_warp" x="3328" y="1024" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-19"/>
     <property name="dest_x" value="41"/>
     <property name="dest_y" value="30"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="21" name="To Merchant Hall" type="warp" x="3424" y="1568" width="32" height="32">
+  <object id="21" name="To Merchant Hall" type="ani_warp" x="3424" y="1568" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-20"/>
     <property name="dest_x" value="33"/>
     <property name="dest_y" value="34"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="22" name="To Noble House #3" type="warp" x="4736" y="1728" width="32" height="32">
+  <object id="22" name="To Noble House #3" type="ani_warp" x="4736" y="1728" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-11"/>
     <property name="dest_x" value="46"/>
     <property name="dest_y" value="45"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="23" name="To Noble House #4 East" type="warp" x="4320" y="1568" width="32" height="32">
+  <object id="23" name="To Noble House #4 East" type="ani_warp" x="4320" y="1568" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-10"/>
     <property name="dest_x" value="51"/>
     <property name="dest_y" value="44"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="24" name="To Noble House #4 West" type="warp" x="3776" y="1568" width="32" height="32">
+  <object id="24" name="To Noble House #4 West" type="ani_warp" x="3776" y="1568" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-10"/>
     <property name="dest_x" value="27"/>
     <property name="dest_y" value="44"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
-  <object id="25" name="ToLeftBuildingStairway" type="warp" x="1568" y="3072" width="32" height="32">
+  <object id="25" name="ToLeftBuildingStairway" type="ani_warp" x="1568" y="3072" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-31"/>
     <property name="dest_x" value="48"/>
     <property name="dest_y" value="40"/>
+    <property name="npc_id" value="NPC_ARTIS_DOOR"/>
+    <property name="trigger_x" value="2"/>
+    <property name="trigger_y" value="3"/>
    </properties>
   </object>
   <object id="32" name="graphics/particles/chimney.xml" type="particle_effect" x="4032" y="3072" width="32" height="32"/>
@@ -1726,6 +1783,248 @@
   <object id="53" name="graphics/particles/panels.xml" type="particle_effect" x="3296" y="2112" width="32" height="32"/>
   <object id="81" name="graphics/particles/chimney.xml" type="particle_effect" x="4608" y="1344" width="32" height="32"/>
   <object id="82" name="graphics/particles/fountain.xml" type="particle_effect" x="2848" y="2496" width="32" height="32"/>
+  <object id="85" name="Piou" type="spawn" x="0" y="0">
+   <properties>
+    <property name="eA_death" value="15000"/>
+    <property name="eA_spawn" value="60000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1002"/>
+   </properties>
+  </object>
+  <object id="87" name="Piousse" type="spawn" x="0" y="0">
+   <properties>
+    <property name="eA_death" value="15000"/>
+    <property name="eA_spawn" value="150000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1003"/>
+   </properties>
+  </object>
+  <object id="88" name="Fluffy" type="spawn" x="5600" y="1024" width="320" height="480">
+   <properties>
+    <property name="eA_death" value="18000"/>
+    <property name="eA_spawn" value="100000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1022"/>
+    <property name="script" value="Mobs#001-1::OnFluffyDeath"/>
+   </properties>
+  </object>
+  <object id="89" name="Fluffy" type="spawn" x="5984" y="1536" width="320" height="480">
+   <properties>
+    <property name="eA_death" value="18000"/>
+    <property name="eA_spawn" value="100000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1022"/>
+    <property name="script" value="Mobs#001-1::OnFluffyDeath"/>
+   </properties>
+  </object>
+  <object id="90" name="Piou" type="spawn" x="5696" y="864" width="320" height="672">
+   <properties>
+    <property name="eA_death" value="15000"/>
+    <property name="eA_spawn" value="60000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1002"/>
+   </properties>
+  </object>
+  <object id="91" name="Pikpik" type="spawn" x="832" y="2304" width="192" height="896">
+   <properties>
+    <property name="eA_death" value="40000"/>
+    <property name="eA_spawn" value="20000"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1013"/>
+   </properties>
+  </object>
+  <object id="92" name="Pikpik" type="spawn" x="1248" y="4288" width="448" height="224">
+   <properties>
+    <property name="eA_death" value="40000"/>
+    <property name="eA_spawn" value="20000"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1013"/>
+   </properties>
+  </object>
+  <object id="93" name="Pikpik" type="spawn" x="1696" y="3936" width="544" height="320">
+   <properties>
+    <property name="eA_death" value="40000"/>
+    <property name="eA_spawn" value="20000"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1013"/>
+   </properties>
+  </object>
+  <object id="94" name="Crocotree" type="spawn" x="1440" y="4352">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="95" name="Crocotree" type="spawn" x="2240" y="4352">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1010"/>
+   </properties>
+  </object>
+  <object id="96" name="Manana Tree" type="spawn" x="1216" y="4032">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="97" name="Manana Tree" type="spawn" x="1120" y="4160">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="98" name="Manana Tree" type="spawn" x="1344" y="4128">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="99" name="Manana Tree" type="spawn" x="1184" y="2464">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="100" name="Manana Tree" type="spawn" x="1120" y="2528">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="101" name="Manana Tree" type="spawn" x="1280" y="2336">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="102" name="Manana Tree" type="spawn" x="1408" y="2240">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="103" name="Manana Tree" type="spawn" x="1568" y="2272">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="104" name="Manana Tree" type="spawn" x="1312" y="2144">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="105" name="Manana Tree" type="spawn" x="1504" y="2080">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="106" name="Manana Tree" type="spawn" x="4896" y="832">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="107" name="Manana Tree" type="spawn" x="4896" y="1024">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="108" name="Manana Tree" type="spawn" x="4992" y="1184">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="109" name="Manana Tree" type="spawn" x="5088" y="928">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="110" name="Manana Tree" type="spawn" x="6528" y="1632">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="111" name="Manana Tree" type="spawn" x="6368" y="1600">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="112" name="Manana Tree" type="spawn" x="6400" y="1760">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="113" name="Manana Tree" type="spawn" x="5952" y="2080">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="114" name="Manana Tree" type="spawn" x="6144" y="2016">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
+  <object id="115" name="Manana Tree" type="spawn" x="6432" y="2112">
+   <properties>
+    <property name="eA_death" value="420000"/>
+    <property name="eA_spawn" value="240000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1017"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="250" height="175">
   <data encoding="csv">