From 3f331cd3a155bf9a050f3af05b0db828db7a8e4b Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Thu, 27 Oct 2016 11:23:27 -0500
Subject: Fix warp placement

Fix monster placement
---
 maps/001-1.tmx | 192 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 96 insertions(+), 96 deletions(-)

(limited to 'maps/001-1.tmx')

diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 0a352a8e..32d98aec 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1643,7 +1643,7 @@
    <properties>
     <property name="dest_map" value="001-2-26"/>
     <property name="dest_x" value="28"/>
-    <property name="dest_y" value="46"/>
+    <property name="dest_y" value="42"/>
     <property name="npc_id" value="NPC_ARTIS_DOOR"/>
     <property name="trigger_x" value="2"/>
     <property name="trigger_y" value="3"/>
@@ -1663,7 +1663,7 @@
    <properties>
     <property name="dest_map" value="001-2-27"/>
     <property name="dest_x" value="35"/>
-    <property name="dest_y" value="35"/>
+    <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"/>
@@ -1681,9 +1681,9 @@
   </object>
   <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"/>
+    <property name="dest_map" value="001-2-33"/>
+    <property name="dest_x" value="34"/>
+    <property name="dest_y" value="45"/>
    </properties>
   </object>
   <object id="18" name="To Noble House #1" type="ani_warp" x="4544" y="960" width="32" height="32">
@@ -1759,8 +1759,8 @@
   <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="dest_x" value="32"/>
+    <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"/>
@@ -1785,244 +1785,244 @@
   <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="death" value="15000"/>
+    <property name="death" value="60000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="1002"/>
-    <property name="spawn" value="60000"/>
+    <property name="spawn" value="15000"/>
    </properties>
   </object>
   <object id="87" name="Piousse" type="spawn" x="0" y="0">
    <properties>
-    <property name="death" value="15000"/>
+    <property name="death" value="150000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1003"/>
-    <property name="spawn" value="150000"/>
+    <property name="spawn" value="15000"/>
    </properties>
   </object>
-  <object id="88" name="Fluffy" type="spawn" x="5600" y="1024" width="320" height="480">
+  <object id="88" name="Fluffy" type="spawn" x="5216" y="608" width="768" height="992">
    <properties>
-    <property name="death" value="18000"/>
+    <property name="death" value="100000"/>
     <property name="max_beings" value="6"/>
     <property name="monster_id" value="1022"/>
     <property name="script" value="Mobs#001-1::OnFluffyDeath"/>
-    <property name="spawn" value="100000"/>
+    <property name="spawn" value="18000"/>
    </properties>
   </object>
-  <object id="89" name="Fluffy" type="spawn" x="5984" y="1536" width="320" height="480">
+  <object id="89" name="Fluffy" type="spawn" x="6304" y="1376" width="192" height="352">
    <properties>
-    <property name="death" value="18000"/>
+    <property name="death" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="1022"/>
     <property name="script" value="Mobs#001-1::OnFluffyDeath"/>
-    <property name="spawn" value="100000"/>
+    <property name="spawn" value="18000"/>
    </properties>
   </object>
-  <object id="90" name="Piou" type="spawn" x="5696" y="864" width="320" height="672">
+  <object id="90" name="Piou" type="spawn" x="5216" y="608" width="768" height="992">
    <properties>
-    <property name="death" value="15000"/>
-    <property name="max_beings" value="2"/>
+    <property name="death" value="60000"/>
+    <property name="max_beings" value="1"/>
     <property name="monster_id" value="1002"/>
-    <property name="spawn" value="60000"/>
+    <property name="spawn" value="12000"/>
    </properties>
   </object>
-  <object id="91" name="Pikpik" type="spawn" x="832" y="2304" width="192" height="896">
+  <object id="91" name="Pikpik" type="spawn" x="1088" y="1856" width="128" height="320">
    <properties>
-    <property name="death" value="40000"/>
+    <property name="death" value="20000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="1013"/>
-    <property name="spawn" value="20000"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
-  <object id="92" name="Pikpik" type="spawn" x="1248" y="4288" width="448" height="224">
+  <object id="92" name="Pikpik" type="spawn" x="736" y="3008" width="224" height="160">
    <properties>
-    <property name="death" value="40000"/>
-    <property name="max_beings" value="3"/>
+    <property name="death" value="20000"/>
+    <property name="max_beings" value="1"/>
     <property name="monster_id" value="1013"/>
-    <property name="spawn" value="20000"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
-  <object id="93" name="Pikpik" type="spawn" x="1696" y="3936" width="544" height="320">
+  <object id="93" name="Pikpik" type="spawn" x="1216" y="4352" width="288" height="128">
    <properties>
-    <property name="death" value="40000"/>
-    <property name="max_beings" value="3"/>
+    <property name="death" value="20000"/>
+    <property name="max_beings" value="2"/>
     <property name="monster_id" value="1013"/>
-    <property name="spawn" value="20000"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
   <object id="94" name="Crocotree" type="spawn" x="1440" y="4352">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
   <object id="95" name="Crocotree" type="spawn" x="2240" y="4352">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="96" name="Manana Tree" type="spawn" x="1216" y="4032">
+  <object id="96" name="Manana Tree" type="spawn" x="1184" y="4032">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="97" name="Manana Tree" type="spawn" x="1120" y="4160">
+  <object id="97" name="Manana Tree" type="spawn" x="1088" y="4160">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="98" name="Manana Tree" type="spawn" x="1344" y="4128">
+  <object id="98" name="Manana Tree" type="spawn" x="1312" y="4128">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="99" name="Manana Tree" type="spawn" x="1184" y="2464">
+  <object id="99" name="Manana Tree" type="spawn" x="1152" y="2464">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="100" name="Manana Tree" type="spawn" x="1120" y="2528">
+  <object id="100" name="Manana Tree" type="spawn" x="1184" y="2528">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="101" name="Manana Tree" type="spawn" x="1280" y="2336">
+  <object id="101" name="Manana Tree" type="spawn" x="1248" y="2336">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="102" name="Manana Tree" type="spawn" x="1408" y="2240">
+  <object id="102" name="Manana Tree" type="spawn" x="1376" y="2240">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="103" name="Manana Tree" type="spawn" x="1568" y="2272">
+  <object id="103" name="Manana Tree" type="spawn" x="1536" y="2272">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="104" name="Manana Tree" type="spawn" x="1312" y="2144">
+  <object id="104" name="Manana Tree" type="spawn" x="1280" y="2144">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="105" name="Manana Tree" type="spawn" x="1504" y="2080">
+  <object id="105" name="Manana Tree" type="spawn" x="1472" y="2080">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="106" name="Manana Tree" type="spawn" x="4896" y="832">
+  <object id="106" name="Manana Tree" type="spawn" x="4864" y="832">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="107" name="Manana Tree" type="spawn" x="4896" y="1024">
+  <object id="107" name="Manana Tree" type="spawn" x="4864" y="1024">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="108" name="Manana Tree" type="spawn" x="4992" y="1184">
+  <object id="108" name="Manana Tree" type="spawn" x="4960" y="1184">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="109" name="Manana Tree" type="spawn" x="5088" y="928">
+  <object id="109" name="Manana Tree" type="spawn" x="5056" y="928">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="110" name="Manana Tree" type="spawn" x="6528" y="1632">
+  <object id="110" name="Manana Tree" type="spawn" x="6496" y="1632">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="111" name="Manana Tree" type="spawn" x="6368" y="1600">
+  <object id="111" name="Manana Tree" type="spawn" x="6336" y="1600">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="112" name="Manana Tree" type="spawn" x="6400" y="1760">
+  <object id="112" name="Manana Tree" type="spawn" x="6368" y="1760">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="113" name="Manana Tree" type="spawn" x="5952" y="2080">
+  <object id="113" name="Manana Tree" type="spawn" x="5920" y="2080">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="114" name="Manana Tree" type="spawn" x="6144" y="2016">
+  <object id="114" name="Manana Tree" type="spawn" x="6112" y="2016">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
-  <object id="115" name="Manana Tree" type="spawn" x="6432" y="2112">
+  <object id="115" name="Manana Tree" type="spawn" x="6400" y="2112">
    <properties>
-    <property name="death" value="420000"/>
+    <property name="death" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1017"/>
-    <property name="spawn" value="240000"/>
+    <property name="spawn" value="420000"/>
    </properties>
   </object>
  </objectgroup>
-- 
cgit v1.2.3-70-g09d2