From 3cf826a0bad763f4ae1395d126fc1d6a90da172e Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Sun, 23 Oct 2016 16:48:00 +0200
Subject: Fix some issues with warps and spawns datas.

---
 maps/000-1.tmx   | 92 ++++++++++++++++++++++++++++----------------------------
 maps/000-2-0.tmx |  8 ++---
 maps/001-1.tmx   |  4 +--
 3 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/maps/000-1.tmx b/maps/000-1.tmx
index 01ca57e8..7462faba 100644
--- a/maps/000-1.tmx
+++ b/maps/000-1.tmx
@@ -1038,209 +1038,209 @@
   <object id="3" name="Tortuga" type="spawn" x="704" y="1280" width="416" height="640">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="16000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="1004"/>
+    <property name="spawn" value="16000"/>
    </properties>
   </object>
   <object id="4" name="Tortuga" type="spawn" x="768" y="3328" width="2240" height="928">
    <properties>
     <property name="death" value="300000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="1004"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
   <object id="5" name="Tortuga" type="spawn" x="2144" y="2656" width="320" height="800">
    <properties>
     <property name="death" value="300000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1004"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
   <object id="6" name="Tortuga" type="spawn" x="1536" y="2400" width="320" height="1120">
    <properties>
     <property name="death" value="300000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="1004"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
   <object id="7" name="Tortuga" type="spawn" x="832" y="1952" width="736" height="352">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="1004"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
   <object id="8" name="Tortuga" type="spawn" x="1056" y="800" width="640" height="1088">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="1004"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
   <object id="9" name="Tortuga" type="spawn" x="2400" y="800" width="768" height="768">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="1004"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
   <object id="10" name="Little Blub" type="spawn" x="1344" y="2368" width="192" height="128">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="25000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="1007"/>
+    <property name="spawn" value="25000"/>
    </properties>
   </object>
   <object id="11" name="Little Blub" type="spawn" x="1728" y="1728" width="480" height="704">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="25000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="1007"/>
+    <property name="spawn" value="25000"/>
    </properties>
   </object>
   <object id="12" name="Little Blub" type="spawn" x="1664" y="672" width="704" height="320">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="25000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="1007"/>
+    <property name="spawn" value="25000"/>
    </properties>
   </object>
   <object id="13" name="Blub" type="spawn" x="2656" y="2112" width="288" height="256">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="25000"/>
     <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1007"/>
+    <property name="monster_id" value="1008"/>
+    <property name="spawn" value="25000"/>
    </properties>
   </object>
   <object id="14" name="Little Blub" type="spawn" x="2656" y="960" width="160" height="256">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="25000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1007"/>
+    <property name="spawn" value="25000"/>
    </properties>
   </object>
   <object id="15" name="Little Blub" type="spawn" x="2272" y="1568" width="928" height="640">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="1007"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="16" name="LittleBlub" type="spawn" x="1248" y="1760" width="608" height="416">
+  <object id="16" name="Little Blub" type="spawn" x="1248" y="1760" width="608" height="416">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1007"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="17" name="LittleBlub" type="spawn" x="800" y="1376" width="224" height="384">
+  <object id="17" name="Little Blub" type="spawn" x="800" y="1376" width="224" height="384">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1007"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="18" name="Plushroom" type="spawn" x="1120" y="1568" width="64" height="96">
+  <object id="18" name="Plushroom Field" type="spawn" x="1120" y="1568" width="64" height="96">
    <properties>
     <property name="death" value="150000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1011"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="19" name="Plushroom" type="spawn" x="1728" y="3648" width="64" height="96">
+  <object id="19" name="Plushroom Field" type="spawn" x="1728" y="3648" width="64" height="96">
    <properties>
     <property name="death" value="150000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1011"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="20" name="Plushroom" type="spawn" x="1888" y="2496" width="320" height="192">
+  <object id="20" name="Plushroom Field" type="spawn" x="1888" y="2496" width="320" height="192">
    <properties>
     <property name="death" value="150000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1011"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="21" name="Plushroom" type="spawn" x="1728" y="1984" width="64" height="192">
+  <object id="21" name="Plushroom Field" type="spawn" x="1728" y="1984" width="64" height="192">
    <properties>
     <property name="death" value="150000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1011"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="22" name="Plushroom" type="spawn" x="2368" y="1696" width="288" height="352">
+  <object id="22" name="Plushroom Field" type="spawn" x="2368" y="1696" width="288" height="352">
    <properties>
     <property name="death" value="150000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="1011"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="23" name="Plushroom" type="spawn" x="2240" y="1952" width="128" height="96">
+  <object id="23" name="Plushroom Field" type="spawn" x="2240" y="1952" width="128" height="96">
    <properties>
     <property name="death" value="150000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1011"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
   <object id="24" name="Croc" type="spawn" x="768" y="3424" width="544" height="640">
    <properties>
     <property name="death" value="300000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="1006"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
   <object id="25" name="Croc" type="spawn" x="1696" y="896" width="672" height="224">
    <properties>
     <property name="death" value="300000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1006"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
   <object id="26" name="Croc" type="spawn" x="2400" y="2144" width="128" height="96">
    <properties>
     <property name="death" value="300000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1006"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
   <object id="27" name="Croc" type="spawn" x="1792" y="2400" width="320" height="1120">
    <properties>
     <property name="death" value="300000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1006"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
   <object id="28" name="Croc" type="spawn" x="2144" y="2336" width="320" height="320">
    <properties>
     <property name="death" value="300000"/>
-    <property name="spawn" value="35000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1006"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
   <object id="29" name="graphics/particles/panels.xml" type="particle_effect" x="2848" y="1632" width="32" height="32"/>
@@ -1248,89 +1248,89 @@
   <object id="31" name="Piou" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="15000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="1002"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="33" name="Crocotree" type="spawn" x="2496" y="3680">
    <properties>
     <property name="death" value="420000"/>
-    <property name="spawn" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
+    <property name="spawn" value="240000"/>
    </properties>
   </object>
   <object id="35" name="Crocotree" type="spawn" x="1824" y="3328">
    <properties>
     <property name="death" value="420000"/>
-    <property name="spawn" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
+    <property name="spawn" value="240000"/>
    </properties>
   </object>
   <object id="36" name="Crocotree" type="spawn" x="1248" y="3584">
    <properties>
     <property name="death" value="420000"/>
-    <property name="spawn" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
+    <property name="spawn" value="240000"/>
    </properties>
   </object>
   <object id="37" name="Crocotree" type="spawn" x="2144" y="2976">
    <properties>
     <property name="death" value="420000"/>
-    <property name="spawn" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
+    <property name="spawn" value="240000"/>
    </properties>
   </object>
   <object id="38" name="Crocotree" type="spawn" x="1696" y="2464">
    <properties>
     <property name="death" value="420000"/>
-    <property name="spawn" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
+    <property name="spawn" value="240000"/>
    </properties>
   </object>
   <object id="39" name="Crocotree" type="spawn" x="2048" y="2016">
    <properties>
     <property name="death" value="420000"/>
-    <property name="spawn" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
+    <property name="spawn" value="240000"/>
    </properties>
   </object>
   <object id="40" name="Crocotree" type="spawn" x="992" y="2208">
    <properties>
     <property name="death" value="420000"/>
-    <property name="spawn" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
+    <property name="spawn" value="240000"/>
    </properties>
   </object>
   <object id="41" name="Crocotree" type="spawn" x="1408" y="1408">
    <properties>
     <property name="death" value="420000"/>
-    <property name="spawn" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
+    <property name="spawn" value="240000"/>
    </properties>
   </object>
   <object id="42" name="Crocotree" type="spawn" x="2240" y="1056">
    <properties>
     <property name="death" value="420000"/>
-    <property name="spawn" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
+    <property name="spawn" value="240000"/>
    </properties>
   </object>
   <object id="43" name="Crocotree" type="spawn" x="2688" y="2112">
    <properties>
     <property name="death" value="420000"/>
-    <property name="spawn" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="1010"/>
+    <property name="spawn" value="240000"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index 26db02fa..a8dd8796 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -318,8 +318,8 @@
   <object id="1" name="ToOutside" type="script_warp" x="608" y="896" width="32" height="32">
    <properties>
     <property name="dest_map" value="000-1"/>
-    <property name="dest_x" value="72"/>
-    <property name="dest_y" value="29"/>
+    <property name="dest_x" value="93"/>
+    <property name="dest_y" value="100"/>
    </properties>
   </object>
   <object id="2" name="To Nard's Room" type="script_warp" x="1056" y="896" width="32" height="32">
@@ -332,8 +332,8 @@
   <object id="3" name="To Second Deck" type="warp" x="992" y="800" width="32" height="32">
    <properties>
     <property name="dest_map" value="000-2-1"/>
-    <property name="dest_x" value="1952"/>
-    <property name="dest_y" value="928"/>
+    <property name="dest_x" value="72"/>
+    <property name="dest_y" value="29"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index dcaac112..0a352a8e 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1802,7 +1802,7 @@
   <object id="88" name="Fluffy" type="spawn" x="5600" y="1024" width="320" height="480">
    <properties>
     <property name="death" value="18000"/>
-    <property name="max_beings" value="1"/>
+    <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"/>
@@ -1811,7 +1811,7 @@
   <object id="89" name="Fluffy" type="spawn" x="5984" y="1536" width="320" height="480">
    <properties>
     <property name="death" value="18000"/>
-    <property name="max_beings" value="1"/>
+    <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"/>
-- 
cgit v1.2.3-60-g2f50